[opensuse-translation-commit] r96206 - branches/plus-SLE12-SP2/yast/nn/po

4 Aug 2016

Author: keichwa
Date: 2016-08-04 14:56:51 +0200 (Thu, 04 Aug 2016)
New Revision: 96206

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

Modified: branches/plus-SLE12-SP2/yast/nn/po/add-on-creator.nn.po
===================================================================

--- branches/plus-SLE12-SP2/yast/nn/po/add-on-creator.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/add-on-creator.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -1226,32 +1226,21 @@
 #: src/include/add-on-creator/helps.rb:36
 #, fuzzy
 msgid ""
-"<p><b><big>Creating the Add-On</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Creating the Add-On</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Opprettar tillegget</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Opprettar tillegget</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help
 #: src/include/add-on-creator/helps.rb:40
 #, fuzzy
 msgid ""
-"<p>Writing the add-on configurations<br>"
-"\n"
-"</p>"
-"\n"
+"<p>Writing the add-on configurations<br>\n"
+"</p>\n"
 msgstr ""
-"<p>Lagrar tilleggsproduktoppsett<br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p>Lagrar tilleggsproduktoppsett<br>\n"
+"Vent…<br></p>\n"
 
 #. help text for start menu
 #: src/include/add-on-creator/helps.rb:44
@@ -2287,12 +2276,8 @@
 #. help text
 #: src/modules/AddOnCreator.rb:1746
 #, fuzzy
-msgid ""
-"<b>Wait while generating data for add-on...</b><br/>"
-"\n"
-msgstr ""
-"<b>Vent medan data vert for generert tilleggsprodukt</b><br>"
-"\n"
+msgid "<b>Wait while generating data for add-on...</b><br/>\n"
+msgstr "<b>Vent medan data vert for generert tilleggsprodukt</b><br>\n"
 
 #. error report
 #: src/modules/AddOnCreator.rb:2730

Modified: branches/plus-SLE12-SP2/yast/nn/po/add-on.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/add-on.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/add-on.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:35+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2012-02-05 14:16+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: Norwegian Nynorsk \n"
@@ -95,24 +95,21 @@
 #. Create a summary
 #. return string
 #: src/clients/add-on_auto.rb:70
-msgid ""
-"<li>Media: %1, Path: %2, Product: %3</li>"
-"\n"
-msgstr ""
-"<li>Medium: %1 – adresse: %2 – produkt: %3</li>"
-"\n"
+msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
+msgstr "<li>Medium: %1 – adresse: %2 – produkt: %3</li>\n"
 
-#. error report
-#: src/clients/add-on_auto.rb:185
-msgid "Failed to add add-on product."
-msgstr "Klarte ikkje leggja til tilleggsprodukt."
-
-#: src/clients/add-on_auto.rb:193
+#. set addon specific sig-handling
+#: src/clients/add-on_auto.rb:186
 #, fuzzy
 #| msgid "Please make the add-on \"%1\" available via \"%2\""
 msgid "Make the add-on \"%1\" available via \"%2\"."
 msgstr "Gjer tillleggsproduktet «%1» tilgjengeleg via «%2»"
 
+#. just report error
+#: src/clients/add-on_auto.rb:193
+msgid "Failed to add add-on product."
+msgstr "Klarte ikkje leggja til tilleggsprodukt."
+
 #. placeholder for unknown path
 #. summary item, %1 is product name, %2 media URL, %3 directory on media
 #. placeholder for unknown directory
@@ -298,17 +295,13 @@
 #. help text
 #: src/include/add-on/add-on-workflow.rb:389
 msgid ""
-"<p><big><b>Software Repository Selection</b></big><br>"
-"\n"
+"<p><big><b>Software Repository Selection</b></big><br>\n"
 "Multiple repositories were found on the selected medium.\n"
-"Select the repository to use.</p>"
-"\n"
+"Select the repository to use.</p>\n"
 msgstr ""
-"<p><big><b>Val av pakkebrønn</b></big><br>"
-"\n"
+"<p><big><b>Val av pakkebrønn</b></big><br>\n"
 "Fann fleire pakkebrønner på det valde mediet.\n"
-"Vel pakkebrønnen du vil bruka.</p>"
-"\n"
+"Vel pakkebrønnen du vil bruka.</p>\n"
 
 #: src/include/add-on/add-on-workflow.rb:399
 msgid "Repositories &Found"
@@ -350,17 +343,13 @@
 #. help text
 #: src/include/add-on/add-on-workflow.rb:720
 msgid ""
-"<p><b><big>Product Selection</big></b><br/>"
-"\n"
+"<p><b><big>Product Selection</big></b><br/>\n"
 "Multiple products were found in the repository. Select the products\n"
-"to install.</p>"
-"\n"
+"to install.</p>\n"
 msgstr ""
-"<p><b><big>Produktval</big></b><br>"
-"\n"
+"<p><b><big>Produktval</big></b><br>\n"
 "Fann fleire produkt i pakkebrønnen. Vel produkta\n"
-"du vil installera.</p>"
-"\n"
+"du vil installera.</p>\n"
 
 #. message popup
 #: src/include/add-on/add-on-workflow.rb:788
@@ -370,14 +359,12 @@
 #. Help for add-on products
 #: src/include/add-on/add-on-workflow.rb:910
 msgid ""
-"<p><big><b>Add-On Product Installation</b></big><br/>"
-"\n"
+"<p><big><b>Add-On Product Installation</b></big><br/>\n"
 "Here see all add-on products that are selected for installation.\n"
 "To add a new product, click <b>Add</b>. To remove an already added one,\n"
 "select it and click <b>Delete</b>.</p>"
 msgstr ""
-"<p><big><b>Installering av tilleggsprodukt</b></big><br/>"
-"\n"
+"<p><big><b>Installering av tilleggsprodukt</b></big><br/>\n"
 "Her er ei oversikt over alle tilleggsprodukta som vert installerte.\n"
 "Trykk <b>Legg til</b> for å leggja til eit nytt produkt eller\n"
 "<b>Fjern</b> for å fjerna eit produkt.</p>"

Modified: branches/plus-SLE12-SP2/yast/nn/po/audit-laf.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/audit-laf.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/audit-laf.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -565,75 +565,55 @@
 #: src/include/audit-laf/helps.rb:35
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing Configuration of Linux Audit Framework</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Initializing Configuration of Linux Audit Framework</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Initialiserer LAF-oppsett (Linux Audit Framework)</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer LAF-oppsett (Linux Audit Framework)</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/audit-laf/helps.rb:39
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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 avbryta oppsettverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
+"Du kan trygt avbryta oppsettverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/audit-laf/helps.rb:43
 #, fuzzy
 msgid ""
-"<p><b><big>Saving auditd Configuration and Rules</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Saving auditd Configuration and Rules</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Lagrar auditd-oppsett og regler</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar auditd-oppsett og regler</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/audit-laf/helps.rb:47
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryt lagring:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. logfile_settings dialog help 1/8
 #: src/include/audit-laf/helps.rb:54
 #, fuzzy
 msgid ""
-"<p><b><big>Auditd Log File Configuration</big></b><br>"
-"\n"
+"<p><b><big>Auditd Log File Configuration</big></b><br>\n"
 "The audit daemon is the component of the Linux Auditing System which is responsible for writing all relevant audit events to the log file <i>/var/log/audit/audit.log</i> (default).\n"
 "Events may come from the <i>apparmor</i> kernel module, from applications which use <i>libaudit</i> (e.g. PAM) or incidents caused by rules (e.g. file watches).</p>"
 msgstr ""
-"<p><b><big>Loggfiloppsett for auditd</big></b><br>"
-"\n"
+"<p><b><big>Loggfiloppsett for auditd</big></b><br>\n"
 "audit-nissen er den komponenten i overvåkingssystemet om lagrar alle relevante audit-hendingar i loggfilen <i>/var/log/audit/audit.log</i> (standard).\n"
 "Handlingar kan genererast av <i>apparmor</i>-kjernemodulen, frå program som brukar <i>libaudit</i> (t.d. PAM) eller utløysast av regler (t.d. filovervåking).</p>"
 
@@ -663,13 +643,11 @@
 msgid ""
 "<p><b>Format</b>: set <i>RAW</i> to log all data (store in a format exactly as the kernel\n"
 "sends it) or <i>NOLOG</i> to discard all audit information instead of writing it on disk (does not affect\n"
-"data sent to the dispatcher).</p>"
-" "
+"data sent to the dispatcher).</p> "
 msgstr ""
 "<p><b>Format</b>: Vel <i>RAW</i> for å logga alle data (lagra i nøyaktig same format som dei kjernen\n"
 "sender dei) eller <i>NOLOG</i> for å forkasta all audit-informasjon i staden for å lager han på disken (påverkar\n"
-"ikkje data som vert send til sendaren).</p>"
-" "
+"ikkje data som vert send til sendaren).</p> "
 
 #. logfile_settings dialog help 5/8
 #: src/include/audit-laf/helps.rb:74
@@ -690,8 +668,7 @@
 #, fuzzy
 msgid ""
 "<p>Configure the maximum log file size (in megabytes) and the action to take when this\n"
-"value is reached via <b>Size and Action</b>.</p>"
-"\n"
+"value is reached via <b>Size and Action</b>.</p>\n"
 msgstr ""
 "<p>Angje maksimal loggfilstørrelse (i megabyte) og handlinga som skal utførast når dette\n"
 "verdet er nått, under <b>Storleik og handling</b>.</p>"
@@ -704,8 +681,7 @@
 "of files to keep. Set to <i>SYSLOG</i>, the audit daemon will write a warning\n"
 "to /var/log/messages. With <i>SUSPEND</i> the daemon stops writing records to\n"
 "disk. <i>IGNORE</i> means do nothing, <i>KEEP_LOGS</i> is similar\n"
-"to ROTATE, but log files are not overwritten.</p>"
-"\n"
+"to ROTATE, but log files are not overwritten.</p>\n"
 msgstr ""
 "Viss handlinga <i>ROTATE</i> er vald, angjev <b>Mengd loggfiler</b> kor mange loggfiler\n"
 "som skal haldast på. <i>SYSLOG</i> tyder: audit-nissen vil lagra ein advarsel i /var/log/messages,\n"
@@ -720,8 +696,7 @@
 "log file.  If <i>USER</i> is set, the <b>User Defined Name</b> is\n"
 "used. <i>NONE</i> means no computer name is inserted. <i>HOSTNAME</i> uses the\n"
 "name returned by the 'gethostname' syscall.  <i>FQD</i> uses the fully qualified\n"
-"domain name.</p>"
-"\n"
+"domain name.</p>\n"
 msgstr ""
 "<p><b>Format for datamaskinnavn</b> skildrar korleis datamaskinnavnet skal lagrast i loggfilen.\n"
 "Viss <i>USER</i> er valt, vil <b>Brukerdefinert namn</b> nyttast. <i>NONE</i> tyder: datamaskinnavn vert\n"
@@ -732,13 +707,11 @@
 #: src/include/audit-laf/helps.rb:101
 #, fuzzy
 msgid ""
-"<p><b><big>Auditd Dispatcher Configuration</big></b><br>"
-"\n"
+"<p><b><big>Auditd Dispatcher Configuration</big></b><br>\n"
 "Detailed information about the dispatcher settings can be obtained from the manual page\n"
 "('man auditd.conf').</p>"
 msgstr ""
-"<p><b><big>Oppsett av auditd-sender</big></b><br>"
-"\n"
+"<p><b><big>Oppsett av auditd-sender</big></b><br>\n"
 "Du finn detaljert informasjon om senderinnstillinger på manualsiden\n"
 "'auditd.conf'.</p>"
 
@@ -781,8 +754,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Note:</b> The dispatcher program must be owned by 'root', have '0750'\n"
-" file permissions, and the full path name has to be entered.</p>"
-"\n"
+" file permissions, and the full path name has to be entered.</p>\n"
 msgstr ""
 "<p><b>Hugs:</b> Senderprogrammet må vera eid av 'root', ha '0750'\n"
 "som filrettigheter, og heile stigen på angjevast.</p>"
@@ -791,17 +763,13 @@
 #: src/include/audit-laf/helps.rb:126
 #, fuzzy
 msgid ""
-"<p><b><big>Auditd Disk Space Configuration</big></b><br>"
-"\n"
+"<p><b><big>Auditd Disk Space Configuration</big></b><br>\n"
 "The settings made here refer to disk space on log partition.\n"
-"For detailed information, refer to the manual page ('man auditd.conf').</p>"
-"\n"
+"For detailed information, refer to the manual page ('man auditd.conf').</p>\n"
 msgstr ""
-"<p><b><big>Oppset av diskplass for auditd</big></b><br>"
-"\n"
+"<p><b><big>Oppset av diskplass for auditd</big></b><br>\n"
 "Desse innstillingane gjeld diskplassen på loggpartisjonen.\n"
-"Du finn detaljert informasjon om innstillingar på manualsiden 'auditd.conf'</p>"
-"\n"
+"Du finn detaljert informasjon om innstillingar på manualsiden 'auditd.conf'</p>\n"
 
 #. disk space dialog help 2/6
 #: src/include/audit-laf/helps.rb:132
@@ -828,18 +796,15 @@
 #, fuzzy
 msgid ""
 "<p>If an action is set to <i>EMAIL</i>, a warning mail will be sent to the\n"
-"account specified in <b>Action Mail Account</b>.<br>"
-" <i>SYSLOG</i> means the\n"
+"account specified in <b>Action Mail Account</b>.<br> <i>SYSLOG</i> means the\n"
 "disk space warning will be written to /var/log/messages. <i>IGNORE</i> means\n"
 "do nothing. <i>EXEC</i> runs the script specified in <b>Path to\n"
 "Script</b>. <i>SUSPEND</i> stops writing records to disk. <i>SINGLE</i>\n"
 "switches the system to single user mode. <i>HALT</i> shuts down the\n"
-"system.</p>"
-"\n"
+"system.</p>\n"
 msgstr ""
 "<p>Viss <i>EMAIL</i> er vald for ei handling, vil ei e-postmelding sendast til til kontoen som er angjeven under\n"
-"<b>E-postkonto for varsling</b>.<br>"
-"\n"
+"<b>E-postkonto for varsling</b>.<br>\n"
 "    <i>SYSLOG</i> tyder: advarsel om lite ledig plass på disken vil vert lagra i /var/log/messages, <i>IGNORE</i>:\n"
 "ikkje gjer noko, <i>EXEC</i>: køyr skriptet frå <b>Filsti til skript</b>, <i>SUSPEND</i>: slutt å lagra\n"
 "oppføringer på disken, <i>SINGLA</i>: sett datamaskina i enkeltbrukermodus, <i>HALT</i>: slå av\n"
@@ -862,8 +827,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Note:</b> All scripts specified for <i>EXEC</i> must be owned\n"
-"by 'root', have '0750' file permissions, and the full path name has to be entered.</p>"
-"\n"
+"by 'root', have '0750' file permissions, and the full path name has to be entered.</p>\n"
 msgstr ""
 "<p><b>Hugs:</b> Alle skript som er definerte for <i>EXEC</i> må eigast\n"
 "av 'root', ha '0750' som filrettigheter og heile filstien må angjevast.</p>"
@@ -872,14 +836,12 @@
 #: src/include/audit-laf/helps.rb:160
 #, fuzzy
 msgid ""
-"<p><b><big>Rules for auditctl</big></b><br>"
-"\n"
+"<p><b><big>Rules for auditctl</big></b><br>\n"
 "This dialog offers the possibility to enable or to disable the syscall\n"
 "auditing as well as to lock the audit configuration.\n"
 "The selected flag from <b>Set Enabled Flag</b> will be added to the rules.</p>"
 msgstr ""
-"<p><b><big>Regler for auditctl</big></b><br>"
-"\n"
+"<p><b><big>Regler for auditctl</big></b><br>\n"
 "I denne dialogen kan du aktivera eller deaktivere systemkommandoen\n"
 "for overvåking og låsa audit-oppsettet.\n"
 "Statusen under <b>Definer aktivert-status</b> vert lagd til reglene.</p>"
@@ -887,64 +849,48 @@
 #. rules dialog help 2/6
 #: src/include/audit-laf/helps.rb:167
 #, fuzzy
-msgid ""
-"<p><b>Note:</b><br>"
-"Locking the rules means they cannot be changed until next reboot.</p>"
-msgstr ""
-"<p><b>Merk</b><br>"
-"Låsing av reglene tyder at dei ikkje kan låsast før maskina startast på nytt! </p>"
+msgid "<p><b>Note:</b><br>Locking the rules means they cannot be changed until next reboot.</p>"
+msgstr "<p><b>Merk</b><br>Låsing av reglene tyder at dei ikkje kan låsast før maskina startast på nytt! </p>"
 
 #. rules dialog help 3/6
 #: src/include/audit-laf/helps.rb:171
 #, fuzzy
 msgid ""
 "<p>Enabling auditing without additional rules will cause the\n"
-" applications which use <i>libaudit</i>, e.g. PAM to log to /var/log/audit/audit.log (default).</p>"
-" "
+" applications which use <i>libaudit</i>, e.g. PAM to log to /var/log/audit/audit.log (default).</p> "
 msgstr ""
 "<p>Å aktivera overvåking utan tilleggsregler vil føra til at\n"
-" program som brukar <i>libaudit</i>, t.d. PAM, vil lagra informasjon i /var/log/audit/audit.log (standard).</p>"
-" "
+" program som brukar <i>libaudit</i>, t.d. PAM, vil lagra informasjon i /var/log/audit/audit.log (standard).</p> "
 
 #. rules dialog help 4/6
 #: src/include/audit-laf/helps.rb:175
 #, fuzzy
 msgid ""
-"<p>You can also edit the rules manually, which we only recommended for advanced users.<br>"
-"\n"
-"For more information about all options, see 'man auditctl'.</p>"
-"\n"
+"<p>You can also edit the rules manually, which we only recommended for advanced users.<br>\n"
+"For more information about all options, see 'man auditctl'.</p>\n"
 msgstr ""
-"<p>I denne dialogen kan du òg redigera regler manuelt, noko som berre vert rådt til for avanserte brukarar.<br>"
-"\n"
+"<p>I denne dialogen kan du òg redigera regler manuelt, noko som berre vert rådt til for avanserte brukarar.<br>\n"
 "Du finn detaljert informasjon om vala på manualsiden 'auditctl'.</p>"
 
 #. rules dialog help 5/6
 #: src/include/audit-laf/helps.rb:179
 #, fuzzy
-msgid ""
-"<p><b>Check Syntax</b> sends the rules via <i>auditctl</i> to the audit subsystem and checks the syntax.<br>"
-"<b>Restore</b> restores the settings from /etc/audit/audit.rules.</p>"
-"\n"
+msgid "<p><b>Check Syntax</b> sends the rules via <i>auditctl</i> to the audit subsystem and checks the syntax.<br><b>Restore</b> restores the settings from /etc/audit/audit.rules.</p>\n"
 msgstr ""
 "<p><b>Kontrollar syntaks</b> sender reglene vigd <i>auditctl</i> til audit-systemet og viser\n"
-" om syntaksen er korrekt.<br>"
-"<b>Gjenopprett</b> gjenoppretter innstillingane frå /etc/audit/audit.rules.</p>"
+" om syntaksen er korrekt.<br><b>Gjenopprett</b> gjenoppretter innstillingane frå /etc/audit/audit.rules.</p>"
 
 #. rules dialog help 6/6
 #: src/include/audit-laf/helps.rb:183
 #, fuzzy
 msgid ""
 "<p>Click <b>Restore and Reset</b> to restore the rules and reset\n"
-"the changes (from previous syntax checks) by calling <i>auditctl</i>.<br>"
-"\n"
+"the changes (from previous syntax checks) by calling <i>auditctl</i>.<br>\n"
 "Click <b>Load</b> to open a file selection dialog in which you can load\n"
-"an example rules file.</p>"
-"\n"
+"an example rules file.</p>\n"
 msgstr ""
 "<p>Bruk <b>Gjenopprett og tilbakestill</b> for å gjenopprette tidlegare regler og tilbakestille\n"
-" endringar (sidan tidlegare syntakskontroller) vigde <i>auditctl</i>.<br>"
-"\n"
+" endringar (sidan tidlegare syntakskontroller) vigde <i>auditctl</i>.<br>\n"
 "<b>Last</b>-knappen opnar eit navigasjonsvindu der du kan lasta eit\n"
 "døme på ein regelfil.</p>"
 

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

Modified: branches/plus-SLE12-SP2/yast/nn/po/auth-server.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/auth-server.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/auth-server.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -293,7 +293,8 @@
 msgstr ""
 
 #. `HWeight(1, `PushButton( `id( `pb_interface_ldaps), "Interfaces ...")),
-#: src/include/auth-server/dialogs.rb:88 src/include/auth-server/widgets.rb:127
+#: src/include/auth-server/dialogs.rb:88
+#: src/include/auth-server/widgets.rb:127
 msgid "Firewall Settings"
 msgstr ""
 
@@ -436,12 +437,12 @@
 msgid "Configure Account for Replication"
 msgstr ""
 
-#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:914
-#: src/modules/LdapDatabase.rb:1173
+#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:908
+#: src/modules/LdapDatabase.rb:1167
 msgid "is not a valid LDAP DN"
 msgstr ""
 
-#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1679
+#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1673
 msgid "Password"
 msgstr ""
 
@@ -467,8 +468,8 @@
 msgid "Provider Details"
 msgstr ""
 
-#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1607
-#: src/modules/LdapDatabase.rb:1702
+#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1601
+#: src/modules/LdapDatabase.rb:1696
 msgid "Protocol"
 msgstr ""
 
@@ -476,7 +477,7 @@
 msgid "Provider Hostname"
 msgstr ""
 
-#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1624
+#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1618
 msgid "Use StartTLS"
 msgstr ""
 
@@ -557,8 +558,8 @@
 msgid "Checking the authentication credentials defined in the replication configuration on the provider server failed.\n"
 msgstr ""
 
-#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1971
-#: src/modules/LdapDatabase.rb:1998
+#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1992
 msgid "The test returned the following error messages:"
 msgstr ""
 
@@ -613,8 +614,7 @@
 msgid ""
 "<p>Select <b>Yes</b> if the LDAP server should be started automatically as \n"
 "part of the boot process. Select <b>No</b> if the LDAP server should not be started. Note:\n"
-"After selecting <b>No</b>, you cannot change the OpenLDAP configuration.</p>"
-"\n"
+"After selecting <b>No</b>, you cannot change the OpenLDAP configuration.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:26
@@ -641,8 +641,7 @@
 msgid ""
 "<p><b>LDAPI</b> enables the \"LDAP over IPC\" interface for accessing the\n"
 "LDAP server via a Unix Domain Socket. Do not disable the LDAPI interface \n"
-"as YaST uses it to communicate with the server.</p>"
-"\n"
+"as YaST uses it to communicate with the server.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:41
@@ -652,8 +651,7 @@
 #: src/include/auth-server/helps.rb:42
 msgid ""
 "<p>Select whether SuSEFirewall should allow access on the LDAP-related\n"
-"network ports or not.</p>"
-"\n"
+"network ports or not.</p>\n"
 msgstr ""
 
 #. First part of the Add Database Widget
@@ -669,8 +667,7 @@
 "<b>hdb</b>-Database needs a larger <b>idlcachesize</b> than a\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"
+"It similar to the <b>hdb</b> backend but it is both more space-efficient and more execution-efficient.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:58
@@ -686,16 +683,14 @@
 "administrative limit restrictions. Checking <b>Append Base DN</b> appends the \n"
 "<b>Base DN</b> entered above, for example, a base DN of <tt>dc=example,dc=com</tt>\n"
 "and Administrator DN of <tt>c=Admin</tt> would combine to an effective Administrator DN\n"
-"of <tt>c=Admin,dc=example,dc=com</tt>.</p>"
-" "
+"of <tt>c=Admin,dc=example,dc=com</tt>.</p> "
 msgstr ""
 
 #: 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>"
-" "
+"entered earlier in the installation process.</p> "
 msgstr ""
 
 #: src/include/auth-server/helps.rb:74
@@ -705,8 +700,7 @@
 "clients</b>. This will result in the hostname \"localhost\" and the above \n"
 "entered <b>Base DN</b> being written to the OpenLDAP client configuration \n"
 "file <tt>/etc/openldap/ldap.conf</tt>. This checkbox is selected by default\n"
-"when creating the first database on a server.</p>"
-"\n"
+"when creating the first database on a server.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:82
@@ -720,8 +714,7 @@
 "<p>To enable or disable plaintext authentication (LDAP Simple Bind)\n"
 "for the configuration database, click the associated checkbox. Plaintext \n"
 "authentication to the configuration database will only be allowed when \n"
-"using sufficiently protected (e.g. SSL/TLS encrypted) connections.</p>"
-"\n"
+"using sufficiently protected (e.g. SSL/TLS encrypted) connections.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:91
@@ -731,8 +724,7 @@
 "A Popup will prompt you to enter the new password and select the \n"
 "<b>Password Encryption</b>. \n"
 "The password fields are initially empty even if a password has already been \n"
-"set in the configuration.</p>"
-"\n"
+"set in the configuration.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:99
@@ -753,8 +745,7 @@
 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"
+"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:109
@@ -784,8 +775,7 @@
 "should encrypt clear text passwords present in add and modify requests before storing them\n"
 "in the database. Note that this violates the  X.500/LDAP information model, but may be\n"
 "needed to compensate for LDAP clients that do not use the password modify extended operation \n"
-"to manage passwords.</p>"
-" "
+"to manage passwords.</p> "
 msgstr ""
 
 #: src/include/auth-server/helps.rb:129
@@ -794,8 +784,7 @@
 "authenticate to a locked account are notified that their account is\n"
 "locked. This notification might provide useful information to an\n"
 "attacker. Sites sensitive to security issues should not enable this\n"
-"option.</p>"
-" \n"
+"option.</p> \n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:136
@@ -806,8 +795,7 @@
 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"
+"Policy Object being read from the server.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:144
@@ -827,39 +815,34 @@
 "<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"
 "common searches on a database. YaST allows you to setup three different types\n"
-"of indexes.</p>"
-"\n"
+"of indexes.</p>\n"
 msgstr ""
 
 #: 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"
+"for attributes that occur rarely in the database.</p>\n"
 msgstr ""
 
 #: 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"
+"should always be configured with the <tt>objectclass</tt> attribute.</p>\n"
 msgstr ""
 
 #: 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"
+"(i.e. <tt>(attributeType=<substring>*)</tt>)</p>\n"
 msgstr ""
 
 #: 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"
+"indexing options of an already indexed attribute.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:173
@@ -867,8 +850,7 @@
 "<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"
 "written to the server, a background task will start to generate the indexing\n"
-"information for the database.</p>"
-"\n"
+"information for the database.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:179
@@ -878,23 +860,20 @@
 #: 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"
+"currently configured for the selected database</p>\n"
 msgstr ""
 
 #: 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"
+"click <b>Edit</b>.</p>\n"
 msgstr ""
 
 #: 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"
+"delete an access control rule.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:193
@@ -902,8 +881,7 @@
 "<p>OpenLDAP's access control evaluation stops at the first rule whose target\n"
 "definition (DN, filter and attributes) matches the entry being\n"
 "accessed. Therefore you should order the rules according to your needs, using\n"
-"the <b>Up</b> and <b>Down</b> buttons.</p>"
-"\n"
+"the <b>Up</b> and <b>Down</b> buttons.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:199
@@ -929,8 +907,7 @@
 "has last been written. By default (both values are '0') the state indicator is\n"
 "only written after a clean shutdown. Writing it more often can result in\n"
 "a faster startup time after an unclean shutdown but might result in a small\n"
-"performance hit in environments with many LDAP write operations.</p>"
-"\n"
+"performance hit in environments with many LDAP write operations.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:216
@@ -952,8 +929,7 @@
 #: 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"
+"database to be a replica of a database on another server.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:229
@@ -983,16 +959,14 @@
 "<p><b>refreshOnly</b>: The slave server will periodically open a new\n"
 "connection, trigger a synchronization and close the connection again. The\n"
 "interval how often this synchronization happens can be configured via the\n"
-"<b>Replication Interval</b> setting.</p>"
-"\n"
+"<b>Replication Interval</b> setting.</p>\n"
 msgstr ""
 
 #: 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"
+"master server are immediately sent to the slave via this connection.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:251
@@ -1002,8 +976,7 @@
 #: 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"
+"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:255
@@ -1016,8 +989,7 @@
 "operations with an LDAP referral. \n"
 "By default, this referral points the client to the master server. You can configure a different update referral here.\n"
 "This is e.g. useful in a cascaded replication setup where the provider for the\n"
-"slave server is as slave server too. </p>"
-"\n"
+"slave server is as slave server too. </p>\n"
 msgstr ""
 
 #. Read dialog help
@@ -1027,25 +999,20 @@
 
 #: src/include/auth-server/helps.rb:267
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Initialization:</big></b><br>\n"
 "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
 msgstr ""
 
 #. Write dialog help
 #: src/include/auth-server/helps.rb:271
-msgid ""
-"<p><b><big>Saving LDAP Server Configuration</big></b></p>"
-" \n"
+msgid "<p><b><big>Saving LDAP Server Configuration</big></b></p> \n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:274
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>. An additional dialog\n"
-"informs you whether it is safe to do so.</p>"
-"\n"
+"informs you whether it is safe to do so.</p>\n"
 msgstr ""
 
 #. Summary dialog help 1/3
@@ -1057,15 +1024,12 @@
 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"
-"Server module.</p>"
-"\n"
+"Server module.</p>\n"
 msgstr ""
 
 #. Configuration Wizard Step 1
 #: 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>"
-" "
+msgid "<p>With <b>Start LDAP Server Yes or No</b>, start or stop the LDAP server.</p> "
 msgstr ""
 
 #: src/include/auth-server/helps.rb:292
@@ -1075,8 +1039,7 @@
 #: 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"
+"for OpenLDAP by checking the corresponding checkbox.</p>\n"
 msgstr ""
 
 #. Configuration Wizard Step 2
@@ -1087,15 +1050,13 @@
 #: 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"
+"no preparations for replication.</p>\n"
 msgstr ""
 
 #: 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"
+"prepared to act as a master server (provider) in a replication setup.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:308
@@ -1117,24 +1078,21 @@
 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"
+"to use.</p>\n"
 msgstr ""
 
 #: 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"
+"support TLS encrypted connections through the StartTLS extended operation.</p>\n"
 msgstr ""
 
 #: 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"
+"the OpenLDAP server uses this certificate.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:331
@@ -1146,15 +1104,13 @@
 "<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"
 "<b>Certificate File</b> and <b>Certificate Key File</b> into the corresponding\n"
-"textfields.</p>"
-"\n"
+"textfields.</p>\n"
 msgstr ""
 
 #: 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"
+"clicking <b>Launch CA Management Module</b>.</p>\n"
 msgstr ""
 
 #. Tree Item Dialog "global" 1/1
@@ -1189,8 +1145,7 @@
 #: 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"
+"Note that OpenLDAP does not truly implement LDAPv2.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:363
@@ -1209,8 +1164,7 @@
 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"
+"access controls and other administrative limits.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:374
@@ -1221,31 +1175,27 @@
 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"
+"prohibit anonymous directory access.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:380
 msgid ""
 "<p><b>Disable Simple Bind authentication</b>: Completely disable Simple Bind\n"
-"authentication</p>"
-"\n"
+"authentication</p>\n"
 msgstr ""
 
 #: 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"
+"to the anonymous state when receiving the StartTLS operation.</p>\n"
 msgstr ""
 
 #: 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"
-"connections.</p>"
-"\n"
+"connections.</p>\n"
 msgstr ""
 
 #. Tree Item Dialog "databases"
@@ -1255,8 +1205,7 @@
 "\"frontend\" and \"config\" represent special internal databases. The \"Frontend\"\n"
 "database is use to configure global access control restrictions and overlays\n"
 "that apply to all databases. The \"Config\" database holds the configuration of\n"
-"the LDAP server itself.</p>"
-"\n"
+"the LDAP server itself.</p>\n"
 msgstr ""
 
 #. Tree Item Dialog "databases" 2/2
@@ -1267,8 +1216,7 @@
 #: 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"
+"You cannot delete the \"config\" and \"frontend\" databases.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:406
@@ -1280,8 +1228,7 @@
 #: 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"
+"checkbox. This will ensure that the serverId attribute is generated as needed for MirrorMode replication.</p>\n"
 msgstr ""
 
 #: src/include/auth-server/helps.rb:412
@@ -1299,9 +1246,7 @@
 
 #. Help text: basic settings 2/2
 #: 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"
+msgid "<p>Although your Kerberos realm can be any ASCII string, the convention is to use upper-case letters as in your domain name.</p>\n"
 msgstr ""
 
 #. advanced item help: database_name
@@ -1505,9 +1450,7 @@
 
 #. advanced item help : kdb_subtrees
 #: 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>"
+msgid "<p>Specifies the list of subtrees containing the principals of a realm. The list contains the DNs of the subtree objects separated by colon(:).</p><p>The search scope specifies the scope for searching the principals under the subtree.</p>"
 msgstr ""
 
 #. advanced item help : kdb_containerref
@@ -2250,7 +2193,7 @@
 msgid "Index Cache (IDL cache)"
 msgstr ""
 
-#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2102
+#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2096
 msgid "Checkpoint Settings"
 msgstr ""
 
@@ -2318,7 +2261,7 @@
 msgstr ""
 
 #. encoding: utf-8
-#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2239
+#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2233
 msgid "Password Policy Settings"
 msgstr ""
 
@@ -2479,237 +2422,237 @@
 msgstr ""
 
 #. try to read the ppolicy from the server
-#: src/modules/LdapDatabase.rb:637
+#: src/modules/LdapDatabase.rb:631
 msgid "Authentication failed. The password is probably incorrect.\n"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:640
+#: src/modules/LdapDatabase.rb:634
 msgid "The error message was: '"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:645
+#: src/modules/LdapDatabase.rb:639
 msgid "Try again?"
 msgstr ""
 
 #. PasswordPolicyDialog only returns the changes made to the original
 #. Entry, try to merge them here
-#: src/modules/LdapDatabase.rb:720
+#: src/modules/LdapDatabase.rb:714
 msgid "Available Attribute Types"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:724
+#: src/modules/LdapDatabase.rb:718
 msgid "Selected Attribute Types"
 msgstr ""
 
 #. Popup to add/edit the acl "by" clauses
-#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:985
+#: src/modules/LdapDatabase.rb:807 src/modules/LdapDatabase.rb:979
 msgid "Who should this rule apply to"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:819 src/modules/LdapDatabase.rb:946
-#: src/modules/LdapDatabase.rb:989 src/modules/LdapDatabase.rb:1227
+#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:940
+#: src/modules/LdapDatabase.rb:983 src/modules/LdapDatabase.rb:1221
 msgid "Entry DN"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:820 src/modules/LdapDatabase.rb:990
+#: src/modules/LdapDatabase.rb:814 src/modules/LdapDatabase.rb:984
 msgid "Select"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:826
+#: src/modules/LdapDatabase.rb:820
 msgid "Define the Access Level"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:836
+#: src/modules/LdapDatabase.rb:830
 msgid "Stop access control evaluation here (default)"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:843
+#: src/modules/LdapDatabase.rb:837
 msgid "Continue with next access control rule (\"break\")"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:849
+#: src/modules/LdapDatabase.rb:843
 msgid "Continue evaluation of this rule (\"continue\")"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:904
+#: src/modules/LdapDatabase.rb:898
 msgid "Please enter a DN in the textfield"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:948 src/modules/LdapDatabase.rb:1090
-#: src/modules/LdapDatabase.rb:1225
+#: src/modules/LdapDatabase.rb:942 src/modules/LdapDatabase.rb:1084
+#: src/modules/LdapDatabase.rb:1219
 msgid "Subtree DN"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:950
+#: src/modules/LdapDatabase.rb:944
 msgid "Group DN"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:973
+#: src/modules/LdapDatabase.rb:967
 msgid "Edit Access Control Rule"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:978
+#: src/modules/LdapDatabase.rb:972
 msgid "Target Objects"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:999
+#: src/modules/LdapDatabase.rb:993
 msgid "Matching the filter:"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1006
+#: src/modules/LdapDatabase.rb:1000
 msgid "LDAP Filter"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1016
+#: src/modules/LdapDatabase.rb:1010
 msgid "Apply this rule only to the listed attribute"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1021 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1015 src/modules/LdapDatabase.rb:1309
 msgid "Attributes"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1023
+#: src/modules/LdapDatabase.rb:1017
 msgid "Edit"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1029 src/modules/LdapDatabase.rb:1041
+#: src/modules/LdapDatabase.rb:1023 src/modules/LdapDatabase.rb:1035
 msgid "Access Level"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1039
+#: src/modules/LdapDatabase.rb:1033
 msgid "Who"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1040 src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1034 src/modules/LdapDatabase.rb:1309
 msgid "DN"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1042
+#: src/modules/LdapDatabase.rb:1036
 msgid "Flow Control"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1047 src/modules/LdapDatabase.rb:1319
+#: src/modules/LdapDatabase.rb:1041 src/modules/LdapDatabase.rb:1313
 msgid "Up"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1048 src/modules/LdapDatabase.rb:1320
+#: src/modules/LdapDatabase.rb:1042 src/modules/LdapDatabase.rb:1314
 msgid "Down"
 msgstr ""
 
 #. FIXME: Validate attribute types
-#: src/modules/LdapDatabase.rb:1185
+#: src/modules/LdapDatabase.rb:1179
 msgid "Enter a list of valid attributes in the <b>Attributes</b> textfield"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1197
+#: src/modules/LdapDatabase.rb:1191
 msgid "Enter valid a LDAP filter in the textfield"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1203
+#: src/modules/LdapDatabase.rb:1197
 msgid "You must add at least one item to the \"Access Level\" list."
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
 msgid "Target"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1315
+#: src/modules/LdapDatabase.rb:1309
 msgid "Filter"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1347
+#: src/modules/LdapDatabase.rb:1341
 msgid ""
 "The selected database contains access control rules that are currently\n"
 "not supported by YaST. The Access Control Dialog will be disabled.\n"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1594
+#: src/modules/LdapDatabase.rb:1588
 msgid "This database is a Replication Consumer."
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1614
+#: src/modules/LdapDatabase.rb:1608
 msgid "Provider Name"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1619 src/modules/LdapDatabase.rb:1716
+#: src/modules/LdapDatabase.rb:1613 src/modules/LdapDatabase.rb:1710
 msgid "Port"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1637
+#: src/modules/LdapDatabase.rb:1631
 msgid "Replication Type"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1644
+#: src/modules/LdapDatabase.rb:1638
 msgid "Replication Interval"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1647
+#: src/modules/LdapDatabase.rb:1641
 msgid "Days"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1651
+#: src/modules/LdapDatabase.rb:1645
 msgid "Hours"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1655 src/modules/LdapDatabase.rb:2118
+#: src/modules/LdapDatabase.rb:1649 src/modules/LdapDatabase.rb:2112
 msgid "Minutes"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1659
+#: src/modules/LdapDatabase.rb:1653
 msgid "Seconds"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1672
+#: src/modules/LdapDatabase.rb:1666
 msgid "Authentication DN"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1693
+#: src/modules/LdapDatabase.rb:1687
 msgid "Custom update referral"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1709
+#: src/modules/LdapDatabase.rb:1703
 msgid "Target Host"
 msgstr ""
 
 #. no updateref
-#: src/modules/LdapDatabase.rb:1929
+#: src/modules/LdapDatabase.rb:1923
 msgid "Invalid replication interval specified"
 msgstr ""
 
 #. test connection
-#: src/modules/LdapDatabase.rb:1965
+#: src/modules/LdapDatabase.rb:1959
 msgid "Checking LDAP connectivity to the provider failed."
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1980 src/modules/LdapDatabase.rb:2007
+#: src/modules/LdapDatabase.rb:1974 src/modules/LdapDatabase.rb:2001
 msgid "Do you still want to continue?"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1989
+#: src/modules/LdapDatabase.rb:1983
 msgid "Checking the LDAPsync capabilities of the provider failed."
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:1995
+#: src/modules/LdapDatabase.rb:1989
 msgid "Please verify that the target server is enabled to be a LDAPsync provider"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:2094
+#: src/modules/LdapDatabase.rb:2088
 msgid "Enable ldapsync provider for this database"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:2108 src/modules/LdapDatabase.rb:2144
+#: src/modules/LdapDatabase.rb:2102 src/modules/LdapDatabase.rb:2138
 msgid "Operations"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:2131
+#: src/modules/LdapDatabase.rb:2125
 msgid "Session Log"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:2137
+#: src/modules/LdapDatabase.rb:2131
 msgid "Enable Session Log"
 msgstr ""
 
-#: src/modules/LdapDatabase.rb:2271
+#: src/modules/LdapDatabase.rb:2265
 msgid "Replication Settings"
 msgstr ""
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/autoinst.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/autoinst.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/autoinst.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -35,7 +35,7 @@
 
 #: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123
 #: src/include/autoinstall/conftree.rb:622
-#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:352
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:358
 #, fuzzy
 msgid "This may take a while"
 msgstr "Dette kan ta eit bel"
@@ -58,12 +58,12 @@
 
 #. command line options
 #. Init variables
-#. Import users configuration from the profile
-#.
+#. We will have to set default entries which are defined
+#. in the import call of ServicesManager
 #. Backup
 #. Now check if there any classes defined in theis pre final control file
 #: src/clients/autoyast.rb:114 src/clients/ayast_setup.rb:148
-#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:410
+#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:389
 #: src/clients/inst_autosetup_upgrade.rb:484
 #: src/modules/AutoInstallRules.rb:1001
 #, fuzzy
@@ -359,24 +359,22 @@
 msgid "Executing Post-Scripts"
 msgstr "Køyrar postskript"
 
-#. Do not restart dbus. Otherwise some services will hang.
-#. bnc#937900
-#: src/clients/inst_autoconfigure.rb:304
+#: src/clients/inst_autoconfigure.rb:303
 msgid "Restarting all running services"
 msgstr ""
 
-#: src/clients/inst_autoconfigure.rb:327
+#: src/clients/inst_autoconfigure.rb:326
 msgid "Activating systemd default target"
 msgstr ""
 
 #. Just in case, remove this file to avoid reconfiguring...
-#: src/clients/inst_autoconfigure.rb:342
+#: src/clients/inst_autoconfigure.rb:341
 #, fuzzy
 msgid "Finishing Configuration"
 msgstr "Fullfører konfigurasjon"
 
 #. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:448
+#: src/clients/inst_autoconfigure.rb:444
 #, fuzzy
 msgid "Processing resource %1"
 msgstr "handsamar ressursen %1"
@@ -392,12 +390,10 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"Please wait while the image is retrieved.</p>"
-"\n"
+"Please wait while the image is retrieved.</p>\n"
 msgstr ""
 "<p>\n"
-"Vent medan diskbildet vert henta.</p>"
-"\n"
+"Vent medan diskbildet vert henta.</p>\n"
 
 #: src/clients/inst_autoimage.rb:32
 #, fuzzy
@@ -460,12 +456,10 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"Please wait while the system is prepared for autoinstallation.</p>"
-"\n"
+"Please wait while the system is prepared for autoinstallation.</p>\n"
 msgstr ""
 "<p>\n"
-"Vent medan systemet vert for klargjort autoinstallasjon.</p>"
-"\n"
+"Vent medan systemet vert for klargjort autoinstallasjon.</p>\n"
 
 #: src/clients/inst_autoinit.rb:41
 #, fuzzy
@@ -576,123 +570,110 @@
 #. Uwe Gansert 
 #.
 #. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:50 src/clients/inst_autosetup_upgrade.rb:47
 #, fuzzy
 msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
 msgstr "<p>Vent medan systemet vert for klargjort autoinstallasjon.</p>"
 
-#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:52
 #, fuzzy
 msgid "Execute pre-install user scripts"
 msgstr "Køyr brukerskript før installasjon"
 
-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:51
 #, fuzzy
 msgid "Configure General Settings "
 msgstr "Konfigurer generelle innstillingar "
 
-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:53
 #, fuzzy
 msgid "Set up language"
 msgstr "Språkinnstillinger"
 
-#: src/clients/inst_autosetup.rb:60
+#: src/clients/inst_autosetup.rb:57
 #, fuzzy
 msgid "Create partition plans"
 msgstr "Opprett partisjonstabeller"
 
-#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:56
 #, fuzzy
 msgid "Configure Bootloader"
 msgstr "Konfigurer oppstartslaster"
 
-#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:54
 #, fuzzy
 msgid "Registration"
 msgstr "Spurnad"
 
-#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:55
 #, fuzzy
 msgid "Configure Software selections"
 msgstr "Konfigurer programvareutvalg"
 
-#: src/clients/inst_autosetup.rb:64
+#: src/clients/inst_autosetup.rb:61
 msgid "Configure Systemd Default Target"
 msgstr ""
 
-#: src/clients/inst_autosetup.rb:65
+#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:61
 #, fuzzy
-msgid "Configure users and groups"
-msgstr "Konfigurera volumgrupper"
-
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61
-#, fuzzy
 msgid "Executing pre-install user scripts..."
 msgstr "Køyrer brukerskript før installasjon …"
 
-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:60
 #, fuzzy
 msgid "Configuring general settings..."
 msgstr "Konfigurerer generelle innstillingar …"
 
-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:62
 #, fuzzy
 msgid "Setting up language..."
 msgstr "Språkinnstillinger"
 
-#: src/clients/inst_autosetup.rb:72
+#: src/clients/inst_autosetup.rb:68
 #, fuzzy
 msgid "Creating partition plans..."
 msgstr "Opprettar partisjonstabeller …"
 
-#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:65
 #, fuzzy
 msgid "Configuring Bootloader..."
 msgstr "Konfigurerer oppstartslaster …"
 
-#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:63
 #, fuzzy
 msgid "Registering the system..."
 msgstr "Klonar systemet …"
 
-#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:64
 #, fuzzy
 msgid "Configuring Software selections..."
 msgstr "Konfigurerer programvareutvalg …"
 
-#: src/clients/inst_autosetup.rb:76
+#: src/clients/inst_autosetup.rb:72
 #, fuzzy
 msgid "Configuring Systemd Default Target..."
 msgstr "Konfigurerer språk …"
 
-#: src/clients/inst_autosetup.rb:77
-msgid "Importing users and groups configuration..."
-msgstr ""
-
-#: src/clients/inst_autosetup.rb:81 src/clients/inst_autosetup_upgrade.rb:69
+#: src/clients/inst_autosetup.rb:76 src/clients/inst_autosetup_upgrade.rb:69
 #, fuzzy
 msgid "Preparing System for Automated Installation"
 msgstr "Klargjer system for automatisk installasjon"
 
-#. Second stage of installation will not be called but a
-#. network configuration is available. So this will be written
-#. while the general inst_finish process at the end of the
-#. first stage. But for the installation workflow the linuxrc
-#. network settings will be taken. (bnc#944942)
-#: src/clients/inst_autosetup.rb:183
+#. configure general settings
+#: src/clients/inst_autosetup.rb:164
 msgid "Handling Add-On Products..."
 msgstr ""
 
 #. Set it in the Language module.
 #.
 #. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:184 src/clients/inst_autosetup_upgrade.rb:149
 #, fuzzy
 msgid "Configuring language..."
 msgstr "Konfigurerer språk …"
 
 #. Yes, do not set Storage testsuite here as we want really GUI with proposal
-#: src/clients/inst_autosetup.rb:290
+#: src/clients/inst_autosetup.rb:273
 #, fuzzy
 msgid ""
 "Error while configuring partitions.\n"
@@ -702,7 +683,7 @@
 "Freist igjen.\n"
 
 #. Software
-#: src/clients/inst_autosetup.rb:344
+#: src/clients/inst_autosetup.rb:331
 #, fuzzy
 msgid ""
 "Error while configuring software selections.\n"
@@ -777,23 +758,19 @@
 #, fuzzy
 msgid ""
 "<p>Depending on your experience, you can skip, log, and show (with time-out)\n"
-"installation messages.</p>"
-" \n"
+"installation messages.</p> \n"
 msgstr ""
 "<p>Avhengig av røynsle kan du deaktivere, logga og visa (med tidsavbrudd)\n"
-"installasjonsmeldinger</p>"
-" \n"
+"installasjonsmeldinger</p> \n"
 
 #: src/clients/report_auto.rb:223
 #, fuzzy
 msgid ""
 "<p>It is recommended to show all  <b>messages</b> with time-out.\n"
-"Warnings can be skipped in some places, but should not be ignored.</p>"
-"\n"
+"Warnings can be skipped in some places, but should not be ignored.</p>\n"
 msgstr ""
 "<p>Vi rår til å visa alle <b>meldingar</b> med tidsavbrudd.\n"
-"Advarsler kan deaktiveres nokon stadar, men bør ikkje ignorerast.</p>"
-"\n"
+"Advarsler kan deaktiveres nokon stadar, men bør ikkje ignorerast.</p>\n"
 
 #: src/clients/report_auto.rb:230
 #, fuzzy
@@ -813,14 +790,12 @@
 "<p>\n"
 "Select one of the following <b>base</b> selections and click <i>Detailed<i> to add\n"
 "more <b>add-on</b> selections and packages.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel éin av følgjande <b>grunnutvalg</b>, og klikk på <i>Detaljert<i> for å leggja til\n"
 "<b>tilleggsutvalg og -pakker</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. AutoinstSoftware::pmInit();
 #. string mainRepo = "http://10.10.0.162/SLES11/DVD1/";
@@ -1152,8 +1127,7 @@
 "on the command line and try again. Because of this error, you\n"
 "can only enter a URL to a profile and not to a directory. If you\n"
 "are using rules or host name-based control files, restart the\n"
-"installation process and make sure the control files are accessible.</p>"
-"\n"
+"installation process and make sure the control files are accessible.</p>\n"
 msgstr ""
 "<p>\n"
 "En profil for denne maskina vart ikkje funnen eller kunne ikkje lastast.\n"
@@ -1161,8 +1135,7 @@
 "på kommandolinjen, og forsøk igjen. På grunn av denne feilen kan du\n"
 "berre leggja inn adressa til en profil, ikkje til ein katalog. Viss du\n"
 "brukar regler eller vertsmaskinnavn basert på kontrollfiler, må du starta\n"
-"installasjonsprosessen på nytt og forsikra deg om at kontrollfilene er tilgjengelege.</p>"
-"\n"
+"installasjonsprosessen på nytt og forsikra deg om at kontrollfilene er tilgjengelege.</p>\n"
 
 #: src/include/autoinstall/autoinst_dialogs.rb:30
 #, fuzzy
@@ -1290,36 +1263,28 @@
 
 #: src/include/autoinstall/classes.rb:200
 #, fuzzy
-msgid ""
-"<p>Use this interface to define classes of control files. </p>"
-"\n"
-msgstr ""
-"<p>I denne dialogen kan du definera kontrollfilklasser. </p>"
-"\n"
+msgid "<p>Use this interface to define classes of control files. </p>\n"
+msgstr "<p>I denne dialogen kan du definera kontrollfilklasser. </p>\n"
 
 #: src/include/autoinstall/classes.rb:206
 #, fuzzy
 msgid ""
 "<p>For example, you can define a class of configurations for\n"
-"a specific  department, group, or site in your company environment.</p>"
-"\n"
+"a specific  department, group, or site in your company environment.</p>\n"
 msgstr ""
 "<p>Du kan til dømes definera ulike konfigurasjonsklasser for\n"
-"avdelingar, arbeidsgrupper eller arbeidssteder i føretaket.</p>"
-"\n"
+"avdelingar, arbeidsgrupper eller arbeidssteder i føretaket.</p>\n"
 
 #: src/include/autoinstall/classes.rb:213
 #, fuzzy
 msgid ""
 "<p>The order (priority) defines the hierarchy of a class\n"
 "and when it is merged when creating a control file.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>Rekkjefølgda (prioriteten) definerer plassen til klassa i hierarkiet,\n"
 "og når han skal tilordnes ein kontrollfil som vert oppretta.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/autoinstall/classes.rb:243
 #, fuzzy
@@ -1429,12 +1394,10 @@
 #, fuzzy
 msgid ""
 "<p>Choose one or more of the listed classes to which the current control\n"
-"file should belong.</p>"
-"\n"
+"file should belong.</p>\n"
 msgstr ""
 "<p>Vel éin eller fleire av dei oppførde klassene som denne kontrollfilen\n"
-"skal tilordnes.</p>"
-"\n"
+"skal tilordnes.</p>\n"
 
 #: src/include/autoinstall/classes.rb:614
 #, fuzzy
@@ -1717,20 +1680,19 @@
 msgid ""
 "<P>If you are using the classes feature\n"
 "of Autoyast, also enter the class directory. This is where\n"
-"all class files are stored.</p>"
-"\n"
+"all class files are stored.</p>\n"
 msgstr ""
 "<P>Viss du brukar klassefunksjonen\n"
 "i Autoyast, må òg klassekatalogen angjevast, dvs. katalogen der\n"
-"alle klassefiler er lagra.</p>"
-"\n"
+"alle klassefiler er lagra.</p>\n"
 
 #: src/include/autoinstall/dialogs.rb:78
 #, fuzzy
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: src/include/autoinstall/dialogs.rb:94 src/include/autoinstall/dialogs.rb:101
+#: src/include/autoinstall/dialogs.rb:94
+#: src/include/autoinstall/dialogs.rb:101
 #, fuzzy
 msgid "Select Directory"
 msgstr "Vel katalog"
@@ -1874,7 +1836,7 @@
 #. list<any> l = [ "key1",0,"key3" ];
 #. m[ l ] = v;
 #. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:813
 #, fuzzy
 msgid "Checking XML with RNG validation..."
 msgstr "Kontrollerer XML med RNG-validering …"
@@ -1886,7 +1848,7 @@
 msgstr "Seksjon %1:"
 
 #. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:825
 #, fuzzy
 msgid "Checking XML with RNC validation..."
 msgstr "Kontrollerer XML med RNC-validering …"
@@ -1933,7 +1895,7 @@
 msgstr "Start maskina på nytt etter andre trinn"
 
 #: src/include/autoinstall/general_dialogs.rb:90
-#: src/modules/AutoinstGeneral.rb:126
+#: src/modules/AutoinstGeneral.rb:121
 #, fuzzy
 msgid "Signature Handling"
 msgstr "Signaturbehandling"
@@ -2184,24 +2146,20 @@
 msgid ""
 "<p>This tool uses <em>xmllint</em> to validate the profile against the DTD and\n"
 "it checks for missing data. Some missing data might be intentional and any\n"
-"reported errors can be ignored, for example, when creating classes.</p>"
-"\n"
+"reported errors can be ignored, for example, when creating classes.</p>\n"
 msgstr ""
 "<p>Dette verktøyet brukar <em>xmllint</em> for å validera profilen mot DTDen, og\n"
 "kontrollerer om data manglar. Data kan iblant utelatast med føremål, og\n"
-"rapporterte feil kan i så fall vert ignorert, til dømes når klasser opprettast.</p>"
-"\n"
+"rapporterte feil kan i så fall vert ignorert, til dømes når klasser opprettast.</p>\n"
 
 #: src/include/autoinstall/helps.rb:22
 #, fuzzy
 msgid ""
 "<p>Load a profile first. Otherwise an empty file\n"
-"is validated.</p>"
-"\n"
+"is validated.</p>\n"
 msgstr ""
 "<p>Du må først lasta en profil for å unngå at ei tom fil\n"
-"vert validert.</p>"
-"\n"
+"vert validert.</p>\n"
 
 #: src/include/autoinstall/helps.rb:25
 #, fuzzy
@@ -2213,26 +2171,22 @@
 msgid ""
 "<p>To import a Kickstart file, enter the path to the configuration file. \n"
 "The imported data is loaded into the configuration management system \n"
-"to add more configuration options available with SUSE.</p>"
-"\n"
+"to add more configuration options available with SUSE.</p>\n"
 msgstr ""
 "<p>For å importera ein hurtigoppstartsfil treng du berre å angje stigen til konfigurasjonsfilen. \n"
 "Den importerte informasjonen vil deretter lastast inn i konfigurasjonsadministrasjonssystemet \n"
-"slik at fleire konfigurasjonsalternativer vert tilgjengelege for SUSA.</p>"
-"\n"
+"slik at fleire konfigurasjonsalternativer vert tilgjengelege for SUSA.</p>\n"
 
 #: src/include/autoinstall/helps.rb:31
 #, fuzzy
 msgid ""
 "<p>This tool creates a reference profile by reading\n"
 "information from this system. Select the resources to read from this system\n"
-"in addition to the default resources, like partitioning and package selections.</p>"
-"\n"
+"in addition to the default resources, like partitioning and package selections.</p>\n"
 msgstr ""
 "<p>Dette verktøyet opprettar ein referanseprofil ved å lesa\n"
 "informasjon frå dette systemet. Vel ressursane som skal lesast frå dette systemet,\n"
-"i tillegg til grunnressurser som partisjonering og pakkeutvalg.</p>"
-"\n"
+"i tillegg til grunnressurser som partisjonering og pakkeutvalg.</p>\n"
 
 #: src/include/autoinstall/helps.rb:36
 #, fuzzy
@@ -2243,13 +2197,11 @@
 #, fuzzy
 msgid ""
 "<p>The table to the right shows the partitions to create on the target system.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Tabellen til høgre visar partisjonene som skal opprettast i målsystemet.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/autoinstall/helps.rb:40
 #, fuzzy
@@ -2334,15 +2286,13 @@
 "For LVM and RAID setup, consult the documentation and add the configuration\n"
 "to an existing control file. You can only create unformatted LVM and RAID partitions as\n"
 "a preparation.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Les dokumentasjonen for oppsett av LVM og RAID, og legg konfigurasjonen\n"
 "inn i ein eksisterande kontrollfil. Du kan berre oppretta uformaterte LVM- og RAID-partisjoner som\n"
 "ei førebuing.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. autoyast tried to read a file but had no success.
 #: src/include/autoinstall/io.rb:123
@@ -2443,13 +2393,11 @@
 #, fuzzy
 msgid ""
 "\n"
-"<h3>Preinstallation Scripts</h3>"
-"\n"
+"<h3>Preinstallation Scripts</h3>\n"
 "<P>Add commands to run on the system  before the installation begins. </P>\n"
 msgstr ""
 "\n"
-"<h3>Preinstallasjonsskript</h3>"
-"\n"
+"<h3>Preinstallasjonsskript</h3>\n"
 "<P>Legg til kommandoar som skal køyrast i systemet før installasjonen byrjar. </P>\n"
 
 #. help 2/6
@@ -2457,15 +2405,13 @@
 #, fuzzy
 msgid ""
 "\n"
-"<h3>Postinstallation Scripts</h3>"
-"\n"
+"<h3>Postinstallation Scripts</h3>\n"
 "<P>You can also add commands to execute on the system after the installation\n"
 "is completed. These scripts are run outside the chroot environment.\n"
 "</P>"
 msgstr ""
 "\n"
-"<h3>Postinstallasjonsskript</h3>"
-"\n"
+"<h3>Postinstallasjonsskript</h3>\n"
 "<P>Du kan òg leggja til kommandoar som skal køyrast i systemet etter at installasjonen\n"
 "er fullførd. Disse skriptene vert køyrd utanfor chroot-miljøet.\n"
 "</P>"
@@ -2500,15 +2446,13 @@
 "<p>It is possible to run chroot scripts in a later stage after\n"
 "the boot loader has been configured using the special boolean tag \"chrooted\".\n"
 "This runs the scripts in the installed system. \n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "\n"
 "<p>Det er mogleg å køyra chroot-skriptene seinare, og etter\n"
 "at oppstartslasteren er konfigurert, ved å bruka den boolske verdet \"chrooted\".\n"
 "Dette vil gjera at skriptene køyrast direkte i det installerte systemet. \n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help 5/6
 #: src/include/autoinstall/script_dialogs.rb:108
@@ -2689,13 +2633,11 @@
 msgid ""
 "<p>\n"
 "By adding scripts to the autoinstallation process, customize the installation for\n"
-"your needs and take control in different stages of the installation.</p>"
-"\n"
+"your needs and take control in different stages of the installation.</p>\n"
 msgstr ""
 "<p>\n"
 "Ved å leggja til skript i autoinstallasjonsprosessen kan du tilpassa installasjonen til\n"
-"behova dine og styre ulike fasar av installasjonen.</p>"
-"\n"
+"behova dine og styre ulike fasar av installasjonen.</p>\n"
 
 #: src/include/autoinstall/script_dialogs.rb:480
 #, fuzzy
@@ -2725,7 +2667,7 @@
 #. @param [String] result_profile the resulting control file path
 #. @return [Boolean] true on success
 #. autoyast has read the autoyast configuration file but something went wrong
-#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:738
+#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:744
 #, fuzzy
 msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
 msgstr "XML-analysen rapporterte ein feil under analysen av autoyast-profilen. Feilmeldinga var:\n"
@@ -2748,54 +2690,54 @@
 
 #. The line above needs to be fixed when we have more attributes
 #. comment will look like this: "(description=BLA BLA)"
-#: src/modules/AutoinstConfig.rb:278
+#: src/modules/AutoinstConfig.rb:273
 #, fuzzy
 msgid "Choose Profile"
 msgstr "Vel profil"
 
 #. SetProtocolMessage ()
 #. @return [void]
-#: src/modules/AutoinstConfig.rb:334
+#: src/modules/AutoinstConfig.rb:329
 #, fuzzy
 msgid "Retrieving control file from floppy."
 msgstr "Hentar kontrollfil frå diskett."
 
-#: src/modules/AutoinstConfig.rb:337
+#: src/modules/AutoinstConfig.rb:332
 #, fuzzy
 msgid "Retrieving control file (%1) from TFTP server: %2."
 msgstr "Hentar kontrollfil (%1) frå TFTP-servar: %2."
 
-#: src/modules/AutoinstConfig.rb:343
+#: src/modules/AutoinstConfig.rb:338
 #, fuzzy
 msgid "Retrieving control file (%1) from NFS server: %2."
 msgstr "Hentar kontrollfil (%1) frå NFS-servar: %2."
 
-#: src/modules/AutoinstConfig.rb:349
+#: src/modules/AutoinstConfig.rb:344
 #, fuzzy
 msgid "Retrieving control file (%1) from HTTP server: %2."
 msgstr "Hentar kontrollfil (%1) frå HTTP-servar: %2."
 
-#: src/modules/AutoinstConfig.rb:355
+#: src/modules/AutoinstConfig.rb:350
 #, fuzzy
 msgid "Retrieving control file (%1) from FTP server: %2."
 msgstr "Hentar kontrollfil (%1) frå FTP-servar: %2."
 
-#: src/modules/AutoinstConfig.rb:361
+#: src/modules/AutoinstConfig.rb:356
 #, fuzzy
 msgid "Copying control file from file: %1."
 msgstr "Kopierer kontrollfil frå fil: %1."
 
-#: src/modules/AutoinstConfig.rb:366
+#: src/modules/AutoinstConfig.rb:361
 #, fuzzy
 msgid "Copying control file from device: /dev/%1."
 msgstr "Kopierer kontrollfil frå eining: /dev/%1."
 
-#: src/modules/AutoinstConfig.rb:370
+#: src/modules/AutoinstConfig.rb:365
 #, fuzzy
 msgid "Copying control file from default location."
 msgstr "Kopierer kontrollfil frå standardplassering."
 
-#: src/modules/AutoinstConfig.rb:372
+#: src/modules/AutoinstConfig.rb:367
 #, fuzzy
 msgid "Source unknown."
 msgstr "Ukjend kjelde."
@@ -2806,50 +2748,42 @@
 #. {
 #. local_rules_file = (string)WFM::Args(1);
 #. }
-#: src/modules/AutoinstConfig.rb:452
+#: src/modules/AutoinstConfig.rb:447
 #, fuzzy
 msgid ""
-"<h3>AutoYaST Configuration Management System</h3>"
-"\n"
+"<h3>AutoYaST Configuration Management System</h3>\n"
 "<p>Almost all resources of the control file can be\n"
-"configured using the configuration management system.</p>"
-"\n"
+"configured using the configuration management system.</p>\n"
 msgstr ""
-"<h3>AutoYaST konfigurasjonsadministrasjonssystem</h3>"
-"\n"
+"<h3>AutoYaST konfigurasjonsadministrasjonssystem</h3>\n"
 "<p>Nesten alle ressursane i kontrollfilen kan\n"
-"konfigurerast ved hjelp av konfigurasjonsadministrasjonssystemet.</p>"
-"\n"
+"konfigurerast ved hjelp av konfigurasjonsadministrasjonssystemet.</p>\n"
 
-#: src/modules/AutoinstConfig.rb:457
+#: src/modules/AutoinstConfig.rb:452
 #, fuzzy
 msgid ""
 "<p>Most of the modules used to create the configuration are identical to those available\n"
 "through the YaST Control Center. Instead of configuring this system, the data\n"
 "entered is collected and exported to the control file that can be used to\n"
 "install another system using AutoYaST.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>Dei fleste modulane som vert brukte for å oppretta konfigurasjonen er identiske med modulane\n"
 "i YaST kontrollsenter. I staden for å konfigurera dette systemet kan informasjonen\n"
 "samlast og vert eksportert til ein kontrollfil. Denne kan deretter brukast for å\n"
 "installera eit anna system ved hjelp av AutoYaST.\n"
-"</p>"
-"\n"
+"</p>\n"
 
-#: src/modules/AutoinstConfig.rb:464
+#: src/modules/AutoinstConfig.rb:459
 #, fuzzy
 msgid ""
 "<p>In addition to the existing and familiar modules,\n"
 "new interfaces were created for special and complex configurations, including\n"
-"partitioning, general options, and software.</p>"
-"\n"
+"partitioning, general options, and software.</p>\n"
 msgstr ""
 "<p>I tillegg til dei eksisterande og velkjende modulane\n"
 "er nye dialogar for spesielle og kompliserte konfigurasjonar utvikla, til dømes\n"
-"for partisjonering, generelle val og programvare.</p>"
-"\n"
+"for partisjonering, generelle val og programvare.</p>\n"
 
 #. Construct node name for display in tree.
 #.
@@ -2878,115 +2812,96 @@
 
 #. string language_name		= "";
 #. string keyboard_name		= "";
-#: src/modules/AutoinstGeneral.rb:90
+#: src/modules/AutoinstGeneral.rb:85
 #, fuzzy
 msgid "Confirm installation?"
 msgstr "Stadfest installasjon?"
 
-#: src/modules/AutoinstGeneral.rb:93 src/modules/AutoinstGeneral.rb:99
-#: src/modules/AutoinstGeneral.rb:108 src/modules/AutoinstGeneral.rb:115
-#: src/modules/AutoinstGeneral.rb:122
+#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94
+#: src/modules/AutoinstGeneral.rb:103 src/modules/AutoinstGeneral.rb:110
+#: src/modules/AutoinstGeneral.rb:117
 #, fuzzy
 msgid "Yes"
 msgstr "Ja"
 
-#: src/modules/AutoinstGeneral.rb:93 src/modules/AutoinstGeneral.rb:99
-#: src/modules/AutoinstGeneral.rb:108
+#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94
+#: src/modules/AutoinstGeneral.rb:103
 #, fuzzy
 msgid "No"
 msgstr "Nei"
 
-#: src/modules/AutoinstGeneral.rb:96
+#: src/modules/AutoinstGeneral.rb:91
 #, fuzzy
 msgid "Second Stage of AutoYaST"
 msgstr "Andre fase i AutoYaST"
 
-#: src/modules/AutoinstGeneral.rb:104
+#: src/modules/AutoinstGeneral.rb:99
 #, fuzzy
 msgid "Halting the machine after stage one"
 msgstr "Slå av maskina etter første trinn"
 
-#: src/modules/AutoinstGeneral.rb:113
+#: src/modules/AutoinstGeneral.rb:108
 #, fuzzy
 msgid "Halting the machine after stage two"
 msgstr "Slå av maskina etter andre trinn"
 
-#: src/modules/AutoinstGeneral.rb:120
+#: src/modules/AutoinstGeneral.rb:115
 #, fuzzy
 msgid "Reboot the machine after stage two"
 msgstr "Start maskina på nytt etter andre trinn"
 
-#: src/modules/AutoinstGeneral.rb:130
+#: src/modules/AutoinstGeneral.rb:125
 #, fuzzy
 msgid "Accepting unsigned files"
 msgstr "Godta usignerte filer"
 
-#: src/modules/AutoinstGeneral.rb:131
+#: src/modules/AutoinstGeneral.rb:126
 #, fuzzy
 msgid "Not accepting unsigned files"
 msgstr "Ikkje godta usignerte filar"
 
-#: src/modules/AutoinstGeneral.rb:140
+#: src/modules/AutoinstGeneral.rb:135
 #, fuzzy
 msgid "Accepting files without a checksum"
 msgstr "Godta filer utan ein kontrollsum"
 
-#: src/modules/AutoinstGeneral.rb:141
+#: src/modules/AutoinstGeneral.rb:136
 #, fuzzy
 msgid "Not accepting files without a checksum"
 msgstr "Ikkje godta filar utan ein kontrollsum"
 
-#: src/modules/AutoinstGeneral.rb:150
+#: src/modules/AutoinstGeneral.rb:145
 #, fuzzy
 msgid "Accepting failed verifications"
 msgstr "Godta mislukka bekreftelser"
 
-#: src/modules/AutoinstGeneral.rb:151
+#: src/modules/AutoinstGeneral.rb:146
 #, fuzzy
 msgid "Not accepting failed verifications"
 msgstr "Ikkje godta mislukka bekreftelser"
 
-#: src/modules/AutoinstGeneral.rb:156
+#: src/modules/AutoinstGeneral.rb:151
 #, fuzzy
 msgid "Accepting unknown GPG keys"
 msgstr "Godta ukjende GPG-nøklar"
 
-#: src/modules/AutoinstGeneral.rb:157
+#: src/modules/AutoinstGeneral.rb:152
 #, fuzzy
 msgid "Not accepting unknown GPG Keys"
 msgstr "Ikkje godta ukjende GPG-nøklar"
 
-#: src/modules/AutoinstGeneral.rb:162
+#: src/modules/AutoinstGeneral.rb:157
 #, fuzzy
 msgid "Importing new GPG keys"
 msgstr "Importera nye GPG-nøklar"
 
-#: src/modules/AutoinstGeneral.rb:163
+#: src/modules/AutoinstGeneral.rb:158
 #, fuzzy
 msgid "Not importing new GPG Keys"
 msgstr "Ikkje importera nye GPG-nøklar"
 
-#. NTP syncing
-#: src/modules/AutoinstGeneral.rb:414
-msgid "Syncing time..."
-msgstr ""
-
-#. TRANSLATORS: %s is the name of the ntp server
-#: src/modules/AutoinstGeneral.rb:416
-msgid "Syncing time with %s."
-msgstr ""
-
-#: src/modules/AutoinstGeneral.rb:420
-#, fuzzy
-msgid "Time syncing failed."
-msgstr "Montering av %1 mislukkast."
-
-#: src/modules/AutoinstGeneral.rb:424
-msgid "Cannot update system time."
-msgstr ""
-
 #. look for VGs to reuse
-#: src/modules/AutoinstLVM.rb:113
+#: src/modules/AutoinstLVM.rb:111
 #, fuzzy
 msgid "Cannot reuse volume group %1. The volume group does not exist."
 msgstr "Kan ikkje gjenbruka volumgruppen %1. Volumgruppen finnast ikkje."
@@ -3081,7 +2996,7 @@
 msgstr "Ukjent"
 
 #. warning text during the installation. %1 is a list of package names
-#: src/modules/AutoinstSoftware.rb:172
+#: src/modules/AutoinstSoftware.rb:171
 #, fuzzy
 msgid ""
 "These packages could not be found in the software repositories:\n"
@@ -3092,36 +3007,36 @@
 
 #. 4 means "already exists"
 #. Add add-ons
-#: src/modules/AutoinstSoftware.rb:327 src/modules/AutoinstSoftware.rb:347
+#: src/modules/AutoinstSoftware.rb:325 src/modules/AutoinstSoftware.rb:345
 #, fuzzy
 msgid "Adding repo %1 failed"
 msgstr "Kunne ikkje leggja til pakkebrønnen %1"
 
 #. Install
-#: src/modules/AutoinstSoftware.rb:375
+#: src/modules/AutoinstSoftware.rb:373
 #, fuzzy
 msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log"
 msgstr "Diskbilde kunne ikkje opprettast under installasjon av mønster. Kontrollar /tmp/ay_image.log"
 
-#: src/modules/AutoinstSoftware.rb:383
+#: src/modules/AutoinstSoftware.rb:381
 #, fuzzy
 msgid "Creating Image - installing packages"
 msgstr "Opprettar diskbilde – installerer pakker"
 
-#: src/modules/AutoinstSoftware.rb:393
+#: src/modules/AutoinstSoftware.rb:391
 #, fuzzy
 msgid "Image creation failed while package installation. Please check /tmp/ay_image.log"
 msgstr "Diskbilde kunne ikkje opprettast under installasjon av pakker. Kontrollar /tmp/ay_image.log"
 
 #. Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") );
-#: src/modules/AutoinstSoftware.rb:404
+#: src/modules/AutoinstSoftware.rb:402
 #, fuzzy
 msgid "Store image to ..."
 msgstr "Lagre diskbilde som …"
 
 #. Compress image:
 #. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*"  .
-#: src/modules/AutoinstSoftware.rb:433
+#: src/modules/AutoinstSoftware.rb:431
 #, fuzzy
 msgid ""
 "You can do changes to the image now in %1/\n"
@@ -3130,18 +3045,18 @@
 "Du kan framleis endra diskbildet i %1/\n"
 "Viss du trykkjer OK, vil diskbildet komprimerast og kan ikkje lenger endrast."
 
-#: src/modules/AutoinstSoftware.rb:447
+#: src/modules/AutoinstSoftware.rb:445
 #, fuzzy
 msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
 msgstr "Komprimering av diskbilde i '%1' mislukkast. Kontrollar /tmp/ay_image.log"
 
-#: src/modules/AutoinstSoftware.rb:454
+#: src/modules/AutoinstSoftware.rb:452
 #, fuzzy
 msgid "Image created successfully"
 msgstr "Diskbildet er oppretta"
 
 #. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:490
+#: src/modules/AutoinstSoftware.rb:488
 #, fuzzy
 msgid ""
 "can not get the directory.yast file at `%1`.\n"
@@ -3151,35 +3066,35 @@
 "Du kan oppretta fila med kommandoen 'ls -F > directory.yast' viss han manglar."
 
 #. don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir.
-#: src/modules/AutoinstSoftware.rb:524
+#: src/modules/AutoinstSoftware.rb:522
 #, fuzzy
 msgid "can not read '%1'. Try again?"
 msgstr "kan ikkje lesa '%1'. Vil du freista igjen?"
 
 #. copy a file
-#: src/modules/AutoinstSoftware.rb:542
+#: src/modules/AutoinstSoftware.rb:540
 #, fuzzy
 msgid "can not read '%1'. ISO creation failed"
 msgstr "Kan ikkje lesa '%1'. ISO kunne ikkje opprettast."
 
 #. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD
-#: src/modules/AutoinstSoftware.rb:572
+#: src/modules/AutoinstSoftware.rb:570
 #, fuzzy
 msgid "Preparing ISO Filestructure ..."
 msgstr "Klargjer ISO-filstruktur …"
 
 #. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:621
+#: src/modules/AutoinstSoftware.rb:619
 #, fuzzy
 msgid "boot config for the DVD"
 msgstr "Oppstartsoppsett for DVD"
 
-#: src/modules/AutoinstSoftware.rb:625
+#: src/modules/AutoinstSoftware.rb:623
 #, fuzzy
 msgid "Ok"
 msgstr "OK"
 
-#: src/modules/AutoinstSoftware.rb:628
+#: src/modules/AutoinstSoftware.rb:626
 #, fuzzy
 msgid ""
 "You can do changes to the ISO now in %1, like adding a complete different AutoYaST XML file.\n"
@@ -3190,51 +3105,51 @@
 
 #. create the actual ISO file
 #. Popup::Message( _("Please choose a place where you want to save the ISO file in the next dialog") );
-#: src/modules/AutoinstSoftware.rb:647
+#: src/modules/AutoinstSoftware.rb:645
 #, fuzzy
 msgid "Store ISO image to ..."
 msgstr "Lagre ISO-diskbilde som …"
 
-#: src/modules/AutoinstSoftware.rb:648
+#: src/modules/AutoinstSoftware.rb:646
 #, fuzzy
 msgid "Creating ISO File ..."
 msgstr "Opprettar ISO-fil …"
 
-#: src/modules/AutoinstSoftware.rb:669
+#: src/modules/AutoinstSoftware.rb:667
 #, fuzzy
 msgid "ISO successfully created at %1"
 msgstr "ISO er oppretta på %1"
 
 #. Summary
 #. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:745
+#: src/modules/AutoinstSoftware.rb:743
 #, fuzzy
 msgid "Selected Patterns"
 msgstr "Valde mønster"
 
-#: src/modules/AutoinstSoftware.rb:755
+#: src/modules/AutoinstSoftware.rb:753
 #, fuzzy
 msgid "Individually Selected Packages"
 msgstr "Valde enkeltpakker"
 
-#: src/modules/AutoinstSoftware.rb:761
+#: src/modules/AutoinstSoftware.rb:759
 #, fuzzy
 msgid "Packages to Remove"
 msgstr "Pakkar som skal fjernast"
 
-#: src/modules/AutoinstSoftware.rb:768
+#: src/modules/AutoinstSoftware.rb:766
 #, fuzzy
 msgid "Force Kernel Package"
 msgstr "Vel spesiell kjernepakke"
 
 #. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:858
+#: src/modules/AutoinstSoftware.rb:856
 #, fuzzy
 msgid "Could not set patterns: %1."
 msgstr "Kunne ikkje definera mønster: %1."
 
 #. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:919
+#: src/modules/AutoinstSoftware.rb:917
 #, fuzzy
 msgid "The package resolver run failed. Please check your software section in the autoyast profile."
 msgstr "Køyringa av pakkeløseren mislukkast. Kontroller programvareseksjonen i autoyast-profilen."
@@ -3287,7 +3202,7 @@
 
 #. Prepare Profile for saving and remove empty data structs
 #. @return [void]
-#: src/modules/Profile.rb:351
+#: src/modules/Profile.rb:357
 #, fuzzy
 msgid "Collecting configuration data..."
 msgstr "Hentar konfigurasjonsdata …"
@@ -3295,7 +3210,7 @@
 #. Save YCP data into XML
 #. @param  path to file
 #. @return	[Boolean] true on success
-#: src/modules/Profile.rb:454
+#: src/modules/Profile.rb:460
 #, fuzzy
 msgid "Encrypted AutoYaST profile. Enter the password twice."
 msgstr "Kryptert autoyast-profil. Angje passordet to gonger."
@@ -3304,7 +3219,7 @@
 #.
 #. @param [String] dir - directory to store section xml files in
 #. @return	  - list of filenames
-#: src/modules/Profile.rb:528
+#: src/modules/Profile.rb:534
 #, fuzzy
 msgid "Could not write section %1 to file %2."
 msgstr "Kunne ikkje lagra seksjonen %1 i fila %2"
@@ -3312,7 +3227,7 @@
 #. Read XML into  YCP data
 #. @param  path to file
 #. @return	[Boolean]
-#: src/modules/Profile.rb:695 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:701 src/modules/ProfileLocation.rb:190
 #, fuzzy
 msgid "Encrypted AutoYaST profile. Enter the correct password."
 msgstr "Kryptert autoyast-profil. Angje riktig passord."
@@ -3335,6 +3250,14 @@
 msgstr "&OK"
 
 #, fuzzy
+#~ msgid "Configure users and groups"
+#~ msgstr "Konfigurera volumgrupper"
+
+#, fuzzy
+#~ msgid "Time syncing failed."
+#~ msgstr "Montering av %1 mislukkast."
+
+#, fuzzy
 #~ msgid "Configure runlevel"
 #~ msgstr "Konfigurer kjørenivåer"
 
@@ -3365,8 +3288,7 @@
 #~ "needs. To reuse an existing partition, enter the partition number of the existing partition to reuse (counting starts with partition number 1) and no size.</P>\n"
 #~ "<p>\n"
 #~ "For partitions that are part of a volume group (not the logical partitions inside a volume group), set the partition ID to 0x8e then choose the volume group. The volume group must already be set up with AutoYaST.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ "<P>For more information, refer to the online documentation.\n"
 #~ "</P>\n"
 #~ msgstr ""
@@ -3375,8 +3297,7 @@
 #~ "behov. Viss du vil gjenbruka ein eksisterande partisjon, må du angje partisjonsnummeret for partisjonen som skal nyttast (lista startar med partisjon nummer 1), men ingen storleik.</P>\n"
 #~ "<p>\n"
 #~ "For partisjoner som tilhøyrer ein volumgruppe (ikkje dei logiske partisjonene i ein volumgruppe), må du velja partisjons-ID 0x8e og deretter velja volumgruppen. Volumgruppen må opprettast i AutoYaST.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ "<P>Den elektroniske dokumentasjonen inneheld meir informasjon.\n"
 #~ "</P>\n"
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/base.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/base.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/base.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 17:00+0200\n"
 "PO-Revision-Date: 2011-07-10 01:23+0200\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: Norwegian Nynorsk \n"
@@ -387,7 +387,7 @@
 #. for translators: use the localized page for your language if it exists,
 #. check the combo box "In other laguages" on top of the page
 #: library/control/src/modules/InstError.rb:167
-#: library/control/src/modules/ProductControl.rb:1444
+#: library/control/src/modules/ProductControl.rb:1450
 msgid "http://en.opensuse.org/Bugs/YaST"
 msgstr "http://en.opensuse.org/Bugs/YaST"
 
@@ -423,7 +423,7 @@
 msgstr ""
 
 #. error report
-#: library/control/src/modules/ProductControl.rb:1253
+#: library/control/src/modules/ProductControl.rb:1259
 msgid "No workflow defined for this installation mode."
 msgstr "Det er ikkje definert nokon prosedyre for denne installasjonsmodusen."
 
@@ -441,14 +441,14 @@
 #. button label
 #. Button that will continue with the installation
 #: library/control/src/modules/ProductProfile.rb:183
-#: library/general/src/modules/Popup.rb:744
+#: library/general/src/modules/Popup.rb:737
 msgid "&Continue Installation"
 msgstr "&Hald fram installeringa"
 
 #. button label
 #. Button that will really abort the installation
 #: library/control/src/modules/ProductProfile.rb:185
-#: library/general/src/modules/Popup.rb:742
+#: library/general/src/modules/Popup.rb:735
 msgid "&Abort Installation"
 msgstr "&Avbryt installeringa"
 
@@ -487,7 +487,7 @@
 msgstr "Det oppstod ein intern feil ved integrering av tilleggsprosedyre."
 
 #. message popup, %1 is a label of some widget
-#: library/cwm/src/modules/CWM.rb:677
+#: library/cwm/src/modules/CWM.rb:691
 msgid "The value of %1 is invalid."
 msgstr "Verdien til %1 er ugyldig."
 
@@ -503,13 +503,11 @@
 #. (both without quotes)
 #: library/cwm/src/modules/CWMServiceStart.rb:225
 msgid ""
-"<p><b><big>Service Start</big></b><br>"
-"\n"
+"<p><b><big>Service Start</big></b><br>\n"
 "To start the service every time your computer is booted, set\n"
 "<b>%1</b>. Otherwise set <b>%2</b>.</p>"
 msgstr ""
-"<p><b><big>Start av teneste</big></b><br>"
-"\n"
+"<p><b><big>Start av teneste</big></b><br>\n"
 "Vel <b>%1</b> for å starta tenesta ved kvar oppstart av maskina.\n"
 "Elles, vel <b>%2</b>.</p>"
 
@@ -521,14 +519,12 @@
 #. (both without quotes)
 #: library/cwm/src/modules/CWMServiceStart.rb:241
 msgid ""
-"<p><b><big>Service Start</big></b><br>"
-"\n"
+"<p><b><big>Service Start</big></b><br>\n"
 "To start the service every time your computer is booted, set\n"
 "<b>%1</b>. To start the service via the xinetd daemon, set <b>%3</b>.\n"
 "Otherwise set <b>%2</b>.</p>"
 msgstr ""
-"<p><b><big>Start av teneste</big></b><br>"
-"\n"
+"<p><b><big>Start av teneste</big></b><br>\n"
 "Vel <b>%1</b> for å starta tenesta ved kvar oppstart av maskina.\n"
 "Vel <b>%3</b> for å starta tenesta via xinetd-tenesta.\n"
 "Elles, vel <b>%2</b>.</p>"
@@ -583,13 +579,11 @@
 #. (both without quotes)
 #: library/cwm/src/modules/CWMServiceStart.rb:504
 msgid ""
-"<p><b><big>Switch On or Off</big></b><br>"
-"\n"
+"<p><b><big>Switch On or Off</big></b><br>\n"
 "To start or stop the service immediately, use \n"
 "<b>%1</b> or <b>%2</b>.</p>"
 msgstr ""
-"<p><b><big>Start og steng</big></b><br>"
-"\n"
+"<p><b><big>Start og steng</big></b><br>\n"
 "Bruk <b>%1</b> eller <b>%2</b> for å \n"
 "høvesvis starta eller stengja tenesta.</p>"
 
@@ -600,12 +594,10 @@
 #: library/cwm/src/modules/CWMServiceStart.rb:516
 msgid ""
 "<p>To save all changes and restart the\n"
-"service immediately, use <b>%3</b>.</p>"
-"\n"
+"service immediately, use <b>%3</b>.</p>\n"
 msgstr ""
 "<p>Bruk <b>%3</b> for å lagra alle\n"
-"endringane og starta tenesta på nytt.</p>"
-"\n"
+"endringane og starta tenesta på nytt.</p>\n"
 
 #. part of help text - push button label, NO SHORTCUT!!!
 #: library/cwm/src/modules/CWMServiceStart.rb:531
@@ -651,13 +643,11 @@
 #. %1 is button label, eg. "LDAP Support Active" (without quotes)
 #: library/cwm/src/modules/CWMServiceStart.rb:730
 msgid ""
-"<p><b><big>LDAP Support</big></b><br>"
-"\n"
+"<p><b><big>LDAP Support</big></b><br>\n"
 "To store the settings in LDAP instead of native configuration files,\n"
 "set <b>%1</b>.</p>"
 msgstr ""
-"<p><b><big>LDAP-støtte</big></b><br>"
-"\n"
+"<p><b><big>LDAP-støtte</big></b><br>\n"
 "Vel <b>%1</b> for å lagra innstillingane i LDAP\n"
 "i staden for i oppsettfilene til systemet.</p>"
 
@@ -785,67 +775,51 @@
 #. tsig keys management dialog help 1/4
 #: library/cwm/src/modules/CWMTsigKeys.rb:565
 msgid ""
-"<p><big><b>TSIG Key Management</b></big><br>"
-"\n"
-"Use this dialog to manage the TSIG keys.</p>"
-"\n"
+"<p><big><b>TSIG Key Management</b></big><br>\n"
+"Use this dialog to manage the TSIG keys.</p>\n"
 msgstr ""
-"<p><big><b>Administrasjon av TSIG-nøklar</b></big><br>"
-"\n"
-"I dette vindauget kan du administrera TSIG-nøklane.</p>"
-"\n"
+"<p><big><b>Administrasjon av TSIG-nøklar</b></big><br>\n"
+"I dette vindauget kan du administrera TSIG-nøklane.</p>\n"
 
 #. tsig keys management dialog help 2/4
 #: library/cwm/src/modules/CWMTsigKeys.rb:569
 msgid ""
-"<p><big><b>Adding an Existing TSIG Key</b></big><br>"
-"\n"
+"<p><big><b>Adding an Existing TSIG Key</b></big><br>\n"
 "To add an already created TSIG key, select a <b>Filename</b> of the file\n"
-"containing the key and click <b>Add</b>.</p>"
-"\n"
+"containing the key and click <b>Add</b>.</p>\n"
 msgstr ""
-"<p><big><b>Leggja til ein eksisterande TSIG-nøkkel</b></big><br>"
-"\n"
+"<p><big><b>Leggja til ein eksisterande TSIG-nøkkel</b></big><br>\n"
 "For å leggja til ein TSIG-nøkkel som alt er oppretta, vel du <b>filnamnet</b>\n"
-"til fila som inneheld nøkkelen, og trykkjer så <b>Legg til</b>.</p>"
-"\n"
+"til fila som inneheld nøkkelen, og trykkjer så <b>Legg til</b>.</p>\n"
 
 #. tsig keys management dialog help 3/4
 #: library/cwm/src/modules/CWMTsigKeys.rb:575
 msgid ""
-"<p><big><b>Creating a New TSIG Key</b></big><br>"
-"\n"
+"<p><big><b>Creating a New TSIG Key</b></big><br>\n"
 "To create a new TSIG key, set the <b>Filename</b> of the file in which to\n"
 "create the key and the <b>Key ID</b> to identify the key then click\n"
-"<b>Generate</b>.</p>"
-"\n"
+"<b>Generate</b>.</p>\n"
 msgstr ""
-"<p><big><b>Laga ein ny TSIG-nøkkel</b></big><br>"
-"\n"
+"<p><big><b>Laga ein ny TSIG-nøkkel</b></big><br>\n"
 "For å laga ein ny TSIG-nøkkel, vel du <b>filnamnet</b> der du\n"
 "vil lagra nøkkelen, samt ein <b>nøkkel-ID</b> for å identifisera\n"
-"nøkkelen. Trykk så på <b>Lag</b>.</p>"
-"\n"
+"nøkkelen. Trykk så på <b>Lag</b>.</p>\n"
 
 #. tsig keys management dialog help 4/4
 #: library/cwm/src/modules/CWMTsigKeys.rb:582
 msgid ""
-"<p><big><b>Removing a TSIG Key</b></big><br>"
-"\n"
+"<p><big><b>Removing a TSIG Key</b></big><br>\n"
 "To remove a configured TSIG key, select it and click <b>Delete</b>.\n"
 "All keys in the same file are deleted.\n"
 "If a TSIG key is in use in the configuration\n"
 "of the server, it cannot be deleted. The server must stop using it\n"
-"in the configuration first.</p>"
-"\n"
+"in the configuration first.</p>\n"
 msgstr ""
-"<p><big><b>Fjerna ein TSIG-nøkkel</b></big><br>"
-"\n"
+"<p><big><b>Fjerna ein TSIG-nøkkel</b></big><br>\n"
 "For å fjerna ein oppsett TSIG-nøkkel, vel du nøkkelen og trykkjer <b>Slett</b>.\n"
 "Alle nøklar i same fil vert sletta.\n"
 "Viss ein TSIG-nøkkel er i bruk i tenaroppsettet,\n"
-"kan du ikkje sletta han. Tenaren må først slutta å bruka han i oppsettet.</p>"
-"\n"
+"kan du ikkje sletta han. Tenaren må først slutta å bruka han i oppsettet.</p>\n"
 
 #. Frame label - adding a created server key
 #: library/cwm/src/modules/CWMTsigKeys.rb:594
@@ -925,13 +899,11 @@
 #. help 1/4
 #: library/cwm/src/modules/TablePopup.rb:899
 msgid ""
-"<p><b><big>Editing the Settings</big></b><br>"
-"\n"
+"<p><b><big>Editing the Settings</big></b><br>\n"
 "To edit the settings, choose the appropriate\n"
 "entry of the table then click <b>Edit</b>.</p>"
 msgstr ""
-"<p><b><big>Redigera innstillingane</big></b><br>"
-"\n"
+"<p><b><big>Redigera innstillingane</big></b><br>\n"
 "For å redigera innstillingane, vel ei oppføring\n"
 "i tabellen og trykk <b>Rediger</b>.</p>"
 
@@ -1015,15 +987,13 @@
 #. NCurses Control Center help 1/
 #: library/desktop/src/clients/menu.rb:323
 msgid ""
-"<p>1) <i>General</i><br>"
-"\n"
+"<p>1) <i>General</i><br>\n"
 "Navigate through the dialog elements with [TAB] to go to\n"
 "the next element and [SHIFT] (or [ALT]) + [TAB] to move backwards.\n"
 "Select or activate elements with [SPACE] or [ENTER].\n"
 "Some elements use arrow keys (e.g., to scroll in lists).</p>"
 msgstr ""
-"<p>1) <i>Generelt</i><br>"
-"\n"
+"<p>1) <i>Generelt</i><br>\n"
 "Flytt mellom dialogelementa med «Tab» for å gåtil neste element og «Shift + Tab» (eller «Alt + Tab»)\n"
 "for å gå til førre element.\n"
 "Vel eller bruk elementa med «Space» eller «Enter».\n"
@@ -1048,25 +1018,21 @@
 #: library/desktop/src/clients/menu.rb:342
 msgid ""
 "<p>Press [ESC] to close selection pop-ups (e.g., from\n"
-"menu buttons) without choosing anything.</p>"
-"\n"
+"menu buttons) without choosing anything.</p>\n"
 msgstr ""
 "<p>Trykk «Escape» for å lukka sprettoppvindauge (for\n"
-"eksempel frå menyknappane) utan å velja noko.</p>"
-"\n"
+"eksempel frå menyknappane) utan å velja noko.</p>\n"
 
 #. NCurses Control Center help 5/10
 #: library/desktop/src/clients/menu.rb:346
 msgid ""
-"<p>2) <i>Substitution of Keystrokes</i><br>"
-"\n"
+"<p>2) <i>Substitution of Keystrokes</i><br>\n"
 "<p>Because the environment can affect the use of the keyboard,\n"
 "there is more than one way to navigate the dialog pages.\n"
 "If [TAB] and [SHIFT] (or [ALT]) + [TAB] do not work,\n"
 "move focus forward with [CTRL] + [F] and backward with [CTRL] + [B].</p>"
 msgstr ""
-"<p>2) <i>Alternative tastar</i><br>"
-"\n"
+"<p>2) <i>Alternative tastar</i><br>\n"
 "<p>Fordi miljøet kan påverka bruken av tastaturet,\n"
 "kan du flytta gjennom dialogvindauga på meir enn éin måte.\n"
 "Viss «Tab» og «Shift + Tab»  og (eller «Alt + Tab») ikkje verkar,\n"
@@ -1087,17 +1053,14 @@
 #: library/desktop/src/clients/menu.rb:360
 #, fuzzy
 #| msgid ""
-#| "<p>3) <i>Function Keys</i><br>"
-#| "\n"
+#| "<p>3) <i>Function Keys</i><br>\n"
 #| "F keys provide a quick access to main functions.\n"
 #| "Press F1 to get the function key bindings for the current dialog.</p>"
 msgid ""
-"<p>3) <i>Function Keys</i><br>"
-"\n"
+"<p>3) <i>Function Keys</i><br>\n"
 "F keys provide a quick access to main functions. The function key bindings for the current dialog are shown in the bottom line.</p>"
 msgstr ""
-"<p>3) <i>Funksjonstastar</i><br>"
-"\n"
+"<p>3) <i>Funksjonstastar</i><br>\n"
 "F-tastane gjev rask tilgang til viktige funksjonar. Trykk «F1»\n"
 "for å visa kva funksjonstastane gjer i det gjeldande vindauget.</p>"
 
@@ -1109,43 +1072,26 @@
 #. NCurses Control Center help 9/10
 #: library/desktop/src/clients/menu.rb:369
 msgid ""
-"F1  = Help<br>"
-"\n"
-"F2  = Info or Description<br>"
-"\n"
-"F3  = Add<br>"
-"\n"
-"F4  = Edit or Configure<br>"
-"\n"
-"F5  = Delete<br>"
-"\n"
-"F6  = Test<br>"
-"\n"
-"F7  = Expert or Advanced<br>"
-"\n"
-"F8  = Back<br>"
-"\n"
-"F9  = Abort or Cancel<br>"
-"\n"
+"F1  = Help<br>\n"
+"F2  = Info or Description<br>\n"
+"F3  = Add<br>\n"
+"F4  = Edit or Configure<br>\n"
+"F5  = Delete<br>\n"
+"F6  = Test<br>\n"
+"F7  = Expert or Advanced<br>\n"
+"F8  = Back<br>\n"
+"F9  = Abort or Cancel<br>\n"
 "F10 = OK, Next, Finish, or Accept<br>"
 msgstr ""
-"F1  = Hjelp<br>"
-"\n"
-"F2  = Info eller skildring<br>"
-"\n"
-"F3  = Legg til<br>"
-"\n"
-"F4  = Rediger eller set opp<br>"
-"\n"
+"F1  = Hjelp<br>\n"
+"F2  = Info eller skildring<br>\n"
+"F3  = Legg til<br>\n"
+"F4  = Rediger eller set opp<br>\n"
 "F5  = Slett\n"
-"F6  = Test<br>"
-"\n"
-"F7  = Ekspert eller avansert<br>"
-"\n"
-"F8  = Tilbake<br>"
-"\n"
-"F9  = Avbryt<br>"
-"\n"
+"F6  = Test<br>\n"
+"F7  = Ekspert eller avansert<br>\n"
+"F8  = Tilbake<br>\n"
+"F9  = Avbryt<br>\n"
 "F10 = OK, neste, hald fram, fullfør eller stadfest<br>"
 
 #. NCurses Control Center help 10/10
@@ -1157,6 +1103,85 @@
 "<p>I nokre miljø er ingen eller berre\n"
 "nokre av F-tastane tilgjengelege.</p>"
 
+#. @param service [Object] An object providing the following methods:
+#. #name, #start, #stop, #enabled?, #running?
+#. For systemd compliant services, just do
+#. Yast::SystemdService.find("name_of_the_service")
+#. Note that this widget will #start and #stop the service by itself but
+#. the actions referenced by the flags (reloading and enabling/disabling)
+#. are expected to be done by the caller, when the whole configuration is
+#. written.
+#. @param reload_flag [Boolean] Initial value for the "reload" checkbox.
+#. Keep in mind it will always be displayed as unchecked if the service
+#. is not running, despite the real value.
+#. @param reload_flag_label [Symbol] Type of label for the "reload" checkbox.
+#. :reload means the service will be reloaded.
+#. :restart means the service will be restarted.
+#: library/general/src/lib/ui/service_status.rb:59
+msgid "Restart After Saving Settings"
+msgstr ""
+
+#: library/general/src/lib/ui/service_status.rb:61
+msgid "Reload After Saving Settings"
+msgstr ""
+
+#. @return [YaST::Term]
+#: library/general/src/lib/ui/service_status.rb:68
+#, fuzzy
+#| msgid "Service Start"
+msgid "Service Status"
+msgstr "Start av teneste"
+
+#. rubocop:enable Style/TrivialAccessors
+#. Content for the help
+#: library/general/src/lib/ui/service_status.rb:133
+msgid ""
+"<p><b><big>Current status</big></b><br>\n"
+"Displays the current status of the service. The status will remain the same after saving the settings, independently of the value of 'start service during boot'.</p>\n"
+"<p><b><big>%{reload_label}</big></b><br>\n"
+"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (either finishing the dialog or pressing the apply button).</p>\n"
+"<p><b><big>Start During System Boot</big></b><br>\n"
+"Check this field to enable the service at system boot. Un-check it to disable the service. This does not affect the current status of the service in the already running system.</p>\n"
+msgstr ""
+
+#. Widget displaying the status and associated buttons
+#: library/general/src/lib/ui/service_status.rb:159
+#, fuzzy
+#| msgid "Current Status: "
+msgid "Current status:"
+msgstr "Status: "
+
+#. Widget to configure the status on boot
+#: library/general/src/lib/ui/service_status.rb:172
+#, fuzzy
+#| msgid "During Boot"
+msgid "Start During System Boot"
+msgstr "Ved oppstart"
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:196
+#, fuzzy
+#| msgid "Warning"
+msgid "running"
+msgstr "Åtvaring"
+
+#: library/general/src/lib/ui/service_status.rb:198
+#, fuzzy
+#| msgid "&Stop"
+msgid "Stop now"
+msgstr "&Stopp"
+
+#. TRANSLATORS: status of a service
+#: library/general/src/lib/ui/service_status.rb:203
+msgid "stopped"
+msgstr ""
+
+#: library/general/src/lib/ui/service_status.rb:205
+#, fuzzy
+#| msgid "&Stop"
+msgid "Start now"
+msgstr "&Stopp"
+
 #. TRANSLATORS: popup question (with continue / cancel buttons)
 #. %1 is the filesystem path
 #: library/general/src/modules/FileUtils.rb:292
@@ -1357,7 +1382,7 @@
 #. this media (CD) so no packages from this media will be installed
 #. PushButton label
 #: library/general/src/modules/Label.rb:250
-#: library/packages/src/modules/PackageCallbacks.rb:664
+#: library/packages/src/modules/PackageCallbacks.rb:665
 #: library/wizard/src/modules/Confirm.rb:126
 msgid "&Skip"
 msgstr "&Hopp over"
@@ -1380,7 +1405,7 @@
 #. TextEntry Label
 #. textentry label
 #: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2230
+#: library/packages/src/modules/PackageCallbacks.rb:2231
 msgid "&Password"
 msgstr "&Passord"
 
@@ -1602,27 +1627,27 @@
 msgstr ""
 
 #. Confirm user request to abort installation
-#: library/general/src/modules/Popup.rb:740
+#: library/general/src/modules/Popup.rb:733
 msgid "Really abort the installation?"
 msgstr "Er du sikker på at du vil avbryta installeringa?"
 
 #. Confirm user request to abort System Repair
-#: library/general/src/modules/Popup.rb:749
+#: library/general/src/modules/Popup.rb:742
 msgid "Really abort YaST System Repair?"
 msgstr "Er du sikker på at du vil avbryta YaST systemreparering?"
 
 #. Button that will really abort the repair
-#: library/general/src/modules/Popup.rb:751
+#: library/general/src/modules/Popup.rb:744
 msgid "Abort System Repair"
 msgstr "Avbryt systemreparering"
 
 #. Button that will continue with the repair
-#: library/general/src/modules/Popup.rb:753
+#: library/general/src/modules/Popup.rb:746
 msgid "&Continue System Repair"
 msgstr "&Hald fram med systemreparering"
 
 #. Warning text for aborting an installation before anything is installed
-#: library/general/src/modules/Popup.rb:756
+#: library/general/src/modules/Popup.rb:749
 msgid ""
 "If you abort the installation now,\n"
 "Linux will not be installed.\n"
@@ -1635,7 +1660,7 @@
 #. Warning text for aborting an installation during the install process
 #. - After some installation steps have been performed - e.g.
 #. disks formatted / some packages already installed
-#: library/general/src/modules/Popup.rb:766
+#: library/general/src/modules/Popup.rb:759
 msgid ""
 "If you abort the installation now, you will\n"
 "have an incomplete Linux system\n"
@@ -1649,7 +1674,7 @@
 
 #. Warning text for aborting an installation during the install process
 #. right in the middle of some critical process (e.g. formatting)
-#: library/general/src/modules/Popup.rb:775
+#: library/general/src/modules/Popup.rb:768
 msgid ""
 "If you abort the installation now,\n"
 "Linux will be unusable.\n"
@@ -1660,18 +1685,18 @@
 "Du må installera då installera det på nytt."
 
 #. Confirm aborting the program
-#: library/general/src/modules/Popup.rb:829
+#: library/general/src/modules/Popup.rb:822
 msgid "Really abort?"
 msgstr "Er du sikker at du vil avbryta?"
 
 #. Additional hint when trying to abort program in spite of changes
-#: library/general/src/modules/Popup.rb:837
+#: library/general/src/modules/Popup.rb:830
 msgid "All changes will be lost!"
 msgstr "Alle endringane går då tapt."
 
 #. FIXME: BNC #422612, Use `opt(`noSanityCheck) later
 #. button label
-#: library/general/src/modules/Popup.rb:867
+#: library/general/src/modules/Popup.rb:860
 msgid "&Details..."
 msgstr "&Detaljar …"
 
@@ -1884,12 +1909,10 @@
 #. fill up the widget in init handler
 #: library/gpg/src/modules/GPGWidgets.rb:207
 msgid ""
-"<p><big><b>GPG Private Key</b></big><br>"
-"\n"
+"<p><big><b>GPG Private Key</b></big><br>\n"
 "The table contains list of the private GPG keys.</p>"
 msgstr ""
-"<p><big><b>GPG-privatnøkkel</b></big><br>"
-"\n"
+"<p><big><b>GPG-privatnøkkel</b></big><br>\n"
 "Tabellen inneheld ei oversikt over GPG-privatnøklar.</p>"
 
 #. Get widget description map
@@ -1901,12 +1924,10 @@
 #. fill up the widget in init handler
 #: library/gpg/src/modules/GPGWidgets.rb:239
 msgid ""
-"<p><big><b>GPG Public Key</b></big><br>"
-"\n"
+"<p><big><b>GPG Public Key</b></big><br>\n"
 "The table contains list of the public GPG keys.</p>"
 msgstr ""
-"<p><big><b>GPG-offentlegnøkkel</b></big><br>"
-"\n"
+"<p><big><b>GPG-offentlegnøkkel</b></big><br>\n"
 "Tabellen inneheld ei oversikt over GPG-offentlegnøklar.</p>"
 
 #. Get widget description map
@@ -1917,14 +1938,12 @@
 
 #: library/gpg/src/modules/GPGWidgets.rb:285
 msgid ""
-"<p><big><b>Create a new GPG key</b></big><br>"
-"\n"
+"<p><big><b>Create a new GPG key</b></big><br>\n"
 "<tt>gpg --gen-key</tt> is started, see <tt>gpg</tt> manual pager for more information.\n"
 "Press Ctrl+C to cancel.\n"
 "</p>"
 msgstr ""
-"<p><big><b>Lag ein ny GPG-nøkkel</b></big><br>"
-"\n"
+"<p><big><b>Lag ein ny GPG-nøkkel</b></big><br>\n"
 "<tt>gpg --gen-key</tt> er starta. Sjå manualsida for <tt>gpg</tt>\n"
 "for meir informasjon.\n"
 "Trykk «Ctrl+C» for å avbryta.\n"
@@ -1938,12 +1957,10 @@
 #. help text
 #: library/gpg/src/modules/GPGWidgets.rb:333
 msgid ""
-"<p><big><b>Passphrase</b></big><br>"
-"\n"
+"<p><big><b>Passphrase</b></big><br>\n"
 "Enter passphrase to unlock the GPG key."
 msgstr ""
-"<p><big><b>Passfrase</b></big><br>"
-"\n"
+"<p><big><b>Passfrase</b></big><br>\n"
 "Skriv inn passfrasen for å låsa opp GPG-nøkkelen."
 
 #. Create a popup window term with the passphrase widget.
@@ -1968,27 +1985,21 @@
 #. help for the log widget, part 1, alt. 1
 #: library/log/src/modules/LogView.rb:109
 msgid ""
-"<p><b><big>Displayed Log</big></b><br>"
-"\n"
+"<p><b><big>Displayed Log</big></b><br>\n"
 "Use <b>Log</b> to select the log to display. It will be displayed in\n"
-"the field below.</p>"
-"\n"
+"the field below.</p>\n"
 msgstr ""
-"<p><b><big>Loggvising</big></b><br>"
-"\n"
+"<p><b><big>Loggvising</big></b><br>\n"
 "Bruk <b>Logg</b> for å velja kva logg du vil visa.\n"
-"Han vert så vist i feltet nedanfor.</p>"
-"\n"
+"Han vert så vist i feltet nedanfor.</p>\n"
 
 #. help for the log widget, part 1, alt. 2
 #: library/log/src/modules/LogView.rb:120
 msgid ""
-"<p><b><big>The Log</big></b><br>"
-"\n"
+"<p><b><big>The Log</big></b><br>\n"
 "This screen displays the log.</p>"
 msgstr ""
-"<p><b><big>Loggen</big></b><br>"
-"\n"
+"<p><b><big>Loggen</big></b><br>\n"
 "Loggen vert vist i dette vindauget.</p>"
 
 #. help for the log widget, part 2, alt. 1, %1 is a menu button label
@@ -2018,13 +2029,11 @@
 msgid ""
 "<p>\n"
 "To save the log into a file, click <b>Save Log</b> and select the file\n"
-"to which to save the log.</p>"
-"\n"
+"to which to save the log.</p>\n"
 msgstr ""
 "<p>\n"
 "For å lagra loggen i ei fil, trykk <b>Lagra logg</b>\n"
-"og vel fila du vil lagra loggen i.</p>"
-"\n"
+"og vel fila du vil lagra loggen i.</p>\n"
 
 #. menu button
 #. Get the buttons below the box with the log
@@ -2210,13 +2219,11 @@
 #. %1 is check box label, eg. "Open Port in Firewall" (without quotes)
 #: library/network/src/modules/CWMFirewallInterfaces.rb:998
 msgid ""
-"<p><b><big>Firewall Settings</big></b><br>"
-"\n"
+"<p><b><big>Firewall Settings</big></b><br>\n"
 "To open the firewall to allow access to the service from remote computers,\n"
 "set <b>%1</b>.<br>"
 msgstr ""
-"<p><b><big>Brannmurinnstillinger</big></b><br>"
-"\n"
+"<p><b><big>Brannmurinnstillinger</big></b><br>\n"
 "Vel <b>%1</b> for å opna brannmuren slik at eksterne maskiner\n"
 "har tilgang til tenesta.<br>"
 
@@ -2751,47 +2758,47 @@
 "Du kan ikkje bruka mellomrom.\n"
 
 #. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:115
+#: library/network/src/modules/SuSEFirewall.rb:116
 msgid "External Zone"
 msgstr "Ekstern sone"
 
 #. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:119
+#: library/network/src/modules/SuSEFirewall.rb:120
 msgid "Internal Zone"
 msgstr "Intern sone"
 
 #. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:123
+#: library/network/src/modules/SuSEFirewall.rb:124
 msgid "Demilitarized Zone"
 msgstr "Demilitarisert sone"
 
 #. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:246
+#: library/network/src/modules/SuSEFirewall.rb:247
 msgid "TCP"
 msgstr "TCP"
 
 #. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:248
+#: library/network/src/modules/SuSEFirewall.rb:249
 msgid "UDP"
 msgstr "UDP"
 
 #. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:250
+#: library/network/src/modules/SuSEFirewall.rb:251
 msgid "RPC"
 msgstr "RPC"
 
 #. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:252
+#: library/network/src/modules/SuSEFirewall.rb:253
 msgid "IP"
 msgstr "IP"
 
 #. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:1158
+#: library/network/src/modules/SuSEFirewall.rb:1159
 msgid "Unknown Zone"
 msgstr "Ukjend sone"
 
 #. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1506
+#: library/network/src/modules/SuSEFirewall.rb:1508
 msgid ""
 "Interface '%1' is included in multiple firewall zones.\n"
 "Continuing with configuration can produce errors.\n"
@@ -2807,8 +2814,8 @@
 
 #. TRANSLATORS: Error message, %1 = interface name (like eth0)
 #. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1971
-#: library/network/src/modules/SuSEFirewall.rb:2047
+#: library/network/src/modules/SuSEFirewall.rb:1973
+#: library/network/src/modules/SuSEFirewall.rb:2049
 msgid ""
 "Interface '%1' is not assigned to any firewall zone.\n"
 "Run YaST2 Firewall and assign it.\n"
@@ -2817,72 +2824,72 @@
 "Du kan tilordna det manuelt under «Brannmur» i YaST2.\n"
 
 #. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2478
+#: library/network/src/modules/SuSEFirewall.rb:2480
 msgid "Initializing Firewall Configuration"
 msgstr "Set opp brannmur"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2486
+#: library/network/src/modules/SuSEFirewall.rb:2488
 msgid "Check for network devices"
 msgstr "Søk etter nettverkseiningar"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2488
+#: library/network/src/modules/SuSEFirewall.rb:2490
 msgid "Read current configuration"
 msgstr "Les gjeldande oppsett"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2490
+#: library/network/src/modules/SuSEFirewall.rb:2492
 msgid "Check possibly conflicting services"
 msgstr "Sjå etter tenester i konflikt"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2494
+#: library/network/src/modules/SuSEFirewall.rb:2496
 msgid "Checking for network devices..."
 msgstr "Søkjer etter nettverkseiningar …"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2496
+#: library/network/src/modules/SuSEFirewall.rb:2498
 msgid "Reading current configuration..."
 msgstr "Les gjeldande oppsett …"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2498
+#: library/network/src/modules/SuSEFirewall.rb:2500
 msgid "Checking possibly conflicting services..."
 msgstr "Ser etter tenester i konflikt …"
 
 #. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2648
+#: library/network/src/modules/SuSEFirewall.rb:2643
 msgid "Writing Firewall Configuration"
 msgstr "Lagrar brannmuroppsett"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2656
+#: library/network/src/modules/SuSEFirewall.rb:2651
 msgid "Write firewall settings"
 msgstr "Lagre brannmuroppsett"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2658
+#: library/network/src/modules/SuSEFirewall.rb:2653
 msgid "Adjust firewall service"
 msgstr "Juster brannmurtenesta"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2662
+#: library/network/src/modules/SuSEFirewall.rb:2657
 msgid "Writing firewall settings..."
 msgstr "Lagrar brannmurinnstillingar …"
 
 #. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2664
+#: library/network/src/modules/SuSEFirewall.rb:2659
 msgid "Adjusting firewall service..."
 msgstr "Tilpassar brannmurtenesta …"
 
 #. TRANSLATORS: a popup error message
-#: library/network/src/modules/SuSEFirewall.rb:2683
+#: library/network/src/modules/SuSEFirewall.rb:2678
 msgid "Writing settings failed"
 msgstr "Klarte ikkje lagra innstillingane"
 
 #. table item, %1 stands for the buggy protocol name
-#: library/network/src/modules/SuSEFirewall.rb:3476
+#: library/network/src/modules/SuSEFirewall.rb:3471
 msgid "Unknown protocol (%1)"
 msgstr "Ukjend protokoll (%1)"
 
@@ -2976,51 +2983,52 @@
 
 #. Returns service definition.
 #. See @services for the format.
-#. If `silent` is not defined or set to `true`, function throws an exception
-#. SuSEFirewalServiceNotFound if service is not found on disk.
+#. If *silent* is `false` (the default), the method throws an exception
+#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk.
 #.
-#. @param [String] service name
+#. @param [String] service name (including the "service:" prefix)
 #. @param [String] (optional) whether to silently return nil
 #. when service is not found (default false)
+#. @api private
 #. Immediately writes the configuration of service defined by package to the
 #. service definition file. Service must be defined by package, this function
 #. doesn't work for hard-coded services (SuSEFirewallServices).
-#. Function throws an exception SuSEFirewalServiceNotFound
+#. Function throws an exception {Yast::SuSEFirewalServiceNotFound}
 #. if service is not known (undefined) or it is not a service
 #. defined by package.
 #.
 #. @param [String] service ID (e.g., "service:ssh")
-#. @param map  of full service definition
+#. @param [Hash{String => Array<String>] store_definition of full service definition
 #. @return [Boolean] if successful (nil in case of developer's mistake)
 #.
-#. @see #IsKnownService()
-#. @see #ServiceDefinedByPackage()
+#. @see #IsKnownService
+#. @see #ServiceDefinedByPackage
 #.
 #. @example
 #. SetNeededPortsAndProtocols (
 #. "service:something",
-#. $[
-#. "tcp_ports"       : [ "22", "ftp-data", "400:420" ],
-#. "udp_ports"       : [ ],
-#. "rpc_ports"       : [ "portmap", "ypbind" ],
-#. "ip_protocols"    : [ "esp" ],
-#. "broadcast_ports" : [ ],
-#. ]
-#. );
-#: library/network/src/modules/SuSEFirewallServices.rb:354
-#: library/network/src/modules/SuSEFirewallServices.rb:637
+#. {
+#. "tcp_ports"      => [ "22", "ftp-data", "400:420" ],
+#. "udp_ports"      => [ ],
+#. "rpc_ports"      => [ "portmap", "ypbind" ],
+#. "ip_protocols"   => [ "esp" ],
+#. "broadcast_ports"=> [ ],
+#. }
+#. )
+#: library/network/src/modules/SuSEFirewallServices.rb:356
+#: library/network/src/modules/SuSEFirewallServices.rb:640
 msgid "Service with name '%{service_name}' does not exist"
 msgstr ""
 
 #. Fallback for presented service
-#: library/network/src/modules/SuSEFirewallServices.rb:430
+#: library/network/src/modules/SuSEFirewallServices.rb:434
 #, fuzzy
 #| msgid "Service: %1"
 msgid "Service: %{filename}"
 msgstr "Teneste: %1"
 
 #. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server
-#: library/network/src/modules/SuSEFirewallServices.rb:503
+#: library/network/src/modules/SuSEFirewallServices.rb:505
 msgid "Unknown service '%1'"
 msgstr "Ukjend teneste: «%1»"
 
@@ -3044,35 +3052,77 @@
 msgid "&Uninstall"
 msgstr "&Avinstaller"
 
+#. TRANSLATORS: progress bar label
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:77
+#, fuzzy
+#| msgid "Checking possibly conflicting services..."
+msgid "Checking file conflicts..."
+msgstr "Ser etter tenester i konflikt …"
+
+#. TRANSLATORS: help text for the file conflict detection progress
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:87
+msgid "<p>Detecting the file conflicts is in progress.</p>"
+msgstr ""
+
+#. TRANSLATORS: An error message, %s is the actual list of detected conflicts
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:132
+msgid ""
+"File conflicts detected, these conflicting files will be overwritten:\n"
+"\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: A popup label, use max. 70 chars per line, use more lines if needed
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:168
+msgid ""
+"File conflicts happen when two packages attempt to install\n"
+"files with the same name but different contents. If you continue\n"
+"the conflicting files will be replaced, losing the previous content."
+msgstr ""
+
+#. TRANSLATORS: Popup heading
+#: library/packages/src/lib/packages/file_conflict_callbacks.rb:173
+msgid "A File Conflict Detected"
+msgid_plural "File Conflicts Detected"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Convert one message to richtext
+#.
+#. @return [String] Message converted to richtext
+#: library/packages/src/lib/packages/update_messages_view.rb:35
+msgid "This message will be available at %s"
+msgstr ""
+
 #. --------------------------------------------------------------------------
 #. defaults
 #. at start of file providal
-#: library/packages/src/modules/PackageCallbacks.rb:149
-#: library/packages/src/modules/PackageCallbacks.rb:157
+#: library/packages/src/modules/PackageCallbacks.rb:150
+#: library/packages/src/modules/PackageCallbacks.rb:158
 msgid "Downloading package %1 (%2)..."
 msgstr "Laster ned pakken %1 (%2) …"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:161
+#: library/packages/src/modules/PackageCallbacks.rb:162
 msgid "Downloading Package"
 msgstr "Laster ned pakken"
 
 #. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:220
+#: library/packages/src/modules/PackageCallbacks.rb:221
 msgid "Package %1 is broken, integrity check has failed."
 msgstr "Integritetskontrollen viser at pakken %1 er øydelagd."
 
 #. command line mode - ask user whether installation of the failed package should be retried
 #. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:232
-#: library/packages/src/modules/PackageCallbacks.rb:447
+#: library/packages/src/modules/PackageCallbacks.rb:233
+#: library/packages/src/modules/PackageCallbacks.rb:448
 msgid "Retry installation of the package?"
 msgstr "Vil du prøva å installera pakken på nytt?"
 
 #. command line mode - ask user whether the installation should be aborted
 #. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:240
-#: library/packages/src/modules/PackageCallbacks.rb:455
+#: library/packages/src/modules/PackageCallbacks.rb:241
+#: library/packages/src/modules/PackageCallbacks.rb:456
 msgid "Abort the installation?"
 msgstr "Vil du avbryta installeringa?"
 
@@ -3081,15 +3131,15 @@
 #. detail string is appended to the end
 #. error message, %1 is code of the error,
 #. detail string is appended to the end
-#: library/packages/src/modules/PackageCallbacks.rb:268
-#: library/packages/src/modules/PackageCallbacks.rb:302
-#: library/packages/src/modules/PackageCallbacks.rb:2143
+#: library/packages/src/modules/PackageCallbacks.rb:269
+#: library/packages/src/modules/PackageCallbacks.rb:303
+#: library/packages/src/modules/PackageCallbacks.rb:2144
 msgid "Error: %1:"
 msgstr "Feil: %1:"
 
 #. TODO: add "Don't show again" checkbox
 #. a warning popup displayed after pressing [Ignore] after a download error
-#: library/packages/src/modules/PackageCallbacks.rb:326
+#: library/packages/src/modules/PackageCallbacks.rb:327
 #, fuzzy
 #| msgid ""
 #| "Ignoring a download failure may result in a broken system.\n"
@@ -3102,35 +3152,35 @@
 "Du bør kontrollera system på nytt seinare, ved å køyra programvareinstallasjonsmodulen."
 
 #. At start of package install.
-#: library/packages/src/modules/PackageCallbacks.rb:364
+#: library/packages/src/modules/PackageCallbacks.rb:365
 msgid "Uninstalling package %1 (%2)..."
 msgstr "Avinstallerer pakken %1 (%2) …"
 
-#: library/packages/src/modules/PackageCallbacks.rb:366
+#: library/packages/src/modules/PackageCallbacks.rb:367
 msgid "Installing package %1 (%2)..."
 msgstr "Installerer pakken %1 (%2) …"
 
-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
 msgid "Uninstalling Package"
 msgstr "Avinstallerer pakke"
 
-#: library/packages/src/modules/PackageCallbacks.rb:374
+#: library/packages/src/modules/PackageCallbacks.rb:375
 msgid "Installing Package"
 msgstr "Installerer pakke"
 
 #. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:430
+#: library/packages/src/modules/PackageCallbacks.rb:431
 msgid "Removal of package %1 failed."
 msgstr "Klarte ikkje fjerna pakken %1."
 
 #. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:433
+#: library/packages/src/modules/PackageCallbacks.rb:434
 msgid "Installation of package %1 failed."
 msgstr "Feil ved installering av pakken %1."
 
 #. TODO: add "Don't show again" checkbox
 #. a warning popup displayed after pressing [Ignore] after a package installation error
-#: library/packages/src/modules/PackageCallbacks.rb:506
+#: library/packages/src/modules/PackageCallbacks.rb:507
 msgid ""
 "Ignoring a package failure may result in a broken system.\n"
 "The system should be later verified by running the Software Management module."
@@ -3139,44 +3189,42 @@
 "Du bør kontrollera system på nytt seinare, ved å køyra programvareinstallasjonsmodulen."
 
 #. error report
-#: library/packages/src/modules/PackageCallbacks.rb:575
+#: library/packages/src/modules/PackageCallbacks.rb:576
 msgid ""
 "<p>The repository at the specified URL now provides a different media ID.\n"
 "If the URL is correct, this indicates that the repository content has changed. To \n"
 "continue using this repository, start <b>Installation Repositories</b> from \n"
-"the YaST control center and refresh the repository.</p>"
-"\n"
+"the YaST control center and refresh the repository.</p>\n"
 msgstr ""
 "<p>Pakkebrønnen på den valde adressa har no ein annan medie-ID.\n"
 "Viss adressa framleis er rett, tyder dette at pakkebrønninnhaldet er endra. For å \n"
 "halda fram å bruka denne pakkebrønnen, bør du starta modulen <b>Pakkebrønnar</b> i \n"
-"YaST og oppdatera pakkebrønnen.</p>"
-"\n"
+"YaST og oppdatera pakkebrønnen.</p>\n"
 
 #. media is double sided, we want the user to insert the 'Side A' of the media
 #. the complete string will be "<product> <media> <number>, <side>"
 #. e.g. "'SuSE Linux 9.0' DVD 1, Side A"
-#: library/packages/src/modules/PackageCallbacks.rb:590
+#: library/packages/src/modules/PackageCallbacks.rb:591
 msgid "Side A"
 msgstr "side A"
 
 #. media is double sided, we want the user to insert the 'Side B' of the media
-#: library/packages/src/modules/PackageCallbacks.rb:593
+#: library/packages/src/modules/PackageCallbacks.rb:594
 msgid "Side B"
 msgstr "side B"
 
 #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2)
-#: library/packages/src/modules/PackageCallbacks.rb:608
+#: library/packages/src/modules/PackageCallbacks.rb:609
 msgid "%1 (Disc %2)"
 msgstr "%1 (plate %2)"
 
 #. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2)
-#: library/packages/src/modules/PackageCallbacks.rb:611
+#: library/packages/src/modules/PackageCallbacks.rb:612
 msgid "%1 (Medium %2)"
 msgstr "%1 (medium %2)"
 
 #. prompt to insert product (%1 == "SuSE Linux version 9.2 CD 2")
-#: library/packages/src/modules/PackageCallbacks.rb:617
+#: library/packages/src/modules/PackageCallbacks.rb:618
 msgid ""
 "Insert\n"
 "'%1'"
@@ -3185,7 +3233,7 @@
 "«%1»"
 
 #. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:622
+#: library/packages/src/modules/PackageCallbacks.rb:623
 msgid ""
 "Cannot access installation media\n"
 "%1\n"
@@ -3198,7 +3246,7 @@
 "Kontrollar at mappa er tilgjengeleg."
 
 #. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:634
+#: library/packages/src/modules/PackageCallbacks.rb:635
 msgid ""
 "Cannot access installation media \n"
 "%1\n"
@@ -3212,51 +3260,51 @@
 
 #. wrong media id, offer "Ignore"
 #. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:659
-#: library/packages/src/modules/PackageCallbacks.rb:1838
+#: library/packages/src/modules/PackageCallbacks.rb:660
+#: library/packages/src/modules/PackageCallbacks.rb:1839
 msgid "Skip Autorefresh"
 msgstr "Hopp over autooppdatering"
 
 #. menu button label - used for more then one device
 #. push button label - in the media change popup, user can eject the CD/DVD
-#: library/packages/src/modules/PackageCallbacks.rb:678
-#: library/packages/src/modules/PackageCallbacks.rb:681
+#: library/packages/src/modules/PackageCallbacks.rb:679
+#: library/packages/src/modules/PackageCallbacks.rb:682
 msgid "&Eject"
 msgstr "&Løys ut"
 
-#: library/packages/src/modules/PackageCallbacks.rb:688
+#: library/packages/src/modules/PackageCallbacks.rb:689
 msgid "A&utomatically Eject CD or DVD Medium"
 msgstr "Løys a&utomatisk ut CD-/DVD-medium"
 
 #. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:755
+#: library/packages/src/modules/PackageCallbacks.rb:756
 msgid "Retry the installation?"
 msgstr "Vil du prøva å installera på nytt?"
 
 #. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:763
+#: library/packages/src/modules/PackageCallbacks.rb:764
 msgid "Skip the medium?"
 msgstr "Vil du hoppa over mediet?"
 
 #. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:770
+#: library/packages/src/modules/PackageCallbacks.rb:771
 msgid "Ignoring the bad medium..."
 msgstr "Hoppar over ugyldig medium …"
 
 #. TextEntry label
 #. TextEntry label
-#: library/packages/src/modules/PackageCallbacks.rb:791
-#: library/packages/src/modules/PackageCallbacks.rb:847
+#: library/packages/src/modules/PackageCallbacks.rb:792
+#: library/packages/src/modules/PackageCallbacks.rb:848
 msgid "&URL"
 msgstr "&Adresse"
 
 #. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1039
+#: library/packages/src/modules/PackageCallbacks.rb:1040
 msgid "Creating Repository %1"
 msgstr "Legg til pakkebrønnen %1"
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1072
+#: library/packages/src/modules/PackageCallbacks.rb:1073
 #, fuzzy
 #| msgid "Error occurred while creating the repository."
 msgid "An error occurred while creating the repository."
@@ -3265,32 +3313,32 @@
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1076
-#: library/packages/src/modules/PackageCallbacks.rb:1203
-#: library/packages/src/modules/PackageCallbacks.rb:1313
+#: library/packages/src/modules/PackageCallbacks.rb:1077
+#: library/packages/src/modules/PackageCallbacks.rb:1204
+#: library/packages/src/modules/PackageCallbacks.rb:1314
 msgid "Unable to retrieve the remote repository description."
 msgstr "Klarte ikkje henta skildring av ekstern pakkebrønn."
 
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1079
-#: library/packages/src/modules/PackageCallbacks.rb:1206
-#: library/packages/src/modules/PackageCallbacks.rb:1316
+#: library/packages/src/modules/PackageCallbacks.rb:1080
+#: library/packages/src/modules/PackageCallbacks.rb:1207
+#: library/packages/src/modules/PackageCallbacks.rb:1317
 msgid "An error occurred while retrieving the new metadata."
 msgstr "Det oppstod ein feil ved henting av ny metadata."
 
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1082
-#: library/packages/src/modules/PackageCallbacks.rb:1209
-#: library/packages/src/modules/PackageCallbacks.rb:1319
+#: library/packages/src/modules/PackageCallbacks.rb:1083
+#: library/packages/src/modules/PackageCallbacks.rb:1210
+#: library/packages/src/modules/PackageCallbacks.rb:1320
 msgid "The repository is not valid."
 msgstr "Pakkebrønnen er ikkje gyldig."
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1085
+#: library/packages/src/modules/PackageCallbacks.rb:1086
 msgid "The repository metadata is invalid."
 msgstr "Pakkebrønnen har ugyldige metadata."
 
@@ -3298,92 +3346,92 @@
 #. command line mode - ask user whether the repository refreshment should be retried
 #. command line mode - ask user whether the repository refreshment should be retried
 #. command line mode - ask user whether target initializatin can be restarted
-#: library/packages/src/modules/PackageCallbacks.rb:1098
-#: library/packages/src/modules/PackageCallbacks.rb:1228
-#: library/packages/src/modules/PackageCallbacks.rb:1332
-#: library/packages/src/modules/PackageCallbacks.rb:2097
+#: library/packages/src/modules/PackageCallbacks.rb:1099
+#: library/packages/src/modules/PackageCallbacks.rb:1229
+#: library/packages/src/modules/PackageCallbacks.rb:1333
+#: library/packages/src/modules/PackageCallbacks.rb:2098
 msgid "Retry?"
 msgstr "Vil du prøva på nytt?"
 
 #. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1144
-#: library/packages/src/modules/PackageCallbacks.rb:1152
+#: library/packages/src/modules/PackageCallbacks.rb:1145
+#: library/packages/src/modules/PackageCallbacks.rb:1153
 msgid "Probing Repository %1"
 msgstr "Undersøkjer pakkebrønnen %1"
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1199
+#: library/packages/src/modules/PackageCallbacks.rb:1200
 msgid "Error occurred while probing the repository."
 msgstr "Det oppstod ein feil ved gransking av pakkebrønnen."
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1212
+#: library/packages/src/modules/PackageCallbacks.rb:1213
 msgid "Repository probing details."
 msgstr "Granskingsdetaljer."
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1215
+#: library/packages/src/modules/PackageCallbacks.rb:1216
 msgid "Repository metadata is invalid."
 msgstr "Pakkebrønnen har ugyldige metadata."
 
 #. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1309
+#: library/packages/src/modules/PackageCallbacks.rb:1310
 msgid "Repository %1"
 msgstr "Pakkebrønn %1"
 
 #. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1397
+#: library/packages/src/modules/PackageCallbacks.rb:1398
 msgid "Downloading delta RPM package %1 (%2)..."
 msgstr "Lastar ned delta-RPM-pakken %1 (%2) …"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1405
+#: library/packages/src/modules/PackageCallbacks.rb:1406
 msgid "Downloading Delta RPM package"
 msgstr "Lastar ned delta-RPM-pakke"
 
 #. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1418
+#: library/packages/src/modules/PackageCallbacks.rb:1419
 msgid "Applying delta RPM package %1..."
 msgstr "Brukar delta-RPM-pakken %1 …"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1425
+#: library/packages/src/modules/PackageCallbacks.rb:1426
 msgid "Applying delta RPM package"
 msgstr "Brukar delta-RPM-pakke"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1427
-#: library/packages/src/modules/PackageCallbacks.rb:3075
+#: library/packages/src/modules/PackageCallbacks.rb:1428
+#: library/packages/src/modules/PackageCallbacks.rb:3082
 msgid "Package: "
 msgstr "Pakke: "
 
 #. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1493
+#: library/packages/src/modules/PackageCallbacks.rb:1494
 msgid "Starting script %1 (patch %2)..."
 msgstr "Startar skriptet %1 (pakkeoppdatering %2) …"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1502
+#: library/packages/src/modules/PackageCallbacks.rb:1503
 msgid "Running Script"
 msgstr "Køyrer skript"
 
 #. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1507
+#: library/packages/src/modules/PackageCallbacks.rb:1508
 msgid "Patch: "
 msgstr "Pakkeoppdatering: "
 
 #. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1516
+#: library/packages/src/modules/PackageCallbacks.rb:1517
 msgid "Script: "
 msgstr "Skript: "
 
 #. label
-#: library/packages/src/modules/PackageCallbacks.rb:1522
+#: library/packages/src/modules/PackageCallbacks.rb:1523
 msgid "Output of the Script"
 msgstr "Resultat av skriptet"
 
 #. label, %1 is patch name with version and architecture
-#: library/packages/src/modules/PackageCallbacks.rb:1610
+#: library/packages/src/modules/PackageCallbacks.rb:1611
 msgid ""
 "Patch: %1\n"
 "\n"
@@ -3392,7 +3440,7 @@
 "\n"
 
 #. a popup question with "Continue", "Skip" and "Abort" buttons
-#: library/packages/src/modules/PackageCallbacks.rb:1627
+#: library/packages/src/modules/PackageCallbacks.rb:1628
 msgid ""
 "The repositories are being refreshed.\n"
 "Continue with refreshing?\n"
@@ -3407,36 +3455,36 @@
 "nokre pakker mangla eller vera forelda."
 
 #. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1642
+#: library/packages/src/modules/PackageCallbacks.rb:1643
 msgid "&Skip Refresh"
 msgstr "&Hopp over oppdatering"
 
 #. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1676
+#: library/packages/src/modules/PackageCallbacks.rb:1677
 msgid "Downloading"
 msgstr "Lastar ned"
 
 #. message in a progress popup
 #. progress bar label, %1 is URL with optional download rate
-#: library/packages/src/modules/PackageCallbacks.rb:1723
-#: library/packages/src/modules/PackageCallbacks.rb:1771
+#: library/packages/src/modules/PackageCallbacks.rb:1724
+#: library/packages/src/modules/PackageCallbacks.rb:1772
 msgid "Downloading: %1"
 msgstr "Laster ned: %1"
 
 #. heading of popup
 #. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1875
-#: library/packages/src/modules/PackageCallbacks.rb:1941
+#: library/packages/src/modules/PackageCallbacks.rb:1876
+#: library/packages/src/modules/PackageCallbacks.rb:1942
 msgid "Checking Package Database"
 msgstr "Kontrollerer pakkedatabase"
 
 #. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1878
+#: library/packages/src/modules/PackageCallbacks.rb:1879
 msgid "Rebuilding package database. This process can take some time."
 msgstr "Bygger opp att pakkedatabasen. Denne prosessen kan ta litt tid."
 
 #. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1911
+#: library/packages/src/modules/PackageCallbacks.rb:1912
 msgid ""
 "Rebuilding of package database failed:\n"
 "%1"
@@ -3445,16 +3493,16 @@
 "%1"
 
 #. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1944
+#: library/packages/src/modules/PackageCallbacks.rb:1945
 msgid "Converting package database. This process can take some time."
 msgstr "Konverterer pakkedatabasen. Dette kan ta litt tid."
 
-#: library/packages/src/modules/PackageCallbacks.rb:1957
+#: library/packages/src/modules/PackageCallbacks.rb:1958
 msgid "Status"
 msgstr "Status"
 
 #. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1981
+#: library/packages/src/modules/PackageCallbacks.rb:1982
 msgid ""
 "Conversion of package database failed:\n"
 "%1"
@@ -3463,12 +3511,12 @@
 "%1"
 
 #. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2017
+#: library/packages/src/modules/PackageCallbacks.rb:2018
 msgid "Reading RPM database..."
 msgstr "Leser pakkedatabase …"
 
 #. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2027
+#: library/packages/src/modules/PackageCallbacks.rb:2028
 msgid "Reading Installed Packages"
 msgstr "Finn installerte pakkar"
 
@@ -3479,27 +3527,27 @@
 #. `Label(""),
 #. `PushButton(`id(`abort), Label::AbortButton())
 #. )
-#: library/packages/src/modules/PackageCallbacks.rb:2033
-#: library/packages/src/modules/PackageCallbacks.rb:2049
+#: library/packages/src/modules/PackageCallbacks.rb:2034
+#: library/packages/src/modules/PackageCallbacks.rb:2050
 msgid "Scanning RPM database..."
 msgstr "Søkjer gjennom pakkedatabasen …"
 
 #. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2086
+#: library/packages/src/modules/PackageCallbacks.rb:2087
 msgid "Initialization of the target failed."
 msgstr "Klarte ikkje gjera klar målet."
 
 #. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2178
+#: library/packages/src/modules/PackageCallbacks.rb:2179
 msgid "RPM database read"
 msgstr "Pakkedatabase lesen"
 
 #. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2212
+#: library/packages/src/modules/PackageCallbacks.rb:2213
 msgid "User Authentication"
 msgstr "Brukerautentisering"
 
-#: library/packages/src/modules/PackageCallbacks.rb:2218
+#: library/packages/src/modules/PackageCallbacks.rb:2219
 msgid ""
 "URL: %1\n"
 "\n"
@@ -3510,20 +3558,20 @@
 "%2"
 
 #. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2227
+#: library/packages/src/modules/PackageCallbacks.rb:2228
 msgid "&User Name"
 msgstr "&Brukernamn"
 
 #. check box
-#: library/packages/src/modules/PackageCallbacks.rb:3010
+#: library/packages/src/modules/PackageCallbacks.rb:3017
 msgid "Show &details"
 msgstr "Vis &detaljar"
 
-#: library/packages/src/modules/PackageCallbacks.rb:3076
+#: library/packages/src/modules/PackageCallbacks.rb:3083
 msgid "Size: "
 msgstr "Storleik: "
 
-#: library/packages/src/modules/PackageCallbacks.rb:3099
+#: library/packages/src/modules/PackageCallbacks.rb:3106
 msgid "Remaining time to automatic retry: %1"
 msgstr "Prøver på nytt om: %1"
 
@@ -3607,12 +3655,12 @@
 "løysast manuelt i pakkehandsamaren."
 
 #. error report
-#: library/packages/src/modules/PackageSystem.rb:415
+#: library/packages/src/modules/PackageSystem.rb:417
 msgid "Installing required packages failed."
 msgstr "Klarte ikkje installera nødvendige pakkar."
 
 #. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:419
+#: library/packages/src/modules/PackageSystem.rb:421
 msgid ""
 "Installing required packages failed. If you continue\n"
 "without installing required packages,\n"
@@ -3623,12 +3671,12 @@
 "kan det henda at YaST ikkje vil fungera skikkeleg.\n"
 
 #. error report
-#: library/packages/src/modules/PackageSystem.rb:430
+#: library/packages/src/modules/PackageSystem.rb:432
 msgid "Cannot continue without installing required packages."
 msgstr "Kan ikkje halda utan å installera nødvendige pakkar."
 
 #. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:435
+#: library/packages/src/modules/PackageSystem.rb:437
 msgid ""
 "If you continue without installing required \n"
 "packages, YaST may not work properly.\n"
@@ -3637,47 +3685,42 @@
 "pakkane, kan det henda at YaST ikkje vil fungera skikkeleg.\n"
 
 #. dialog heading, %1 is package name
-#: library/packages/src/modules/PackagesUI.rb:152
+#: library/packages/src/modules/PackagesUI.rb:156
 msgid "Confirm Package License: %1"
 msgstr "Godta pakkelisens: %1"
 
 #. push button
-#: library/packages/src/modules/PackagesUI.rb:159
+#: library/packages/src/modules/PackagesUI.rb:163
 msgid "I &Agree"
 msgstr "&Godta"
 
 #. push button
-#: library/packages/src/modules/PackagesUI.rb:161
+#: library/packages/src/modules/PackagesUI.rb:165
 msgid "I &Disagree"
 msgstr "&Ikkje godta"
 
 #. help text
-#: library/packages/src/modules/PackagesUI.rb:173
+#: library/packages/src/modules/PackagesUI.rb:177
 msgid ""
-"<p><b><big>License Confirmation</big></b><br>"
-"\n"
+"<p><b><big>License Confirmation</big></b><br>\n"
 "The package in the headline of the dialog requires an explicit confirmation\n"
 "of acceptance of its license.\n"
 "If you reject the license of the package, the package will not be installed.\n"
-"<br>"
-"\n"
+"<br>\n"
 "To accept the license of the package, click <b>I Agree</b>.\n"
-"To reject the license of the package, click <b>I Disagree</b></p>"
-"."
+"To reject the license of the package, click <b>I Disagree</b></p>."
 msgstr ""
-"<p><b><big>Lisensgodtaking</big></b><br>"
-"\n"
+"<p><b><big>Lisensgodtaking</big></b><br>\n"
 "Pakken nemnd i overskrifta krev at du uttrykkjeleg\n"
 "\n"
 "godtek dei tilhøyrande lisensvilkåra.\n"
 "Viss du avviser desse, vert ikkje pakke installert.\n"
-"<br>"
-"\n"
+"<br>\n"
 "Trykk <b>Godta</b> for å godta lisensvilkåa,\n"
 "eller trykk <b>Ikkje godta</b> for å avslå vilkåra.</p>"
 
 #. Help text for software patterns / selections dialog
-#: library/packages/src/modules/PackagesUI.rb:326
+#: library/packages/src/modules/PackagesUI.rb:347
 msgid ""
 "<p>\n"
 "\t\t This dialog allows you to define this system's tasks and what software to install.\n"
@@ -3692,7 +3735,7 @@
 "\t\t kolonne, fordelt på kategoriar. Vel eit element for å visa skildringa.\n"
 "\t\t </p>"
 
-#: library/packages/src/modules/PackagesUI.rb:333
+#: library/packages/src/modules/PackagesUI.rb:354
 msgid ""
 "<p>\n"
 "\t\t Change the status of an item by clicking its status icon\n"
@@ -3706,7 +3749,7 @@
 "\t\t Du kan òg endra status for alle elementa i denne menyen.\n"
 "\t\t </p>"
 
-#: library/packages/src/modules/PackagesUI.rb:340
+#: library/packages/src/modules/PackagesUI.rb:361
 msgid ""
 "<p>\n"
 "\t\t <b>Details</b> opens the detailed software package selection\n"
@@ -3718,7 +3761,7 @@
 "\t\t Her kan du visa og velja einskilde programvarepakkar.\n"
 "\t\t </p>"
 
-#: library/packages/src/modules/PackagesUI.rb:346
+#: library/packages/src/modules/PackagesUI.rb:367
 msgid ""
 "<p>\n"
 "\t\t The disk usage display in the lower right corner shows the remaining disk space\n"
@@ -3739,134 +3782,134 @@
 
 #. Dialog title
 #. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
-#: library/packages/src/modules/PackagesUI.rb:367
+#: library/packages/src/modules/PackagesUI.rb:388
 msgid "Software Selection and System Tasks"
 msgstr "Programvareutval og systemoppgåver"
 
 #. don't get all the way out - the user might just have
 #. been scared of the gory details.
-#: library/packages/src/modules/PackagesUI.rb:408
+#: library/packages/src/modules/PackagesUI.rb:429
 msgid "(more)"
 msgstr "(fleire)"
 
-#: library/packages/src/modules/PackagesUI.rb:424
+#: library/packages/src/modules/PackagesUI.rb:445
 msgid "Installation Successfully Finished"
 msgstr "Installeringa er fullførd"
 
-#: library/packages/src/modules/PackagesUI.rb:426
+#: library/packages/src/modules/PackagesUI.rb:447
 msgid "Package Installation Failed"
 msgstr "Feil ved pakkeinstallering"
 
-#: library/packages/src/modules/PackagesUI.rb:438
+#: library/packages/src/modules/PackagesUI.rb:459
 msgid "Error Message: %1"
 msgstr "Feilmelding: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:455
+#: library/packages/src/modules/PackagesUI.rb:476
 msgid "Failed Packages: %1"
 msgstr "Pakkar som ikkje kunne installerast: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:474
+#: library/packages/src/modules/PackagesUI.rb:495
 msgid "Installed Packages: %1"
 msgstr "Installerte pakkar: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:493
+#: library/packages/src/modules/PackagesUI.rb:514
 msgid "Updated Packages: %1"
 msgstr "Oppdaterte pakkar: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:512
+#: library/packages/src/modules/PackagesUI.rb:533
 msgid "Removed Packages: %1"
 msgstr "Fjerna pakkar: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:534
+#: library/packages/src/modules/PackagesUI.rb:555
 msgid "Not Installed Packages: %1"
 msgstr "Ikkje installerte pakker: %1"
 
 #. Table headings for CD statistics during installation
-#: library/packages/src/modules/PackagesUI.rb:550
-#: library/packages/src/modules/SlideShow.rb:533
+#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/SlideShow.rb:534
 msgid "Packages"
 msgstr "Pakkar"
 
 #. reset the items list
-#: library/packages/src/modules/PackagesUI.rb:561
+#: library/packages/src/modules/PackagesUI.rb:582
 msgid "Elapsed Time: %1"
 msgstr "Brukt tid: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:571
+#: library/packages/src/modules/PackagesUI.rb:592
 msgid "Total Installed Size: %1"
 msgstr "Samla installert storleik: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:581
+#: library/packages/src/modules/PackagesUI.rb:602
 msgid "Total Downloaded Size: %1"
 msgstr "Samla nedlastingsstorleik: %1"
 
-#: library/packages/src/modules/PackagesUI.rb:590
+#: library/packages/src/modules/PackagesUI.rb:611
 msgid "Statistics"
 msgstr "Statistikk"
 
 #. display installation log
-#: library/packages/src/modules/PackagesUI.rb:603
-#: library/packages/src/modules/PackagesUI.rb:691
+#: library/packages/src/modules/PackagesUI.rb:624
+#: library/packages/src/modules/PackagesUI.rb:712
 msgid "Installation log"
 msgstr "Installasjonslogg"
 
-#: library/packages/src/modules/PackagesUI.rb:610
+#: library/packages/src/modules/PackagesUI.rb:631
 msgid "Details"
 msgstr "Detaljar"
 
 #. open a new wizard dialog if needed
-#: library/packages/src/modules/PackagesUI.rb:658
+#: library/packages/src/modules/PackagesUI.rb:679
 #, fuzzy
 #| msgid "Installing Package"
 msgid "After Installing Packages"
 msgstr "Installerer pakke"
 
-#: library/packages/src/modules/PackagesUI.rb:659
+#: library/packages/src/modules/PackagesUI.rb:680
 msgid "Show This Report"
 msgstr ""
 
-#: library/packages/src/modules/PackagesUI.rb:660
+#: library/packages/src/modules/PackagesUI.rb:681
 #, fuzzy
 #| msgid "&Finish"
 msgid "Finish"
 msgstr "&Fullfør"
 
-#: library/packages/src/modules/PackagesUI.rb:661
+#: library/packages/src/modules/PackagesUI.rb:682
 #, fuzzy
 #| msgid "Accessing the Software Management Failed"
 msgid "Continue in the Software Manager"
 msgstr "Fekk ikkje tilgang til programvarehandsaming"
 
-#: library/packages/src/modules/PackagesUI.rb:666
+#: library/packages/src/modules/PackagesUI.rb:687
 #, fuzzy
 #| msgid "<P><BIG><B>Installation Summary</B></BIG><BR>Here is a summary of installed packages.</P>"
 msgid "<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed or removed packages.</P>"
 msgstr "<P><BIG><B>Installasjonssamandrag</B></BIG><BR>Her er ei oversikt over dei installerte pakkane.</P>"
 
-#: library/packages/src/modules/PackagesUI.rb:674
+#: library/packages/src/modules/PackagesUI.rb:695
 #, fuzzy
 #| msgid "Installation Error"
 msgid "Installation Report"
 msgstr "Feil ved installering"
 
-#: library/packages/src/modules/PackagesUI.rb:696
+#: library/packages/src/modules/PackagesUI.rb:717
 msgid "Installed Packages"
 msgstr "Installerte pakkar"
 
-#: library/packages/src/modules/PackagesUI.rb:701
+#: library/packages/src/modules/PackagesUI.rb:722
 msgid "Updated Packages"
 msgstr "Oppdaterte pakkar"
 
-#: library/packages/src/modules/PackagesUI.rb:706
+#: library/packages/src/modules/PackagesUI.rb:727
 msgid "Removed Packages"
 msgstr "Fjerna pakkar"
 
-#: library/packages/src/modules/PackagesUI.rb:711
+#: library/packages/src/modules/PackagesUI.rb:732
 msgid "Remaining Packages"
 msgstr "Gjenståande pakker"
 
 #. disabling installation report dialog, inform the user how to enable it back
-#: library/packages/src/modules/PackagesUI.rb:732
+#: library/packages/src/modules/PackagesUI.rb:753
 msgid ""
 "If you want to show this report dialog again edit\n"
 "\n"
@@ -4421,84 +4464,84 @@
 #. Return the description for the current stage.
 #. @return [String]	localized string description
 #. translators: default global progress bar label
-#: library/packages/src/modules/SlideShow.rb:151
 #: library/packages/src/modules/SlideShow.rb:152
-#: library/packages/src/modules/SlideShow.rb:323
-#: library/packages/src/modules/SlideShow.rb:344
+#: library/packages/src/modules/SlideShow.rb:153
+#: library/packages/src/modules/SlideShow.rb:324
+#: library/packages/src/modules/SlideShow.rb:345
 msgid "Installing..."
 msgstr "Installerer …"
 
 #. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:529
+#: library/packages/src/modules/SlideShow.rb:530
 msgid "Media"
 msgstr "Medium"
 
 #. Table headings for CD statistics during installation - keep as short as possible!
-#: library/packages/src/modules/SlideShow.rb:531
+#: library/packages/src/modules/SlideShow.rb:532
 #, fuzzy
 #| msgid "Remaining Packages"
 msgid "Remaining"
 msgstr "Gjenståande pakker"
 
 #. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:535
+#: library/packages/src/modules/SlideShow.rb:536
 msgid "Time"
 msgstr "Tid"
 
 #. Construct widgets for the "details" page
 #.
 #. @return	A term describing the widgets
-#: library/packages/src/modules/SlideShow.rb:551
+#: library/packages/src/modules/SlideShow.rb:552
 msgid "Actions performed:"
 msgstr "Utførde handlingar:"
 
 #. Help text while software packages are being installed (displayed only in rare cases)
-#: library/packages/src/modules/SlideShow.rb:633
+#: library/packages/src/modules/SlideShow.rb:634
 #, fuzzy
 #| msgid "<p>Please wait while packages are being installed.</p>"
 msgid "<p>Packages are being installed.</p>"
 msgstr "<p>Vent mens pakkene vert installerte.</p>"
 
-#: library/packages/src/modules/SlideShow.rb:634
+#: library/packages/src/modules/SlideShow.rb:635
 msgid "<P><B>Aborting Installation</B> Package installation can be aborted using the <B>Abort</B> button. However, the system then can be in an inconsistent or unusable state or it may not boot if the basic system component is not installed.</P>"
 msgstr "<P><B>Avbryta installeringa</B> Du kan avbryta pakkeinstalleringa med <B>Avbryt</B>-knappen. Men viss ikkje alle grunnleggjande systemkomponentane er installerte enno, kan det henda at systemet vert inkonsistent eller ubrukeleg.</P>"
 
 #. Translators: Tab name, keep short, %s is product name, e.g. SLES
-#: library/packages/src/modules/SlideShow.rb:652
+#: library/packages/src/modules/SlideShow.rb:653
 #, fuzzy
 #| msgid "Release &Notes"
 msgid "%s Release Notes"
 msgstr "&Versjonsmerknader"
 
 #. tab
-#: library/packages/src/modules/SlideShow.rb:664
+#: library/packages/src/modules/SlideShow.rb:665
 msgid "Slide Sho&w"
 msgstr "&Lysbiletepresentasjon"
 
 #. tab
-#: library/packages/src/modules/SlideShow.rb:666
+#: library/packages/src/modules/SlideShow.rb:667
 msgid "&Details"
 msgstr "&Detaljar"
 
 #. Dialog heading - software packages are being upgraded
-#: library/packages/src/modules/SlideShow.rb:705
+#: library/packages/src/modules/SlideShow.rb:706
 msgid "Performing Upgrade"
 msgstr ""
 
 #. Dialog heading - software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:708
+#: library/packages/src/modules/SlideShow.rb:709
 #, fuzzy
 #| msgid "Perform Installation"
 msgid "Performing Installation"
 msgstr "Installer"
 
 #. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:743
+#: library/packages/src/modules/SlideShow.rb:744
 msgid "Package Installation"
 msgstr "Pakkeinstallering"
 
 #. popup yes-no
-#: library/packages/src/modules/SlideShow.rb:815
+#: library/packages/src/modules/SlideShow.rb:816
 msgid ""
 "Do you really want\n"
 "to quit the installation?"
@@ -4507,7 +4550,7 @@
 "avslutta installeringa?"
 
 #. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:827
+#: library/packages/src/modules/SlideShow.rb:828
 msgid "Aborted"
 msgstr "Avbroten"
 
@@ -5102,6 +5145,16 @@
 msgid "Bluetooth device"
 msgstr "Bluetooth-eining"
 
+#. Runs arguments without changed root.
+#. @see http://www.rubydoc.info/github/openSUSE/cheetah/Cheetah.run parameter docs
+#. @raise Cheetah::ExecutionFailed
+#: library/system/src/lib/yast2/execute.rb:67
+msgid ""
+"Execution of command \"%{command}\" failed.\n"
+"Exit code: %{exitcode}\n"
+"Error output: %{stderr}"
+msgstr ""
+
 #. Continue/Cancel question, %1 is a file name
 #: library/system/src/modules/FileChanges.rb:175
 #, fuzzy
@@ -5193,7 +5246,7 @@
 "heksadesimalsiffer skilde med kolon."
 
 #. Translators: dot: ".", hyphen: "-"
-#: library/types/src/modules/Hostname.rb:55
+#: library/types/src/modules/Hostname.rb:56
 msgid ""
 "A valid domain name consists of components separated by dots.\n"
 "Each component contains letters, digits, and hyphens. A hyphen may not\n"
@@ -5204,7 +5257,7 @@
 "starta eller avslutta eit komponentnamn, og den siste komponenten kan ikkje begynna med eit tal."
 
 #. Translators: hyphen: "-"
-#: library/types/src/modules/Hostname.rb:66
+#: library/types/src/modules/Hostname.rb:67
 msgid ""
 "A valid host name consists of letters, digits, and hyphens.\n"
 "A host name may not begin or end with a hyphen.\n"
@@ -6192,72 +6245,6 @@
 "Det finst ikkje noka baklengs sone for %1 administrert av DNS-tenaren.\n"
 "Vertsnamnet %2 kan ikkje leggjast til."
 
-#: src/lib/ui/srv_status_component.rb:60
-#, fuzzy
-#| msgid "Service Start"
-msgid "Service Status"
-msgstr "Start av teneste"
-
-#. Content for the help
-#: src/lib/ui/srv_status_component.rb:114
-msgid ""
-"<p><b><big>Current status</big></b><br>"
-"\n"
-"Displays the current status of the service. The status will remain the same after saving the settings, independently of the value of 'start service during boot'.</p>"
-"\n"
-"<p><b><big>Reload After Saving Settings</big></b><br>"
-"\n"
-"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (via 'ok' or 'save' buttons).</p>"
-"\n"
-"<p><b><big>Start During System Boot</big></b><br>"
-"\n"
-"Check this field to enable the service at system boot. Un-check it to disable the service. This does not affect the current status of the service in the already running system.</p>"
-"\n"
-msgstr ""
-
-#. Widget displaying the status and associated buttons
-#: src/lib/ui/srv_status_component.rb:181
-#, fuzzy
-#| msgid "Current Status: "
-msgid "Current status:"
-msgstr "Status: "
-
-#. Widget to configure the status on boot
-#: src/lib/ui/srv_status_component.rb:194
-#, fuzzy
-#| msgid "During Boot"
-msgid "Start During System Boot"
-msgstr "Ved oppstart"
-
-#. Widget to configure reloading of the running service
-#: src/lib/ui/srv_status_component.rb:208
-msgid "Reload After Saving Settings"
-msgstr ""
-
-#. TRANSLATORS: status of a service
-#: src/lib/ui/srv_status_component.rb:218
-#, fuzzy
-#| msgid "Warning"
-msgid "running"
-msgstr "Åtvaring"
-
-#: src/lib/ui/srv_status_component.rb:220
-#, fuzzy
-#| msgid "&Stop"
-msgid "Stop now"
-msgstr "&Stopp"
-
-#. TRANSLATORS: status of a service
-#: src/lib/ui/srv_status_component.rb:225
-msgid "stopped"
-msgstr ""
-
-#: src/lib/ui/srv_status_component.rb:227
-#, fuzzy
-#| msgid "&Stop"
-msgid "Start now"
-msgstr "&Stopp"
-
 #~ msgid "The correct repository medium could not be mounted."
 #~ msgstr "Klarte ikkje montera pakkebrønnmediet."
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/bootloader.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/bootloader.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/bootloader.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2015-11-16 20:31+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"
@@ -34,57 +34,175 @@
 #. command line help text for delete action
 #: src/clients/bootloader.rb:58
 #, fuzzy
-msgid "Delete a global option"
-msgstr "&Detaljerte generelle val"
+msgid "Delete a global option or option of a section"
+msgstr "Slett eit generelt alternativ eller eit seksjonsalternativ"
 
 #. command line help text for set action
 #: src/clients/bootloader.rb:65
 #, fuzzy
-msgid "Set a global option"
-msgstr "&Detaljerte generelle val"
+msgid "Set a global option or option of a section"
+msgstr "Definer eit generelt alternativ eller seksjonsalternativ"
 
+#. command line help text for add action
+#: src/clients/bootloader.rb:72
+#, fuzzy
+msgid "Add a new section - please use interactive mode"
+msgstr "Legg til ein ny seksjon – bruk interaktiv modus"
+
 #. command line help text for print action
-#: src/clients/bootloader.rb:75
+#: src/clients/bootloader.rb:82
 #, fuzzy
 msgid "Print value of specified option"
 msgstr "Skriv ut verdet for det spesifiserte alternativet"
 
 #. command line help text for an option
-#: src/clients/bootloader.rb:83
+#: src/clients/bootloader.rb:90
 #, fuzzy
+msgid "The name of the section"
+msgstr "Namnet til seksjonen"
+
+#. command line help text for an option
+#: src/clients/bootloader.rb:97
+#, fuzzy
 msgid "The key of the option"
 msgstr "Koda til alternativet"
 
 #. command line help text for an option
-#: src/clients/bootloader.rb:90
+#: src/clients/bootloader.rb:104
 #, fuzzy
 msgid "The value of the option"
 msgstr "Verdet til alternativet"
 
+#. command line error report, %1 is section name
+#. command line error report, %1 is section name
+#: src/clients/bootloader.rb:185 src/clients/bootloader.rb:225
+#, fuzzy
+msgid "Section %1 not found."
+msgstr "Seksjonen %1 ikkje funnet."
+
 #. command line error report
-#: src/clients/bootloader.rb:152
+#: src/clients/bootloader.rb:201
 #, fuzzy
 msgid "Value was not specified."
 msgstr "Inkje verd spesifisert."
 
+#. Add a new bootloader section with specified name
+#. @param [Hash] options a list of parameters passed as args
+#. @return [Boolean] true on success
+#: src/clients/bootloader.rb:239
+#, fuzzy
+msgid "Add option is available only in commandline interactive mode"
+msgstr "Legg til-valet er berre tilgjengeleg i interaktiv kommandolinjemodus"
+
 #. command line error report
-#: src/clients/bootloader.rb:174
+#: src/clients/bootloader.rb:245
 #, fuzzy
+msgid "Section name must be specified."
+msgstr "Eit seksjonsnavn må spesifiserast."
+
+#. command line error report
+#: src/clients/bootloader.rb:265
+#, fuzzy
 msgid "Option was not specified."
 msgstr "Alternativ ikkje spesifisert."
 
+#. command line error report
+#: src/clients/bootloader.rb:284
+#, fuzzy
+msgid "Specified option does not exist."
+msgstr "Det spesifiserte alternativet finst ikkje."
+
 #. command line, %1 is the value of bootloader option
-#: src/clients/bootloader.rb:180
+#: src/clients/bootloader.rb:287
 #, fuzzy
-msgid "Value: %s"
+msgid "Value: %1"
 msgstr "Verd: %1"
 
-#. command line error report
-#: src/clients/bootloader.rb:183
+#. progress step title
+#: src/clients/bootloader_finish.rb:52
 #, fuzzy
-msgid "Specified option does not exist."
-msgstr "Det spesifiserte alternativet finst ikkje."
+msgid "Saving bootloader configuration..."
+msgstr "Lagrar konfigurasjon for oppstartslaster …"
 
+#. TRANSLATORS: reboot message
+#. %1 is replaced with additional message from reIPL
+#: src/clients/bootloader_finish.rb:133
+#, fuzzy
+msgid ""
+"\n"
+"Your system will now shut down.%1\n"
+"For details, read the related chapter \n"
+"in the documentation. \n"
+msgstr ""
+"\n"
+"Systemet vil slåast av.%1%2\n"
+"Du finn meir informasjon i det aktuelle kapittelet \n"
+"i dokumentasjonen. \n"
+
+#. Final message after all packages from CD1 are installed
+#. and we're ready to start (boot into) the installed system
+#. Message that will be displayed along with information
+#. how the boot loader was installed
+#: src/clients/bootloader_finish.rb:146
+#, fuzzy
+msgid "The system will reboot now..."
+msgstr "Maskina vil startast på nytt no …"
+
+#. warning text in the summary richtext
+#: src/clients/bootloader_proposal.rb:116
+#, fuzzy
+msgid "No boot loader is selected for installation. Your system might not be bootable."
+msgstr "Ingen oppstartslaster er valde for installasjon. Systemet vil kanskje ikkje kunna verta opp starta."
+
+#. error in the proposal
+#: src/clients/bootloader_proposal.rb:126
+#, fuzzy
+msgid "Because of the partitioning, the bootloader cannot be installed properly"
+msgstr "Oppstartslasteren kan ikkje installerast riktig med denne partisjoneringen"
+
+#. proposal part - bootloader label
+#: src/clients/bootloader_proposal.rb:225
+#, fuzzy
+msgid "Booting"
+msgstr "Oppstart"
+
+#. menubutton entry
+#: src/clients/bootloader_proposal.rb:227
+#, fuzzy
+msgid "&Booting"
+msgstr "&Oppstart"
+
+#. Run dialog to adjust installation on i386 and AMD64
+#. @return [Symbol] for wizard sequencer
+#. Run dialog to adjust installation on i386 and AMD64
+#. @return [Symbol] for wizard sequencer
+#: src/include/bootloader/grub/dialogs.rb:41
+#: src/include/bootloader/grub2/dialogs.rb:221
+#, fuzzy
+msgid "Disk Order"
+msgstr "Diskrekkefølge"
+
+#: src/include/bootloader/grub/dialogs.rb:50
+#: src/include/bootloader/grub2/dialogs.rb:230
+#, fuzzy
+msgid "Disk order settings"
+msgstr "Innstillingar fir diskrekkefølge"
+
+#. Run dialog for loader installation details on i386
+#. @return [Symbol] for wizard sequencer
+#: src/include/bootloader/grub/dialogs.rb:68
+#, fuzzy
+msgid "Boot Menu"
+msgstr "Oppstartsmeny"
+
+#. `VSpacing(1),
+#. Window title
+#: src/include/bootloader/grub/dialogs.rb:106
+#: src/include/bootloader/grub2/dialogs.rb:143
+#, fuzzy
+msgid "Boot Loader Options"
+msgstr "Alternativ for oppstartslaster"
+
 #. encoding: utf-8
 #. File:
 #. include/bootloader/grup/helps.ycp
@@ -101,24 +219,18 @@
 #. $Id$
 #: src/include/bootloader/grub/helps.rb:23
 #, fuzzy
-msgid ""
-"<p><big><b>Boot Menu</b></big><br>"
-"</p>"
-msgstr ""
-"<p><big><b>Oppstartsmeny</b></big><br>"
-"</p>"
+msgid "<p><big><b>Boot Menu</b></big><br></p>"
+msgstr "<p><big><b>Oppstartsmeny</b></big><br></p>"
 
 #: src/include/bootloader/grub/helps.rb:24
 #, fuzzy
 msgid ""
-"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>"
-"\n"
+"<p><b>Set active Flag in Partition Table for Boot Partition</b><br>\n"
 "To activate the partition which contains the boot loader. The generic MBR code will then\n"
 "boot the active partition. Older BIOSes require one partition to be active even\n"
 "if the boot loader is installed in the MBR.</p>"
 msgstr ""
-"<b>Angje oppstartspartisjonen som aktiv i partisjonstabellen</b><br>"
-"\n"
+"<b>Angje oppstartspartisjonen som aktiv i partisjonstabellen</b><br>\n"
 "Brukast for å aktivare partisjonen som inneheld oppstartslasteren. Den generiske MBR-koda vil då\n"
 "starta opp den aktive partisjonen. Eldre BIOS-er krev at ein partisjon er aktiv sjølv om\n"
 "oppstartslasteren er installert i MBR.</p>"
@@ -141,15 +253,11 @@
 #: src/include/bootloader/routines/common_helps.rb:23
 #, fuzzy
 msgid ""
-"<p><b>Timeout in Seconds</b><br>"
-"\n"
-"Specifies the time the bootloader will wait until the default kernel is loaded.</p>"
-"\n"
+"<p><b>Timeout in Seconds</b><br>\n"
+"Specifies the time the bootloader will wait until the default kernel is loaded.</p>\n"
 msgstr ""
-"<p><b>Tidsavbrudd i sekund</b><br>"
-"\n"
-"Angjev kor lenge oppstartslasteren skal venta før standardkjernen lastast.</p>"
-"\n"
+"<p><b>Tidsavbrudd i sekund</b><br>\n"
+"Angjev kor lenge oppstartslasteren skal venta før standardkjernen lastast.</p>\n"
 
 #: src/include/bootloader/grub/helps.rb:33
 #, fuzzy
@@ -159,16 +267,14 @@
 "wait for the user to select a kernel or OS to boot. If no\n"
 "key is pressed before the timeout, the default kernel or OS will\n"
 "boot. The order of the sections in the boot loader menu can be changed\n"
-"using the <b>Up</b> and <b>Down</b> buttons.</p>"
-"\n"
+"using the <b>Up</b> and <b>Down</b> buttons.</p>\n"
 msgstr ""
 "<p> Ved å klikka <b>Bruk som standard</b> markerer du den valde \n"
 "seksjonen som standard. Ved oppstart vil oppstartslasteren visa ein \n"
 "oppstartsmeny og vente på at brukaren skal velja ein kjerne eller anna \n"
 "operativsystem som skal startast. Viss det ikkje vert trykt nokon tast før tidsavbruddet, vert \n"
 "standardkjernen/operativsystemet lasta. Rekkjefølgda på seksjonane i oppstartslasteren \n"
-"kan endrast ved hjelp av <b>Opp</b> og <b>Ned</b>-knappen.</p>"
-"\n"
+"kan endrast ved hjelp av <b>Opp</b> og <b>Ned</b>-knappen.</p>\n"
 
 #: src/include/bootloader/grub/helps.rb:41
 #, fuzzy
@@ -176,8 +282,7 @@
 "<p><b>Write generic Boot Code to MBR</b> replace the master boot record of your disk with generic code (OS independent code which\n"
 "boots the active partition).</p>"
 msgstr ""
-"<p><big><b>Skriv generisk oppstartskode til MBR</b></big><br>"
-" erstattar «master boot record» på disken med generisk kode (OS-uavhengig kode som\n"
+"<p><big><b>Skriv generisk oppstartskode til MBR</b></big><br> erstattar «master boot record» på disken med generisk kode (OS-uavhengig kode som\n"
 "startar opp den aktive partisjonen).</p>"
 
 #: src/include/bootloader/grub/helps.rb:44
@@ -192,13 +297,22 @@
 #: src/include/bootloader/grub/helps.rb:47
 #, fuzzy
 msgid ""
+"<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option <i>Graphical Menu File</i> will be ignored.\n"
+"It is recommended to install grub to MBR</p>"
+msgstr ""
+"<p>Vel <b>Bruk påliteleg Grub</b> for å installera og bruka påliteleg Grub. Valet <i>Grafisk menyfil</i> vil ignorerast.\n"
+"Det vert rådt til å installera Grub i MBR</p>"
+
+#: src/include/bootloader/grub/helps.rb:50
+#, fuzzy
+msgid ""
 "<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
 "installed on your computer</p>"
 msgstr ""
 "<p><b>Start frå hovedoppstartssektor</b> vert ikkje rådt til viss du har eit anna operativsystem\n"
 "installert på datamaskina</p>"
 
-#: src/include/bootloader/grub/helps.rb:50
+#: src/include/bootloader/grub/helps.rb:53
 #, fuzzy
 msgid ""
 "<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
@@ -211,18 +325,18 @@
 " i <b>Oppstartslastervalg</b> for å oppdatera \"master boot record\" viss det er naudsynt, eller konfigurera den andre oppstartslasteren\n"
 " til å starta denne seksjonen.</p>"
 
-#: src/include/bootloader/grub/helps.rb:56
+#: 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:59
+#: src/include/bootloader/grub/helps.rb:62
 #, fuzzy
 msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
 msgstr "<p>Med <b>Egendefinert oppstartspartisjon</b> kan du velja kva for ein partisjon du vil starta frå.</p>"
 
-#: src/include/bootloader/grub/helps.rb:62
+#: src/include/bootloader/grub/helps.rb:65
 #, fuzzy
 msgid ""
 "<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
@@ -231,35 +345,31 @@
 "<p>MD-tilordning vert oppretta frå 2 diskar. <b>Aktivar redundans for MD-tilordning</b>\n"
 "aktivum lagring av GRUB i  MBR på begge diskar.</p>"
 
-#: src/include/bootloader/grub/helps.rb:65
+#: src/include/bootloader/grub/helps.rb:68
 #, fuzzy
 msgid ""
 "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
-"for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>"
+"for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
 msgstr ""
 "<p>Med <b>Bruk seriell konsoll</b> kan du definera parametrar som skal brukast\n"
 "for ein seriell konsoll. Du finn meir informasjon i grub-dokumentasjonen (<code>info grub</code>).</p>"
 
-#: src/include/bootloader/grub/helps.rb:68
+#: src/include/bootloader/grub/helps.rb:71
 #, fuzzy
 msgid ""
-"<p><b>Terminal Definition</b></p>"
-"<br>"
-"\n"
-"Defines the type of terminal you want to use. For a serial terminal (e.g. a serial console),\n"
+"<p><b>Terminal Definition</b></p><br>\n"
+"Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n"
 "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n"
 "command, as <code>serial console</code>. In this case, a terminal in which you\n"
 "press any key will be selected as a GRUB terminal.</p>"
 msgstr ""
-"<p><b>Terminaldefinisjon</b></p>"
-"<br>"
-"\n"
+"<p><b>Terminaldefinisjon</b></p><br>\n"
 "Definerer typen terminal du vil bruka. For ein seriell terminal (t.d. ein seriell konsoll),\n"
 " må du angje <code>seriell</code>. Du kan òg senda <code>konsoll</code> til\n"
 " kommandoen, som <code>seriell konsoll</code>. I dette tilfellet vil det veljast ein terminal \n"
 "der du kan trykkja ein kva for ein som helst tast, som GRUB-terminal.</p>"
 
-#: src/include/bootloader/grub/helps.rb:75
+#: src/include/bootloader/grub/helps.rb:78
 #, fuzzy
 msgid ""
 "<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
@@ -268,186 +378,276 @@
 "<p><b>Reserveseksjoner viss standard mislukkast</b> inneheld ei liste med nummer \n"
 "på seksjonar som vert brukt til oppstart viss filsystemet i standardseksjonen ikkje kan startast.</p>"
 
-#: src/include/bootloader/grub/helps.rb:78
+#: src/include/bootloader/grub/helps.rb:81
 #, fuzzy
 msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
 msgstr "<p>Viss du vel <b>Skjul meny ved oppstart</b>, vert skjult oppstartsmenyen.</p>"
 
-#: src/include/bootloader/grub/helps.rb:81
+#: src/include/bootloader/grub/helps.rb:84
 #, fuzzy
+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 fila som skal brukast til den grafiske oppstartsmenyen.</p>"
+
+#: src/include/bootloader/grub/helps.rb:87
+#, fuzzy
+msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>"
+msgstr "<p><b>Aktivar lydsignaler</b> slå på/av lydsignaler.</p>"
+
+#: src/include/bootloader/grub/helps.rb:90
+#, fuzzy
 msgid ""
-"<p><b>Protect Boot Loader with Password</b><br>"
-"\n"
-"At boot time, modifying or even booting any entry will require the password. If <b>Protect Entry Modification Only</b> is checked then booting any entry is not restricted but modifying entries requires the password (which is the way GRUB 1 behaved).<br>"
-"YaST will only accept the password if you repeat it in <b>Retype Password</b>.</p>"
+"<p><b>Protect Boot Loader with Password</b><br>\n"
+"Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n"
+"it in <b>Retype Password</b>.</p>"
 msgstr ""
-"<p><b>Passord for oppstartslaster</b><br>"
-"\n"
+"<p><b>Passord for oppstartslaster</b><br>\n"
 "Angje passordet som må brukast for å få tilgjenge til oppstartsmenyen. YaST godkjenner berre passordet når du gjentek det i\n"
 " <b>Gjenta passordet</b>.</p>"
 
 #. help text 1/5
-#: src/include/bootloader/grub/helps.rb:91
+#: src/include/bootloader/grub/helps.rb:97
 #, fuzzy
 msgid ""
-"<p><big><b>Disks Order</b></big><br>"
-"\n"
+"<p><big><b>Disks Order</b></big><br>\n"
 "To specify the order of the disks according to the order in BIOS, use\n"
 "the <b>Up</b> and <b>Down</b> buttons to reorder the disks.\n"
 "To add a disk, push <b>Add</b>.\n"
 "To remove a disk, push <b>Remove</b>.</p>"
 msgstr ""
-"<p><big><b>Diskrekkefølge</b></big><br>"
-"\n"
+"<p><big><b>Diskrekkefølge</b></big><br>\n"
 "Angje diskrekkefølgen i samsvar med rekkjefølgda i BIOS med\n"
 "<b>opp</b>- og <b>ned</b>-knappane.\n"
 "Bruk <b>Legg til</b> for å leggja til ein disk.\n"
 "Nytte <b>Fjern</b> for å fjerne ein disk.</p>"
 
-#: src/include/bootloader/grub/helps.rb:101
+#: src/include/bootloader/grub/helps.rb:108
 #, fuzzy
 msgid "Boot Loader Locations"
 msgstr "Plassering av oppstartslaster"
 
-#: src/include/bootloader/grub/helps.rb:102
+#: src/include/bootloader/grub/helps.rb:109
 #, fuzzy
 msgid "Set &active Flag in Partition Table for Boot Partition"
 msgstr "Angje oppstartspartisjonen som &aktiv i partisjonstabellen"
 
-#: src/include/bootloader/grub/helps.rb:105
-#: src/include/bootloader/routines/common_helps.rb:28
+#: src/include/bootloader/grub/helps.rb:112
+#: src/include/bootloader/routines/common_helps.rb:29
 #, fuzzy
 msgid "&Timeout in Seconds"
 msgstr "&Tidsavbrudd i sekund"
 
-#: src/include/bootloader/grub/helps.rb:106
+#: src/include/bootloader/grub/helps.rb:113
 #, fuzzy
 msgid "&Default Boot Section"
 msgstr "Standar&d oppstartsseksjon"
 
-#: src/include/bootloader/grub/helps.rb:107
+#: src/include/bootloader/grub/helps.rb:114
 #, fuzzy
 msgid "Write &generic Boot Code to MBR"
 msgstr "Skriv &generisk oppstartskode til MBR"
 
-#: src/include/bootloader/grub/helps.rb:108
+#: src/include/bootloader/grub/helps.rb:115
 #, fuzzy
+msgid "Use &Trusted Grub"
+msgstr "Nytte påli&telig Grub"
+
+#: src/include/bootloader/grub/helps.rb:116
+#, fuzzy
 msgid "Custom Boot Partition"
 msgstr "Egendefinert oppstartspartisjon"
 
-#: src/include/bootloader/grub/helps.rb:109
+#: src/include/bootloader/grub/helps.rb:117
 #, fuzzy
 msgid "Boot from Master Boot Record"
 msgstr "Start frå hovedoppstartssektor"
 
-#: src/include/bootloader/grub/helps.rb:110
+#: src/include/bootloader/grub/helps.rb:118
 #, fuzzy
 msgid "Boot from Root Partition"
 msgstr "Start frå rotpartisjon"
 
-#: src/include/bootloader/grub/helps.rb:111
+#: src/include/bootloader/grub/helps.rb:119
 #, fuzzy
 msgid "Boot from Boot Partition"
 msgstr "Start frå oppstartspartisjon"
 
-#: src/include/bootloader/grub/helps.rb:112
+#: src/include/bootloader/grub/helps.rb:120
 #, fuzzy
 msgid "Boot from Extended Partition"
 msgstr "Start frå utvida partisjon"
 
-#: src/include/bootloader/grub/helps.rb:113
+#: src/include/bootloader/grub/helps.rb:121
 #, fuzzy
 msgid "Serial Connection &Parameters"
 msgstr "&Parametrar for seriell tilkobling"
 
-#: src/include/bootloader/grub/helps.rb:114
+#: src/include/bootloader/grub/helps.rb:122
 #, fuzzy
 msgid "Fallback Sections if Default fails"
 msgstr "Reserveseksjoner viss standard mislukkast"
 
-#: src/include/bootloader/grub/helps.rb:115
+#: src/include/bootloader/grub/helps.rb:123
 #, fuzzy
 msgid "&Hide Menu on Boot"
 msgstr "&Skjul meny ved oppstart"
 
-#: src/include/bootloader/grub/helps.rb:116
+#: src/include/bootloader/grub/helps.rb:124
 #, fuzzy
+msgid "Graphical &Menu File"
+msgstr "Fil for grafisk &meny"
+
+#: src/include/bootloader/grub/helps.rb:125
+#, fuzzy
 msgid "Pa&ssword for the Menu Interface"
 msgstr "Pa&ssord for menygrensesnitt"
 
-#: src/include/bootloader/grub/helps.rb:117
+#: src/include/bootloader/grub/helps.rb:126
 #, fuzzy
 msgid "Debugg&ing Flag"
 msgstr "Feilsøk&ingsvalg"
 
+#. encoding: utf-8
+#. File:
+#. modules/BootGRUB.ycp
+#.
+#. Module:
+#. Bootloader installation and configuration
+#.
+#. Summary:
+#. Module containing specific functions for GRUB configuration
+#. and installation
+#.
+#. Authors:
+#. Jiri Srain 
+#. Joachim Plack 
+#. Olaf Dabrunz 
+#. Philipp Thomas 
+#.
+#. $Id$
+#: src/include/bootloader/grub/options.rb:68
+#, fuzzy
+msgid "Choose new graphical menu file"
+msgstr "Vel ny fil for grafisk meny"
+
+#. `Left(`CheckBox(`id(`enable_acoustic_signals), _("Enable Acoustic &Signals"))),
+#: src/include/bootloader/grub/options.rb:129
+#, fuzzy
+msgid "Enable Acoustic &Signals"
+msgstr "Aktiver lydar&signal"
+
 #. Validate function of a popup
 #. @param [String] key any widget key
 #. @param [Hash] event map event that caused validation
 #. @return [Boolean] true if widget settings ok
-#: src/include/bootloader/grub/options.rb:73
+#: src/include/bootloader/grub/options.rb:254
 #, fuzzy
 msgid "Prot&ect Boot Loader with Password"
 msgstr "B&eskytt oppstartslasteren med eit passord"
 
-#. TRANSLATORS: checkbox entry
-#: src/include/bootloader/grub/options.rb:79
-msgid "P&rotect Entry Modification Only"
-msgstr ""
-
 #. text entry
-#: src/include/bootloader/grub/options.rb:85
+#: src/include/bootloader/grub/options.rb:259
 #, fuzzy
 msgid "&Password"
 msgstr "&Passord"
 
 #. text entry
-#: src/include/bootloader/grub/options.rb:88
+#: src/include/bootloader/grub/options.rb:262
 #, fuzzy
 msgid "Re&type Password"
 msgstr "Gjen&ta passordet"
 
+#. Common widget of a console
+#. @return [Hash{String => Object}] CWS widget
+#: src/include/bootloader/grub/options.rb:359
+#: src/include/bootloader/grub2/options.rb:295
+#, fuzzy
+msgid "Use &serial console"
+msgstr "Nytte &seriell konsoll"
+
+#: src/include/bootloader/grub/options.rb:366
+#: src/include/bootloader/grub2/options.rb:302
+#, fuzzy
+msgid "&Console arguments"
+msgstr "&Konsollargumenter"
+
+#. textentry header
+#: src/include/bootloader/grub/options.rb:455
+#, fuzzy
+msgid "&Device"
+msgstr "&Eining"
+
+#. disabling & enabling up/down, do it after change
+#: src/include/bootloader/grub/options.rb:534
+#, fuzzy
+msgid "Device map must contain at least one device"
+msgstr "Enhetskartet må innehalda minst éi eining"
+
+#: src/include/bootloader/grub/options.rb:543
+#, fuzzy
+msgid "D&isks"
+msgstr "D&isker"
+
+#: src/include/bootloader/grub/options.rb:555
+#, fuzzy
+msgid "&Up"
+msgstr "&Opp"
+
+#: src/include/bootloader/grub/options.rb:556
+#, fuzzy
+msgid "&Down"
+msgstr "&Ned"
+
 #. Create Frame "Boot Loader Location"
 #.
 #. @return [Yast::Term] with widgets
-#: src/include/bootloader/grub/options.rb:222
+#: src/include/bootloader/grub/options.rb:730
 #, fuzzy
 msgid "Boot from &Root Partition"
 msgstr "Start frå &rotpartisjon"
 
-#: src/include/bootloader/grub/options.rb:224
+#: src/include/bootloader/grub/options.rb:731
 #, fuzzy
 msgid "Boo&t from Boot Partition"
 msgstr "Star&t frå oppstartspartisjon"
 
-#: src/include/bootloader/grub/options.rb:235
+#: src/include/bootloader/grub/options.rb:739
+#: src/include/bootloader/grub/options.rb:766
+#: src/include/bootloader/grub/options.rb:801
 #, fuzzy
-msgid "C&ustom Boot Partition"
-msgstr "E&gendefinert oppstartspartisjon"
-
-#: src/include/bootloader/grub/options.rb:250
-#: src/include/bootloader/grub/options.rb:280
-#: src/include/bootloader/grub/options.rb:301
-#, fuzzy
 msgid "Boot Loader Location"
 msgstr "Oppstartslasterens plassering"
 
-#: src/include/bootloader/grub/options.rb:256
-#: src/include/bootloader/grub/options.rb:286
-#: src/include/bootloader/grub/options.rb:307
+#: src/include/bootloader/grub/options.rb:745
+#: src/include/bootloader/grub/options.rb:772
+#: src/include/bootloader/grub/options.rb:807
 #, fuzzy
 msgid "Boot from &Master Boot Record"
 msgstr "Start frå &Mastar Boot Record"
 
-#: src/include/bootloader/grub/options.rb:263
+#: src/include/bootloader/grub/options.rb:752
 #, fuzzy
 msgid "Boot from &Extended Partition"
 msgstr "Start frå utvid&eit partisjon"
 
-#: src/include/bootloader/grub/options.rb:312
+#: src/include/bootloader/grub/options.rb:778
+#: src/include/bootloader/grub/options.rb:819
 #, fuzzy
+msgid "C&ustom Boot Partition"
+msgstr "E&gendefinert oppstartspartisjon"
+
+#: src/include/bootloader/grub/options.rb:812
+#, fuzzy
 msgid "Enable Red&undancy for MD Array"
 msgstr "Aktivar rei&undans for MD-tilordning"
 
+#. push button
+#. push button
+#: src/include/bootloader/grub/options.rb:871
+#: src/include/bootloader/routines/global_widgets.rb:831
+#, fuzzy
+msgid "Boot Loader Installation &Details"
+msgstr "&Informasjon om oppstartslasterinstallasjon"
+
 #. Title in tab
 #: src/include/bootloader/grub2/dialogs.rb:57
 #, fuzzy
@@ -455,39 +655,33 @@
 msgstr "Alternativ for oppstartslaster"
 
 #. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:84
+#: src/include/bootloader/grub2/dialogs.rb:82
 #, fuzzy
 msgid "Kernel Parameters"
 msgstr "Ekstra kjerneparametere: %1"
 
 #. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:103
+#: src/include/bootloader/grub2/dialogs.rb:102
 #, fuzzy
 msgid "Bootloader Options"
 msgstr "Alternativ for oppstartslaster"
 
-#. Window title
-#: src/include/bootloader/grub2/dialogs.rb:149
-#, fuzzy
-msgid "Boot Loader Options"
-msgstr "Alternativ for oppstartslaster"
-
-#: src/include/bootloader/grub2/dialogs.rb:190
+#: src/include/bootloader/grub2/dialogs.rb:183
 msgid "Secure Boot"
 msgstr ""
 
-#: src/include/bootloader/grub2/dialogs.rb:196
+#: src/include/bootloader/grub2/dialogs.rb:189
 msgid "Enable &Secure Boot Support"
 msgstr ""
 
 #. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:247
+#: src/include/bootloader/grub2/dialogs.rb:262
 #, fuzzy
 msgid "Boot &Loader Location"
 msgstr "Oppstartslasterens plassering"
 
 #. help text
-#: src/include/bootloader/grub2/dialogs.rb:266
+#: src/include/bootloader/grub2/dialogs.rb:281
 msgid "Choose partition where is boot sequence installed."
 msgstr ""
 
@@ -506,38 +700,60 @@
 #.
 #. $Id: helps.ycp 58279 2009-08-04 16:01:51Z juhliarik $
 #: src/include/bootloader/grub2/helps.rb:23
+#: src/include/bootloader/routines/section_helps.rb:33
 #, fuzzy
 msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
 msgstr "<p>Med <b>Andre kommandolinjeparametere for kjernen</b> kan du definera tilleggsparametere som skal sendast til kjernen.</p>"
 
 #: src/include/bootloader/grub2/helps.rb:26
+#: src/include/bootloader/routines/section_helps.rb:30
 #, fuzzy
 msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
 msgstr "<p><b>VGA-modus</b> definerer VGA-modusen for <i>konsollen</i> kjernen skal stilla inn ved oppstart.</p>"
 
 #: src/include/bootloader/grub2/helps.rb:29
+#, fuzzy
+msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>"
+msgstr "<p>Med <b>Andre kommandolinjeparametere for kjernen</b> kan du definera tilleggsparametere som skal sendast til kjernen.</p>"
+
+#: src/include/bootloader/grub2/helps.rb:32
 msgid "<p><b>Probe Foreign OS</b> by means of os-prober for multiboot with other foreign distribution </p>"
 msgstr ""
 
-#: src/include/bootloader/grub2/helps.rb:32
+#: src/include/bootloader/grub2/helps.rb:35
 msgid "<p><b>Protective MBR flag</b> is expert only settings, that is needed only on exotic hardware. For details see Protective MBR in GPT disks. Do not touch if you are not sure.</p>"
 msgstr ""
 
 #: src/include/bootloader/grub2/helps.rb:38
+msgid "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>"
+msgstr ""
+
+#: src/include/bootloader/grub2/helps.rb:44
+#: src/include/bootloader/routines/section_helps.rb:99
 #, fuzzy
 msgid "O&ptional Kernel Command Line Parameter"
 msgstr "Andre kommandolinje¶metrar for kjernen"
 
-#: src/include/bootloader/grub2/helps.rb:39
+#: src/include/bootloader/grub2/helps.rb:45
+msgid "D&istributor"
+msgstr ""
+
+#: src/include/bootloader/grub2/helps.rb:46
+#: src/include/bootloader/routines/section_helps.rb:98
 #, fuzzy
 msgid "&Vga Mode"
 msgstr "&VGA-modus"
 
-#: src/include/bootloader/grub2/helps.rb:40
+#: src/include/bootloader/grub2/helps.rb:47
+#, fuzzy
+msgid "&Failsafe Kernel Command Line Parameter"
+msgstr "Andre kommandolinje¶metrar for kjernen"
+
+#: src/include/bootloader/grub2/helps.rb:48
 msgid "Probe Foreign OS"
 msgstr ""
 
-#: src/include/bootloader/grub2/helps.rb:41
+#: src/include/bootloader/grub2/helps.rb:49
 msgid "Protective MBR flag"
 msgstr ""
 
@@ -546,22 +762,32 @@
 #. %2 is Y resolution (height) in pixels
 #. %3 is color depth (usually one of 8, 16, 24, 32)
 #. %4 is the VGA mode ID (hexadecimal number)
+#. combo box item
+#. %1 is X resolution (width) in pixels
+#. %2 is Y resolution (height) in pixels
+#. %3 is color depth (usually one of 8, 16, 24, 32)
+#. %4 is the VGA mode ID (hexadecimal number)
 #: src/include/bootloader/grub2/options.rb:58
+#: src/include/bootloader/routines/section_widgets.rb:523
 #, fuzzy
 msgid "%1x%2, %3 bits (mode %4)"
 msgstr "%1x%2, %3 bitar sine (modus %4)"
 
 #: src/include/bootloader/grub2/options.rb:68
+#: src/include/bootloader/routines/section_widgets.rb:537
 #, fuzzy
 msgid "Standard 8-pixel font mode."
 msgstr "Standard skrifttypemodus med 8 piksler."
 
 #. item of a combo box
+#. item of a combo box
 #: src/include/bootloader/grub2/options.rb:71
+#: src/include/bootloader/routines/section_widgets.rb:540
 msgid "Text Mode"
 msgstr "Tekstmodus"
 
 #: src/include/bootloader/grub2/options.rb:72
+#: src/include/bootloader/routines/section_widgets.rb:541
 #, fuzzy
 msgid "Unspecified"
 msgstr "Uspesifisert"
@@ -583,81 +809,254 @@
 
 #. Init function for console
 #. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:173
+#: src/include/bootloader/grub2/options.rb:174
 msgid "Autodetect by grub2"
 msgstr ""
 
 #. FATE: #110038: Serial console
 #. add or remove console key with value for sections
-#: src/include/bootloader/grub2/options.rb:246
+#: src/include/bootloader/grub2/options.rb:249
 #, fuzzy
 msgid "Choose new graphical theme file"
 msgstr "Vel ny fil for grafisk meny"
 
-#: src/include/bootloader/grub2/options.rb:258
+#: src/include/bootloader/grub2/options.rb:261
 #, fuzzy
 msgid "Use &graphical console"
 msgstr "Nytte &seriell konsoll"
 
-#: src/include/bootloader/grub2/options.rb:265
+#: src/include/bootloader/grub2/options.rb:268
 #, fuzzy
 msgid "&Console resolution"
 msgstr "&Konsollargumenter"
 
-#: src/include/bootloader/grub2/options.rb:273
+#: src/include/bootloader/grub2/options.rb:276
 #, fuzzy
 msgid "&Console theme"
 msgstr "&Konsollargumenter"
 
-#: src/include/bootloader/grub2/options.rb:292
-#, fuzzy
-msgid "Use &serial console"
-msgstr "Nytte &seriell konsoll"
-
-#: src/include/bootloader/grub2/options.rb:299
-#, fuzzy
-msgid "&Console arguments"
-msgstr "&Konsollargumenter"
-
-#. FIXME: this should be better handled by exception and show it properly, but it require too big change now
-#: src/include/bootloader/routines/autoinstall.rb:131
+#. 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
-#: src/include/bootloader/routines/common_options.rb:98
+#. file open popup caption
+#. file open popup caption
+#: src/include/bootloader/routines/common_options.rb:102
+#: src/include/bootloader/routines/section_widgets.rb:265
+#: src/include/bootloader/routines/section_widgets.rb:279
 #, fuzzy
 msgid "Select File"
 msgstr "Vel fil"
 
 #. F#300779 - Install diskless client (NFS-root)
 #. 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:86 src/modules/Bootloader.rb:239
+#: src/include/bootloader/routines/dialogs.rb:90 src/modules/Bootloader.rb:270
 #, fuzzy
 msgid "The boot partition is of type NFS. Bootloader cannot be installed."
 msgstr "Oppstartspartisjonen er av typen NFS. Oppstartslasteren kan ikkje installerast."
 
 #. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:114
+#: src/include/bootloader/routines/dialogs.rb:131
 #, fuzzy
 msgid "Boot Loader Settings"
 msgstr "Oppstartslasterinnstillinger"
 
 #. message
-#: src/include/bootloader/routines/dialogs.rb:142
+#: src/include/bootloader/routines/dialogs.rb:159
 #, fuzzy
 msgid "There are no options to set for the current boot loader."
 msgstr "Ingen tilgjengelege val for denne oppstartslasteren."
 
+#. heading
+#. heading
+#. heading
+#: src/include/bootloader/routines/dialogs.rb:177
+#: src/include/bootloader/routines/dialogs.rb:255
+#: src/include/bootloader/routines/dialogs.rb:325
+#, fuzzy
+msgid "Kernel Section"
+msgstr "Kjerneseksjon"
+
+#. frame
+#. frame
+#. frame
+#. frame
+#. frame
+#. frame
+#. frame
+#. frame
+#: src/include/bootloader/routines/dialogs.rb:183
+#: src/include/bootloader/routines/dialogs.rb:261
+#: src/include/bootloader/routines/dialogs.rb:331
+#: src/include/bootloader/routines/dialogs.rb:399
+#: src/include/bootloader/routines/dialogs.rb:474
+#: src/include/bootloader/routines/dialogs.rb:522
+#: src/include/bootloader/routines/dialogs.rb:581
+#: src/include/bootloader/routines/dialogs.rb:636
+#, fuzzy
+msgid "Section Settings"
+msgstr "Seksjonsinnstillinger"
+
+#. dialog caption
+#. dialog caption
+#. dialog caption
+#. dialog caption
+#. dialog caption
+#. dialog caption
+#. dialog caption
+#. dialog caption
+#. dialog caption
+#: src/include/bootloader/routines/dialogs.rb:231
+#: src/include/bootloader/routines/dialogs.rb:302
+#: src/include/bootloader/routines/dialogs.rb:370
+#: src/include/bootloader/routines/dialogs.rb:445
+#: src/include/bootloader/routines/dialogs.rb:494
+#: src/include/bootloader/routines/dialogs.rb:542
+#: src/include/bootloader/routines/dialogs.rb:605
+#: src/include/bootloader/routines/dialogs.rb:683
+#: src/include/bootloader/routines/dialogs.rb:721
+#, fuzzy
+msgid "Boot Loader Settings: Section Management"
+msgstr "Oppstartslasterinnstillinger: Administrasjon av seksjonar"
+
+#. heading
+#. radio button
+#: src/include/bootloader/routines/dialogs.rb:393
+#: src/include/bootloader/routines/section_helps.rb:108
+#: src/include/bootloader/routines/section_widgets.rb:585
+#, fuzzy
+msgid "Xen Section"
+msgstr "Xen-seksjon"
+
+#. heading
+#. radio button
+#: src/include/bootloader/routines/dialogs.rb:468
+#: src/include/bootloader/routines/section_helps.rb:111
+#: src/include/bootloader/routines/section_helps.rb:121
+#: src/include/bootloader/routines/section_widgets.rb:591
+#, fuzzy
+msgid "Menu Section"
+msgstr "Meny-seksjon"
+
+#. heading
+#. radio button
+#: src/include/bootloader/routines/dialogs.rb:516
+#: src/include/bootloader/routines/section_widgets.rb:593
+#, fuzzy
+msgid "Dump Section"
+msgstr "Dumpseksjon"
+
+#. label
+#. label
+#: src/include/bootloader/routines/dialogs.rb:573
+#: src/include/bootloader/routines/dialogs.rb:628
+#, fuzzy
+msgid "Other System Section"
+msgstr "Annan systemseksjon"
+
+#. combobox label
+#: src/include/bootloader/routines/dialogs.rb:803
+#, fuzzy
+msgid "&Filename"
+msgstr "&Filnavn"
+
+#. label. %1 is name of file (eg. /etc/lilo.conf
+#: src/include/bootloader/routines/dialogs.rb:811
+#, fuzzy
+msgid "Filename: %1"
+msgstr "Filnavn: %1"
+
+#. multiline edit header
+#: src/include/bootloader/routines/dialogs.rb:828
+#, fuzzy
+msgid "Fi&le Contents"
+msgstr "Fi&linnhold"
+
+#. dialog caption
+#: src/include/bootloader/routines/dialogs.rb:836
+#, fuzzy
+msgid "Expert Manual Configuration"
+msgstr "Avansert manuell konfigurasjon"
+
+#. sections list widget
+#. Refresh and redraw widget wits sections
+#. @param [Array Object>}] sects list of current sections
+#. menu button
+#: src/include/bootloader/routines/global_widgets.rb:114
+#: src/include/bootloader/routines/global_widgets.rb:641
+#, fuzzy
+msgid "Other"
+msgstr "Anna"
+
+#: src/include/bootloader/routines/global_widgets.rb:116
+#, fuzzy
+msgid "Image"
+msgstr "Diskbilde"
+
+#: src/include/bootloader/routines/global_widgets.rb:134
+#, fuzzy
+msgid "Xen"
+msgstr "Xen"
+
+#: src/include/bootloader/routines/global_widgets.rb:152
+#, fuzzy
+msgid "Floppy"
+msgstr "Diskett"
+
+#: src/include/bootloader/routines/global_widgets.rb:154
+#, fuzzy
+msgid "Menu"
+msgstr "Meny"
+
+#: src/include/bootloader/routines/global_widgets.rb:161
+#, fuzzy
+msgid "Dump"
+msgstr "Dump"
+
+#. table header, Def stands for default
+#: src/include/bootloader/routines/global_widgets.rb:255
+#, fuzzy
+msgid "Def."
+msgstr "Def."
+
+#. table header
+#: src/include/bootloader/routines/global_widgets.rb:257
+#, fuzzy
+msgid "Label"
+msgstr "Nemning"
+
+#. table header
+#: src/include/bootloader/routines/global_widgets.rb:259
+#: src/include/bootloader/routines/global_widgets.rb:746
+#, fuzzy
+msgid "Type"
+msgstr "Type"
+
+#. table header; header for section details, either
+#. the specification of the kernel image to load,
+#. or the specification of device to boot from
+#: src/include/bootloader/routines/global_widgets.rb:263
+#, fuzzy
+msgid "Image / Device"
+msgstr "Diskbilde / Eining"
+
+#: src/include/bootloader/routines/global_widgets.rb:271
+#, fuzzy
+msgid "Set as De&fault"
+msgstr "Definer som st&andard"
+
 #. combo box
-#: src/include/bootloader/routines/global_widgets.rb:109
+#: src/include/bootloader/routines/global_widgets.rb:312
 #, fuzzy
 msgid "&Boot Loader"
 msgstr "&Oppstartslaster"
 
 #. popup - Continue/Cancel
-#: src/include/bootloader/routines/global_widgets.rb:138
+#: src/include/bootloader/routines/global_widgets.rb:343
 #, fuzzy
 msgid ""
 "\n"
@@ -672,78 +1071,134 @@
 "\n"
 "Vil du halda fram?\n"
 
-#. menu button entry
-#: src/include/bootloader/routines/global_widgets.rb:175
+#. warning - popup, followed by radio buttons
+#: src/include/bootloader/routines/global_widgets.rb:377
 #, fuzzy
-msgid "E&dit Configuration Files"
-msgstr "&Rediger konfigurasjonsfiler"
+msgid ""
+"\n"
+"You chose to change your boot loader. When converting \n"
+"the configuration, some settings might be lost.\n"
+"\n"
+"The current configuration will be saved and you can\n"
+"restore it if you return to the current boot loader.\n"
+"\n"
+"Select a course of action:\n"
+msgstr ""
+"\n"
+"Du valde å endra oppstartslasteren. Under konvertering \n"
+"av konfigurasjonen kan nokre innstillingar gå tapt.\n"
+"\n"
+"Gjeldande konfigurasjon vil lagrast, og du kan\n"
+"gjenopprette han viss du går tilbake til gjeldande oppstartslaster.\n"
+"\n"
+"Vel kva du vil gjera:\n"
 
+#. radiobutton
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:182
+#: src/include/bootloader/routines/global_widgets.rb:399
+#: src/include/bootloader/routines/global_widgets.rb:593
 #, fuzzy
 msgid "&Propose New Configuration"
 msgstr "&Foreslå ny konfigurasjon"
 
+#. radiobutton
+#: src/include/bootloader/routines/global_widgets.rb:406
+#, fuzzy
+msgid "Co&nvert Current Configuration"
+msgstr "Ko&nverter gjeldande konfigurasjon"
+
+#. radiobutton
+#: src/include/bootloader/routines/global_widgets.rb:415
+#, fuzzy
+msgid "&Start New Configuration from Scratch"
+msgstr "&Lag heilt ny konfigurasjon"
+
+#. radiobutton
+#: src/include/bootloader/routines/global_widgets.rb:423
+#, fuzzy
+msgid "&Read Configuration Saved on Disk"
+msgstr "&Konfigurasjonen til le som er lagra på disk"
+
+#. radiobutton
+#: src/include/bootloader/routines/global_widgets.rb:433
+#, fuzzy
+msgid "Res&tore Configuration Saved before Conversion"
+msgstr "Gjen&opprett konfigurasjon som vart lagra før konvertering"
+
+#. popup message
+#: src/include/bootloader/routines/global_widgets.rb:514
+#, fuzzy
+msgid "Select the boot loader before editing sections."
+msgstr "Vel ein oppstartslaster før du redigerer seksjonar."
+
+#. pushbutton
+#. menu button entry
+#: src/include/bootloader/routines/global_widgets.rb:563
+#: src/include/bootloader/routines/global_widgets.rb:586
+#, fuzzy
+msgid "E&dit Configuration Files"
+msgstr "&Rediger konfigurasjonsfiler"
+
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:189
+#: src/include/bootloader/routines/global_widgets.rb:600
 #, fuzzy
 msgid "&Start from Scratch"
 msgstr "&Lag heilt ny"
 
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:197
+#: src/include/bootloader/routines/global_widgets.rb:608
 #, fuzzy
 msgid "&Reread Configuration from Disk"
 msgstr "&Bruk konfigurasjon frå disk"
 
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:214
+#: src/include/bootloader/routines/global_widgets.rb:625
 #, fuzzy
 msgid "Restore MBR of Hard Disk"
 msgstr "Gjenopprett MBR på harddisk"
 
 #. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:222
+#: src/include/bootloader/routines/global_widgets.rb:633
 #, fuzzy
 msgid "Write bootloader boot code to disk"
 msgstr "Skriv oppstartskode for oppstartslaster til disk"
 
-#. menu button
-#: src/include/bootloader/routines/global_widgets.rb:230
-#, fuzzy
-msgid "Other"
-msgstr "Anna"
-
 #. message popup
-#: src/include/bootloader/routines/global_widgets.rb:254
+#: src/include/bootloader/routines/global_widgets.rb:665
 #, fuzzy
 msgid "MBR restored successfully."
 msgstr "MBR gjenopprettet."
 
 #. message popup
-#: src/include/bootloader/routines/global_widgets.rb:257
+#: src/include/bootloader/routines/global_widgets.rb:668
 #, fuzzy
 msgid "Failed to restore MBR."
 msgstr "MBR kunne ikkje gjenopprettes."
 
 #. Bootloader::blSave (false, false, false);
-#: src/include/bootloader/routines/global_widgets.rb:280
+#: src/include/bootloader/routines/global_widgets.rb:691
 #, fuzzy
 msgid "Writing bootloader settings failed."
 msgstr "Oppstartslasterinnstillingene kunne ikkje lagrast."
 
+#. tab header
+#: src/include/bootloader/routines/global_widgets.rb:730
+#, fuzzy
+msgid "&Section Management"
+msgstr "Administrasjon av &seksjonar"
+
+#. tab header
+#: src/include/bootloader/routines/global_widgets.rb:740
+#, fuzzy
+msgid "Boot Loader &Installation"
+msgstr "&Installasjon av oppstartslaster"
+
 #. push button
-#: src/include/bootloader/routines/global_widgets.rb:329
+#: src/include/bootloader/routines/global_widgets.rb:818
 #, fuzzy
 msgid "Boot &Loader Options"
 msgstr "Oppstart sin&lastervalg"
 
-#. push button
-#: src/include/bootloader/routines/global_widgets.rb:342
-#, fuzzy
-msgid "Boot Loader Installation &Details"
-msgstr "&Informasjon om oppstartslasterinstallasjon"
-
 #. help text 1/1 (shown during settings reading progress)
 #: src/include/bootloader/routines/helps.rb:32
 #, fuzzy
@@ -759,17 +1214,25 @@
 #, fuzzy
 msgid ""
 "<P><B><BIG>Saving Boot Loader Configuration</BIG></B><BR>\n"
-"Please wait...<br>"
-"</p>"
+"Please wait...<br></p>"
 msgstr ""
 "<P><B><BIG>Lagrar konfigurasjon for oppstartslaster </BIG></B><BR>\n"
-"Vent…<br>"
-"</p>"
+"Vent…<br></p>"
 
-#. help text 1/2 (%1 may be following sentence, optionally empty)
+#. help text, optional part of following
 #: src/include/bootloader/routines/helps.rb:52
 #, fuzzy
 msgid ""
+"If you have multiple Linux systems installed,\n"
+"YaST can try to find them and merge their menus."
+msgstr ""
+"Viss du har fleire Linux-system installert,\n"
+"kan YaST freista å finna dei og slå saman menyane."
+
+#. help text 1/2 (%1 may be following sentence, optionally empty)
+#: src/include/bootloader/routines/helps.rb:58
+#, fuzzy
+msgid ""
 "<P>From <B>Other</B>,\n"
 "you can manually edit the boot loader configuration files, clear the current \n"
 "configuration and propose a new configuration, start from scratch, or reread\n"
@@ -781,7 +1244,7 @@
 "konfigurasjonen som er lagra på disken som utgangspunkt. %1</P>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:67
+#: src/include/bootloader/routines/helps.rb:73
 #, fuzzy
 msgid ""
 "<P>To edit boot loader configuration files\n"
@@ -791,7 +1254,7 @@
 "manuelt, klikk <B>Rediger konfigurasjonsfiler</B>.</P>"
 
 #. help 1/4
-#: src/include/bootloader/routines/helps.rb:76
+#: src/include/bootloader/routines/helps.rb:83
 #, fuzzy
 msgid ""
 "<P> In the table, each section represents one item\n"
@@ -801,7 +1264,7 @@
 "i oppstartsmenyen.</P>"
 
 #. help 2/4
-#: src/include/bootloader/routines/helps.rb:80
+#: src/include/bootloader/routines/helps.rb:87
 #, fuzzy
 msgid ""
 "<P> Press <B>Edit</B> to display the properties of the\n"
@@ -811,7 +1274,7 @@
 "valde seksjonen.</P>"
 
 #. help 3/4
-#: src/include/bootloader/routines/helps.rb:84
+#: src/include/bootloader/routines/helps.rb:91
 #, fuzzy
 msgid ""
 "<P> By pressing <b>Set as Default</b>, mark the selected \n"
@@ -829,7 +1292,7 @@
 "kan endrast ved å bruka <B>Opp</B>- og <B>Ned</B>knappane.</P>"
 
 #. help 4/4
-#: src/include/bootloader/routines/helps.rb:93
+#: src/include/bootloader/routines/helps.rb:100
 #, fuzzy
 msgid ""
 "<P>Press <B>Add</B> to create a new boot loader section\n"
@@ -841,19 +1304,17 @@
 #. help text for the custom boot manager installation, 1 of 7
 #. %1 = name of boot loader (e.g. "LILO")
 #. this should be per architecture
-#: src/include/bootloader/routines/helps.rb:107
+#: src/include/bootloader/routines/helps.rb:115
 #, fuzzy
 msgid ""
-"<p><big><b>Boot Loader Location</b></big><br>"
-"\n"
+"<p><big><b>Boot Loader Location</b></big><br>\n"
 "The boot manager (%1) can be installed in the following ways:</p>"
 msgstr ""
-"<p><big><b>Oppstartslasterplassering</b></big><br>"
-"\n"
+"<p><big><b>Oppstartslasterplassering</b></big><br>\n"
 "Oppstartslasteren (%1) kan installerast på følgjande måtar:</p>"
 
 #. custom bootloader help text, 2 of 7
-#: src/include/bootloader/routines/helps.rb:116
+#: src/include/bootloader/routines/helps.rb:124
 #, fuzzy
 msgid ""
 "<p>- In the <b>Master Boot Record</b> (MBR).\n"
@@ -865,7 +1326,7 @@
 "på datamaskina.</p>"
 
 #. custom bootloader help text, 3 of 7
-#: src/include/bootloader/routines/helps.rb:126
+#: src/include/bootloader/routines/helps.rb:134
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -886,8 +1347,25 @@
 "viss dette er naudsynt, eller konfigurer den andre oppstartslasteren\n"
 "for å starta &product;.</p>"
 
+#. custom bootloader help text, 4 of 7
+#. this part will only be shown if a floppy drive is attached.
+#: src/include/bootloader/routines/helps.rb:151
+#, fuzzy
+msgid ""
+"<p>\n"
+"- On a <b>Floppy Disk</b>.\n"
+"Use this to avoid the risk of interfering with an already existing\n"
+"boot mechanism. Enable booting from floppy disk in\n"
+"the BIOS of your machine to use this option.</p>"
+msgstr ""
+"<p>\n"
+"- På ein <b>diskett</b>.\n"
+"Bruk dette valet for å unngå å påverka eit eksisterande\n"
+"oppstartssystem. Du må aktivera oppstart frå diskett i\n"
+"BIOS for å bruka dette valet.</p>"
+
 #. custom bootloader help text, 5 of 7
-#: src/include/bootloader/routines/helps.rb:141
+#: src/include/bootloader/routines/helps.rb:164
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -899,7 +1377,7 @@
 "viss du vel dette alternativet.</p>"
 
 #. optional part, only inserted on x86 architectures. 6 of 7
-#: src/include/bootloader/routines/helps.rb:151
+#: src/include/bootloader/routines/helps.rb:174
 #, fuzzy
 msgid ""
 "<p>For example, most PCs have a BIOS\n"
@@ -913,7 +1391,7 @@
 "er det kanskje mogleg å starta opp frå ein logisk partisjon, og kanskje ikkje.</p>"
 
 #. custom bootloader help text, 7 of 7
-#: src/include/bootloader/routines/helps.rb:163
+#: src/include/bootloader/routines/helps.rb:186
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -925,49 +1403,43 @@
 "<tt>/dev/sdb</tt>) i feltet.</p>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:176
+#: src/include/bootloader/routines/helps.rb:199
 #, fuzzy
 msgid ""
-"<p><b>Boot Loader Installation Details</b><br>"
-"\n"
+"<p><b>Boot Loader Installation Details</b><br>\n"
 "To adjust advanced boot loader installation options (such as the device\n"
 "mapping), click <b>Boot Loader Installation Details</b>.</p>"
 msgstr ""
-"<p><b>Informasjon om oppstartslasterinstallasjon</b><br>"
-"\n"
+"<p><b>Informasjon om oppstartslasterinstallasjon</b><br>\n"
 "Nytte avanserte val for oppstartslasterinstallasjonen (til dømes\n"
 "enhetsmapping) under <b>Informasjon om oppstartslasterinstallasjon</b>.</p>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:187
+#: src/include/bootloader/routines/helps.rb:210
 #, fuzzy
 msgid ""
-"<p><b>Boot Loader Type</b><br>"
-"\n"
+"<p><b>Boot Loader Type</b><br>\n"
 "To select whether to install a boot loader and which bootloader to install,\n"
 "use <b>Boot Loader</b>.</p>"
 msgstr ""
-"<p><b>Oppstartslastertype</b><br>"
-"\n"
+"<p><b>Oppstartslastertype</b><br>\n"
 "Vel om ein oppstartslaster skal installerast, og i så fall kva for ein\n"
 "under <b>Oppstartslaster</b>.</p>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:198
+#: src/include/bootloader/routines/helps.rb:222
 #, fuzzy
 msgid ""
-"<p><b>Boot Loader Options</b><br>"
-"\n"
+"<p><b>Boot Loader Options</b><br>\n"
 "To adjust options of the boot loader, such as the time-out, click\n"
 "<b>Boot Loader Options</b>.</p>"
 msgstr ""
-"<p><b>Oppstartslastervalg</b><br>"
-"\n"
+"<p><b>Oppstartslastervalg</b><br>\n"
 "For velja alternativ for oppstartslasteren, t.d. forseinking, klikk på\n"
 "<b>Oppstartslastervalg</b>.</p>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:209
+#: src/include/bootloader/routines/helps.rb:233
 #, fuzzy
 msgid ""
 "<P><B>Expert Manual Configuration</B><BR>\n"
@@ -979,33 +1451,29 @@
 "<P>Merk: Den endelege konfigurasjonsfilen treng ikkje å ha same tekstinnrykk.</P>"
 
 #. help text 1/1
-#: src/include/bootloader/routines/helps.rb:220
+#: src/include/bootloader/routines/helps.rb:244
 #, fuzzy
 msgid ""
-"<p><b>Section Name</b><br>"
-"\n"
+"<p><b>Section Name</b><br>\n"
 "Use <b>Section Name</b> to specify the boot loader section name. The section\n"
 "name must be unique.</p>"
 msgstr ""
-"<p><b>Seksjonsnavn</b><br>"
-"\n"
+"<p><b>Seksjonsnavn</b><br>\n"
 "Klikk på <b>Seksjonsnavn</b> for å angje oppstartslasterseksjonens namn. Seksjonsnavnet\n"
 "må vera unikt.</p>"
 
 #. help text 1/5
-#: src/include/bootloader/routines/helps.rb:231
+#: src/include/bootloader/routines/helps.rb:255
 #, fuzzy
 msgid ""
-"<p><big><b>Type of the New Section</b></big><br>"
-"\n"
+"<p><big><b>Type of the New Section</b></big><br>\n"
 "Select the type of the new section to create.</p>"
 msgstr ""
-"<p><b><big>Ny seksjonstype</big></b><br>"
-"\n"
+"<p><b><big>Ny seksjonstype</big></b><br>\n"
 "Vel kva for ein ny seksjonstype som skal opprettast.</p>"
 
 #. help text 2/5
-#: src/include/bootloader/routines/helps.rb:235
+#: src/include/bootloader/routines/helps.rb:259
 #, fuzzy
 msgid ""
 "<p>Select <b>Clone Selected Section</b> to clone the currently selected\n"
@@ -1017,7 +1485,7 @@
 "som skal vera annleis.</p>"
 
 #. help text 3/5
-#: src/include/bootloader/routines/helps.rb:241
+#: src/include/bootloader/routines/helps.rb:265
 #, fuzzy
 msgid ""
 "<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
@@ -1027,7 +1495,7 @@
 "som skal lastast og vert starta.</p>"
 
 #. help text 4/5
-#: src/include/bootloader/routines/helps.rb:245
+#: src/include/bootloader/routines/helps.rb:269
 #, fuzzy
 msgid ""
 "<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
@@ -1037,7 +1505,7 @@
 "men starta han i eit XEN-miljø.</p>"
 
 #. help text 5/5
-#: src/include/bootloader/routines/helps.rb:249
+#: src/include/bootloader/routines/helps.rb:273
 #, fuzzy
 msgid ""
 "<p>Select <b>Other System (Chainloader)</b> to add a section that \n"
@@ -1048,7 +1516,7 @@
 "skal lasta og starta opp ein oppstartssektor på ein diskpartisjon. Dette valet vert nytta for å\n"
 "starta opp andre operativsystemer.</p>"
 
-#: src/include/bootloader/routines/helps.rb:254
+#: src/include/bootloader/routines/helps.rb:278
 #, fuzzy
 msgid ""
 "<p>Select <b>Menu Section</b> to add a section that \n"
@@ -1060,46 +1528,58 @@
 "starta opp andre operativsystemer.</p>"
 
 #. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:108
+#: src/include/bootloader/routines/lilolike.rb:697
 #, fuzzy
 msgid "Order of Hard Disks: %1"
 msgstr "Harddiskrekkefølge: %1"
 
 #. summary string
-#: src/include/bootloader/routines/misc.rb:51
+#: src/include/bootloader/routines/misc.rb:48
 #, fuzzy
 msgid "Do not install any boot loader"
 msgstr "Ikkje installer nokon oppstartslaster"
 
 #. combo box item
-#: src/include/bootloader/routines/misc.rb:54
+#: src/include/bootloader/routines/misc.rb:50
 #, fuzzy
 msgid "Do Not Install Any Boot Loader"
 msgstr "Ikkje installer nokon oppstartslaster"
 
 #. summary string
-#: src/include/bootloader/routines/misc.rb:60
+#: src/include/bootloader/routines/misc.rb:55
 #, fuzzy
 msgid "Install the default boot loader"
 msgstr "Installer standard oppstartslaster"
 
 #. combo box item
-#: src/include/bootloader/routines/misc.rb:63
+#: src/include/bootloader/routines/misc.rb:57
 #, fuzzy
 msgid "Install Default Boot Loader"
 msgstr "Installer standard oppstartslaster"
 
 #. summary string
-#: src/include/bootloader/routines/misc.rb:68
+#: src/include/bootloader/routines/misc.rb:61
 #, fuzzy
 msgid "Boot loader"
 msgstr "Oppstartslaster"
 
 #. combo box item
-#: src/include/bootloader/routines/misc.rb:71
+#: src/include/bootloader/routines/misc.rb:63
 msgid "Boot Loader"
 msgstr "Oppstartslastar"
 
+#. popup, %1 is bootloader name
+#: src/include/bootloader/routines/misc.rb:101
+#, fuzzy
+msgid "The %1 boot sector has been written to the floppy disk."
+msgstr "%1-oppstartssektoren er lagra på disketten."
+
+#. popup - continuing
+#: src/include/bootloader/routines/misc.rb:113
+#, fuzzy
+msgid "Leave the floppy disk in the drive."
+msgstr "La disketten stå i stasjonen."
+
 #. popup message
 #: src/include/bootloader/routines/popups.rb:35
 #, fuzzy
@@ -1120,14 +1600,20 @@
 "Er du sikker på at du vil avslutta konfigurasjonen av oppstartslasteren utan å lagra?\n"
 "Alle endringar vil gå tapt.\n"
 
+#. yes-no popup question
+#: src/include/bootloader/routines/popups.rb:59
+#, fuzzy
+msgid "Really delete section %1?"
+msgstr "Er du sikker på at du vil sletta seksjonen %1?"
+
 #. error popup
-#: src/include/bootloader/routines/popups.rb:57
+#: src/include/bootloader/routines/popups.rb:65
 #, fuzzy
 msgid "The password must not be empty."
 msgstr "Passordfeltet må ikkje vera tomt."
 
 #. error popup
-#: src/include/bootloader/routines/popups.rb:66
+#: src/include/bootloader/routines/popups.rb:74
 #, fuzzy
 msgid ""
 "'Password' and 'Retype password'\n"
@@ -1136,16 +1622,92 @@
 "'Passord og Stadfest passord'\n"
 "samsvarte ikkje. Skriv inn passordet på nytt."
 
+#. message popup, %1 is sectino label
+#: src/include/bootloader/routines/popups.rb:88
+#, fuzzy
+msgid ""
+"The disk settings have changed.\n"
+"Check section %1 settings.\n"
+msgstr ""
+"Diskinnstillingene er endra.\n"
+"Kontroller innstillingane for seksjonen %1.\n"
+
+#. message popup
+#: src/include/bootloader/routines/popups.rb:100
+#, fuzzy
+msgid ""
+"The disk settings have changed and you edited boot loader\n"
+"configuration files manually. Check the boot loader settings.\n"
+msgstr ""
+"Diskinnstillingene er endra, og du har endra oppstartslasterens\n"
+"konfigurasjonsfiler manuelt. Kontrollar oppstartslasteren innstillingar.\n"
+
 #. Confirmation box with yes-no popup. %1 is reason why we need to set
 #. default location. It is translated on caller side and it is complete
 #. sentence.
-#: src/include/bootloader/routines/popups.rb:82
+#: src/include/bootloader/routines/popups.rb:116
 #, fuzzy
 msgid "%1Set default boot loader location?\n"
 msgstr "%1Definer oppstartslasterens plassering?\n"
 
+#. combobox item
+#: src/include/bootloader/routines/popups.rb:128
+#, fuzzy
+msgid "Do Not Create a File System"
+msgstr "Ikkje opprett noko filsystem"
+
+#. combobox item
+#: src/include/bootloader/routines/popups.rb:130
+#, fuzzy
+msgid "Create an ext2 File System"
+msgstr "Opprett eit ext2-filsystem"
+
+#. combobox item
+#: src/include/bootloader/routines/popups.rb:136
+#, fuzzy
+msgid "Create a FAT File System"
+msgstr "Opprett eit FAT-filsystem"
+
+#. label
+#: src/include/bootloader/routines/popups.rb:142
+#, fuzzy
+msgid ""
+"The boot loader boot sector will be written\n"
+"to a floppy disk. Insert a floppy disk\n"
+"and confirm with OK.\n"
+msgstr ""
+"Oppstartslasterens oppstartsektor vil lagrast\n"
+"på ein diskett. Sett inn ein diskett\n"
+"og stadfest med OK.\n"
+
+#. checkbox
+#: src/include/bootloader/routines/popups.rb:150
+#, fuzzy
+msgid "&Low Level Format"
+msgstr "&Lavnivåformater"
+
+#. combobox
+#: src/include/bootloader/routines/popups.rb:153
+#, fuzzy
+msgid "&Create File System"
+msgstr "&Opprett filsystem"
+
+#. yes-no popup
+#: src/include/bootloader/routines/popups.rb:182
+#, fuzzy
+msgid "Low level format failed. Try again?"
+msgstr "Lavnivåformatering mislukkast. Vil du prøva igjen?"
+
+#. error report
+#. error report
+#: src/include/bootloader/routines/popups.rb:195
+#: src/include/bootloader/routines/popups.rb:207
+#, fuzzy
+msgid "Creating file system failed."
+msgstr "Oppretting av filsystem mislukkast."
+
 #. error popup
-#: src/include/bootloader/routines/popups.rb:90
+#: src/include/bootloader/routines/popups.rb:218
 #, fuzzy
 msgid ""
 "The name selected is already used.\n"
@@ -1155,7 +1717,7 @@
 "Vel eit anna.\n"
 
 #. yes-no popup
-#: src/include/bootloader/routines/popups.rb:101
+#: src/include/bootloader/routines/popups.rb:229
 #, fuzzy
 msgid ""
 "An error occurred during boot loader\n"
@@ -1164,9 +1726,15 @@
 "Ein feil oppstod under installasjon av\n"
 "oppstartslasteren. Vil du freista å konfigurera oppstartslasteren på nytt?\n"
 
+#. FIXME too generic, but was already translated
+#: src/include/bootloader/routines/popups.rb:241
+#, fuzzy
+msgid "Unable to install the boot loader."
+msgstr "Kan ikkje installera oppstartslasteren."
+
 #. warning popup. %1 is device name, %2 is date/time in form of
 #. 'date' command output
-#: src/include/bootloader/routines/popups.rb:125
+#: src/include/bootloader/routines/popups.rb:283
 #, fuzzy
 msgid ""
 "Warning!\n"
@@ -1190,953 +1758,641 @@
 "Vil du halda fram?\n"
 
 #. PushButton
-#: src/include/bootloader/routines/popups.rb:147
+#: src/include/bootloader/routines/popups.rb:305
 #, fuzzy
 msgid "&Yes, Rewrite"
 msgstr "&Ja, overskriv"
 
-#. error report
-#: src/include/bootloader/routines/wizards.rb:36
+#. encoding: utf-8
+#. File:
+#. include/bootloader/routines/section_helps.ycp
+#.
+#. Module:
+#. Bootloader installation and configuration
+#.
+#. Summary:
+#. Help and label strings for bootloader section widgets
+#.
+#. Authors:
+#. Josef Reidinger 
+#.
+#. $Id$
+#: src/include/bootloader/routines/section_helps.rb:23
 #, fuzzy
-msgid "Because of the partitioning, the boot loader cannot be installed properly."
-msgstr "Oppstartslasteren kan ikkje installerast riktig med denne partisjoneringen."
+msgid "<p><b>Image Section</b></p>"
+msgstr "<p><b>Diskbilde-seksjon</b></p>"
 
-#. Represents dialog for modification of device map
-#: src/lib/bootloader/device_map_dialog.rb:53
+#: src/include/bootloader/routines/section_helps.rb:24
 #, fuzzy
-msgid "Device map must contain at least one device"
-msgstr "Enhetskartet må innehalda minst éi eining"
+msgid "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>"
+msgstr "<p><b>Kjernediskbilde</b> definerer kjernen som skal startast. Skriv inn namnet direkte, eller vel ein kjerne med <b>Bla gjennom.</b></p>"
 
-#. we just go back to original dialog
-#: src/lib/bootloader/device_map_dialog.rb:96
+#: src/include/bootloader/routines/section_helps.rb:27
 #, fuzzy
-msgid "Disk order settings"
-msgstr "Innstillingar fir diskrekkefølge"
+msgid "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"
+msgstr "<p><b>Rotenhet</b> angjev eininga som skal sendast til kjernen som rotenhet.</p>"
 
-#: src/lib/bootloader/device_map_dialog.rb:101
+#: src/include/bootloader/routines/section_helps.rb:36
 #, fuzzy
-msgid "D&isks"
-msgstr "D&isker"
-
-#. textentry header
-#: src/lib/bootloader/device_map_dialog.rb:146
-#, fuzzy
-msgid "&Device"
-msgstr "&Eining"
-
-#. TRANSLATORS: %s stands for partition
-#: src/lib/bootloader/disk_change_detector.rb:47
-msgid "Selected custom bootloader partition %s is not available any more."
+msgid ""
+"<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to use. Either enter the path and file name\n"
+"directly or choose by using <b>Browse</b>.</p>\n"
 msgstr ""
+"<p><b>Første RAM-disk</b> definerer, viss utfylt, kva for ein RAM-DISK som skal verta først brukt. Skriv inn stigen og filnavnet\n"
+"direkte, eller vel ein disk ved hjelp av <b>Bla gjennom</b>.</p>\n"
 
-#. TRANSLATORS the %{path} is path where bootloader stage1 is selected to install and
-#. the %{device} is device where it should be, but isn't
-#: src/lib/bootloader/disk_change_detector.rb:61
-msgid "Selected bootloader location %{path} is not on %{device} any more."
-msgstr ""
-
-#. Finish client for bootloader configuration
-#: src/lib/bootloader/finish_client.rb:28
+#: src/include/bootloader/routines/section_helps.rb:39
 #, fuzzy
-msgid "Saving bootloader configuration..."
-msgstr "Lagrar konfigurasjon for oppstartslaster …"
+msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>"
+msgstr "<p>Vel <b>Chainloader-seksjon</b> viss du vil definera ein seksjon for å starta eit anna operativsystem enn Linux.</p>"
 
-#. TRANSLATORS: reboot message
-#. %1 is replaced with additional message from reIPL
-#: src/lib/bootloader/finish_client.rb:145
+#: src/include/bootloader/routines/section_helps.rb:42
 #, fuzzy
-msgid ""
-"\n"
-"Your system will now shut down.%1\n"
-"For details, read the related chapter \n"
-"in the documentation. \n"
-msgstr ""
-"\n"
-"Systemet vil slåast av.%1%2\n"
-"Du finn meir informasjon i det aktuelle kapittelet \n"
-"i dokumentasjonen. \n"
+msgid "<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>"
+msgstr "<p>Viss du angjev <b>Bruk passordbeskyttelse</p>, vil det krevjast eit passord for å velja denne seksjonen.</p>"
 
-#. Final message after all packages from CD1 are installed
-#. and we're ready to start (boot into) the installed system
-#. Message that will be displayed along with information
-#. how the boot loader was installed
-#: src/lib/bootloader/finish_client.rb:158
+#: src/include/bootloader/routines/section_helps.rb:45
 #, fuzzy
-msgid "The system will reboot now..."
-msgstr "Maskina vil startast på nytt no …"
+msgid "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>"
+msgstr "<p>Med <b>Anna system</b> kan du velja blant dei andre operativsystemene (ikkje Linux) på datamaskina.</p>"
 
-#. proposal part - bootloader label
-#: src/lib/bootloader/proposal_client.rb:94
+#: src/include/bootloader/routines/section_helps.rb:48
 #, fuzzy
-msgid "Booting"
-msgstr "Oppstart"
+msgid "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>"
+msgstr "<p>Vel <b>Aktivum denne partisjonen når han er vald for oppstart</b> viss BIOSen treng dette flagga for å starta henne</p>"
 
-#. menubutton entry
-#: src/lib/bootloader/proposal_client.rb:96
+#: src/include/bootloader/routines/section_helps.rb:51
 #, fuzzy
-msgid "&Booting"
-msgstr "&Oppstart"
+msgid ""
+"<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n"
+"to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation.</p>\n"
+msgstr ""
+"<p>Med <b>Blokkforskyvning for chainloading</b> kan du angje lista over blokker som skal startast. I dei fleste tilfelle bør du\n"
+"angje <code>+1</code> her. Du finn meir informasjon om blokklistenotasjon i grub-dokumentasjonen.</p>\n"
 
-#. warning text in the summary richtext
-#: src/lib/bootloader/proposal_client.rb:174
+#: src/include/bootloader/routines/section_helps.rb:54
 #, fuzzy
-msgid "No boot loader is selected for installation. Your system might not be bootable."
-msgstr "Ingen oppstartslaster er valde for installasjon. Systemet vil kanskje ikkje kunna verta opp starta."
+msgid ""
+"<p>Select <b>Xen Section</b> if you want to add a new Linux kernel or other image \n"
+"and start it in a Xen environment.</p>\n"
+msgstr ""
+"<p>Vel <b>Xen-seksjon</b> viss du vil leggja til ein ny Linux-kjerne eller eit anna diskbilde\n"
+"som skal startast i eit Xen-miljø.</p>\n"
 
-#. error in the proposal
-#: src/lib/bootloader/proposal_client.rb:183
+#: src/include/bootloader/routines/section_helps.rb:57
 #, fuzzy
-msgid "Because of the partitioning, the bootloader cannot be installed properly"
-msgstr "Oppstartslasteren kan ikkje installerast riktig med denne partisjoneringen"
+msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
+msgstr "<p><b>Hypervisor</b> angjev kva for ein hypervisor som skal brukast.</p>"
 
-#. FATE#303643 Enable one-click changes in bootloader proposal
-#.
-#: src/modules/BootGRUB2.rb:168
+#: src/include/bootloader/routines/section_helps.rb:60
 #, fuzzy
-msgid "Install bootcode into MBR (do not install</a>)"
-msgstr "Oppstart frå MBR er aktivert (deaktiver</a>"
+msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>"
+msgstr "<p>Med <b>Fleire Xen Hypervisor-parametrar</b> kan du du angje fleire parametrar som skal verta til send Xen Hypervisor.</p>"
 
-#: src/modules/BootGRUB2.rb:172
+#: src/include/bootloader/routines/section_helps.rb:63
 #, fuzzy
-msgid "Do not install bootcode into MBR (install</a>)"
-msgstr "Oppstart frå MBR er deaktivert (aktiver</a>"
+msgid "<p><b>Menu Section</b></p>"
+msgstr "<p><b>Meny-seksjon</b></p>"
 
-#. check for separated boot partition, use root otherwise
-#: src/modules/BootGRUB2.rb:185
+#: src/include/bootloader/routines/section_helps.rb:64
 #, fuzzy
-msgid "Install bootcode into /boot partition (do not install</a>)"
-msgstr "Oppstart frå /boot-partisjon er aktivert (deaktiver</a>"
+msgid "<p><b>Partition of Menu File</b></p>"
+msgstr "<p><b>Partisjon for menyfil</b></p>"
 
-#: src/modules/BootGRUB2.rb:189
+#: src/include/bootloader/routines/section_helps.rb:65
 #, fuzzy
-msgid "Do not install bootcode into /boot partition (install</a>)"
-msgstr "Oppstart frå /boot-partisjon er deaktivert (aktiver</a>"
+msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>"
+msgstr "<p><b>Menybeskrivelsesfil<b> angjev adressa på rotenheten der menyfilen verta frå lasta.</p>"
 
-#: src/modules/BootGRUB2.rb:195
+#: src/include/bootloader/routines/section_helps.rb:68
 #, fuzzy
-msgid "Install bootcode into \"/\" partition (do not install</a>)"
-msgstr "Oppstart frå «/»-partisjon er aktivert (deaktiver</a>"
+msgid "<p><b>Map Section to the First Disk from Device Map</b> Windows usually need to be on the first disk.</p>"
+msgstr "<p><b>Plasser seksjonen på første disk i enhetskartet</b>: Windows må vanlegvis liggja på første disk.</p>"
 
-#: src/modules/BootGRUB2.rb:199
+#: src/include/bootloader/routines/section_helps.rb:71
 #, fuzzy
-msgid "Do not install bootcode into \"/\" partition (install</a>)"
-msgstr "Oppstart frå «/»-partisjon er deaktivert (aktiver</a>"
-
-#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:209
-msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
+msgid ""
+"<p><b>Measures</b> includes measured files with PCR. Change table is possible via buttons: <b>Add</b> , \n"
+"<b>Edit</b> and <b>Delete</b></p>"
 msgstr ""
+"<p>Bruk <b>Måling</b> for å inkludera mælte filer med PCR. Tabellen kan endrast med knappen: <b>Legg til</b> , \n"
+"<b>Rediger</b> og <b>Slett</b></p>"
 
-#. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB2.rb:217
+#: src/include/bootloader/routines/section_helps.rb:74
 #, fuzzy
-msgid "Change Location: %s"
-msgstr "Endre plassering: %1"
+msgid ""
+"<p><b>Allow attempt to relocate</b>\n"
+"Usually specified in global section</p>"
+msgstr ""
+"<p><b>Tillat forsøk på flytting</b></p>\n"
+"Verta vanlegvis angjeven i den generelle seksjonen</p>"
 
-#. Display bootloader summary
-#. @return a list of summary lines
-#. Display bootloader summary
-#. @return a list of summary lines
-#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100
+#: src/include/bootloader/routines/section_helps.rb:77
 #, fuzzy
-msgid "Boot Loader Type: %1"
-msgstr "Oppstartslastertype: %1"
+msgid ""
+"<p><b>Force root filesystem to be mounted read-only</b><br>\n"
+"Usually specified in global section</p>"
+msgstr ""
+"<p><b>Fremtving skrivebeskyttet montering av rotfilsystem</b><br>\n"
+"Verta vanlegvis angjeven i den globale seksjonen</p>"
 
-#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB2.rb:237
+#: src/include/bootloader/routines/section_helps.rb:80
 #, fuzzy
-msgid " (extended)"
-msgstr " (utvida)"
-
-#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
-#. is used in your language, then keep it as it is.
-#: src/modules/BootGRUB2.rb:245
-#, fuzzy
-msgid " (MBR)"
-msgstr " (MBR)"
-
-#: src/modules/BootGRUB2.rb:252
-#, fuzzy
-msgid "Status Location: %1"
-msgstr "Status for plassering: %1"
-
-#: src/modules/BootGRUB2EFI.rb:108
-msgid "Enable Secure Boot: %1"
+msgid ""
+"<p>Select <b>Dump Section</b> to add a section that specifies how to\n"
+"create a system dump either on a DASD disk partition or tape device or to a\n"
+"file on a SCSI disk partition.</p>"
 msgstr ""
+"<p>Vel<b>Dump seksjon</b> for å leggja til ein seksjon som definerer\n"
+"korleis ein systemdump skal opprettast på ein DASD-diskpartisjon eller båndenhet\n"
+" eller ei fil på ein SCSI-diskpartisjon.</p>"
 
-#. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:65
+#: src/include/bootloader/routines/section_helps.rb:85
 #, fuzzy
-msgid "Unknown bootloader: %1"
-msgstr "Ukjent oppstartslaster: %1"
-
-#. grub2 is sooo cool...
-#: src/modules/BootSupportCheck.rb:99
-#, fuzzy
-msgid "Unsupported combination of hardware platform %1 and bootloader %2"
-msgstr "Ein kombinasjon av maskinvareplattformen %1 og oppstartslasteren %2 vert ikkje støtta"
-
-#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
-#: src/modules/BootSupportCheck.rb:139
-msgid "Boot from MBR does not work together with btrfs filesystem and GPT disk label without bios_grub partition.To fix this issue, create bios_grub partition or use any ext filesystem for boot partition or do not install stage 1 to MBR."
+msgid ""
+"<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n"
+"Menu sections represent a list of tasks which are grouped together.</p>\n"
 msgstr ""
+"<p>Vel<b>Menyseksjon</b> for å leggja til ein meny i oppsettet.\n"
+"Menyseksjoner representerer ei liste over oppgåver som er gruppert saman</p>\n"
 
-#. check if boot device is on raid0
-#: src/modules/BootSupportCheck.rb:167
+#: src/include/bootloader/routines/section_helps.rb:88
 #, fuzzy
-msgid "The boot device is on raid type: %1. System will not boot."
-msgstr "Oppstartsenheten er på raid-typen: %1. Systemet vil ikkje starta opp."
-
-#. bnc#501043 added check for valid configuration
-#: src/modules/BootSupportCheck.rb:187
-#, fuzzy
-msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"
-msgstr "Oppstartsenheten er plassert på programvarebasert RAID1. Vel ein anna plassering for oppstartslasteren, t.d. Mastar Boot Record."
-
-#. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:239
-msgid "Missing ext partition for booting. Cannot install boot code."
+msgid ""
+"<p>Select <b>Enable SELinux</b> to add the needed kernel boot parameters to enable the SELinux security framework. \n"
+"Please note that this will also disable AppArmor.</p>"
 msgstr ""
+"<p>Vel <b>Aktivum SELinux</b> for å leggja til naudsynte oppstartsparametere for kjernen for å aktivare sikkerhetssystemet SELinux. \n"
+"Hugs at dette òg vil deaktivere AppArmor.</p>"
 
-#. activate set or there is already activate flag
-#: src/modules/BootSupportCheck.rb:248
-msgid "Activate flag is not set by installer. If it is not set at all, some BIOSes could refuse to boot."
-msgstr ""
-
-#: src/modules/BootSupportCheck.rb:255
-msgid "The installer will not modify the MBR of the disk. Unless it already contains boot code, the BIOS won't be able to boot disk."
-msgstr ""
-
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:146
+#. radio button
+#: src/include/bootloader/routines/section_helps.rb:95
+#: src/include/bootloader/routines/section_widgets.rb:583
 #, fuzzy
-msgid "Check boot loader"
-msgstr "Kontrollar oppstartslaster"
+msgid "Image Section"
+msgstr "Diskbildeseksjon"
 
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:148
+#: src/include/bootloader/routines/section_helps.rb:96
 #, fuzzy
-msgid "Read partitioning"
-msgstr "Les partisjonstabell"
+msgid "&Kernel Image"
+msgstr "&Kjernediskbilde"
 
-#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:150
+#: src/include/bootloader/routines/section_helps.rb:97
 #, fuzzy
-msgid "Load boot loader settings"
-msgstr "Last innstillingar for oppstartslaster"
+msgid "&Root Device"
+msgstr "&Rotenhet"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:154
+#: src/include/bootloader/routines/section_helps.rb:100
 #, fuzzy
-msgid "Checking boot loader..."
-msgstr "Kontrollerer oppstartslaster …"
+msgid "&Initial RAM Disk"
+msgstr "&Første RAM-disk"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:156
+#: src/include/bootloader/routines/section_helps.rb:101
 #, fuzzy
-msgid "Reading partitioning..."
-msgstr "Lesar partisjonstabell …"
+msgid "Chainloader Section"
+msgstr "Chainloader-seksjon"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:158
+#: src/include/bootloader/routines/section_helps.rb:102
 #, fuzzy
-msgid "Loading boot loader settings..."
-msgstr "Lastar innstillingar for oppstartslaster …"
+msgid "Use Password Protection"
+msgstr "Nytte passordbeskyttelse"
 
-#. dialog header
-#: src/modules/Bootloader.rb:162
+#: src/include/bootloader/routines/section_helps.rb:103
 #, fuzzy
-msgid "Initializing Boot Loader Configuration"
-msgstr "Initialiserer konfigurasjon for oppstartslaster"
+msgid "&Other System"
+msgstr "&Anna system"
 
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:281
+#: src/include/bootloader/routines/section_helps.rb:104
 #, fuzzy
-msgid "Create initrd"
-msgstr "Opprett initrd"
+msgid "Do not &verify Filesystem before Booting"
+msgstr "Ikkje &verifiser filsystem før oppstart"
 
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:283
+#: src/include/bootloader/routines/section_helps.rb:105
 #, fuzzy
-msgid "Save boot loader configuration files"
-msgstr "Lagre konfigurasjonsfiler for oppstartslaster"
+msgid "&Activate this Partition when selected for Boot"
+msgstr "&Aktivar denne partisjonen når han er vald for oppstart"
 
-#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:285
+#: src/include/bootloader/routines/section_helps.rb:106
 #, fuzzy
-msgid "Install boot loader"
-msgstr "Installer oppstartslaster"
+msgid "B&lock Offset for Chainloading"
+msgstr "B&lokkforskyvning for chainloading"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:289
+#: src/include/bootloader/routines/section_helps.rb:107
 #, fuzzy
-msgid "Creating initrd..."
-msgstr "Opprettar initrd …"
+msgid "&Map Section to the First Disk in Device Map"
+msgstr "&Plasser seksjonen på første disk i enhetskartet"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:291
+#: src/include/bootloader/routines/section_helps.rb:109
 #, fuzzy
-msgid "Saving boot loader configuration files..."
-msgstr "Lagrar konfigurasjonsfiler for oppstartslaster …"
+msgid "&Hypervisor"
+msgstr "&Hypervisor"
 
-#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:293
+#: src/include/bootloader/routines/section_helps.rb:110
 #, fuzzy
-msgid "Installing boot loader..."
-msgstr "Installerer oppstartslaster …"
+msgid "&Additional Xen Hypervisor Parameters"
+msgstr "Fleire p&arametere for Xen Hypervisor"
 
-#. progress line
-#: src/modules/Bootloader.rb:299
+#: src/include/bootloader/routines/section_helps.rb:112
 #, fuzzy
-msgid "Saving Boot Loader Configuration"
-msgstr "Lagrar konfigurasjon for oppstartslaster"
+msgid "&Partition of Menu File"
+msgstr "&Partisjon for menyfil"
 
+#: src/include/bootloader/routines/section_helps.rb:113
 #, fuzzy
-#~ msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>"
-#~ msgstr "<p>Med <b>Andre kommandolinjeparametere for kjernen</b> kan du definera tilleggsparametere som skal sendast til kjernen.</p>"
+msgid "&Menu Description File"
+msgstr "Fil for &menybeskrivelse"
 
+#: src/include/bootloader/routines/section_helps.rb:114
 #, fuzzy
-#~ msgid "&Failsafe Kernel Command Line Parameter"
-#~ msgstr "Andre kommandolinje¶metrar for kjernen"
+msgid "&Force root filesystem to be mounted read-only"
+msgstr "Nytte skrivebeskyttet montering av rot&filsystem"
 
+#: src/include/bootloader/routines/section_helps.rb:115
 #, fuzzy
-#~ msgid "Delete a global option or option of a section"
-#~ msgstr "Slett eit generelt alternativ eller eit seksjonsalternativ"
+msgid "Allow attempt to &relocate"
+msgstr "Tillat fo&rsøk på flytting"
 
+#: src/include/bootloader/routines/section_helps.rb:116
 #, fuzzy
-#~ msgid "Set a global option or option of a section"
-#~ msgstr "Definer eit generelt alternativ eller seksjonsalternativ"
+msgid "Tar&get Directory for Section"
+msgstr "Målkatalo&g for seksjon"
 
+#: src/include/bootloader/routines/section_helps.rb:117
 #, fuzzy
-#~ msgid "Add a new section - please use interactive mode"
-#~ msgstr "Legg til ein ny seksjon – bruk interaktiv modus"
+msgid "Op&tional Parameter File"
+msgstr "Fil med al&ternative parametrar"
 
+#: src/include/bootloader/routines/section_helps.rb:118
 #, fuzzy
-#~ msgid "The name of the section"
-#~ msgstr "Namnet til seksjonen"
+msgid "Dump Section (obsolete)"
+msgstr "Dump-seksjon (forelda)"
 
+#: src/include/bootloader/routines/section_helps.rb:119
 #, fuzzy
-#~ msgid "Section %1 not found."
-#~ msgstr "Seksjonen %1 ikkje funnet."
+msgid "&Dump Device"
+msgstr "&Dumpenhet"
 
+#: src/include/bootloader/routines/section_helps.rb:120
 #, fuzzy
-#~ msgid "Add option is available only in commandline interactive mode"
-#~ msgstr "Legg til-valet er berre tilgjengeleg i interaktiv kommandolinjemodus"
+msgid "&SCSI Dump Device"
+msgstr "&SCSI-dumpenhet"
 
+#: src/include/bootloader/routines/section_helps.rb:122
 #, fuzzy
-#~ msgid "Section name must be specified."
-#~ msgstr "Eit seksjonsnavn må spesifiserast."
+msgid "&List of Menu Entries"
+msgstr "&Liste over menyoppføringer"
 
+#: src/include/bootloader/routines/section_helps.rb:123
 #, fuzzy
-#~ msgid "Disk Order"
-#~ msgstr "Diskrekkefølge"
+msgid "&Number of Default Entry"
+msgstr "&Nummer på standardoppføring"
 
+#: src/include/bootloader/routines/section_helps.rb:124
 #, fuzzy
-#~ msgid "Boot Menu"
-#~ msgstr "Oppstartsmeny"
+msgid "&Timeout in seconds"
+msgstr "&Tidsavbrudd i sekund"
 
+#: src/include/bootloader/routines/section_helps.rb:125
 #, fuzzy
-#~ msgid ""
-#~ "<p><b>Use Trusted Grub</b> means install trusted grub and use it. Option <i>Graphical Menu File</i> will be ignored.\n"
-#~ "It is recommended to install grub to MBR</p>"
-#~ msgstr ""
-#~ "<p>Vel <b>Bruk påliteleg Grub</b> for å installera og bruka påliteleg Grub. Valet <i>Grafisk menyfil</i> vil ignorerast.\n"
-#~ "Det vert rådt til å installera Grub i MBR</p>"
+msgid "&Show boot menu"
+msgstr "Vis opp&startsmeny"
 
+#: src/include/bootloader/routines/section_helps.rb:126
 #, fuzzy
-#~ 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 fila som skal brukast til den grafiske oppstartsmenyen.</p>"
+msgid "C&opy Image to Boot Partition"
+msgstr "K&opier diskbilde til oppstartspartisjon"
 
+#: src/include/bootloader/routines/section_helps.rb:127
 #, fuzzy
-#~ msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>"
-#~ msgstr "<p><b>Aktivar lydsignaler</b> slå på/av lydsignaler.</p>"
+msgid "&Skip Section gracefully on Errors"
+msgstr "Hopp over &seksjonen utan melding ved feil"
 
+#: src/include/bootloader/routines/section_helps.rb:128
 #, fuzzy
-#~ msgid "Use &Trusted Grub"
-#~ msgstr "Nytte påli&telig Grub"
+msgid "Boot &Partition of Other System"
+msgstr "Oppstart sin&partisjon for anna system"
 
+#. Cache for CommonSectionWidgets
+#: src/include/bootloader/routines/section_widgets.rb:58
 #, fuzzy
-#~ msgid "Graphical &Menu File"
-#~ msgstr "Fil for grafisk &meny"
+msgid "Image section must have specified kernel image"
+msgstr "Det må angjevast eit kjernediskbilde for diskbildeseksjonen"
 
+#: src/include/bootloader/routines/section_widgets.rb:65
 #, fuzzy
-#~ msgid "Choose new graphical menu file"
-#~ msgstr "Vel ny fil for grafisk meny"
+msgid "Image file doesn't exist now. Do you really want use it?"
+msgstr "Diskbildefilen finst førebels ikkje. Vil du bruka han likevel?"
 
+#: src/include/bootloader/routines/section_widgets.rb:82
 #, fuzzy
-#~ msgid "Enable Acoustic &Signals"
-#~ msgstr "Aktiver lydar&signal"
+msgid "Initrd file doesn't exist now. Do you really want use it?"
+msgstr "Initrd-fila finst førebels ikkje. Vil du bruka han likevel?"
 
+#. string append = BootCommon::current_section["append"]:"";
+#: src/include/bootloader/routines/section_widgets.rb:227
 #, fuzzy
-#~ msgid "&Up"
-#~ msgstr "&Opp"
+msgid "Enable &SELinux"
+msgstr "Aktivar &SELinux"
 
+#. bnc#456362 filter out special chars like diacritics china chars etc.
+#: src/include/bootloader/routines/section_widgets.rb:401
 #, fuzzy
-#~ msgid "&Down"
-#~ msgstr "&Ned"
+msgid "The name includes unallowable char(s)"
+msgstr "Namnet inneheld ugyldige teikn"
 
+#: src/include/bootloader/routines/section_widgets.rb:533
 #, fuzzy
-#~ msgid "Kernel Section"
-#~ msgstr "Kjerneseksjon"
+msgid "Ask for resolution during boot."
+msgstr "Spør om oppløysing under oppstart."
 
+#. radio button
+#: src/include/bootloader/routines/section_widgets.rb:573
 #, fuzzy
-#~ msgid "Section Settings"
-#~ msgstr "Seksjonsinnstillinger"
+msgid "Clone Selected Section"
+msgstr "Klon valt seksjon"
 
+#. radio button (don't translate 'chainloader')
+#: src/include/bootloader/routines/section_widgets.rb:587
 #, fuzzy
-#~ msgid "Boot Loader Settings: Section Management"
-#~ msgstr "Oppstartslasterinnstillinger: Administrasjon av seksjonar"
+msgid "Other System (Chainloader)"
+msgstr "Anna system (chainloader)"
 
+#. frame
+#: src/include/bootloader/routines/section_widgets.rb:609
 #, fuzzy
-#~ msgid "Xen Section"
-#~ msgstr "Xen-seksjon"
+msgid "Section Type"
+msgstr "Seksjonstype"
 
+#. text entry
+#: src/include/bootloader/routines/section_widgets.rb:668
 #, fuzzy
-#~ msgid "Menu Section"
-#~ msgstr "Meny-seksjon"
+msgid "Section &Name"
+msgstr "Namnet til &seksjonen"
 
+#. error report
+#: src/include/bootloader/routines/wizards.rb:36
 #, fuzzy
-#~ msgid "Dump Section"
-#~ msgstr "Dumpseksjon"
+msgid "Because of the partitioning, the boot loader cannot be installed properly."
+msgstr "Oppstartslasteren kan ikkje installerast riktig med denne partisjoneringen."
 
+#. FATE#303643 Enable one-click changes in bootloader proposal
+#.
+#.
+#. FIXME identical code in BootGRUB module
+#: src/modules/BootGRUB.rb:657 src/modules/BootGRUB2.rb:189
 #, fuzzy
-#~ msgid "Other System Section"
-#~ msgstr "Annan systemseksjon"
+msgid "Install bootcode into MBR (do not install</a>)"
+msgstr "Oppstart frå MBR er aktivert (deaktiver</a>"
 
+#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:193
 #, fuzzy
-#~ msgid "&Filename"
-#~ msgstr "&Filnavn"
+msgid "Do not install bootcode into MBR (install</a>)"
+msgstr "Oppstart frå MBR er deaktivert (aktiver</a>"
 
+#. check for separated boot partition, use root otherwise
+#. check for separated boot partition, use root otherwise
+#: src/modules/BootGRUB.rb:673 src/modules/BootGRUB2.rb:206
 #, fuzzy
-#~ msgid "Filename: %1"
-#~ msgstr "Filnavn: %1"
+msgid "Install bootcode into /boot partition (do not install</a>)"
+msgstr "Oppstart frå /boot-partisjon er aktivert (deaktiver</a>"
 
+#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:210
 #, fuzzy
-#~ msgid "Fi&le Contents"
-#~ msgstr "Fi&linnhold"
+msgid "Do not install bootcode into /boot partition (install</a>)"
+msgstr "Oppstart frå /boot-partisjon er deaktivert (aktiver</a>"
 
+#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:216
 #, fuzzy
-#~ msgid "Expert Manual Configuration"
-#~ msgstr "Avansert manuell konfigurasjon"
+msgid "Install bootcode into \"/\" partition (do not install</a>)"
+msgstr "Oppstart frå «/»-partisjon er aktivert (deaktiver</a>"
 
+#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:220
 #, fuzzy
-#~ msgid "Image"
-#~ msgstr "Diskbilde"
+msgid "Do not install bootcode into \"/\" partition (install</a>)"
+msgstr "Oppstart frå «/»-partisjon er deaktivert (aktiver</a>"
 
+#. TRANSLATORS: title for list of location proposals
+#: src/modules/BootGRUB.rb:695 src/modules/BootGRUB2.rb:238
 #, fuzzy
-#~ msgid "Xen"
-#~ msgstr "Xen"
+msgid "Change Location: %s"
+msgstr "Endre plassering: %1"
 
+#. summary text, %1 is bootloader name (eg. LILO)
+#. Display bootloader summary
+#. @return a list of summary lines
+#. Display bootloader summary
+#. @return a list of summary lines
+#: src/modules/BootGRUB.rb:708 src/modules/BootGRUB2.rb:248
+#: src/modules/BootGRUB2EFI.rb:96
 #, fuzzy
-#~ msgid "Floppy"
-#~ msgstr "Diskett"
+msgid "Boot Loader Type: %1"
+msgstr "Oppstartslastertype: %1"
 
+#. summary text, location is location description (eg. /dev/hda)
+#: src/modules/BootGRUB.rb:718
 #, fuzzy
-#~ msgid "Menu"
-#~ msgstr "Meny"
+msgid " (\"/boot\")"
+msgstr " («/boot»)"
 
+#. TRANSLATORS: extended is here for extended partition. Keep translation short.
+#: src/modules/BootGRUB.rb:724 src/modules/BootGRUB2.rb:259
 #, fuzzy
-#~ msgid "Dump"
-#~ msgstr "Dump"
+msgid " (extended)"
+msgstr " (utvida)"
 
+#: src/modules/BootGRUB.rb:730
 #, fuzzy
-#~ msgid "Def."
-#~ msgstr "Def."
+msgid " (\"/\")"
+msgstr " (\"/\")"
 
+#. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific
+#. is used in your language, then keep it as it is.
+#: src/modules/BootGRUB.rb:736 src/modules/BootGRUB2.rb:267
 #, fuzzy
-#~ msgid "Label"
-#~ msgstr "Nemning"
+msgid " (MBR)"
+msgstr " (MBR)"
 
+#. FIXME: should we translate all devices to names and add MBR suffixes?
+#: src/modules/BootGRUB.rb:750 src/modules/BootGRUB2.rb:274
 #, fuzzy
-#~ msgid "Type"
-#~ msgstr "Type"
+msgid "Status Location: %1"
+msgstr "Status for plassering: %1"
 
+#. section name "suffix" for default section
+#: src/modules/BootGRUB.rb:768
 #, fuzzy
-#~ msgid "Image / Device"
-#~ msgstr "Diskbilde / Eining"
+msgid " (default)"
+msgstr " (standard)"
 
+#: src/modules/BootGRUB.rb:779
 #, fuzzy
-#~ msgid "Set as De&fault"
-#~ msgstr "Definer som st&andard"
+msgid "Sections:<br>%1"
+msgstr "Seksjoner:<br>%1"
 
+#. summary text
+#: src/modules/BootGRUB.rb:788
 #, fuzzy
-#~ msgid ""
-#~ "\n"
-#~ "You chose to change your boot loader. When converting \n"
-#~ "the configuration, some settings might be lost.\n"
-#~ "\n"
-#~ "The current configuration will be saved and you can\n"
-#~ "restore it if you return to the current boot loader.\n"
-#~ "\n"
-#~ "Select a course of action:\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Du valde å endra oppstartslasteren. Under konvertering \n"
-#~ "av konfigurasjonen kan nokre innstillingar gå tapt.\n"
-#~ "\n"
-#~ "Gjeldande konfigurasjon vil lagrast, og du kan\n"
-#~ "gjenopprette han viss du går tilbake til gjeldande oppstartslaster.\n"
-#~ "\n"
-#~ "Vel kva du vil gjera:\n"
+msgid "Do not install boot loader; just create configuration files"
+msgstr "Ikkje installer oppstartslasteren – berre opprett konfigurasjonsfiler"
 
+#. menubutton item, keep as short as possible
+#: src/modules/BootGRUB.rb:919
 #, fuzzy
-#~ msgid "Co&nvert Current Configuration"
-#~ msgstr "Ko&nverter gjeldande konfigurasjon"
+msgid "Propose and &Merge with Existing GRUB Menus"
+msgstr "Foreslå og &slå saman med eksisterande GRUB-menyar"
 
-#, fuzzy
-#~ msgid "&Start New Configuration from Scratch"
-#~ msgstr "&Lag heilt ny konfigurasjon"
+#. 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 ""
 
-#, fuzzy
-#~ msgid "&Read Configuration Saved on Disk"
-#~ msgstr "&Konfigurasjonen til le som er lagra på disk"
+#: src/modules/BootGRUB2EFI.rb:104
+msgid "Enable Secure Boot: %1"
+msgstr ""
 
+#. Check that bootloader is known and supported
+#: src/modules/BootSupportCheck.rb:70
 #, fuzzy
-#~ msgid "Res&tore Configuration Saved before Conversion"
-#~ msgstr "Gjen&opprett konfigurasjon som vart lagra før konvertering"
+msgid "Unknown bootloader: %1"
+msgstr "Ukjent oppstartslaster: %1"
 
+#. grub2 is sooo cool...
+#: src/modules/BootSupportCheck.rb:101
 #, fuzzy
-#~ msgid "Select the boot loader before editing sections."
-#~ msgstr "Vel ein oppstartslaster før du redigerer seksjonar."
+msgid "Unsupported combination of hardware platform %1 and bootloader %2"
+msgstr "Ein kombinasjon av maskinvareplattformen %1 og oppstartslasteren %2 vert ikkje støtta"
 
-#, fuzzy
-#~ msgid "&Section Management"
-#~ msgstr "Administrasjon av &seksjonar"
+#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
+#: src/modules/BootSupportCheck.rb:140
+msgid "Boot from MBR does not work together with btrfs filesystem and GPT disk label without bios_grub partition.To fix this issue, create bios_grub partition or use any ext filesystem for boot partition or do not install stage 1 to MBR."
+msgstr ""
 
+#. check if boot device is on raid0
+#: src/modules/BootSupportCheck.rb:168
 #, fuzzy
-#~ msgid "Boot Loader &Installation"
-#~ msgstr "&Installasjon av oppstartslaster"
+msgid "The boot device is on raid type: %1. System will not boot."
+msgstr "Oppstartsenheten er på raid-typen: %1. Systemet vil ikkje starta opp."
 
+#. bnc#501043 added check for valid configuration
+#: src/modules/BootSupportCheck.rb:188
 #, fuzzy
-#~ msgid ""
-#~ "If you have multiple Linux systems installed,\n"
-#~ "YaST can try to find them and merge their menus."
-#~ msgstr ""
-#~ "Viss du har fleire Linux-system installert,\n"
-#~ "kan YaST freista å finna dei og slå saman menyane."
+msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"
+msgstr "Oppstartsenheten er plassert på programvarebasert RAID1. Vel ein anna plassering for oppstartslasteren, t.d. Mastar Boot Record."
 
+#. s390 do not have bios boot order (bnc#874106)
+#: src/modules/BootSupportCheck.rb:243
 #, fuzzy
-#~ msgid ""
-#~ "<p>\n"
-#~ "- On a <b>Floppy Disk</b>.\n"
-#~ "Use this to avoid the risk of interfering with an already existing\n"
-#~ "boot mechanism. Enable booting from floppy disk in\n"
-#~ "the BIOS of your machine to use this option.</p>"
-#~ msgstr ""
-#~ "<p>\n"
-#~ "- På ein <b>diskett</b>.\n"
-#~ "Bruk dette valet for å unngå å påverka eit eksisterande\n"
-#~ "oppstartssystem. Du må aktivera oppstart frå diskett i\n"
-#~ "BIOS for å bruka dette valet.</p>"
+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 ikkje mogleg å definera den nøyaktige diskrekkefølgen for enhetskartet. Diskrekkefølgen kan endrast under «Informasjon om oppstartslasterinstallasjon»"
 
-#, fuzzy
-#~ msgid "The %1 boot sector has been written to the floppy disk."
-#~ msgstr "%1-oppstartssektoren er lagra på disketten."
+#. if partitioning worked before upgrade, it will keep working (bnc#886604)
+#: src/modules/BootSupportCheck.rb:263
+msgid "Missing ext partition for booting. Cannot install boot code."
+msgstr ""
 
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:170
 #, fuzzy
-#~ msgid "Leave the floppy disk in the drive."
-#~ msgstr "La disketten stå i stasjonen."
+msgid "Check boot loader"
+msgstr "Kontrollar oppstartslaster"
 
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:172
 #, fuzzy
-#~ msgid "Really delete section %1?"
-#~ msgstr "Er du sikker på at du vil sletta seksjonen %1?"
+msgid "Read partitioning"
+msgstr "Les partisjonstabell"
 
+#. progress stage, text in dialog (short, infinitiv)
+#: src/modules/Bootloader.rb:174
 #, fuzzy
-#~ msgid ""
-#~ "The disk settings have changed.\n"
-#~ "Check section %1 settings.\n"
-#~ msgstr ""
-#~ "Diskinnstillingene er endra.\n"
-#~ "Kontroller innstillingane for seksjonen %1.\n"
+msgid "Load boot loader settings"
+msgstr "Last innstillingar for oppstartslaster"
 
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:178
 #, fuzzy
-#~ msgid ""
-#~ "The disk settings have changed and you edited boot loader\n"
-#~ "configuration files manually. Check the boot loader settings.\n"
-#~ msgstr ""
-#~ "Diskinnstillingene er endra, og du har endra oppstartslasterens\n"
-#~ "konfigurasjonsfiler manuelt. Kontrollar oppstartslasteren innstillingar.\n"
+msgid "Checking boot loader..."
+msgstr "Kontrollerer oppstartslaster …"
 
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:180
 #, fuzzy
-#~ msgid "Do Not Create a File System"
-#~ msgstr "Ikkje opprett noko filsystem"
+msgid "Reading partitioning..."
+msgstr "Lesar partisjonstabell …"
 
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:182
 #, fuzzy
-#~ msgid "Create an ext2 File System"
-#~ msgstr "Opprett eit ext2-filsystem"
+msgid "Loading boot loader settings..."
+msgstr "Lastar innstillingar for oppstartslaster …"
 
+#. dialog header
+#: src/modules/Bootloader.rb:186
 #, fuzzy
-#~ msgid "Create a FAT File System"
-#~ msgstr "Opprett eit FAT-filsystem"
+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:307
 #, fuzzy
-#~ msgid ""
-#~ "The boot loader boot sector will be written\n"
-#~ "to a floppy disk. Insert a floppy disk\n"
-#~ "and confirm with OK.\n"
-#~ msgstr ""
-#~ "Oppstartslasterens oppstartsektor vil lagrast\n"
-#~ "på ein diskett. Sett inn ein diskett\n"
-#~ "og stadfest med OK.\n"
+msgid "Added Kernel Parameters: %1"
+msgstr "Ekstra kjerneparametere: %1"
 
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:367
 #, fuzzy
-#~ msgid "&Low Level Format"
-#~ msgstr "&Lavnivåformater"
+msgid "Create initrd"
+msgstr "Opprett initrd"
 
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:369
 #, fuzzy
-#~ msgid "&Create File System"
-#~ msgstr "&Opprett filsystem"
+msgid "Save boot loader configuration files"
+msgstr "Lagre konfigurasjonsfiler for oppstartslaster"
 
+#. progress stage, text in dialog (short)
+#: src/modules/Bootloader.rb:371
 #, fuzzy
-#~ msgid "Low level format failed. Try again?"
-#~ msgstr "Lavnivåformatering mislukkast. Vil du prøva igjen?"
+msgid "Install boot loader"
+msgstr "Installer oppstartslaster"
 
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:375
 #, fuzzy
-#~ msgid "Creating file system failed."
-#~ msgstr "Oppretting av filsystem mislukkast."
+msgid "Creating initrd..."
+msgstr "Opprettar initrd …"
 
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:377
 #, fuzzy
-#~ msgid "Unable to install the boot loader."
-#~ msgstr "Kan ikkje installera oppstartslasteren."
+msgid "Saving boot loader configuration files..."
+msgstr "Lagrar konfigurasjonsfiler for oppstartslaster …"
 
+#. progress step, text in dialog (short)
+#: src/modules/Bootloader.rb:379
 #, fuzzy
-#~ msgid "<p><b>Image Section</b></p>"
-#~ msgstr "<p><b>Diskbilde-seksjon</b></p>"
+msgid "Installing boot loader..."
+msgstr "Installerer oppstartslaster …"
 
+#. progress line
+#: src/modules/Bootloader.rb:385
 #, fuzzy
-#~ msgid "<p><b>Kernel Image</b> defines the kernel to boot. Either enter the name directly or choose via <b>Browse</b>.</p>"
-#~ msgstr "<p><b>Kjernediskbilde</b> definerer kjernen som skal startast. Skriv inn namnet direkte, eller vel ein kjerne med <b>Bla gjennom.</b></p>"
+msgid "Saving Boot Loader Configuration"
+msgstr "Lagrar konfigurasjon for oppstartslaster"
 
 #, fuzzy
-#~ msgid "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"
-#~ msgstr "<p><b>Rotenhet</b> angjev eininga som skal sendast til kjernen som rotenhet.</p>"
+#~ msgid "Delete a global option"
+#~ msgstr "&Detaljerte generelle val"
 
 #, fuzzy
-#~ msgid ""
-#~ "<p><b>Initial RAM Disk</b>, if not empty, defines the initial ramdisk to use. Either enter the path and file name\n"
-#~ "directly or choose by using <b>Browse</b>.</p>"
-#~ "\n"
-#~ msgstr ""
-#~ "<p><b>Første RAM-disk</b> definerer, viss utfylt, kva for ein RAM-DISK som skal verta først brukt. Skriv inn stigen og filnavnet\n"
-#~ "direkte, eller vel ein disk ved hjelp av <b>Bla gjennom</b>.</p>"
-#~ "\n"
+#~ msgid "Set a global option"
+#~ msgstr "&Detaljerte generelle val"
 
 #, fuzzy
-#~ msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>"
-#~ msgstr "<p>Vel <b>Chainloader-seksjon</b> viss du vil definera ein seksjon for å starta eit anna operativsystem enn Linux.</p>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<p>Setting <b>Use Password Protection</p>"
-#~ " will require a password to select this section.</p>"
-#~ msgstr ""
-#~ "<p>Viss du angjev <b>Bruk passordbeskyttelse</p>"
-#~ ", vil det krevjast eit passord for å velja denne seksjonen.</p>"
-
-#, fuzzy
-#~ msgid "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>"
-#~ msgstr "<p>Med <b>Anna system</b> kan du velja blant dei andre operativsystemene (ikkje Linux) på datamaskina.</p>"
-
-#, fuzzy
-#~ msgid "<p>Select <b>Activate this Partition when selected for Boot</b> if your BIOS needs this flag set in order to boot it</p>"
-#~ msgstr "<p>Vel <b>Aktivum denne partisjonen når han er vald for oppstart</b> viss BIOSen treng dette flagga for å starta henne</p>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<p><b>Block Offset for Chainloading</b> lets you specify the list of blocks to boot. In most cases you want\n"
-#~ "to specify <code>+1</code> here. For specifics on blocklist notation see the grub documentation.</p>"
-#~ "\n"
-#~ msgstr ""
-#~ "<p>Med <b>Blokkforskyvning for chainloading</b> kan du angje lista over blokker som skal startast. I dei fleste tilfelle bør du\n"
-#~ "angje <code>+1</code> her. Du finn meir informasjon om blokklistenotasjon i grub-dokumentasjonen.</p>"
-#~ "\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "<p>Select <b>Xen Section</b> if you want to add a new Linux kernel or other image \n"
-#~ "and start it in a Xen environment.</p>"
-#~ "\n"
-#~ msgstr ""
-#~ "<p>Vel <b>Xen-seksjon</b> viss du vil leggja til ein ny Linux-kjerne eller eit anna diskbilde\n"
-#~ "som skal startast i eit Xen-miljø.</p>"
-#~ "\n"
-
-#, fuzzy
-#~ msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
-#~ msgstr "<p><b>Hypervisor</b> angjev kva for ein hypervisor som skal brukast.</p>"
-
-#, fuzzy
-#~ msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>"
-#~ msgstr "<p>Med <b>Fleire Xen Hypervisor-parametrar</b> kan du du angje fleire parametrar som skal verta til send Xen Hypervisor.</p>"
-
-#, fuzzy
-#~ msgid "<p><b>Menu Section</b></p>"
-#~ msgstr "<p><b>Meny-seksjon</b></p>"
-
-#, fuzzy
-#~ msgid "<p><b>Partition of Menu File</b></p>"
-#~ msgstr "<p><b>Partisjon for menyfil</b></p>"
-
-#, fuzzy
-#~ msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>"
-#~ msgstr "<p><b>Menybeskrivelsesfil<b> angjev adressa på rotenheten der menyfilen verta frå lasta.</p>"
-
-#, fuzzy
-#~ msgid "<p><b>Map Section to the First Disk from Device Map</b> Windows usually need to be on the first disk.</p>"
-#~ msgstr "<p><b>Plasser seksjonen på første disk i enhetskartet</b>: Windows må vanlegvis liggja på første disk.</p>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<p><b>Measures</b> includes measured files with PCR. Change table is possible via buttons: <b>Add</b> , \n"
-#~ "<b>Edit</b> and <b>Delete</b></p>"
-#~ msgstr ""
-#~ "<p>Bruk <b>Måling</b> for å inkludera mælte filer med PCR. Tabellen kan endrast med knappen: <b>Legg til</b> , \n"
-#~ "<b>Rediger</b> og <b>Slett</b></p>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<p><b>Allow attempt to relocate</b>\n"
-#~ "Usually specified in global section</p>"
-#~ msgstr ""
-#~ "<p><b>Tillat forsøk på flytting</b></p>"
-#~ "\n"
-#~ "Verta vanlegvis angjeven i den generelle seksjonen</p>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<p><b>Force root filesystem to be mounted read-only</b><br>"
-#~ "\n"
-#~ "Usually specified in global section</p>"
-#~ msgstr ""
-#~ "<p><b>Fremtving skrivebeskyttet montering av rotfilsystem</b><br>"
-#~ "\n"
-#~ "Verta vanlegvis angjeven i den globale seksjonen</p>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<p>Select <b>Dump Section</b> to add a section that specifies how to\n"
-#~ "create a system dump either on a DASD disk partition or tape device or to a\n"
-#~ "file on a SCSI disk partition.</p>"
-#~ msgstr ""
-#~ "<p>Vel<b>Dump seksjon</b> for å leggja til ein seksjon som definerer\n"
-#~ "korleis ein systemdump skal opprettast på ein DASD-diskpartisjon eller båndenhet\n"
-#~ " eller ei fil på ein SCSI-diskpartisjon.</p>"
-
-#, fuzzy
-#~ msgid ""
-#~ "<p>Select <b>Menu Section</b> to add a new menu to the configuration.\n"
-#~ "Menu sections represent a list of tasks which are grouped together.</p>"
-#~ "\n"
-#~ msgstr ""
-#~ "<p>Vel<b>Menyseksjon</b> for å leggja til ein meny i oppsettet.\n"
-#~ "Menyseksjoner representerer ei liste over oppgåver som er gruppert saman</p>"
-#~ "\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "<p>Select <b>Enable SELinux</b> to add the needed kernel boot parameters to enable the SELinux security framework. \n"
-#~ "Please note that this will also disable AppArmor.</p>"
-#~ msgstr ""
-#~ "<p>Vel <b>Aktivum SELinux</b> for å leggja til naudsynte oppstartsparametere for kjernen for å aktivare sikkerhetssystemet SELinux. \n"
-#~ "Hugs at dette òg vil deaktivere AppArmor.</p>"
-
-#, fuzzy
-#~ msgid "Image Section"
-#~ msgstr "Diskbildeseksjon"
-
-#, fuzzy
-#~ msgid "&Kernel Image"
-#~ msgstr "&Kjernediskbilde"
-
-#, fuzzy
-#~ msgid "&Root Device"
-#~ msgstr "&Rotenhet"
-
-#, fuzzy
-#~ msgid "&Initial RAM Disk"
-#~ msgstr "&Første RAM-disk"
-
-#, fuzzy
-#~ msgid "Chainloader Section"
-#~ msgstr "Chainloader-seksjon"
-
-#, fuzzy
-#~ msgid "Use Password Protection"
-#~ msgstr "Nytte passordbeskyttelse"
-
-#, fuzzy
-#~ msgid "&Other System"
-#~ msgstr "&Anna system"
-
-#, fuzzy
-#~ msgid "Do not &verify Filesystem before Booting"
-#~ msgstr "Ikkje &verifiser filsystem før oppstart"
-
-#, fuzzy
-#~ msgid "&Activate this Partition when selected for Boot"
-#~ msgstr "&Aktivar denne partisjonen når han er vald for oppstart"
-
-#, fuzzy
-#~ msgid "B&lock Offset for Chainloading"
-#~ msgstr "B&lokkforskyvning for chainloading"
-
-#, fuzzy
-#~ msgid "&Map Section to the First Disk in Device Map"
-#~ msgstr "&Plasser seksjonen på første disk i enhetskartet"
-
-#, fuzzy
-#~ msgid "&Hypervisor"
-#~ msgstr "&Hypervisor"
-
-#, fuzzy
-#~ msgid "&Additional Xen Hypervisor Parameters"
-#~ msgstr "Fleire p&arametere for Xen Hypervisor"
-
-#, fuzzy
-#~ msgid "&Partition of Menu File"
-#~ msgstr "&Partisjon for menyfil"
-
-#, fuzzy
-#~ msgid "&Menu Description File"
-#~ msgstr "Fil for &menybeskrivelse"
-
-#, fuzzy
-#~ msgid "&Force root filesystem to be mounted read-only"
-#~ msgstr "Nytte skrivebeskyttet montering av rot&filsystem"
-
-#, fuzzy
-#~ msgid "Allow attempt to &relocate"
-#~ msgstr "Tillat fo&rsøk på flytting"
-
-#, fuzzy
-#~ msgid "Tar&get Directory for Section"
-#~ msgstr "Målkatalo&g for seksjon"
-
-#, fuzzy
-#~ msgid "Op&tional Parameter File"
-#~ msgstr "Fil med al&ternative parametrar"
-
-#, fuzzy
-#~ msgid "Dump Section (obsolete)"
-#~ msgstr "Dump-seksjon (forelda)"
-
-#, fuzzy
-#~ msgid "&Dump Device"
-#~ msgstr "&Dumpenhet"
-
-#, fuzzy
-#~ msgid "&SCSI Dump Device"
-#~ msgstr "&SCSI-dumpenhet"
-
-#, fuzzy
-#~ msgid "&List of Menu Entries"
-#~ msgstr "&Liste over menyoppføringer"
-
-#, fuzzy
-#~ msgid "&Number of Default Entry"
-#~ msgstr "&Nummer på standardoppføring"
-
-#, fuzzy
-#~ msgid "&Timeout in seconds"
-#~ msgstr "&Tidsavbrudd i sekund"
-
-#, fuzzy
-#~ msgid "&Show boot menu"
-#~ msgstr "Vis opp&startsmeny"
-
-#, fuzzy
-#~ msgid "C&opy Image to Boot Partition"
-#~ msgstr "K&opier diskbilde til oppstartspartisjon"
-
-#, fuzzy
-#~ msgid "&Skip Section gracefully on Errors"
-#~ msgstr "Hopp over &seksjonen utan melding ved feil"
-
-#, fuzzy
-#~ msgid "Boot &Partition of Other System"
-#~ msgstr "Oppstart sin&partisjon for anna system"
-
-#, fuzzy
-#~ msgid "Image section must have specified kernel image"
-#~ msgstr "Det må angjevast eit kjernediskbilde for diskbildeseksjonen"
-
-#, fuzzy
-#~ msgid "Image file doesn't exist now. Do you really want use it?"
-#~ msgstr "Diskbildefilen finst førebels ikkje. Vil du bruka han likevel?"
-
-#, fuzzy
-#~ msgid "Initrd file doesn't exist now. Do you really want use it?"
-#~ msgstr "Initrd-fila finst førebels ikkje. Vil du bruka han likevel?"
-
-#, fuzzy
-#~ msgid "Enable &SELinux"
-#~ msgstr "Aktivar &SELinux"
-
-#, fuzzy
-#~ msgid "The name includes unallowable char(s)"
-#~ msgstr "Namnet inneheld ugyldige teikn"
-
-#, fuzzy
-#~ msgid "Ask for resolution during boot."
-#~ msgstr "Spør om oppløysing under oppstart."
-
-#, fuzzy
-#~ msgid "Clone Selected Section"
-#~ msgstr "Klon valt seksjon"
-
-#, fuzzy
-#~ msgid "Other System (Chainloader)"
-#~ msgstr "Anna system (chainloader)"
-
-#, fuzzy
-#~ msgid "Section Type"
-#~ msgstr "Seksjonstype"
-
-#, fuzzy
-#~ msgid "Section &Name"
-#~ msgstr "Namnet til &seksjonen"
-
-#, fuzzy
-#~ msgid " (\"/boot\")"
-#~ msgstr " («/boot»)"
-
-#, fuzzy
-#~ msgid " (\"/\")"
-#~ msgstr " (\"/\")"
-
-#, fuzzy
-#~ msgid " (default)"
-#~ msgstr " (standard)"
-
-#, fuzzy
-#~ msgid ""
-#~ "Sections:<br>"
-#~ "%1"
-#~ msgstr ""
-#~ "Seksjoner:<br>"
-#~ "%1"
-
-#, fuzzy
-#~ msgid "Do not install boot loader; just create configuration files"
-#~ msgstr "Ikkje installer oppstartslasteren – berre opprett konfigurasjonsfiler"
-
-#, fuzzy
-#~ msgid "Propose and &Merge with Existing GRUB Menus"
-#~ msgstr "Foreslå og &slå saman med eksisterande GRUB-menyar"
-
-#, fuzzy
 #~ msgid "Partition number > 3 is being used for booting with GPT partition table"
 #~ msgstr "Partisjonsnummer > 3 vert brukte til oppstart med GPT-partisjonstabellen"
 
 #, fuzzy
-#~ 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 ikkje mogleg å definera den nøyaktige diskrekkefølgen for enhetskartet. Diskrekkefølgen kan endrast under «Informasjon om oppstartslasterinstallasjon»"
-
-#, fuzzy
-#~ msgid "Added Kernel Parameters: %1"
-#~ msgstr "Ekstra kjerneparametere: %1"
-
-#, fuzzy
 #~ msgid "The boot device is on iSCSI disk: %1. System may not boot."
 #~ msgstr "Oppstartsenheten er på iSCSI-disken: %1. Systemet vil kanskje ikkje starta."
 
@@ -2206,13 +2462,11 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "Configure a valid boot loader location before continuing.<br/>"
-#~ "\n"
+#~ "Configure a valid boot loader location before continuing.<br/>\n"
 #~ "The device map includes more than 8 devices and the boot device is out of range.\n"
 #~ "The range is limited by BIOS to the first 8 devices. Adjust BIOS boot order ( or if it already set, then correct order in bootloader configuration)"
 #~ msgstr ""
-#~ "Angje ei gyldig plassering for oppstartslasteren før du held fram.<br/>"
-#~ "\n"
+#~ "Angje ei gyldig plassering for oppstartslasteren før du held fram.<br/>\n"
 #~ "Enhetskartet inneheld meir enn 8 einingar, og oppstartsenheten er utanfor området.\n"
 #~ "Områdd er avgrensa i BIOS til dei første 8 einingane. Juster oppstartsrekkefølgen i BIOS (eller korriger rekkjefølgda i oppstartslasteroppsettet viss dette allereie er gjort)."
 
@@ -2226,22 +2480,18 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "Configure a valid boot loader location before continuing.<br>"
-#~ "\n"
+#~ "Configure a valid boot loader location before continuing.<br>\n"
 #~ "In case that no selection can be made it may be necessary to create a small primary Apple HFS partition."
 #~ msgstr ""
-#~ "Vel ei gyldig plassering for oppstartslasteren før du held fram.<br>"
-#~ "\n"
+#~ "Vel ei gyldig plassering for oppstartslasteren før du held fram.<br>\n"
 #~ "Viss det ikkje er mogleg å velja ei plassering, må du kanskje oppretta ein liten primær Apple HFS-partisjon."
 
 #, fuzzy
 #~ msgid ""
-#~ "Configure a valid boot loader location before continuing.<br>"
-#~ "\n"
+#~ "Configure a valid boot loader location before continuing.<br>\n"
 #~ "In case that no selection can be made it may be necessary to create a PReP Boot partition."
 #~ msgstr ""
-#~ "Vel ei gyldig plassering for oppstartslasteren før du held fram.<br>"
-#~ "\n"
+#~ "Vel ei gyldig plassering for oppstartslasteren før du held fram.<br>\n"
 #~ "Viss det ikkje er mogleg å velja ei plassering, må du kanskje oppretta ein PReP Boot-partisjon."
 
 #, fuzzy
@@ -2290,39 +2540,31 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b>Set level of verbosity [0-5]</b><br>"
-#~ " Increase verbosity of ELILO\n"
+#~ "<p><b>Set level of verbosity [0-5]</b><br> Increase verbosity of ELILO\n"
 #~ "in case of boot problems.</p>"
 #~ msgstr ""
-#~ "<p><b>Angje detaljnivå [0-5]</b><br>"
-#~ " Auk detaljnivået for ELILO\n"
+#~ "<p><b>Angje detaljnivå [0-5]</b><br> Auk detaljnivået for ELILO\n"
 #~ "i tilfelle med oppstartsproblemer.</p>"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b>Append string for.global options to pass to kernel command line</b><br>"
-#~ "\n"
+#~ "<p><b>Append string for.global options to pass to kernel command line</b><br>\n"
 #~ "Lets you define additional global parameters to pass to the kernel. These are\n"
-#~ "used if no 'append' appears in a given section.</p>"
-#~ "\n"
+#~ "used if no 'append' appears in a given section.</p>\n"
 #~ msgstr ""
-#~ "<p><b>Tilleggsstreng med globale kommandolinjevalg for kjernen</b><br>"
-#~ "\n"
+#~ "<p><b>Tilleggsstreng med globale kommandolinjevalg for kjernen</b><br>\n"
 #~ "Her kan du definera globale tilleggsparametere som skal sendast til kjernen. Desse vert brukte\n"
-#~ "viss ingen 'tillegg' er til steda i ein aktuell seksjon.</p>"
-#~ "\n"
+#~ "viss ingen 'tillegg' er til steda i ein aktuell seksjon.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p><b>Name of the default initrd file</b>, if not empty, defines the initial\n"
 #~ "ramdisk to use. Either enter the path and file name directly or choose by using\n"
-#~ "<b>Browse</b></p>"
-#~ "\n"
+#~ "<b>Browse</b></p>\n"
 #~ msgstr ""
 #~ "<p><b>Namn på standard initrd-fil</b> definerer, viss utfylt, kva for ein \n"
 #~ "RAM-DISK som skal verta først brukt. Skriv inn stigen og filnavnet direkte, eller bruk\n"
-#~ " <b>Bla gjennom</b> for å velja ei fil.</p>"
-#~ "\n"
+#~ " <b>Bla gjennom</b> for å velja ei fil.</p>\n"
 
 #, fuzzy
 #~ msgid ""
@@ -2336,42 +2578,34 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b>Specify user interface for ELILO ('simple' or 'textmenu')</b><br>"
-#~ "\n"
+#~ "<p><b>Specify user interface for ELILO ('simple' or 'textmenu')</b><br>\n"
 #~ "Beware: 'textmenu' has occasionally caused problems on some machines.</p>"
 #~ msgstr ""
-#~ "<p><b>Angje brukergrensesnitt for ELILO («enkelt» eller «tekstmeny»)</b><br>"
-#~ "\n"
+#~ "<p><b>Angje brukergrensesnitt for ELILO («enkelt» eller «tekstmeny»)</b><br>\n"
 #~ "Forsiktig: «tekstmeny» har medført problem på einskilde maskiner.</p>"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b>Prevent EDD30 mode</b><br>"
-#~ "\n"
+#~ "<p><b>Prevent EDD30 mode</b><br>\n"
 #~ "By default, if EDD30 is off, ELILO will try and set the variable to TRUE.\n"
 #~ "However, some controllers do not support EDD30 and forcing the variable\n"
 #~ "may cause problems. Therefore, as of elilo-3.2, there is an option to \n"
-#~ "avoid forcing the variable.</p>"
-#~ "\n"
+#~ "avoid forcing the variable.</p>\n"
 #~ msgstr ""
-#~ "<p><b>Hindre EDD30-modus</b><br>"
-#~ "\n"
+#~ "<p><b>Hindre EDD30-modus</b><br>\n"
 #~ "Som standard vil ELILO prøva å setja variabelen til SANN viss EDD30 er av.\n"
 #~ "Einskilde kontrollera støtter likevel ikkje EDD30, og å bruka variabelen\n"
 #~ "kan difor føra til problem. Difor kan ein frå og med elilo 3.2  \n"
-#~ "unngå å bruka variabelen.</p>"
-#~ "\n"
+#~ "unngå å bruka variabelen.</p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b>Allow attempt to relocate</b><br>"
-#~ "\n"
+#~ "<p><b>Allow attempt to relocate</b><br>\n"
 #~ "In case of memory allocation error at initial load point of\n"
 #~ "kernel, allow attempt to relocate (assume this kernel is relocatable).\n"
 #~ "</p>"
 #~ msgstr ""
-#~ "<p><b>Tillat forsøk på flytting</b><br>"
-#~ "\n"
+#~ "<p><b>Tillat forsøk på flytting</b><br>\n"
 #~ "I tillfeller av minnetilordningsfeil ved første innlastingspunkt i\n"
 #~ " kjernen, tillatast forsøk på flytting (føresett at kjernen kan flyttast).\n"
 #~ " </p>"
@@ -2608,29 +2842,23 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b>Append String for Global Options to Pass to Kernel Command Line</b><br>"
-#~ "\n"
+#~ "<p><b>Append String for Global Options to Pass to Kernel Command Line</b><br>\n"
 #~ "Lets you define additional global parameters to pass to the kernel. These are\n"
-#~ "used if no 'append' appears in a given section.</p>"
-#~ "\n"
+#~ "used if no 'append' appears in a given section.</p>\n"
 #~ msgstr ""
-#~ "<p><b>Tilleggsstreng med generelle kommandolinjevalg for kjernen</b><br>"
-#~ "\n"
+#~ "<p><b>Tilleggsstreng med generelle kommandolinjevalg for kjernen</b><br>\n"
 #~ "Her kan du definera generelle tilleggsparametere som skal sendast til kjernen. Desse vert brukte\n"
-#~ "viss ingen 'append'-verd finst i ein seksjon.</p>"
-#~ "\n"
+#~ "viss ingen 'append'-verd finst i ein seksjon.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p><b>Name of the Default Initrd File</b>, if not empty, defines the initial\n"
 #~ "ramdisk to use. Either enter the path and file name directly or choose by using\n"
-#~ "<b>Browse</b></p>"
-#~ "\n"
+#~ "<b>Browse</b></p>\n"
 #~ msgstr ""
 #~ "<p><b>Namn på standard initrd-fil</b> definerer, viss utfylt, kva for ein \n"
 #~ "RAM-DISK som skal verta først brukt. Skriv inn stigen og filnavnet direkte, eller bruk\n"
-#~ " <b>Bla gjennom</b> for å velja ei fil.</p>"
-#~ "\n"
+#~ " <b>Bla gjennom</b> for å velja ei fil.</p>\n"
 
 #, fuzzy
 #~ msgid ""

Modified: branches/plus-SLE12-SP2/yast/nn/po/ca-management.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/ca-management.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/ca-management.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -138,15 +138,13 @@
 "YaST generates a default CA and certificate automatically. This CA and certificate\n"
 "is used for communicating with the Apache server.\n"
 "Here, change the settings of this CA and certificate or import a CA and certificate from a file.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "YaST genererer standard CA og sertifikat automatisk. CA og sertifikatet\n"
 "vert nytta ved kommunikasjon med Apache-serveren.\n"
 "Her kan du endra innstillingar for dette CA og sertifikat, eller importera eit CA og sertifikat frå fil.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Initialization dialog contents
 #: src/clients/ca_mgm_auto.rb:193
@@ -162,7 +160,8 @@
 #: src/clients/ca_mgm_auto.rb:235 src/clients/ca_mgm_auto.rb:362
 #: src/clients/ca_mgm_proposal.rb:301 src/clients/ca_select_proposal.rb:466
 #: src/include/ca-management/new_cert.rb:573
-#: src/include/ca-management/util.rb:277 src/include/ca-management/util.rb:1211
+#: src/include/ca-management/util.rb:277
+#: src/include/ca-management/util.rb:1211
 #, fuzzy
 msgid "&Password:"
 msgstr "&Passord:"
@@ -247,7 +246,8 @@
 #: src/clients/ca_mgm_auto.rb:478 src/clients/ca_mgm_auto.rb:536
 #: src/clients/ca_mgm_proposal.rb:320 src/clients/ca_select_proposal.rb:536
 #: src/include/ca-management/util.rb:216 src/include/ca-management/util.rb:565
-#: src/include/ca-management/util.rb:777 src/include/ca-management/util.rb:1121
+#: src/include/ca-management/util.rb:777
+#: src/include/ca-management/util.rb:1121
 #, fuzzy
 msgid "New passwords do not match."
 msgstr "Nye passord samsvarer ikkje."
@@ -595,14 +595,12 @@
 "<p>\n"
 "In this frame, select the desired installation method for <b>CAs</b> and <b>certificates</b>\n"
 "while completing the installation.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Her kan du velja installasjonsmetode for <b>CA</b> og <b>sertifikat</b>\n"
 "medan installasjonen vert fullførd.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/clients/ca_select_proposal.rb:112
 #, fuzzy
@@ -610,14 +608,12 @@
 "<p>\n"
 "You also have the possibility of creating the default CA and certificate in the installed system \n"
 "if you do not want to create or import it now.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Du kan òg oppretta standard-CA og sertifikat i det installerte systemet \n"
 "viss du ikkje vil oppretta eller importera no.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Creates Country items
 #. @return a list country items formated for a UI table
@@ -721,15 +717,13 @@
 "YaST generates a <b>default CA and certificate</b> automatically. This CA and certificate\n"
 "is used for communicating with the <b>Apache server</b>.\n"
 "Here, change these <b>default settings</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "YaST genererer <b>standard CA og sertifikat</b> automatisk. CA og sertifikatet\n"
 "vert nytta ved kommunikasjon med <b>Apache-serveren</b>.\n"
 "Her kan du endra desse <b>standardinnstillingene</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/clients/ca_select_proposal.rb:484
 #, fuzzy
@@ -1617,12 +1611,8 @@
 #. Translators: long help text - security information
 #: src/include/ca-management/crlExport.rb:111
 #, fuzzy
-msgid ""
-"Warning!<br>"
-"Activating the automatic creation and export of a CRL will write the CA password to a configuration file on disk. The password will be stored there in plain text as it is needed to create a CRL. The file will only be readable for the root user."
-msgstr ""
-"Advarsel!<br>"
-"Ved å aktivera automatisk oppretting og eksport av CRL, vil CA-passordet lagrast i ein oppsettfil på disken. Passordet vil lagrast som rein tekst, fordi dette vert kravt for å oppretta ein CRL. Fila vil berre kunna lesast av rotbrukeren."
+msgid "Warning!<br>Activating the automatic creation and export of a CRL will write the CA password to a configuration file on disk. The password will be stored there in plain text as it is needed to create a CRL. The file will only be readable for the root user."
+msgstr "Advarsel!<br>Ved å aktivera automatisk oppretting og eksport av CRL, vil CA-passordet lagrast i ein oppsettfil på disken. Passordet vil lagrast som rein tekst, fordi dette vert kravt for å oppretta ein CRL. Fila vil berre kunna lesast av rotbrukeren."
 
 #. Editing CRL defaults of a selected CA
 #. @param selected CA
@@ -2196,15 +2186,15 @@
 
 #. Creating default CA/Certificate
 #. @return [Boolean] ( success )
-#: src/include/ca-management/new_cert_read_write.rb:1890
+#: src/include/ca-management/new_cert_read_write.rb:1891
 #, fuzzy
 msgid "Creating certificate..."
 msgstr "Opprettar sertifikat …"
 
 #. Creating server certificate
 #. Exporting to common server certificate
-#: src/include/ca-management/new_cert_read_write.rb:1932
-#: src/include/ca-management/new_cert_read_write.rb:2013
+#: src/include/ca-management/new_cert_read_write.rb:1933
+#: src/include/ca-management/new_cert_read_write.rb:2014
 #, fuzzy
 msgid ""
 "The default certificate can also be created in\n"
@@ -2214,32 +2204,31 @@
 "modulen CA-administrasjon.\n"
 
 #. To translators: ContinueCancel Popup headline
-#: src/include/ca-management/popup.rb:50
+#: src/include/ca-management/popup.rb:52
 #, fuzzy
 msgid "Finish"
 msgstr "Fullfør"
 
 #. To translators: ContinueCancel Popup
-#: src/include/ca-management/popup.rb:52
+#: src/include/ca-management/popup.rb:54
 #, fuzzy
 msgid "Really save configuration ?"
 msgstr "Er du sikker på at du vil lagra konfigurasjonen?"
 
 #. To translators: YesNo Popup headline
-#: src/include/ca-management/popup.rb:64
+#: src/include/ca-management/popup.rb:66
 #, fuzzy
 msgid "Exit"
 msgstr "Avslutt"
 
 #. To translators: YesNo Popup
-#: src/include/ca-management/popup.rb:66
+#: src/include/ca-management/popup.rb:68
 #, fuzzy
 msgid "Really exit configuration without saving ?"
 msgstr "Er du sikker på at du vil avslutta konfigurasjonen utan å lagra?"
 
-#. Popup displaying openssl error messages
-#. @return [void]
-#: src/include/ca-management/popup.rb:88
+#. Show description while normal installation only.(bnc#962328)
+#: src/include/ca-management/popup.rb:91
 #, fuzzy
 msgid "Details"
 msgstr "Detaljer"
@@ -2639,27 +2628,32 @@
 msgid "Ce&rtificate and the Key Unencrypted in PEM Format"
 msgstr "Sjå&rtifikat og nøkkel ukryptert i PEM-format"
 
-#: src/include/ca-management/util.rb:665 src/include/ca-management/util.rb:1002
+#: src/include/ca-management/util.rb:665
+#: src/include/ca-management/util.rb:1002
 #, fuzzy
 msgid "C&ertificate and the Key Encrypted in PEM Format"
 msgstr "S&ertifikat og nøkkel kryptert i PEM-format"
 
-#: src/include/ca-management/util.rb:672 src/include/ca-management/util.rb:1009
+#: src/include/ca-management/util.rb:672
+#: src/include/ca-management/util.rb:1009
 #, fuzzy
 msgid "&Certificate in DER Format"
 msgstr "&Sertifikat i DER-format"
 
-#: src/include/ca-management/util.rb:679 src/include/ca-management/util.rb:1016
+#: src/include/ca-management/util.rb:679
+#: src/include/ca-management/util.rb:1016
 #, fuzzy
 msgid "Cer&tificate and the Key in PKCS12 Format"
 msgstr "Ser&tifikat og nøkkel i PKCS12-format"
 
-#: src/include/ca-management/util.rb:686 src/include/ca-management/util.rb:1023
+#: src/include/ca-management/util.rb:686
+#: src/include/ca-management/util.rb:1023
 #, fuzzy
 msgid "&Like PKCS12 and Include the CA Chain"
 msgstr "&Som PKCS12 og inkluder CA-kjeda"
 
-#: src/include/ca-management/util.rb:693 src/include/ca-management/util.rb:1035
+#: src/include/ca-management/util.rb:693
+#: src/include/ca-management/util.rb:1035
 #, fuzzy
 msgid "&New Password"
 msgstr "&Nytt passord"
@@ -2732,12 +2726,10 @@
 #, fuzzy
 msgid ""
 "<p><b><big>Importing Common Server Certificate (PKCS12 + CA Chain Format)\n"
-" from Disk:</big></b> Select one file name and press <b>Next</b> to continue.</p>"
-"\n"
+" from Disk:</big></b> Select one file name and press <b>Next</b> to continue.</p>\n"
 msgstr ""
 "<p><b><big>Importera vanleg serversertifikat (PKCS12- + CA-kjedeformat)\n"
-" frå disk:</big></b> Vel eit filnavn og klikk <b>Neste</b> for å halda fram.</p>"
-"\n"
+" frå disk:</big></b> Vel eit filnavn og klikk <b>Neste</b> for å halda fram.</p>\n"
 
 #. help text 2/3
 #: src/include/ca-management/util.rb:1222
@@ -2749,15 +2741,11 @@
 #: src/include/ca-management/util.rb:1230
 #, fuzzy
 msgid ""
-"<p><b>Password:</b><br>"
-"\n"
-"Certificate password</p>"
-"\n"
+"<p><b>Password:</b><br>\n"
+"Certificate password</p>\n"
 msgstr ""
-"<p><b>Passord:</b><br>"
-"\n"
-"Sertifikatpassord</p>"
-"\n"
+"<p><b>Passord:</b><br>\n"
+"Sertifikatpassord</p>\n"
 
 #: src/include/ca-management/util.rb:1236
 #, fuzzy

Modified: branches/plus-SLE12-SP2/yast/nn/po/cio.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/cio.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/cio.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -45,11 +45,11 @@
 msgstr ""
 
 #: src/lib/iochannel/channels_dialog.rb:142
-msgid "yes"
+msgid "no"
 msgstr ""
 
 #: src/lib/iochannel/channels_dialog.rb:142
-msgid "no"
+msgid "yes"
 msgstr ""
 
 #. filter can be empty if dialog is not yet created

Modified: branches/plus-SLE12-SP2/yast/nn/po/cluster.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/cluster.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/cluster.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -129,7 +129,7 @@
 msgstr ""
 
 #: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1427
+#: src/include/cluster/dialogs.rb:1429
 msgid "The Multicast Address has to be fulfilled"
 msgstr ""
 
@@ -155,7 +155,7 @@
 msgstr ""
 
 #: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478
-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1365
 msgid "Multicast Address:"
 msgstr ""
 
@@ -203,311 +203,246 @@
 msgstr ""
 
 #. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:715
+#: src/include/cluster/dialogs.rb:717
 msgid "Enable Security Auth"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:719
+#: src/include/cluster/dialogs.rb:721
 msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:724
+#: src/include/cluster/dialogs.rb:726
 msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:750
+#: src/include/cluster/dialogs.rb:752
 msgid "Failed to create /etc/corosync/authkey"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:752
+#: src/include/cluster/dialogs.rb:754
 msgid "Create /etc/corosync/authkey succeeded"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:813 src/include/cluster/dialogs.rb:883
+#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885
 msgid "Running"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:815
+#: src/include/cluster/dialogs.rb:817
 msgid "Not running"
 msgstr ""
 
 #. servie:cluster is the  name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:851
+#: src/include/cluster/dialogs.rb:853
 msgid "Booting"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:861
+#: src/include/cluster/dialogs.rb:863
 msgid "On -- Start pacemaker during boot"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:868
+#: src/include/cluster/dialogs.rb:870
 msgid "Off -- Start pacemaker manually"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:877
+#: src/include/cluster/dialogs.rb:879
 msgid "Switch On and Off"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:882
+#: src/include/cluster/dialogs.rb:884
 msgid "Current Status: "
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:891
+#: src/include/cluster/dialogs.rb:893
 msgid "Start pacemaker Now"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:892
+#: src/include/cluster/dialogs.rb:894
 msgid "Stop pacemaker Now"
 msgstr ""
 
 #. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:990
+#: src/include/cluster/dialogs.rb:992
 msgid "Sync Host"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:994 src/include/cluster/dialogs.rb:1006
+#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
 msgid "Add"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:995 src/include/cluster/dialogs.rb:1007
+#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009
 msgid "Del"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
+#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
 msgid "Edit"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1002
+#: src/include/cluster/dialogs.rb:1004
 msgid "Sync File"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1009
+#: src/include/cluster/dialogs.rb:1011
 msgid "Add Suggested Files"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1018
+#: src/include/cluster/dialogs.rb:1020
 msgid "Generate Pre-Shared-Keys"
 msgstr ""
 
 #. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1143
+#: src/include/cluster/dialogs.rb:1145
 msgid "Csync2 Status Unknown"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1146
+#: src/include/cluster/dialogs.rb:1148
 msgid "Turn csync2 ON"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1149
+#: src/include/cluster/dialogs.rb:1151
 msgid "Turn csync2 OFF"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1179
+#: src/include/cluster/dialogs.rb:1181
 msgid "Enter a hostname"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1193
+#: src/include/cluster/dialogs.rb:1195
 msgid "Edit the hostname"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1207
+#: src/include/cluster/dialogs.rb:1209
 msgid "Enter a filename to synchronize"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1222
+#: src/include/cluster/dialogs.rb:1224
 msgid "Edit the filename"
 msgstr ""
 
 #. key file exist
-#: src/include/cluster/dialogs.rb:1254
+#: src/include/cluster/dialogs.rb:1256
 msgid ""
 "Key file %1 already exist.\n"
 "Do you want to overwrite it?"
 msgstr ""
 
 #. remove exist key file
-#: src/include/cluster/dialogs.rb:1264
+#: src/include/cluster/dialogs.rb:1266
 msgid "Delete key file %1 failed."
 msgstr ""
 
 #. generate key file
-#: src/include/cluster/dialogs.rb:1278
+#: src/include/cluster/dialogs.rb:1280
 msgid ""
 "Key file %1 is generated.\n"
 "Clicking \"Add Suggested Files\" button adds it to sync list."
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1285
+#: src/include/cluster/dialogs.rb:1287
 msgid "Key generation failed."
 msgstr ""
 
 #. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1347
+#: src/include/cluster/dialogs.rb:1349
 msgid ""
 "Conntrackd is a daemon which helps to duplicate firewall status between cluster nodes.\n"
 "YaST can help to configure some basic aspects of conntrackd.\n"
 "You need to start it with the ocf:heartbeat:conntrackd."
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1358
+#: src/include/cluster/dialogs.rb:1360
 msgid "Dedicated Interface:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1361
+#: src/include/cluster/dialogs.rb:1363
 msgid "IP:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1364
+#: src/include/cluster/dialogs.rb:1366
 msgid "Group Number:"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1368
+#: src/include/cluster/dialogs.rb:1370
 msgid "Generate /etc/conntrackd/conntrackd.conf"
 msgstr ""
 
-#: src/include/cluster/dialogs.rb:1435
+#: src/include/cluster/dialogs.rb:1437
 msgid "The Group Number must be a positive integer"
 msgstr ""
 
 #. All helps are here
 #: src/include/cluster/helps.rb:35
 msgid ""
-"<p><b><big>Bind Network Address</big></b><br>"
-"This  specifies  the  address which the openais executive should bind.  This address should always end in  zero.   If  the  totem traffic  should  be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0.<br>"
-"This may also be an IPV6 address, in which case IPV6  networking will  be used.  In this case, the full address must be specified and there is no automatic selection  of  the  network  interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified.<br>"
-"</p>"
-"\n"
-"<p><b><big>Multicast Address</big></b><br>"
-"This is the multicast address used by  openais  executive.   The default  should work for most networks, but the network administrator should be queried  about  a  multicast  address  to  use.  Avoid 224.x.x.x because this is a \"config\" multicast address.<br>"
-"This  may  also be an IPV6 multicast address, in which case IPV6 networking will be used.  If IPv6 networking is used, the nodeid field must be specified.</p>"
-"\n"
-"<p><b><big>Port</big></b><br>"
-"This  specifies  the UDP port number.  It is possible to use the same multicast address on a network with  the  openais  services configured for different UDP ports.<br>"
-"</p>"
-"\n"
-"<p><b><big>Member Address</big></b><br>"
-"This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu(Unicast). <br>"
-"</p>"
-"\n"
-"<p><b><big>Node ID</big></b><br>"
-"This  configuration  option  is  optional  when  using  IPv4 and required when using IPv6.  This is a 32 bit value specifying the node identifier delivered to the cluster membership service.  If this is not specified with IPv4, the node id will be  determined from  the  32  bit  IP address the system to which the system is bound with ring identifier of 0.  The node identifier  value  of zero is reserved and should not be used.<br>"
-"</p>"
-"\n"
-"<p><b><big>rrp_mode</big></b><br>"
-"This specifies the mode of redundant ring, which  may  be  none, active,  or  passive.   Active replication offers slightly lower latency from transmit to delivery in faulty network environments but  with less performance.  Passive replication may nearly double the speed of the totem  protocol  if  the  protocol  doesn't become  cpu bound.  The final option is none, in which case only one network interface will be used to operate the  totem  protocol.  If  only one interface directive is specified, none is automatically chosen.  If multiple interface directives  are  specified, only active or passive may be chosen.<br>"
-"</p>"
-"\n"
-"<p><b><big>Expected votes</big></b><br>"
-"Expect vote number for voting quorum.  Will be automatically calculated when the nodelist {} section is present in corosync.conf (the list will be generated when using unicast transport) or can be specified in the quorum {} section (Expect votes should use the total node numble of the cluster). If Expected votes presents in unicast transport, the value will override the one automatically calculated.<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"
+"<p><b><big>Bind Network Address</big></b><br>This  specifies  the  address which the openais executive should bind.  This address should always end in  zero.   If  the  totem traffic  should  be routed over 192.168.5.92, set bindnetaddr to 192.168.5.0.<br>This may also be an IPV6 address, in which case IPV6  networking will  be used.  In this case, the full address must be specified and there is no automatic selection  of  the  network  interface within a specific subnet as with IPv4. If IPv6 networking is used, the nodeid field must be specified.<br></p>\n"
+"<p><b><big>Multicast Address</big></b><br>This is the multicast address used by  openais  executive.   The default  should work for most networks, but the network administrator should be queried  about  a  multicast  address  to  use.  Avoid 224.x.x.x because this is a \"config\" multicast address.<br>This  may  also be an IPV6 multicast address, in which case IPV6 networking will be used.  If IPv6 networking is used, the nodeid field must be specified.</p>\n"
+"<p><b><big>Port</big></b><br>This  specifies  the UDP port number.  It is possible to use the same multicast address on a network with  the  openais  services configured for different UDP ports.<br></p>\n"
+"<p><b><big>Member Address</big></b><br>This list specifies all the nodes in the cluster by IP address. This could be configurable when using udpu(Unicast). <br></p>\n"
+"<p><b><big>Node ID</big></b><br>This  configuration  option  is  optional  when  using  IPv4 and required when using IPv6.  This is a 32 bit value specifying the node identifier delivered to the cluster membership service.  If this is not specified with IPv4, the node id will be  determined from  the  32  bit  IP address the system to which the system is bound with ring identifier of 0.  The node identifier  value  of zero is reserved and should not be used.<br></p>\n"
+"<p><b><big>rrp_mode</big></b><br>This specifies the mode of redundant ring, which  may  be  none, active,  or  passive.   Active replication offers slightly lower latency from transmit to delivery in faulty network environments but  with less performance.  Passive replication may nearly double the speed of the totem  protocol  if  the  protocol  doesn't become  cpu bound.  The final option is none, in which case only one network interface will be used to operate the  totem  protocol.  If  only one interface directive is specified, none is automatically chosen.  If multiple interface directives  are  specified, only active or passive may be chosen.<br></p>\n"
+"<p><b><big>Expected votes</big></b><br>Expect vote number for voting quorum.  Will be automatically calculated when the nodelist {} section is present in corosync.conf (the list will be generated when using unicast transport) or can be specified in the quorum {} section (Expect votes should use the total node numble of the cluster). If Expected votes presents in unicast transport, the value will override the one automatically calculated.<br></p>\n"
+"<p><b><big>Auto Generate Node ID</big></b><br>Nodeid is required when using IPv6. Auto node ID enabled will generate nodeid automatically.<br></p>\n"
 msgstr ""
 
 #: src/include/cluster/helps.rb:45
 msgid ""
 "\n"
-"<p><b><big>Enable Security Auth</big></b><br>"
-"This  specifies  that HMAC/SHA1 authentication should be used to authenticate all messages.  It further specifies that  all  data should  be  encrypted  with the sober128 encryption algorithm to protect data from eavesdropping.  Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput.  Encryption and authentication consume 75% of CPU cycles in aisexec as  measured  with gprof when enabled.  For  100Mbit  networks  with  1500  MTU  frame  transmissions: A throughput of 9Mb/s is possible with 100% cpu utilization when this  option  is enabled on 3GHz cpus.  A throughput of 10Mb/s is possible wth 20% cpu utilization when this option is  disabled on 3GHz cpus.  For  gig-e networks with large frame transmissions: A throughput of 20Mb/s is possible when this  option  is  enabled  on  3GHz cpus.   A throughput of 60Mb/s is possible when this option is disabled on 3GHz cpus.  The default is on. <br>"
-"</p>"
-"\n"
+"<p><b><big>Enable Security Auth</big></b><br>This  specifies  that HMAC/SHA1 authentication should be used to authenticate all messages.  It further specifies that  all  data should  be  encrypted  with the sober128 encryption algorithm to protect data from eavesdropping.  Enabling this option adds a 36 byte header to every message sent by totem which reduces total throughput.  Encryption and authentication consume 75% of CPU cycles in aisexec as  measured  with gprof when enabled.  For  100Mbit  networks  with  1500  MTU  frame  transmissions: A throughput of 9Mb/s is possible with 100% cpu utilization when this  option  is enabled on 3GHz cpus.  A throughput of 10Mb/s is possible wth 20% cpu utilization when this option is  disabled on 3GHz cpus.  For  gig-e networks with large frame transmissions: A throughput of 20Mb/s is possible when this  option  is  enabled  on  3GHz cpus.   A throughput of 60Mb/s is possible when this option is disabled on 3GHz cpus.  The default is on. <b
 r></p>\n"
 msgstr ""
 
 #: src/include/cluster/helps.rb:49
 msgid ""
 "\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"
-"<p><b><big>Booting</big></b><br>"
-"Starting corosync service during boot or not</p>"
-"\n"
-"\t\t\t"
-"<p><b><big>Firewall Settings</big></b><br>"
-"Enable the port when Firewall is enabled</p>"
-"\n"
-"\t\t\t"
 msgstr ""
 
 #: src/include/cluster/helps.rb:55
 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"
-"\t\t"
-"<p><b><big>Sync File</big></b><br>"
-"The full absolute filename to be synced.</p>"
-"\n"
-"\t\t"
-"<p><b><big>Pre-Shared-Keys</big></b><br>"
-"Authentication is performed using the IP addresses and pre-shared-keys in Csync2. The key file is generated with csync2 -k /etc/csync2/key_hagroup. The file key_hagroup should be copied to all members of the cluster manually after it's created.</p>"
-"\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"
+"\t\t<p><b><big>Sync File</big></b><br>The full absolute filename to be synced.</p>\n"
+"\t\t<p><b><big>Pre-Shared-Keys</big></b><br>Authentication is performed using the IP addresses and pre-shared-keys in Csync2. The key file is generated with csync2 -k /etc/csync2/key_hagroup. The file key_hagroup should be copied to all members of the cluster manually after it's created.</p>\n"
 "\t"
 msgstr ""
 
 #: src/include/cluster/helps.rb:62
 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"
-"\t\t"
-"<p><b><big>IP</big></b><br>"
-"The IPv4 address assigned to the dedicated network interface. This is detected automatically.</p>"
-"\n"
-"\t\t"
-"<p><b><big>Multicast Address</big></b><br>"
-"The multicast address to be used for syncing.</p>"
-"\n"
-"\t\t"
-"<p><b><big>Group Number</big></b><br>"
-"A numeric ID indicate the group for syncing.</p>"
-"\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"
+"\t\t<p><b><big>IP</big></b><br>The IPv4 address assigned to the dedicated network interface. This is detected automatically.</p>\n"
+"\t\t<p><b><big>Multicast Address</big></b><br>The multicast address to be used for syncing.</p>\n"
+"\t\t<p><b><big>Group Number</big></b><br>A numeric ID indicate the group for syncing.</p>\n"
 "\t"
 msgstr ""
 
 #. Read dialog help 1/2
 #: src/include/cluster/helps.rb:71
 msgid ""
-"<p><b><big>Initializing cluster Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Initializing cluster Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
 
 #. Read dialog help 2/2
 #: src/include/cluster/helps.rb:75
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<p><b><big>Aborting Initialization:</big></b><br>\n"
+"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n"
 msgstr ""
 
 #. Write dialog help 1/2
 #: src/include/cluster/helps.rb:79
 msgid ""
-"<p><b><big>Saving cluster Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Saving cluster Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
 
 #. Write dialog help 2/2
 #: src/include/cluster/helps.rb:83
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 
 #. Initialization dialog caption
@@ -521,96 +456,96 @@
 msgstr ""
 
 #. Cluster read dialog caption
-#: src/modules/Cluster.rb:390
+#: src/modules/Cluster.rb:394
 msgid "Initializing cluster Configuration"
 msgstr ""
 
 #. Progress stage 1/3
-#: src/modules/Cluster.rb:406
+#: src/modules/Cluster.rb:410
 msgid "Read the database"
 msgstr ""
 
 #. Progress stage 2/3
-#: src/modules/Cluster.rb:408
+#: src/modules/Cluster.rb:412
 msgid "Read the previous settings"
 msgstr ""
 
 #. Progress stage 3/3
-#: src/modules/Cluster.rb:410
+#: src/modules/Cluster.rb:414
 msgid "Read SuSEFirewall Settings"
 msgstr ""
 
 #. Progress step 1/3
-#: src/modules/Cluster.rb:414
+#: src/modules/Cluster.rb:418
 msgid "Reading the database..."
 msgstr ""
 
 #. Progress step 2/3
-#: src/modules/Cluster.rb:416
+#: src/modules/Cluster.rb:420
 msgid "Reading the previous settings..."
 msgstr ""
 
 #. Progress step 3/3
-#: src/modules/Cluster.rb:418
+#: src/modules/Cluster.rb:422
 msgid "Reading SuSEFirewall settings..."
 msgstr ""
 
 #. Progress finished
 #. Progress finished
-#: src/modules/Cluster.rb:420 src/modules/Cluster.rb:522
+#: src/modules/Cluster.rb:424 src/modules/Cluster.rb:526
 msgid "Finished"
 msgstr ""
 
-#: src/modules/Cluster.rb:435
+#: src/modules/Cluster.rb:439
 msgid "Cannot install required package"
 msgstr ""
 
 #. read database
-#: src/modules/Cluster.rb:444
+#: src/modules/Cluster.rb:448
 msgid "Cannot load existing configuration"
 msgstr ""
 
 #. Error message
-#: src/modules/Cluster.rb:455
+#: src/modules/Cluster.rb:459
 msgid "Cannot read database1."
 msgstr ""
 
 #. Error message
-#: src/modules/Cluster.rb:463
+#: src/modules/Cluster.rb:467
 msgid "Cannot read database2."
 msgstr ""
 
 #. Error message
-#: src/modules/Cluster.rb:479
+#: src/modules/Cluster.rb:483
 msgid "Cannot detect devices."
 msgstr ""
 
 #. Cluster read dialog caption
-#: src/modules/Cluster.rb:497
+#: src/modules/Cluster.rb:501
 msgid "Saving cluster Configuration"
 msgstr ""
 
 #. Progress stage 1/2
-#: src/modules/Cluster.rb:512
+#: src/modules/Cluster.rb:516
 msgid "Write the settings"
 msgstr ""
 
 #. Progress stage 2/2
-#: src/modules/Cluster.rb:514
+#: src/modules/Cluster.rb:518
 msgid "Save changes to SuSEFirewall"
 msgstr ""
 
 #. Progress step 1/2
-#: src/modules/Cluster.rb:518
+#: src/modules/Cluster.rb:522
 msgid "Writing the settings..."
 msgstr ""
 
 #. Progress step 2/2
-#: src/modules/Cluster.rb:520
+#: src/modules/Cluster.rb:524
 msgid "Saving changes to SuSEFirewall..."
 msgstr ""
 
 #. Error message
-#: src/modules/Cluster.rb:532
+#: src/modules/Cluster.rb:536
 msgid "Cannot write settings."
 msgstr ""

Modified: branches/plus-SLE12-SP2/yast/nn/po/control-center.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/control-center.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/control-center.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2011-05-17 17:30+0200\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: Norwegian Nynorsk \n"

Modified: branches/plus-SLE12-SP2/yast/nn/po/control.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/control.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/control.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2015-08-12 21:02+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"
@@ -14,329 +14,305 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 2.0\n"
 
-#: control/control.openSUSE.glade.translations.glade:3
+#: control/control.SLED.glade.translations.glade:3
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "<p>\n"
+#| "The installation has completed successfully.\n"
+#| "Your system is ready for use.\n"
+#| "Click Finish to log in to the system.\n"
+#| "</p>\n"
+#| "<p>\n"
+#| "Please visit us at http://www.novell.com/linux/.\n"
+#| "</p>\n"
+#| "\t"
 msgid ""
 "\n"
-"<p><b>Congratulations!</b></p>"
-"\n"
-"<p>The installation of openSUSE on your machine is complete.\n"
-"After clicking <b>Finish</b>, you can log in to the system.</p>"
-"\n"
-"<p>Visit us at %1.</p>"
-"\n"
-"<p>Have a lot of fun!<br>"
-"Your openSUSE Development Team</p>"
-"\n"
-"            "
+"<p>\n"
+"The installation has completed successfully.\n"
+"Your system is ready for use.\n"
+"Click <b>Finish</b> to log in to the system.\n"
+"</p>\n"
+"<p>\n"
+"Please visit us at http://www.suse.com/.\n"
+"</p>\n"
+"        "
 msgstr ""
 "\n"
-"<p><b>Gratulerer!</b></p>"
-"\n"
-"<p>openSUSE er no ferdig installert på maskina.\n"
-"Etter at du har trykkja på <b>Fullfør</b>, kan du logga på systemet.</p>"
-"\n"
-"<p>Besøk oss på %1.</p>"
-"\n"
-"<p>Ha det gøy!<br>"
-"openSUSE-utviklarane</p>"
-"\n"
-"            "
+"<p>\n"
+"Installeringa er ferdig.\n"
+"Systemet er no klart til bruk.\n"
+"Trykk «Fullfør» for å logga på systemet.\n"
+"</p>\n"
+"<p>\n"
+"Besøk oss på http://www.novell.com/linux/.\n"
+"</p>\n"
+"\t"
 
-#: control/control.openSUSE.glade.translations.glade:10
-msgid ""
-"The desktop environment on your computer provides the graphical user\n"
-"interface for your computer, as well as a suite of applications for\n"
-"email, Web browsing, office productivity, games, and utilities to\n"
-"manage your computer.\n"
-"\n"
-"openSUSE offers a choice of desktop environments.  The most widely\n"
-"used desktop environments are GNOME and KDE, and they are equally\n"
-"supported under openSUSE. Both desktop environments are easy to use,\n"
-"highly integrated, and have an attractive look and feel. Each desktop\n"
-"environment has a distinct style, so personal taste determines which\n"
-"is the most appropriate desktop for you."
-msgstr ""
-"Skrivebordsmiljøet på datamaskina er den grafiske\n"
-"brukerflata, og har blant anna program for e-post\n"
-"nettlesing, kontorarbeid, spel og verktøy for å\n"
-"administrera datamaskina.\n"
-"\n"
-"openSUSE tilbyr ulike skrivebordsmiljø. Dei mest\n"
-"brukte miljøa er GNOME og KDE. Begge desse er like\n"
-"godt støtta i openSUSE, og begge er enkle å bruka,\n"
-"godt integrerte og elegant utforma. Dei to\n"
-"skrivebordsmiljøa har kvart sitt særpreg, så det er\n"
-"opp til deg kven av dei du føretrekkjer."
+#: control/control.SLED.glade.translations.glade:15
+msgid "CIM Server"
+msgstr "CIM-tenar"
 
-#: control/control.openSUSE.glade.translations.glade:21
-msgid "GNOME Desktop"
-msgstr "GNOME-miljøet"
-
-#: control/control.openSUSE.glade.translations.glade:22
-msgid "KDE Desktop"
-msgstr "KDE-miljøet"
-
-#: control/control.openSUSE.glade.translations.glade:23
-msgid "XFCE Desktop"
-msgstr "XFCE-miljøet"
-
-#: control/control.openSUSE.glade.translations.glade:24
-msgid "LXDE Desktop"
-msgstr "LXDE-miljøet"
-
-#: control/control.openSUSE.glade.translations.glade:25
-msgid "Minimal X Window"
-msgstr "Minimalt grafisk grensesnitt"
-
-#: control/control.openSUSE.glade.translations.glade:26
-msgid "Enlightenment Desktop"
-msgstr "Enlightenment-miljøet"
-
-#: control/control.openSUSE.glade.translations.glade:27
-msgid "Minimal Server Selection (Text Mode)"
-msgstr "Minimal tenar i tekstmodus"
-
-#: control/control.openSUSE.glade.translations.glade:28
-#: control/control.openSUSE.glade.translations.glade:29
-#: control/control.openSUSE.glade.translations.glade:32
-#: control/control.openSUSE.glade.translations.glade:70
-#: control/control.openSUSE.glade.translations.glade:71
+#: control/control.SLED.glade.translations.glade:16
+#: control/control.SLED.glade.translations.glade:17
+#: control/control.SLED.glade.translations.glade:22
+#: control/control.SLED.glade.translations.glade:56
+#: control/control.SLED.glade.translations.glade:57
 msgid "Installation Settings"
 msgstr "Installasjonsinnstillingar"
 
-#: control/control.openSUSE.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:18
+msgid "Overview"
+msgstr "Oversikt"
+
+#: control/control.SLED.glade.translations.glade:19
+msgid "Expert"
+msgstr "Ekspert"
+
+#: control/control.SLED.glade.translations.glade:20
 msgid "Live Installation Settings"
 msgstr "Innstillingar for live-installasjon"
 
-#: control/control.openSUSE.glade.translations.glade:31
-#: control/control.openSUSE.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:21
 msgid "Update Settings"
 msgstr "Oppdateringsinnstillingar"
 
-#: control/control.openSUSE.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:23
 msgid "Network Configuration"
 msgstr "Nettverksoppsett"
 
-#: control/control.openSUSE.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:24
 msgid "Hardware Configuration"
 msgstr "Maskinvareoppsett"
 
-#: control/control.openSUSE.glade.translations.glade:35
-#: control/control.openSUSE.glade.translations.glade:77
-#: control/control.openSUSE.glade.translations.glade:103
+#: control/control.SLED.glade.translations.glade:25
+#: control/control.SLED.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:90
 msgid "Preparation"
 msgstr "Førebuing"
 
-#: control/control.openSUSE.glade.translations.glade:36
-#: control/control.openSUSE.glade.translations.glade:63
+#: control/control.SLED.glade.translations.glade:26
+#: control/control.SLED.glade.translations.glade:50
+#: control/control.SLED.glade.translations.glade:64
 msgid "Load linuxrc Network Configuration"
 msgstr "Last linuxrc-nettverksoppsett"
 
-#: control/control.openSUSE.glade.translations.glade:37
-#: control/control.openSUSE.glade.translations.glade:64
+#: control/control.SLED.glade.translations.glade:27
+#: control/control.SLED.glade.translations.glade:51
+#: control/control.SLED.glade.translations.glade:65
 msgid "Network Autosetup"
 msgstr "Automatisk nettverksoppsett"
 
-#: control/control.openSUSE.glade.translations.glade:38
-#: control/control.openSUSE.glade.translations.glade:65
-#: control/control.openSUSE.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:28
+#: control/control.SLED.glade.translations.glade:52
+#: control/control.SLED.glade.translations.glade:66
 msgid "Welcome"
 msgstr "Velkommen"
 
-#: control/control.openSUSE.glade.translations.glade:39
+#: control/control.SLED.glade.translations.glade:29
+#: control/control.SLED.glade.translations.glade:53
+#: control/control.SLED.glade.translations.glade:67
 msgid "Network Activation"
 msgstr "Nettverksoppsett"
 
-#: control/control.openSUSE.glade.translations.glade:40
-#: control/control.openSUSE.glade.translations.glade:79
+#: control/control.SLED.glade.translations.glade:30
+#: control/control.SLED.glade.translations.glade:68
 msgid "Disk Activation"
 msgstr "Diskoppsett"
 
-#: control/control.openSUSE.glade.translations.glade:41
-#: control/control.openSUSE.glade.translations.glade:42
-#: control/control.openSUSE.glade.translations.glade:80
-#: control/control.openSUSE.glade.translations.glade:104
+#: control/control.SLED.glade.translations.glade:31
+#: control/control.SLED.glade.translations.glade:32
+#: control/control.SLED.glade.translations.glade:69
+#: control/control.SLED.glade.translations.glade:91
 msgid "System Analysis"
 msgstr "Systemanalyse"
 
-#: control/control.openSUSE.glade.translations.glade:43
-#: control/control.openSUSE.glade.translations.glade:67
+#: control/control.SLED.glade.translations.glade:33
+#: control/control.SLED.glade.translations.glade:71
+msgid "Add-On Products"
+msgstr "Tilleggsprodukt"
+
+#: control/control.SLED.glade.translations.glade:34
+#: control/control.SLED.glade.translations.glade:54
 msgid "Disk"
 msgstr "Disk"
 
-#: control/control.openSUSE.glade.translations.glade:44
-#: control/control.openSUSE.glade.translations.glade:66
+#: control/control.SLED.glade.translations.glade:35
+#: control/control.SLED.glade.translations.glade:55
 msgid "Time Zone"
 msgstr "Tidssone"
 
-#: control/control.openSUSE.glade.translations.glade:45
-#: control/control.openSUSE.glade.translations.glade:82
-msgid "Online Repositories"
-msgstr "Pakkebrønnar"
-
-#: control/control.openSUSE.glade.translations.glade:46
-#: control/control.openSUSE.glade.translations.glade:83
-msgid "Add-On Products"
-msgstr "Tilleggsprodukt"
-
-#: control/control.openSUSE.glade.translations.glade:47
-msgid "Desktop Selection"
-msgstr "Skrivebordsval"
-
-#: control/control.openSUSE.glade.translations.glade:48
-#: control/control.openSUSE.glade.translations.glade:49
-#: control/control.openSUSE.glade.translations.glade:68
-#: control/control.openSUSE.glade.translations.glade:69
+#: control/control.SLED.glade.translations.glade:36
+#: control/control.SLED.glade.translations.glade:37
 msgid "User Settings"
 msgstr "Brukarinnstillingar"
 
-#: control/control.openSUSE.glade.translations.glade:50
-#: control/control.openSUSE.glade.translations.glade:62
-msgid "Installation"
-msgstr "Installering"
-
-#: control/control.openSUSE.glade.translations.glade:51
+#: control/control.SLED.glade.translations.glade:38
 msgid "Installation Overview"
 msgstr "Installasjonsoversikt"
 
-#: control/control.openSUSE.glade.translations.glade:52
-#: control/control.openSUSE.glade.translations.glade:53
-#: control/control.openSUSE.glade.translations.glade:54
-#: control/control.openSUSE.glade.translations.glade:55
-#: control/control.openSUSE.glade.translations.glade:56
-#: control/control.openSUSE.glade.translations.glade:57
-#: control/control.openSUSE.glade.translations.glade:58
-#: control/control.openSUSE.glade.translations.glade:59
-#: control/control.openSUSE.glade.translations.glade:60
-#: control/control.openSUSE.glade.translations.glade:61
-#: control/control.openSUSE.glade.translations.glade:72
-#: control/control.openSUSE.glade.translations.glade:73
-#: control/control.openSUSE.glade.translations.glade:74
-#: control/control.openSUSE.glade.translations.glade:75
-#: control/control.openSUSE.glade.translations.glade:76
-#: control/control.openSUSE.glade.translations.glade:96
-#: control/control.openSUSE.glade.translations.glade:97
-#: control/control.openSUSE.glade.translations.glade:98
-#: control/control.openSUSE.glade.translations.glade:99
-#: control/control.openSUSE.glade.translations.glade:100
-#: control/control.openSUSE.glade.translations.glade:101
-#: control/control.openSUSE.glade.translations.glade:102
-#: control/control.openSUSE.glade.translations.glade:117
-#: control/control.openSUSE.glade.translations.glade:118
-#: control/control.openSUSE.glade.translations.glade:119
+#: control/control.SLED.glade.translations.glade:39
+#: control/control.SLED.glade.translations.glade:40
+#: control/control.SLED.glade.translations.glade:41
+#: control/control.SLED.glade.translations.glade:42
+#: control/control.SLED.glade.translations.glade:43
+#: control/control.SLED.glade.translations.glade:44
+#: control/control.SLED.glade.translations.glade:45
+#: control/control.SLED.glade.translations.glade:46
+#: control/control.SLED.glade.translations.glade:47
+#: control/control.SLED.glade.translations.glade:48
+#: control/control.SLED.glade.translations.glade:58
+#: control/control.SLED.glade.translations.glade:59
+#: control/control.SLED.glade.translations.glade:60
+#: control/control.SLED.glade.translations.glade:61
+#: control/control.SLED.glade.translations.glade:62
+#: control/control.SLED.glade.translations.glade:83
+#: control/control.SLED.glade.translations.glade:84
+#: control/control.SLED.glade.translations.glade:85
+#: control/control.SLED.glade.translations.glade:86
+#: control/control.SLED.glade.translations.glade:87
+#: control/control.SLED.glade.translations.glade:88
+#: control/control.SLED.glade.translations.glade:89
+#: control/control.SLED.glade.translations.glade:104
+#: control/control.SLED.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:106
 msgid "Perform Installation"
 msgstr "Installer"
 
-#: control/control.openSUSE.glade.translations.glade:81
-#: control/control.openSUSE.glade.translations.glade:105
+#: control/control.SLED.glade.translations.glade:49
+msgid "Installation"
+msgstr "Installering"
+
+#: control/control.SLED.glade.translations.glade:70
+#: control/control.SLED.glade.translations.glade:92
 msgid "System for Update"
 msgstr "System som skal oppgraderast"
 
-#: control/control.openSUSE.glade.translations.glade:84
-#: control/control.openSUSE.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:72
+#: control/control.SLED.glade.translations.glade:95
 msgid "Update"
 msgstr "Oppgrader"
 
-#: control/control.openSUSE.glade.translations.glade:86
-#: control/control.openSUSE.glade.translations.glade:87
-#: control/control.openSUSE.glade.translations.glade:88
-#: control/control.openSUSE.glade.translations.glade:89
-#: control/control.openSUSE.glade.translations.glade:90
-#: control/control.openSUSE.glade.translations.glade:110
-#: control/control.openSUSE.glade.translations.glade:111
-#: control/control.openSUSE.glade.translations.glade:112
-#: control/control.openSUSE.glade.translations.glade:113
-#: control/control.openSUSE.glade.translations.glade:114
-#: control/control.openSUSE.glade.translations.glade:115
-#: control/control.openSUSE.glade.translations.glade:116
-#: control/control.openSUSE.glade.translations.glade:122
-#: control/control.openSUSE.glade.translations.glade:123
+#: control/control.SLED.glade.translations.glade:73
+msgid "Update Summary"
+msgstr "Oppgraderingssammendrag"
+
+#: control/control.SLED.glade.translations.glade:74
+#: control/control.SLED.glade.translations.glade:75
+#: control/control.SLED.glade.translations.glade:76
+#: control/control.SLED.glade.translations.glade:77
+#: control/control.SLED.glade.translations.glade:78
+#: control/control.SLED.glade.translations.glade:97
+#: control/control.SLED.glade.translations.glade:98
+#: control/control.SLED.glade.translations.glade:99
+#: control/control.SLED.glade.translations.glade:100
+#: control/control.SLED.glade.translations.glade:101
+#: control/control.SLED.glade.translations.glade:102
+#: control/control.SLED.glade.translations.glade:103
+#: control/control.SLED.glade.translations.glade:109
+#: control/control.SLED.glade.translations.glade:110
 msgid "Perform Update"
 msgstr "Oppgrader"
 
-#: control/control.openSUSE.glade.translations.glade:91
-#: control/control.openSUSE.glade.translations.glade:120
-#: control/control.openSUSE.glade.translations.glade:124
-msgid "Configuration"
-msgstr "Oppsett"
-
-#: control/control.openSUSE.glade.translations.glade:92
+#: control/control.SLED.glade.translations.glade:79
 msgid "Base Installation"
 msgstr "Grunninstallasjon"
 
-#: control/control.openSUSE.glade.translations.glade:93
-#: control/control.openSUSE.glade.translations.glade:94
-#: control/control.openSUSE.glade.translations.glade:95
-#: control/control.openSUSE.glade.translations.glade:106
-#: control/control.openSUSE.glade.translations.glade:107
-#: control/control.openSUSE.glade.translations.glade:109
+#: control/control.SLED.glade.translations.glade:80
+#: control/control.SLED.glade.translations.glade:81
+#: control/control.SLED.glade.translations.glade:82
+#: control/control.SLED.glade.translations.glade:93
+#: control/control.SLED.glade.translations.glade:94
+#: control/control.SLED.glade.translations.glade:96
 msgid "AutoYaST Settings"
 msgstr "AutoYaST-innstillingar"
 
-#: control/control.openSUSE.glade.translations.glade:121
-#: control/control.openSUSE.glade.translations.glade:125
+#: control/control.SLED.glade.translations.glade:107
+#: control/control.SLED.glade.translations.glade:111
+msgid "Configuration"
+msgstr "Oppsett"
+
+#: control/control.SLED.glade.translations.glade:108
+#: control/control.SLED.glade.translations.glade:112
 msgid "System Configuration"
 msgstr "Systemoppsett"
 
-#, fuzzy
-#~| msgid ""
-#~| "\n"
-#~| "<p>\n"
-#~| "The installation has completed successfully.\n"
-#~| "Your system is ready for use.\n"
-#~| "Click Finish to log in to the system.\n"
-#~| "</p>"
-#~| "\n"
-#~| "<p>\n"
-#~| "Please visit us at http://www.novell.com/linux/.\n"
-#~| "</p>"
-#~| "\n"
-#~| "\t"
 #~ msgid ""
 #~ "\n"
-#~ "<p>\n"
-#~ "The installation has completed successfully.\n"
-#~ "Your system is ready for use.\n"
-#~ "Click Finish to log in to the system.\n"
-#~ "</p>"
+#~ "<p><b>Congratulations!</b></p>\n"
+#~ "<p>The installation of openSUSE on your machine is complete.\n"
+#~ "After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+#~ "<p>Visit us at %1.</p>\n"
+#~ "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+#~ "            "
+#~ msgstr ""
 #~ "\n"
-#~ "<p>\n"
-#~ "Please visit us at http://www.suse.com/.\n"
-#~ "</p>"
+#~ "<p><b>Gratulerer!</b></p>\n"
+#~ "<p>openSUSE er no ferdig installert på maskina.\n"
+#~ "Etter at du har trykkja på <b>Fullfør</b>, kan du logga på systemet.</p>\n"
+#~ "<p>Besøk oss på %1.</p>\n"
+#~ "<p>Ha det gøy!<br>openSUSE-utviklarane</p>\n"
+#~ "            "
+
+#~ 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 på datamaskina er den grafiske\n"
+#~ "brukerflata, og har blant anna program for e-post\n"
+#~ "nettlesing, kontorarbeid, spel og verktøy for å\n"
+#~ "administrera datamaskina.\n"
 #~ "\n"
-#~ "<p>\n"
-#~ "Installeringa er ferdig.\n"
-#~ "Systemet er no klart til bruk.\n"
-#~ "Trykk «Fullfør» for å logga på systemet.\n"
-#~ "</p>"
-#~ "\n"
-#~ "<p>\n"
-#~ "Besøk oss på http://www.novell.com/linux/.\n"
-#~ "</p>"
-#~ "\n"
-#~ "\t"
+#~ "openSUSE tilbyr ulike skrivebordsmiljø. Dei mest\n"
+#~ "brukte miljøa er GNOME og KDE. Begge desse er like\n"
+#~ "godt støtta i openSUSE, og begge er enkle å bruka,\n"
+#~ "godt integrerte og elegant utforma. Dei to\n"
+#~ "skrivebordsmiljøa har kvart sitt særpreg, så det er\n"
+#~ "opp til deg kven av dei du føretrekkjer."
 
-#~ msgid "CIM Server"
-#~ msgstr "CIM-tenar"
+#~ msgid "GNOME Desktop"
+#~ msgstr "GNOME-miljøet"
 
-#~ msgid "Overview"
-#~ msgstr "Oversikt"
+#~ msgid "KDE Desktop"
+#~ msgstr "KDE-miljøet"
 
-#~ msgid "Expert"
-#~ msgstr "Ekspert"
+#~ msgid "XFCE Desktop"
+#~ msgstr "XFCE-miljøet"
 
+#~ msgid "LXDE Desktop"
+#~ msgstr "LXDE-miljøet"
+
+#~ msgid "Minimal X Window"
+#~ msgstr "Minimalt grafisk grensesnitt"
+
+#~ msgid "Enlightenment Desktop"
+#~ msgstr "Enlightenment-miljøet"
+
+#~ msgid "Minimal Server Selection (Text Mode)"
+#~ msgstr "Minimal tenar i tekstmodus"
+
+#~ msgid "Online Repositories"
+#~ msgstr "Pakkebrønnar"
+
+#~ msgid "Desktop Selection"
+#~ msgstr "Skrivebordsval"
+
 #~ msgid "Network Services Configuration"
 #~ msgstr "Oppsett av nettverkstenester"
 
 #~ msgid "Installation Summary"
 #~ msgstr "Installasjonssamandrag"
 
-#~ msgid "Update Summary"
-#~ msgstr "Oppgraderingssammendrag"
-
 #~ msgid "Add-On Product Installation"
 #~ msgstr "Installering av tilleggsprodukt"
 
@@ -350,12 +326,10 @@
 #~| "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"
 #~| "<p>\n"
 #~| "Please visit us at http://www.novell.com/linux/.\n"
-#~| "</p>"
-#~| "\n"
+#~| "</p>\n"
 #~| "\t"
 #~ msgid ""
 #~ "\n"
@@ -363,12 +337,10 @@
 #~ "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"
 #~ "<p>\n"
 #~ "Please visit us at http://www.suse.com/.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ "\t"
 #~ msgstr ""
 #~ "\n"
@@ -376,12 +348,10 @@
 #~ "Installeringa er ferdig.\n"
 #~ "Systemet er no klart til bruk.\n"
 #~ "Trykk <b>Fullfør</b> for å logga på systemet.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ "<p>\n"
 #~ "Besøk oss på http://www.novell.com/linux/.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ "\t"
 
 #~ msgid "Initialization..."

Modified: branches/plus-SLE12-SP2/yast/nn/po/country.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/country.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/country.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2015-08-26 20:23+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"
@@ -81,12 +81,8 @@
 
 #. help text for keyboard expert screen cont.
 #: keyboard/src/include/keyboard/dialogs.rb:60
-msgid ""
-"<p>Settings made here apply only to the console keyboard. Configure the keyboard for the graphical user interface with another tool.</p>"
-"\n"
-msgstr ""
-"<p>Desse innstillingane påverkar berre konsolltastaturet. Innstillingane for det grafiske miljøet må du setja opp med eit anna verktøy.</p>"
-"\n"
+msgid "<p>Settings made here apply only to the console keyboard. Configure the keyboard for the graphical user interface with another tool.</p>\n"
+msgstr "<p>Desse innstillingane påverkar berre konsolltastaturet. Innstillingane for det grafiske miljøet må du setja opp med eit anna verktøy.</p>\n"
 
 #. heading text
 #: keyboard/src/include/keyboard/dialogs.rb:78
@@ -168,16 +164,14 @@
 "installation and in the installed system.  \n"
 "Test the layout in <b>Test</b>.\n"
 "For advanced options, such as repeat rate and delay, select <b>Expert Settings</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel <b>tastaturoppsettet</b> du vil bruka ved\n"
 "installering og på det installerte systemet.  \n"
 "Test oppsettet med<b>Test</b>.\n"
 "Vel <b>Avanserte innstillingar</b> for avanserte val som repetisjonsfart og forseinking.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. general help trailer
 #: keyboard/src/include/keyboard/dialogs.rb:238
@@ -195,17 +189,13 @@
 msgid ""
 "<p>\n"
 "Choose the <b>Keyboard Layout</b> to use in the system.\n"
-"For advanced options, such as repeat rate and delay, select <b>Expert Settings</b>.</p>"
-"\n"
-"<p>Find more options as well as more layouts in the keyboard layout tool of your desktop environment.</p>"
-"\n"
+"For advanced options, such as repeat rate and delay, select <b>Expert Settings</b>.</p>\n"
+"<p>Find more options as well as more layouts in the keyboard layout tool of your desktop environment.</p>\n"
 msgstr ""
 "<p>\n"
 "Vel <b>tastaturoppsettet</b> du vil bruka på systemet.\n"
-"Vel <b>Avanserte innstillingar</b> for avanserte val som repetisjonsfart og forseinking.</p>"
-"\n"
-"<p>Du finn fleire val og fleire tastaturoppsett i tastaturverktøyet i skrivebordsmiljøet ditt.</p>"
-"\n"
+"Vel <b>Avanserte innstillingar</b> for avanserte val som repetisjonsfart og forseinking.</p>\n"
+"<p>Du finn fleire val og fleire tastaturoppsett i tastaturverktøyet i skrivebordsmiljøet ditt.</p>\n"
 
 #. Screen title for keyboard screen
 #: keyboard/src/include/keyboard/dialogs.rb:259
@@ -327,12 +317,8 @@
 
 #. help for write dialog
 #: language/src/clients/language.rb:233
-msgid ""
-"<p><b>Saving Configuration</b><br>"
-"Please wait...</p>"
-msgstr ""
-"<p><b>Lagrar oppsettet</b><br>"
-"Vent litt …</p>"
+msgid "<p><b>Saving Configuration</b><br>Please wait...</p>"
+msgstr "<p><b>Lagrar oppsettet</b><br>Vent litt …</p>"
 
 #. summary label
 #: language/src/clients/language.rb:252
@@ -408,27 +394,23 @@
 "<p>\n"
 "Choose the <b>Language</b> to use during installation and for\n"
 "the installed system.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel <b>språket</b> du vil bruka under installeringa og etter at\n"
 "systemet er installert.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text, continued
 #: language/src/clients/select_language.rb:249
 msgid ""
 "<p>\n"
 "Click <b>Next</b> to proceed to the next dialog.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Trykk <b>Neste</b> for å gå vidare til neste steg.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text, continued
 #: language/src/clients/select_language.rb:259
@@ -436,14 +418,12 @@
 "<p>\n"
 "Nothing will happen to your computer until you confirm\n"
 "all your settings in the last installation dialog.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Ikkje noko vil skje med datamaskina før du stadfestar\n"
 "alle innstillingane i det siste installasjonssteget.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text, continued
 #: language/src/clients/select_language.rb:270
@@ -451,13 +431,11 @@
 "<p>\n"
 "You can select <b>Abort</b> at any time to abort the\n"
 "installation process.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Du kan velja å <b>avbryta</b> installeringa når som helst.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. different help text when called after installation
 #. in an installed system
@@ -465,26 +443,22 @@
 msgid ""
 "<p>\n"
 "Choose the new <b>Language</b> for your system.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel nytt <b>språk</b> for systemet.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text when "multiple languages" are suported 1/2
 #: language/src/clients/select_language.rb:290
 msgid ""
 "<p>\n"
 "Choose the new <b>Primary Language</b> for your system.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel nytt <b>hovudspråk</b> for systemet.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text for 'adapt keyboard checkbox'
 #: language/src/clients/select_language.rb:300
@@ -492,31 +466,25 @@
 "<p>\n"
 "Check <b>Adapt Keyboard Layout</b> to change the keyboard layout to the primary language.\n"
 "Check <b>Adapt Time Zone</b> to change the current time zone according to the primary language. If the keyboard layout or time zone is already adapted to the default language setting, the respective option is disabled.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Kryss av for <b>Tilpass tastaturoppsett</b> for å tilpassa tastaturoppsettet til hovudspråket.\n"
 "Kryss av for <b>Tilpass tidssone</b> for å endra gjeldande tidssone i samsvar med hovudspråket. Viss tastaturoppsettet eller tidssona alt er tilpassa standardspråket, vert ikkje dei aktuelle tilgjengelege.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text when "multiple languages" are suported 2/2
 #: language/src/clients/select_language.rb:312
 msgid ""
 "<p>\n"
-"<b>Secondary Languages</b><br>"
-"\n"
+"<b>Secondary Languages</b><br>\n"
 "In the selection box, specify additional languages to use on your system.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b>Tilleggsspråk</b><br>"
-"\n"
+"<b>Tilleggsspråk</b><br>\n"
 "Vel kva tilleggsspråk du vil bruka på systemet.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. error message - package solver failed
 #: language/src/clients/select_language.rb:533
@@ -539,15 +507,13 @@
 "Here, fine-tune settings for the language handling.\n"
 "These settings are written into the file <tt>/etc/sysconfig/language</tt>.\n"
 "If unsure, use the default values already selected.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Her kan du finjustera innstillingane for språkhandtering.\n"
 "Desse vert lagra i fila <tt>/etc/sysconfig/language</tt>.\n"
 "ruk standardverdiane om du ikkje er sikker på kva du skal velja.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text for langauge expert screen
 #: language/src/clients/select_language.rb:585
@@ -564,21 +530,15 @@
 #: language/src/clients/select_language.rb:592
 msgid ""
 "<p><b>ctype Only</b>: root has the same LC_CTYPE as a normal user. Other values\n"
-"are unset.<br>"
-"\n"
-"<b>Yes</b>: root has the same locale settings as normal user.<br>"
-"\n"
+"are unset.<br>\n"
+"<b>Yes</b>: root has the same locale settings as normal user.<br>\n"
 "<b>No</b>: root has all locale variables unset.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Berre ctype</b>: Rotbrukaren får same LC_CTYPE som ein vanleg brukar. Dei andre verdiane vert ikkje definerte.<br>"
-"\n"
-"<b>Ja</b>: Rotbrukaren får same språk- og landinnstillingar som ein vanleg brukar.<br>"
-"\n"
+"<p><b>Berre ctype</b>: Rotbrukaren får same LC_CTYPE som ein vanleg brukar. Dei andre verdiane vert ikkje definerte.<br>\n"
+"<b>Ja</b>: Rotbrukaren får same språk- og landinnstillingar som ein vanleg brukar.<br>\n"
 "<b>Nei</b>: Ingen språk- og landvariablar vert definerte.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text for langauge expert screen
 #: language/src/clients/select_language.rb:601
@@ -756,8 +716,7 @@
 "set to Universal Time Coordinated (UTC).\n"
 "If the hardware clock is set to UTC, your system can switch from standard time\n"
 "to daylight saving time and back automatically.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel om maskina er innstilt på lokal tid eller UTC under <b>Maskinvareklokke innstilt på</b>.\n"
@@ -767,8 +726,7 @@
 "UTC.\n"
 "Viss maskinvareklokka er innstilt på UTC, kan systemet byta frå normaltid\n"
 "til sommartid og tilbake automatisk.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text: extra note about localtime
 #: timezone/src/include/timezone/dialogs.rb:118
@@ -883,49 +841,49 @@
 "Ugyldig klokkeslett (DD-MM-YYYY) %1\n"
 "Vel rett dato.\n"
 
-#. button text
-#: timezone/src/include/timezone/dialogs.rb:541
+#. TRANSLATORS: Button label
+#: timezone/src/include/timezone/dialogs.rb:535
 msgid "Other &Settings..."
 msgstr "Andre &innstillingar …"
 
 #. frame label
 #. frame label
-#: timezone/src/include/timezone/dialogs.rb:613
-#: timezone/src/include/timezone/dialogs.rb:910
+#: timezone/src/include/timezone/dialogs.rb:612
+#: timezone/src/include/timezone/dialogs.rb:916
 msgid "Date and Time (NTP is configured)"
 msgstr "Dato og klokkeslett (NTP er sett opp)"
 
 #. frame label
 #. frame label
-#: timezone/src/include/timezone/dialogs.rb:615
-#: timezone/src/include/timezone/dialogs.rb:693
-#: timezone/src/include/timezone/dialogs.rb:912
+#: timezone/src/include/timezone/dialogs.rb:614
+#: timezone/src/include/timezone/dialogs.rb:699
+#: timezone/src/include/timezone/dialogs.rb:918
 msgid "Date and Time"
 msgstr "Dato og klokkeslett"
 
 #. check box label
-#: timezone/src/include/timezone/dialogs.rb:631
+#: timezone/src/include/timezone/dialogs.rb:630
 msgid "&Hardware Clock Set to UTC"
 msgstr "&Maskinvareklokka er innstilt på UTC"
 
 #. label text
 #. label text
-#: timezone/src/include/timezone/dialogs.rb:650
-#: timezone/src/include/timezone/dialogs.rb:684
+#: timezone/src/include/timezone/dialogs.rb:656
+#: timezone/src/include/timezone/dialogs.rb:690
 msgid "&Region"
 msgstr "&Region"
 
-#: timezone/src/include/timezone/dialogs.rb:657
-#: timezone/src/include/timezone/dialogs.rb:688
+#: timezone/src/include/timezone/dialogs.rb:663
+#: timezone/src/include/timezone/dialogs.rb:694
 msgid "Time &Zone"
 msgstr "&Tidssone"
 
-#: timezone/src/include/timezone/dialogs.rb:669
+#: timezone/src/include/timezone/dialogs.rb:675
 msgid "Date and Time:"
 msgstr "Dato og klokkeslett:"
 
 #. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:791
+#: timezone/src/include/timezone/dialogs.rb:797
 msgid ""
 "\n"
 "<p><b><big>Time Zone and Clock Settings</big></b></p>"
@@ -934,24 +892,22 @@
 "<p><b><big>Tidssone og klokke</big></b></p>"
 
 #. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:793
+#: timezone/src/include/timezone/dialogs.rb:799
 msgid ""
 "<p>\n"
 "To select the time zone to use in your system, first select the <b>Region</b>.\n"
 "In <b>Time Zone</b>, then select the appropriate time zone, country, or \n"
 "region from those available.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "For å velja tidssona du vil bruka på systemet, vel først <b>Region</b>.\n"
 "Under <b>Tidssone</b> vel du så tidssona, landet eller \n"
 "regionen.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. general help trailer
-#: timezone/src/include/timezone/dialogs.rb:810
+#: timezone/src/include/timezone/dialogs.rb:816
 msgid ""
 "<p>\n"
 "If the current time is not correct, use <b>Change</b> to adjust it.\n"
@@ -962,12 +918,12 @@
 "</p>"
 
 #. Screen title for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:820
+#: timezone/src/include/timezone/dialogs.rb:826
 msgid "Clock and Time Zone"
 msgstr "Klokke og tidssone"
 
 #. popup text
-#: timezone/src/include/timezone/dialogs.rb:945
+#: timezone/src/include/timezone/dialogs.rb:951
 msgid "Select a valid time zone."
 msgstr "Vel ei gyldig tidssone."
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/crowbar.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/crowbar.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/crowbar.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2015-09-09 16:27+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"
@@ -24,19 +24,9 @@
 msgid "Configuration of crowbar"
 msgstr "Oppsett av crowbar"
 
-#. radio button item: target repository is common for all available platform
-#: src/include/crowbar/complex.rb:90
-msgid "Common for All"
-msgstr ""
-
 #. target platform name
-#: src/include/crowbar/complex.rb:92
-msgid "SLES 11 SP3"
-msgstr ""
-
-#. target platform name
 #: src/include/crowbar/complex.rb:94
-msgid "SLES 12"
+msgid "SLES 12 SP1"
 msgstr ""
 
 #. combobox label
@@ -46,19 +36,15 @@
 
 #: src/include/crowbar/complex.rb:109
 msgid ""
-"<p>Here you can edit the location of your <b>Update Repositories</b>.</p>"
-"\n"
+"<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n"
 "<p>\n"
-"If repositories are stored at SMT server or SUSE Manager server, it's enought to enter server's URL and the paths\n"
-"              to repositories will be filled automatically.</p>"
-"It is also possible to use custom paths. Some examples of how the URL could look like:\n"
-"</p>"
-"<p>\n"
+"If repositories are stored at SMT server or SUSE Manager server, it's enough to enter server's URL and the paths\n"
+"              to repositories will be filled automatically.</p>It is also possible to use custom paths. Some examples of how the URL could look like:\n"
+"</p><p>\n"
 "<ul>\n"
-"<li><i>http://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/</i> for SMT server\n"
+"<li><i>http://smt.example.com/repo/SUSE/Products/SLE-HA/12-SP1/x86_64/product</i> for SMT server\n"
 "<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-s...</i> for SUSE Manager Server.\n"
-"</p>"
-"<p>\n"
+"</p><p>\n"
 "For detailed description, check the Deployment Guide.\n"
 "</p>"
 msgstr ""
@@ -81,8 +67,7 @@
 #. help text for the Network mode tab (do not translate bastion)
 #: src/include/crowbar/complex.rb:196
 msgid ""
-"<p>Here, define a <b>Network Mode</b> with relevant <b>Bonding Policy</b>.</p>"
-"\n"
+"<p>Here, define a <b>Network Mode</b> with relevant <b>Bonding Policy</b>.</p>\n"
 "<p>You can also specify interface names for the bastion network conduits as space-separated list.</p>"
 msgstr ""
 
@@ -176,124 +161,132 @@
 msgstr ""
 
 #. text entry label
-#: src/include/crowbar/complex.rb:520
+#: src/include/crowbar/complex.rb:516
 msgid "Name"
 msgstr ""
 
 #. text entry label
-#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:695
+#: src/include/crowbar/complex.rb:518 src/include/crowbar/complex.rb:704
 msgid "URL"
 msgstr ""
 
 #. text entry label
-#: src/include/crowbar/complex.rb:526 src/include/crowbar/complex.rb:696
+#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:705
 msgid "Ask On Error"
 msgstr ""
 
-#. frame label
-#: src/include/crowbar/complex.rb:531 src/include/crowbar/complex.rb:697
-#: src/include/crowbar/complex.rb:715
+#: src/include/crowbar/complex.rb:527 src/include/crowbar/complex.rb:706
 msgid "Target Platform"
 msgstr ""
 
+#. radiobutton label
+#: src/include/crowbar/complex.rb:542
+msgid "Architecture"
+msgstr ""
+
 #. error popup
-#: src/include/crowbar/complex.rb:580
+#: src/include/crowbar/complex.rb:583
 msgid ""
 "Repository '%1' already exists.\n"
 "Choose a different name."
 msgstr ""
 
 #. text entry label
-#: src/include/crowbar/complex.rb:676
+#: src/include/crowbar/complex.rb:685
 msgid "Server &URL"
 msgstr ""
 
 #. table header
-#: src/include/crowbar/complex.rb:694
+#: src/include/crowbar/complex.rb:703
 msgid "Repository Name"
 msgstr ""
 
 #. checkbox label
-#: src/include/crowbar/complex.rb:701
+#: src/include/crowbar/complex.rb:710
 msgid "&Ask On Error"
 msgstr ""
 
 #. text entry label
-#: src/include/crowbar/complex.rb:707
+#: src/include/crowbar/complex.rb:716
 msgid "Repository &URL"
 msgstr ""
 
 #. label (hint for user)
-#: src/include/crowbar/complex.rb:710
+#: src/include/crowbar/complex.rb:719
 msgid "Empty URL means that default value will be used."
 msgstr ""
 
 #. push button label
-#: src/include/crowbar/complex.rb:726
+#: src/include/crowbar/complex.rb:722
 msgid "A&dd Repository"
 msgstr ""
 
 #. combobox item
-#: src/include/crowbar/complex.rb:793
+#: src/include/crowbar/complex.rb:792
+msgid "Local SMT Server"
+msgstr ""
+
+#. combobox item
+#: src/include/crowbar/complex.rb:794
 msgid "Remote SMT Server"
 msgstr ""
 
 #. combobox item
-#: src/include/crowbar/complex.rb:795
+#: src/include/crowbar/complex.rb:796
 msgid "SUSE Manager Server"
 msgstr ""
 
 #. combobox item
-#: src/include/crowbar/complex.rb:797
+#: src/include/crowbar/complex.rb:798
 msgid "Custom"
 msgstr ""
 
 #. text entry label
-#: src/include/crowbar/complex.rb:866
+#: src/include/crowbar/complex.rb:854
 msgid "User Name"
 msgstr ""
 
 #. text entry label
-#: src/include/crowbar/complex.rb:868
+#: src/include/crowbar/complex.rb:856
 msgid "Password"
 msgstr ""
 
 #. text entry label
-#: src/include/crowbar/complex.rb:870
+#: src/include/crowbar/complex.rb:858
 msgid "Repeat the Password"
 msgstr ""
 
 #. error popup
-#: src/include/crowbar/complex.rb:900
+#: src/include/crowbar/complex.rb:888
 msgid "User name cannot be empty."
 msgstr ""
 
 #. error popup
-#: src/include/crowbar/complex.rb:907
+#: src/include/crowbar/complex.rb:895
 msgid ""
 "The passwords do not match.\n"
 "Try again."
 msgstr ""
 
 #. error popup
-#: src/include/crowbar/complex.rb:915
+#: src/include/crowbar/complex.rb:903
 msgid ""
 "User '%1' already exists.\n"
 "Choose a different name."
 msgstr ""
 
 #. error popup
-#: src/include/crowbar/complex.rb:1018
+#: src/include/crowbar/complex.rb:1006
 msgid "The interface format '%1' is not valid"
 msgstr ""
 
 #. Returns broadcast address. Based on current netmask and subnet
-#: src/include/crowbar/complex.rb:1076
+#: src/include/crowbar/complex.rb:1064
 msgid "disabled"
 msgstr ""
 
 #. error popup
-#: src/include/crowbar/complex.rb:1173
+#: src/include/crowbar/complex.rb:1161
 msgid ""
 "The netmask '%1' is invalid.\n"
 "%2"
@@ -301,91 +294,91 @@
 
 #. error popup
 #. error popup
-#: src/include/crowbar/complex.rb:1184 src/include/crowbar/complex.rb:1216
+#: src/include/crowbar/complex.rb:1172 src/include/crowbar/complex.rb:1204
 msgid ""
 "The IP address '%1' is invalid.\n"
 "%2"
 msgstr ""
 
 #. error popup
-#: src/include/crowbar/complex.rb:1194
+#: src/include/crowbar/complex.rb:1182
 msgid ""
 "The router address '%1' is invalid.\n"
 "%2"
 msgstr ""
 
 #. error popup
-#: src/include/crowbar/complex.rb:1203
+#: src/include/crowbar/complex.rb:1191
 msgid "The router address '%1' is not part of network '%2'."
 msgstr ""
 
 #. error popup
-#: src/include/crowbar/complex.rb:1225
+#: src/include/crowbar/complex.rb:1213
 msgid "The IP address '%1' is not part of network '%2'."
 msgstr ""
 
 #. popup message
-#: src/include/crowbar/complex.rb:1246
+#: src/include/crowbar/complex.rb:1234
 msgid ""
 "Some address ranges are not part of network '%1'.\n"
 "Adapt them using 'Edit ranges' button."
 msgstr ""
 
 #. inputfield label
-#: src/include/crowbar/complex.rb:1335
+#: src/include/crowbar/complex.rb:1326
 msgid "Min IP Address"
 msgstr ""
 
 #. inputfield label
-#: src/include/crowbar/complex.rb:1342
+#: src/include/crowbar/complex.rb:1333
 msgid "Max IP Address"
 msgstr ""
 
-#: src/include/crowbar/complex.rb:1395
+#: src/include/crowbar/complex.rb:1386
 msgid "The address '%1' is not part of network '%2'."
 msgstr ""
 
 #. error message
-#: src/include/crowbar/complex.rb:1407
+#: src/include/crowbar/complex.rb:1398
 msgid "The lowest address must be lower than the highest one."
 msgstr ""
 
 #. error message
-#: src/include/crowbar/complex.rb:1431
+#: src/include/crowbar/complex.rb:1422
 msgid "Ranges '%1' and '%2' are overlapping."
 msgstr ""
 
 #. tab header
-#: src/include/crowbar/complex.rb:1499
+#: src/include/crowbar/complex.rb:1490
 msgid "&User Settings"
 msgstr ""
 
 #. label (hint for user)
-#: src/include/crowbar/complex.rb:1511
+#: src/include/crowbar/complex.rb:1502
 msgid "If no user is present, user 'crowbar' with default password will be used."
 msgstr ""
 
 #. tab header
-#: src/include/crowbar/complex.rb:1527
+#: src/include/crowbar/complex.rb:1518
 msgid "N&etwork Mode"
 msgstr ""
 
-#: src/include/crowbar/complex.rb:1535
+#: src/include/crowbar/complex.rb:1526
 msgid "Bastion Network"
 msgstr ""
 
 #. tab header
-#: src/include/crowbar/complex.rb:1578
+#: src/include/crowbar/complex.rb:1569
 msgid "Net&works"
 msgstr ""
 
 #. tab header
-#: src/include/crowbar/complex.rb:1614
+#: src/include/crowbar/complex.rb:1605
 msgid "Re&positories"
 msgstr ""
 
 #. popup message %1 is FQDN
-#: src/include/crowbar/complex.rb:1731
+#: src/include/crowbar/complex.rb:1722
 msgid ""
 "The Crowbar Admin Server has been deployed. Changing the network is\n"
 "currently not supported.\n"
@@ -394,36 +387,29 @@
 msgstr ""
 
 #. default dialog caption
-#: src/include/crowbar/complex.rb:1749
+#: src/include/crowbar/complex.rb:1740
 msgid "Crowbar Configuration Overview"
 msgstr ""
 
 #. Read dialog help
 #: src/include/crowbar/helps.rb:37
 msgid ""
-"<p><b><big>Initializing Crowbar Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Initializing Crowbar Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
 
 #. Write dialog help
 #: src/include/crowbar/helps.rb:41
 msgid ""
-"<p><b><big>Saving Crowbar Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Saving Crowbar Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
 
 #. Overview dialog help
 #: src/include/crowbar/helps.rb:45
 msgid ""
 "<p><b>Crowbar Configuration Overview</b>\n"
-"<br>"
-"</p>"
+"<br></p>"
 msgstr ""
 
 #. Ovreview dialog help
@@ -446,37 +432,37 @@
 msgstr ""
 
 #. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:142
+#: src/modules/Crowbar.rb:154
 msgid "Initializing crowbar Configuration"
 msgstr ""
 
 #. Progress stage
-#: src/modules/Crowbar.rb:153
+#: src/modules/Crowbar.rb:165
 msgid "Read the configuraton"
 msgstr ""
 
 #. Progress step
-#: src/modules/Crowbar.rb:157
+#: src/modules/Crowbar.rb:169
 msgid "Reading the configuration..."
 msgstr ""
 
 #. Progress finished
 #. Progress finished
-#: src/modules/Crowbar.rb:159 src/modules/Crowbar.rb:249
+#: src/modules/Crowbar.rb:171 src/modules/Crowbar.rb:261
 msgid "Finished"
 msgstr ""
 
 #. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:232
+#: src/modules/Crowbar.rb:244
 msgid "Saving crowbar Configuration"
 msgstr ""
 
 #. Progress stage 1/2
-#: src/modules/Crowbar.rb:243
+#: src/modules/Crowbar.rb:255
 msgid "Write the settings"
 msgstr ""
 
 #. Progress step 1/2
-#: src/modules/Crowbar.rb:247
+#: src/modules/Crowbar.rb:259
 msgid "Writing the settings..."
 msgstr ""

Modified: branches/plus-SLE12-SP2/yast/nn/po/dhcp-server.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/dhcp-server.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/dhcp-server.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -68,9 +68,7 @@
 msgstr "Administrer alternativ for DHCP-undernettverk"
 
 #. command line help text for an option
-#. command line help text for an option
 #: src/include/dhcp-server/commandline.rb:85
-#: src/include/dhcp-server/commandline.rb:138
 #, fuzzy
 msgid "List all defined hosts with a fixed address"
 msgstr "Vis alle definerte vertsmaskiner med fast adresse"
@@ -118,178 +116,184 @@
 msgstr "IP-adresse (eller vertsnavn) til vertsmaskin med fast adresse"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:144
+#: src/include/dhcp-server/commandline.rb:138
 #, fuzzy
 msgid "Select the network interface to use"
 msgstr "Vel nettverksgrensesnittet som skal brukast"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:151
+#: src/include/dhcp-server/commandline.rb:145
 #, fuzzy
 msgid "Print the currently used interface and list other available interfaces"
 msgstr "Skriv ut gjeldande grensesnitt og vis andre tilgjengelege grensesnitt"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:157
+#: src/include/dhcp-server/commandline.rb:151
 #, fuzzy
 msgid "Print current options"
 msgstr "Skriv ut gjeldande alternativ"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:163
+#: src/include/dhcp-server/commandline.rb:157
 #, fuzzy
 msgid "Set a global option"
 msgstr "Definer eit globalt alternativ"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:169
+#: src/include/dhcp-server/commandline.rb:163
 #, fuzzy
 msgid "Option key (for example, ntp-servers)"
 msgstr "Valgnøkkel (t.d. ntp-servar sine)"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:176
+#: src/include/dhcp-server/commandline.rb:170
 #, fuzzy
 msgid "Option value (for example, IP address)"
 msgstr "Valgverdi (t.d. IP address)"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:183
+#: src/include/dhcp-server/commandline.rb:177
 #, fuzzy
 msgid "Lowest IP address of the dynamic address assigning range"
 msgstr "Lågaste IP-adresse i tildelingsområdet for dynamiske adresser"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:190
+#: src/include/dhcp-server/commandline.rb:184
 #, fuzzy
 msgid "Highest IP address of the dynamic address assigning range"
 msgstr "Høgaste IP-adresse i tildelingsområdet for dynamiske adresser"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:197
+#: src/include/dhcp-server/commandline.rb:191
 #, fuzzy
 msgid "Default lease time in seconds"
 msgstr "Standard tildelingstid i sekund"
 
 #. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:204
+#: src/include/dhcp-server/commandline.rb:198
 #, fuzzy
 msgid "Maximum lease time in seconds"
 msgstr "Maksimal tildelingstid i sekund"
 
 #. status information for command line
-#: src/include/dhcp-server/commandline.rb:245
+#: src/include/dhcp-server/commandline.rb:239
 #, fuzzy
 msgid "DHCP server is enabled"
 msgstr "DHCP-serveren er aktivert"
 
 #. status information for command line
-#: src/include/dhcp-server/commandline.rb:247
+#: src/include/dhcp-server/commandline.rb:241
 #, fuzzy
 msgid "DHCP server is disabled"
 msgstr "DHCP-serveren er deaktivert"
 
 #. command-line text output, %1 is host name
-#: src/include/dhcp-server/commandline.rb:300
+#: src/include/dhcp-server/commandline.rb:294
 #, fuzzy
 msgid "Host: %1"
 msgstr "Vertsmaskin %1"
 
 #. command-line text output, %1 is hardwarre address
 #. and hardware type (eg. "ethernet 11:22:33:44:55:66")
-#: src/include/dhcp-server/commandline.rb:306
+#: src/include/dhcp-server/commandline.rb:300
 #, fuzzy
 msgid "Hardware: %1"
 msgstr "Maskinvare: %1"
 
 #. command-line text output, %1 is IP address
-#: src/include/dhcp-server/commandline.rb:312
+#: src/include/dhcp-server/commandline.rb:306
 #, fuzzy
 msgid "IP Address: %1"
 msgstr "IP-adresse: %1"
 
 #. command-line error report
-#: src/include/dhcp-server/commandline.rb:327
+#: src/include/dhcp-server/commandline.rb:321
 #, fuzzy
 msgid "Hostname not specified."
 msgstr "Vertsnavn ikkje spesifisert."
 
 #. command-line error report
-#: src/include/dhcp-server/commandline.rb:337
+#: src/include/dhcp-server/commandline.rb:331
 #, fuzzy
 msgid "Specified host does not exist."
 msgstr "Han spesifiserte vertsmaskinen finst ikkje."
 
 #. to be eventually pasted to "Selected interfaces: %1"
 #. to be eventually pasted to "Other interfaces: %1"
-#: src/include/dhcp-server/commandline.rb:398
-#: src/include/dhcp-server/commandline.rb:402
+#: src/include/dhcp-server/commandline.rb:392
+#: src/include/dhcp-server/commandline.rb:396
 #, fuzzy
 msgid "None"
 msgstr "Ingen"
 
 #. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:406
+#: src/include/dhcp-server/commandline.rb:400
 #, fuzzy
 msgid "Selected Interfaces: %1"
 msgstr "Valde grensesnitt: %1"
 
 #. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:409
+#: src/include/dhcp-server/commandline.rb:403
 #, fuzzy
 msgid "Other Interfaces: %1"
 msgstr "Andre grensesnitt: %1"
 
 #. command-line error report
-#: src/include/dhcp-server/commandline.rb:417
+#: src/include/dhcp-server/commandline.rb:411
 #, fuzzy
 msgid "Specified interface does not exist."
 msgstr "Det spesifiserte grensesnittet finst ikkje."
 
 #. command-line error report
-#: src/include/dhcp-server/commandline.rb:426
+#: src/include/dhcp-server/commandline.rb:420
 #, fuzzy
 msgid "Operation with the interface not specified."
 msgstr "Operasjon med grensesnittet ikkje spesifisert."
 
 #. command-line error report
-#: src/include/dhcp-server/commandline.rb:452
+#: src/include/dhcp-server/commandline.rb:446
 #, fuzzy
 msgid "Option key must be set."
 msgstr "Ein alternativnøkkel må spesifiserast."
 
 #. command-line error report
-#: src/include/dhcp-server/commandline.rb:457
+#: src/include/dhcp-server/commandline.rb:451
 #, fuzzy
 msgid "Value must be set."
 msgstr "Eit verd må spesifiserast."
 
 #. command-line output text, %1  and %1 are IP addresses
-#: src/include/dhcp-server/commandline.rb:501
+#: src/include/dhcp-server/commandline.rb:495
 #, fuzzy
 msgid "Address Range: %1-%2"
 msgstr "Adresseområde: %1-%2"
 
 #. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:510
+#: src/include/dhcp-server/commandline.rb:504
 #, fuzzy
 msgid "Default Lease Time: %1"
 msgstr "Standard tildelingstid: %1"
 
 #. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:518
+#: src/include/dhcp-server/commandline.rb:512
 #, fuzzy
 msgid "Maximum Lease Time: %1"
 msgstr "Maksimal tildelingstid: %1"
 
 #. yes-no popup
-#: src/include/dhcp-server/dialogs.rb:52
+#: src/include/dhcp-server/dialogs.rb:57
 #, fuzzy
 msgid "Saving the configuration failed. Change the settings?"
 msgstr "Konfigurasjonen kunne ikkje lagrast. Vil du endra innstillingane?"
 
+#. Restart only if it's already running
+#: src/include/dhcp-server/dialogs.rb:76
+#, fuzzy
+msgid "Saving the configuration failed"
+msgstr "Konfigurasjonen kunne ikkje lagrast. Vil du endra innstillingane?"
+
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:84
+#: src/include/dhcp-server/dialogs.rb:118
 #, fuzzy
 msgid "DHCP Server Configuration"
 msgstr "Konfigurasjon av DHCP-servar"
@@ -297,108 +301,108 @@
 #. dialog caption
 #. Initialize the widget
 #. @param [String] id any widget id
-#: src/include/dhcp-server/dialogs.rb:116
-#: src/include/dhcp-server/widgets.rb:541
+#: src/include/dhcp-server/dialogs.rb:150
+#: src/include/dhcp-server/widgets.rb:477
 #, fuzzy
 msgid "Global Options"
 msgstr "Generelle alternativ"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:151
+#: src/include/dhcp-server/dialogs.rb:185
 #, fuzzy
 msgid "Subnet Configuration"
 msgstr "Subnettkonfigurasjon"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:185
+#: src/include/dhcp-server/dialogs.rb:219
 #, fuzzy
 msgid "Host with Fixed Address"
 msgstr "Vert med fast adresse"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:222
+#: src/include/dhcp-server/dialogs.rb:256
 #, fuzzy
 msgid "Shared Network"
 msgstr "Delt nettverk"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:256
+#: src/include/dhcp-server/dialogs.rb:290
 #, fuzzy
 msgid "Pool of Addresses"
 msgstr "Adresseutvalg"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:291
+#: src/include/dhcp-server/dialogs.rb:324
 #, fuzzy
 msgid "Group-Specific Options"
 msgstr "Gruppespesifikke alternativ"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:325
+#: src/include/dhcp-server/dialogs.rb:358
 #, fuzzy
 msgid "Class"
 msgstr "Klasse"
 
 #. radio button
-#: src/include/dhcp-server/dialogs.rb:374
+#: src/include/dhcp-server/dialogs.rb:406
 #, fuzzy
 msgid "&Subnet"
 msgstr "&Subnett"
 
 #. radio button
-#: src/include/dhcp-server/dialogs.rb:376
+#: src/include/dhcp-server/dialogs.rb:408
 #, fuzzy
 msgid "&Host"
 msgstr "&Vertsmaskin"
 
 #. radio button
-#: src/include/dhcp-server/dialogs.rb:378
+#: src/include/dhcp-server/dialogs.rb:410
 #, fuzzy
 msgid "Shared &Network"
 msgstr "Delt &nettverk"
 
 #. radio button
-#: src/include/dhcp-server/dialogs.rb:380
+#: src/include/dhcp-server/dialogs.rb:412
 #, fuzzy
 msgid "&Group"
 msgstr "&Gruppe"
 
 #. radio button
-#: src/include/dhcp-server/dialogs.rb:382
+#: src/include/dhcp-server/dialogs.rb:414
 #, fuzzy
 msgid "&Pool of Addresses"
 msgstr "&Adresseutvalg"
 
 #. radio button
-#: src/include/dhcp-server/dialogs.rb:384
+#: src/include/dhcp-server/dialogs.rb:416
 #, fuzzy
 msgid "&Class"
 msgstr "&Klasse"
 
 #. frame
-#: src/include/dhcp-server/dialogs.rb:399
+#: src/include/dhcp-server/dialogs.rb:431
 #, fuzzy
 msgid "Declaration Types"
 msgstr "Deklarasjonstyper"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:407
+#: src/include/dhcp-server/dialogs.rb:439
 #, fuzzy
 msgid "Declaration Type"
 msgstr "Deklarasjonstype"
 
 #. dialog caption
 #. dialog caption
-#: src/include/dhcp-server/dialogs.rb:453
-#: src/include/dhcp-server/dialogs.rb:493
+#: src/include/dhcp-server/dialogs.rb:485
+#: src/include/dhcp-server/dialogs.rb:525
 #, fuzzy
 msgid "Interface Configuration"
 msgstr "Grensesnittkonfigurasjon"
 
 #. dialog caption
 #. item of a menu button
-#: src/include/dhcp-server/dialogs.rb:522
-#: src/include/dhcp-server/widgets.rb:1118
+#: src/include/dhcp-server/dialogs.rb:554
+#: src/include/dhcp-server/widgets.rb:1106
 #, fuzzy
 msgid "TSIG Key Management"
 msgstr "Administrasjon av TSIG-nøkkel"
@@ -428,7 +432,7 @@
 msgstr "Sekunder"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:93
+#: src/include/dhcp-server/dialogs2.rb:94
 #, fuzzy
 msgid "DHCP Server: Start-Up"
 msgstr "DHCP-servar: Oppstart"
@@ -436,216 +440,168 @@
 #. dialog caption
 #. tree item
 #. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:95
-#: src/include/dhcp-server/dialogs2.rb:97
-#: src/include/dhcp-server/dialogs2.rb:181
+#: src/include/dhcp-server/dialogs2.rb:96
+#: src/include/dhcp-server/dialogs2.rb:98
+#: src/include/dhcp-server/dialogs2.rb:182
 #, fuzzy
 msgid "Start-Up"
 msgstr "Oppstart"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:115
+#: src/include/dhcp-server/dialogs2.rb:116
 #, fuzzy
 msgid "DHCP Server: Card Selection"
 msgstr "DHCP-servar: Val av kort"
 
 #. dialog caption
 #. tree item
-#: src/include/dhcp-server/dialogs2.rb:117
-#: src/include/dhcp-server/dialogs2.rb:119
+#: src/include/dhcp-server/dialogs2.rb:118
+#: src/include/dhcp-server/dialogs2.rb:120
 #, fuzzy
 msgid "Card Selection"
 msgstr "Val av kort"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:129
+#: src/include/dhcp-server/dialogs2.rb:130
 #, fuzzy
 msgid "DHCP Server: Global Settings"
 msgstr "DHCP-servar: Generelle innstillingar"
 
 #. dialog caption
 #. tree item
-#: src/include/dhcp-server/dialogs2.rb:133
-#: src/include/dhcp-server/dialogs2.rb:135
+#: src/include/dhcp-server/dialogs2.rb:134
+#: src/include/dhcp-server/dialogs2.rb:136
 #, fuzzy
 msgid "Global Settings"
 msgstr "Generelle innstillingar"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:141
+#: src/include/dhcp-server/dialogs2.rb:142
 #, fuzzy
 msgid "DHCP Server: Dynamic DHCP"
 msgstr "DHCP-servar: Dynamisk DHCP"
 
 #. dialog caption
 #. tree item
-#: src/include/dhcp-server/dialogs2.rb:143
-#: src/include/dhcp-server/dialogs2.rb:145
+#: src/include/dhcp-server/dialogs2.rb:144
+#: src/include/dhcp-server/dialogs2.rb:146
 #, fuzzy
 msgid "Dynamic DHCP"
 msgstr "Dynamisk DHCP"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:151
+#: src/include/dhcp-server/dialogs2.rb:152
 #, fuzzy
 msgid "DHCP Server: Host Management"
 msgstr "DHCP-servar: Vertsmaskinadministrasjon"
 
 #. tree item
-#: src/include/dhcp-server/dialogs2.rb:155
+#: src/include/dhcp-server/dialogs2.rb:156
 #, fuzzy
 msgid "Host Management"
 msgstr "Vertsmaskinadministrasjon"
 
 #. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:160
+#: src/include/dhcp-server/dialogs2.rb:161
 #, fuzzy
 msgid "DHCP Server: Expert Settings"
 msgstr "DHCP-servar: Avanserte innstillingar"
 
 #. tree item
-#: src/include/dhcp-server/dialogs2.rb:164
+#: src/include/dhcp-server/dialogs2.rb:165
 #, fuzzy
 msgid "Expert Settings"
 msgstr "Avanserte innstillingar"
 
 #. radio button
-#: src/include/dhcp-server/dialogs2.rb:205
+#: src/include/dhcp-server/dialogs2.rb:206
 #, fuzzy
 msgid "When &Booting"
 msgstr "Under &oppstart"
 
 #. radio button
-#: src/include/dhcp-server/dialogs2.rb:207
+#: src/include/dhcp-server/dialogs2.rb:208
 #, fuzzy
 msgid "&Manually"
 msgstr "&Manuelt"
 
 #. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:211
+#: src/include/dhcp-server/dialogs2.rb:212
 #, fuzzy
 msgid "When Booting"
 msgstr "Under oppstart"
 
 #. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:213
+#: src/include/dhcp-server/dialogs2.rb:214
 #, fuzzy
 msgid "Manually"
 msgstr "Manuelt"
 
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:221
+#: src/include/dhcp-server/dialogs2.rb:334
 #, fuzzy
-msgid "DHCP server is running"
-msgstr "DHCP-serveren køyrer"
-
-#. label - service status
-#: src/include/dhcp-server/dialogs2.rb:225
-#, fuzzy
-msgid "DHCP server is not running"
-msgstr "DHCP-serveren køyrer ikkje"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:229
-#, fuzzy
-msgid "&Start DHCP Server Now"
-msgstr "&Start DHCP-serveren no"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:233
-#, fuzzy
-msgid "S&top DHCP Server Now"
-msgstr "S&topp DHCP-serveren no"
-
-#. push button
-#: src/include/dhcp-server/dialogs2.rb:241
-#, fuzzy
-msgid "Save Settings and Restart DHCP Server &Now"
-msgstr "Lagre innstillingane og start DHCP-serveren på nytt &no"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:247
-#, fuzzy
-msgid "Start DHCP Server Now"
-msgstr "Start DHCP-serveren no"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:249
-#, fuzzy
-msgid "Stop DHCP Server Now"
-msgstr "Stopp DHCP-serveren no"
-
-#. part of help text - push button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:251
-#, fuzzy
-msgid "Save Settings and Restart DHCP Server Now"
-msgstr "Lagre innstillingane og start DHCP-serveren på nytt no"
-
-#: src/include/dhcp-server/dialogs2.rb:371
-#, fuzzy
 msgid "DHCP Server Start-up Arguments"
 msgstr "DHCP-servar: Oppstartsalternativer"
 
 #. Table - listing available network cards
-#: src/include/dhcp-server/dialogs2.rb:443
+#: src/include/dhcp-server/dialogs2.rb:404
 #, fuzzy
 msgid "Network Cards for DHCP Server"
 msgstr "Nettverkskort for DHCP-servar"
 
 #. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:449
+#: src/include/dhcp-server/dialogs2.rb:410
 #, fuzzy
 msgid "Selected"
 msgstr "Valde"
 
 #. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:451
+#: src/include/dhcp-server/dialogs2.rb:412
 #, fuzzy
 msgid "Interface Name"
 msgstr "Grensesnittnavn"
 
 #. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:453
+#: src/include/dhcp-server/dialogs2.rb:414
 #, fuzzy
 msgid "Device Name"
 msgstr "Enhetsnavn"
 
 #. TRANSLATORS: table header item
 #. Table header item - IP of the host
-#: src/include/dhcp-server/dialogs2.rb:455
-#: src/include/dhcp-server/dialogs2.rb:1650
+#: src/include/dhcp-server/dialogs2.rb:416
+#: src/include/dhcp-server/dialogs2.rb:1602
 #, fuzzy
 msgid "IP"
 msgstr "IP"
 
 #. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:462
+#: src/include/dhcp-server/dialogs2.rb:423
 #, fuzzy
 msgid "&Select"
 msgstr "&Vel"
 
 #. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:464
+#: src/include/dhcp-server/dialogs2.rb:425
 #, fuzzy
 msgid "&Deselect"
 msgstr "&Vel bort"
 
 #. TRANSLATORS: Table items; Informs that the IP is a DHCP Address
-#: src/include/dhcp-server/dialogs2.rb:533
+#: src/include/dhcp-server/dialogs2.rb:494
 #, fuzzy
 msgid "DHCP address"
 msgstr "DHCP-adresse"
 
 #. TRANSLATORS: popup error, DHCP Server needs to run on one or more interfaces,
 #. currently no one is selected
-#: src/include/dhcp-server/dialogs2.rb:608
+#: src/include/dhcp-server/dialogs2.rb:569
 #, fuzzy
 msgid "At least one network interface must be selected."
 msgstr "Minst eit nettverksgrensesnitt må veljast."
 
 #. TRANSLATORS: popup error, DHCP Server requires selected interface to have
 #. at least minimal configuration
-#: src/include/dhcp-server/dialogs2.rb:616
+#: src/include/dhcp-server/dialogs2.rb:577
 #, fuzzy
 msgid ""
 "One or more selected network interfaces is not configured (no assigned IP address \n"
@@ -657,70 +613,70 @@
 
 #. configuration will be saved in ldap?
 #. check box
-#: src/include/dhcp-server/dialogs2.rb:632
-#: src/include/dhcp-server/widgets.rb:1079
+#: src/include/dhcp-server/dialogs2.rb:593
+#: src/include/dhcp-server/widgets.rb:1058
 #, fuzzy
 msgid "&LDAP Support"
 msgstr "&LDAP-støytte"
 
 #. FATE #227, comments #5 and #17
-#: src/include/dhcp-server/dialogs2.rb:639
+#: src/include/dhcp-server/dialogs2.rb:600
 #, fuzzy
 msgid "DHCP Server &Name (optional)"
 msgstr "DHCP-servar&namn (valfritt)"
 
 #. Textentry with name of the domain
-#: src/include/dhcp-server/dialogs2.rb:652
+#: src/include/dhcp-server/dialogs2.rb:613
 #, fuzzy
 msgid "&Domain Name"
 msgstr "&Domenenavn"
 
 #. Textentry with IP address of primary name server
-#: src/include/dhcp-server/dialogs2.rb:654
+#: src/include/dhcp-server/dialogs2.rb:615
 #, fuzzy
 msgid "&Primary Name Server IP"
 msgstr "&Primær navneserver-IP"
 
 #. Textentry with IP address of secondary name server
-#: src/include/dhcp-server/dialogs2.rb:657
+#: src/include/dhcp-server/dialogs2.rb:618
 #, fuzzy
 msgid "&Secondary Name Server IP"
 msgstr "&Sekundær navneserver-IP"
 
 #. Textentry with IP address of default router
-#: src/include/dhcp-server/dialogs2.rb:660
+#: src/include/dhcp-server/dialogs2.rb:621
 #, fuzzy
 msgid "Default &Gateway (Router) "
 msgstr "Standard &systemport (ruter) "
 
 #. Textentry with IP address of time server
-#: src/include/dhcp-server/dialogs2.rb:665
+#: src/include/dhcp-server/dialogs2.rb:626
 #, fuzzy
 msgid "NTP &Time Server"
 msgstr "NTP-&tidsserver"
 
 #. Textentry with IP address of print server
-#: src/include/dhcp-server/dialogs2.rb:667
+#: src/include/dhcp-server/dialogs2.rb:628
 #, fuzzy
 msgid "&Print Server"
 msgstr "&Utskriftsserver"
 
 #. Textentry with IP address of WINS (Windows Internet Naming Service) server
-#: src/include/dhcp-server/dialogs2.rb:669
+#: src/include/dhcp-server/dialogs2.rb:630
 #, fuzzy
 msgid "&WINS Server"
 msgstr "&WINS-servar"
 
 #. Textentry with default lease time of IP address from dhcp server
-#: src/include/dhcp-server/dialogs2.rb:674
+#: src/include/dhcp-server/dialogs2.rb:635
 #, fuzzy
 msgid "Default &Lease Time"
 msgstr "Standard tilde&lingstid"
 
 #. Units for defaultleasetime
 #. Combobox - type of units for lease time
-#: src/include/dhcp-server/dialogs2.rb:683
-#: src/include/dhcp-server/dialogs2.rb:1139
+#: src/include/dhcp-server/dialogs2.rb:644
+#: src/include/dhcp-server/dialogs2.rb:1097
 #, fuzzy
 msgid "&Units"
 msgstr "&Einingar"
@@ -729,41 +685,41 @@
 #. error popup
 #. error popup
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1017
-#: src/include/dhcp-server/dialogs2.rb:1029
-#: src/include/dhcp-server/dialogs2.rb:1041
-#: src/include/dhcp-server/dialogs2.rb:1053
+#: src/include/dhcp-server/dialogs2.rb:975
+#: src/include/dhcp-server/dialogs2.rb:987
+#: src/include/dhcp-server/dialogs2.rb:999
+#: src/include/dhcp-server/dialogs2.rb:1011
 #, fuzzy
 msgid "The specified value is not a valid hostname or IP address."
 msgstr "Det spesifiserte verdet er ikkje eit gyldig vertsnavn eller IP-adresse."
 
 #. frame
-#: src/include/dhcp-server/dialogs2.rb:1067
+#: src/include/dhcp-server/dialogs2.rb:1025
 #, fuzzy
 msgid "Subnet Information"
 msgstr "Subnettkonfigurasjon"
 
 #. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1073
+#: src/include/dhcp-server/dialogs2.rb:1031
 #, fuzzy
 msgid "Current &Network"
 msgstr "Gjeldande &nettverk"
 
 #. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1078
+#: src/include/dhcp-server/dialogs2.rb:1036
 #, fuzzy
 msgid "Current Net&mask"
 msgstr "Maska til&gjeldande nettverk"
 
 #. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1083
+#: src/include/dhcp-server/dialogs2.rb:1041
 #, fuzzy
 msgid "Netmask Bi&ts"
 msgstr "Nettverksmaskebi&ts"
 
 #. text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1090
+#: src/include/dhcp-server/dialogs2.rb:1048
 #: src/include/dhcp-server/dns-server-dialogs.rb:81
 #, fuzzy
 msgid "Min&imum IP Address"
@@ -771,13 +727,13 @@
 
 #. text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1095
+#: src/include/dhcp-server/dialogs2.rb:1053
 #: src/include/dhcp-server/dns-server-dialogs.rb:83
 #, fuzzy
 msgid "Ma&ximum IP Address"
 msgstr "Hø&yeste IP-adresse"
 
-#: src/include/dhcp-server/dialogs2.rb:1103
+#: src/include/dhcp-server/dialogs2.rb:1061
 #, fuzzy
 msgid "IP Address Range"
 msgstr "IP-adresseområde"
@@ -786,10 +742,10 @@
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1109
+#: src/include/dhcp-server/dialogs2.rb:1067
 #: src/include/dhcp-server/dns-server-dialogs.rb:93
-#: src/include/dhcp-server/dns-server-management.rb:356
-#: src/include/dhcp-server/dns-server-management.rb:917
+#: src/include/dhcp-server/dns-server-management.rb:355
+#: src/include/dhcp-server/dns-server-management.rb:915
 #, fuzzy
 msgid "&First IP Address"
 msgstr "&Første IP-adresse"
@@ -798,71 +754,71 @@
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1114
+#: src/include/dhcp-server/dialogs2.rb:1072
 #: src/include/dhcp-server/dns-server-dialogs.rb:95
-#: src/include/dhcp-server/dns-server-management.rb:358
-#: src/include/dhcp-server/dns-server-management.rb:919
+#: src/include/dhcp-server/dns-server-management.rb:357
+#: src/include/dhcp-server/dns-server-management.rb:917
 #, fuzzy
 msgid "&Last IP Address"
 msgstr "&Siste IP-adresse"
 
 #. checkbox
-#: src/include/dhcp-server/dialogs2.rb:1118
-#: src/include/dhcp-server/options.rb:1094
+#: src/include/dhcp-server/dialogs2.rb:1076
+#: src/include/dhcp-server/options.rb:1093
 #, fuzzy
 msgid "Allow Dynamic &BOOTP"
 msgstr "Tillat dynamisk &BOOTP"
 
 #. frame label
-#: src/include/dhcp-server/dialogs2.rb:1124
+#: src/include/dhcp-server/dialogs2.rb:1082
 #, fuzzy
 msgid "Lease Time"
 msgstr "Tildelingstid"
 
 #. Textentry label - lease time for IPs in the range
-#: src/include/dhcp-server/dialogs2.rb:1130
+#: src/include/dhcp-server/dialogs2.rb:1088
 #, fuzzy
 msgid "&Default"
 msgstr "&Standard"
 
 #. TextEntryLabel - max. time for leasing of IPs from the range
-#: src/include/dhcp-server/dialogs2.rb:1148
+#: src/include/dhcp-server/dialogs2.rb:1106
 #, fuzzy
 msgid "&Maximum"
 msgstr "&Maks. tildelingstid"
 
 #. Combobox - type of units for max lease time
-#: src/include/dhcp-server/dialogs2.rb:1158
+#: src/include/dhcp-server/dialogs2.rb:1116
 #, fuzzy
 msgid "Uni&ts"
 msgstr "Enhe&ter"
 
 #. zone is not maintained by the DNS server
 #. zone is maintained and it is a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1360
-#: src/include/dhcp-server/dialogs2.rb:1369
+#: src/include/dhcp-server/dialogs2.rb:1318
+#: src/include/dhcp-server/dialogs2.rb:1327
 #, fuzzy
 msgid "Create New DNS Zone from Scratch"
 msgstr "Opprett ny DNS-sone"
 
-#: src/include/dhcp-server/dialogs2.rb:1371
+#: src/include/dhcp-server/dialogs2.rb:1329
 #, fuzzy
 msgid "Edit Current DNS Zone"
 msgstr "Rediger Gjeldande DNS-sone"
 
 #. zone is maintained but it is not a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1377
+#: src/include/dhcp-server/dialogs2.rb:1335
 #, fuzzy
 msgid "Get Current Zone Information"
 msgstr "Hent informasjon om gjeldande sone"
 
-#: src/include/dhcp-server/dialogs2.rb:1385
+#: src/include/dhcp-server/dialogs2.rb:1343
 #, fuzzy
 msgid "&Synchronize DNS Server..."
 msgstr "&Synkroniser DNS-servar …"
 
 #. Show DNS Zone Information
-#: src/include/dhcp-server/dialogs2.rb:1414
+#: src/include/dhcp-server/dialogs2.rb:1372
 #, fuzzy
 msgid ""
 "DNS zone %1 is not a master zone.\n"
@@ -873,8 +829,8 @@
 
 #. A popup error text
 #. A popup error text
-#: src/include/dhcp-server/dialogs2.rb:1547
-#: src/include/dhcp-server/dialogs2.rb:1555
+#: src/include/dhcp-server/dialogs2.rb:1499
+#: src/include/dhcp-server/dialogs2.rb:1507
 #, fuzzy
 msgid "Enter values for both ends of the IP address range."
 msgstr "Angje start- og sluttverdier for IP-adresseområdet."
@@ -883,8 +839,8 @@
 #. %1 is the tested IP which should match network %2 and netmask %3
 #. TRANSLATORS: popup error message
 #. %1 is the tested IP which should match network %2 and netmask %3
-#: src/include/dhcp-server/dialogs2.rb:1594
-#: src/include/dhcp-server/dialogs2.rb:1617
+#: src/include/dhcp-server/dialogs2.rb:1546
+#: src/include/dhcp-server/dialogs2.rb:1569
 #, fuzzy
 msgid ""
 "The dynamic DHCP address range must be in the same network as the DHCP server.\n"
@@ -894,149 +850,149 @@
 "IP '%1' samsvarer ikkje med nettverket %2/%3."
 
 #. Label of the registered hosts table
-#: src/include/dhcp-server/dialogs2.rb:1642
+#: src/include/dhcp-server/dialogs2.rb:1594
 #, fuzzy
 msgid "Registered Host"
 msgstr "Registrert vertsmaskin"
 
 #. Table header item - Name of the host
-#: src/include/dhcp-server/dialogs2.rb:1648
+#: src/include/dhcp-server/dialogs2.rb:1600
 #, fuzzy
 msgid "Name"
 msgstr "Namn"
 
 #. MAC address of the host
-#: src/include/dhcp-server/dialogs2.rb:1652
+#: src/include/dhcp-server/dialogs2.rb:1604
 #, fuzzy
 msgid "Hardware Address"
 msgstr "Maskinvareadresse"
 
 #. Network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1654
+#: src/include/dhcp-server/dialogs2.rb:1606
 #, fuzzy
 msgid "Type"
 msgstr "Type"
 
 #. Frame label - configuration of particular host
-#: src/include/dhcp-server/dialogs2.rb:1661
+#: src/include/dhcp-server/dialogs2.rb:1613
 #, fuzzy
 msgid "List Setup"
 msgstr "Oppsettliste"
 
 #. Textentry label - name of the host
-#: src/include/dhcp-server/dialogs2.rb:1669
+#: src/include/dhcp-server/dialogs2.rb:1621
 #, fuzzy
 msgid "&Name"
 msgstr "&Namn"
 
 #. Textentry label - IP address of the host
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1674
-#: src/include/dhcp-server/dns-server-management.rb:229
+#: src/include/dhcp-server/dialogs2.rb:1626
+#: src/include/dhcp-server/dns-server-management.rb:228
 #, fuzzy
 msgid "&IP Address"
 msgstr "&IP-Adresse"
 
 #. Textentry label - hardware (mac) address of the host
-#: src/include/dhcp-server/dialogs2.rb:1682
+#: src/include/dhcp-server/dialogs2.rb:1634
 #, fuzzy
 msgid "&Hardware Address"
 msgstr "&Maskinvareadresse"
 
 #. Radiobutton label - network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1689
+#: src/include/dhcp-server/dialogs2.rb:1641
 #, fuzzy
 msgid "&Ethernet"
 msgstr "&Ethernet"
 
-#: src/include/dhcp-server/dialogs2.rb:1691
+#: src/include/dhcp-server/dialogs2.rb:1643
 #, fuzzy
 msgid "&Token Ring"
 msgstr "&Tokenring"
 
 #. Pushbutton label - change host in list
-#: src/include/dhcp-server/dialogs2.rb:1706
+#: src/include/dhcp-server/dialogs2.rb:1658
 #, fuzzy
 msgid "C&hange in List"
 msgstr "E&ndre i liste"
 
 #. Pushbutton label - delete host from list
-#: src/include/dhcp-server/dialogs2.rb:1709
+#: src/include/dhcp-server/dialogs2.rb:1661
 #, fuzzy
 msgid "Dele&te from List"
 msgstr "Sleit&te frå liste"
 
 #. now, fill the dialog
 #. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1810
-#: src/include/dhcp-server/options.rb:1039
+#: src/include/dhcp-server/dialogs2.rb:1762
+#: src/include/dhcp-server/options.rb:1038
 #, fuzzy
 msgid "Ethernet"
 msgstr "Ethernet"
 
 #. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1811
-#: src/include/dhcp-server/options.rb:1041
+#: src/include/dhcp-server/dialogs2.rb:1763
+#: src/include/dhcp-server/options.rb:1040
 #, fuzzy
 msgid "Token Ring"
 msgstr "Tokenring"
 
 #. error popup
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1885
-#: src/include/dhcp-server/options.rb:935
+#: src/include/dhcp-server/dialogs2.rb:1837
+#: src/include/dhcp-server/options.rb:934
 #, fuzzy
 msgid "The hardware address is invalid.\n"
 msgstr "Maskinvareadressen er ugyldig.\n"
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1931
+#: src/include/dhcp-server/dialogs2.rb:1883
 #, fuzzy
 msgid "The hardware address must be unique."
 msgstr "Maskinvareadressen må vera unik."
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1941
+#: src/include/dhcp-server/dialogs2.rb:1893
 #, fuzzy
 msgid "The hostname cannot be empty."
 msgstr "Du må angje eit vertsnavn."
 
 #. error popup, %1 is host name
-#: src/include/dhcp-server/dialogs2.rb:1951
+#: src/include/dhcp-server/dialogs2.rb:1903
 #, fuzzy
 msgid "A host named %1 already exists."
 msgstr "Ein vertsmaskin med namnet %1 finst allereie."
 
 #. error popup
 #. FIXME: text?
-#: src/include/dhcp-server/dialogs2.rb:1969
-#: src/include/dhcp-server/dialogs2.rb:2033
+#: src/include/dhcp-server/dialogs2.rb:1921
+#: src/include/dhcp-server/dialogs2.rb:1985
 #, fuzzy
 msgid "Enter a host IP."
 msgstr "Angje IP for vertsmaskin."
 
 #. error popup
-#: src/include/dhcp-server/dialogs2.rb:1984
+#: src/include/dhcp-server/dialogs2.rb:1936
 #, fuzzy
 msgid "The hardware address must be defined."
 msgstr "Maskinvareadressen må spesifiserast."
 
 #. error popup
 #. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2005
-#: src/include/dhcp-server/dialogs2.rb:2020
+#: src/include/dhcp-server/dialogs2.rb:1957
+#: src/include/dhcp-server/dialogs2.rb:1972
 #, fuzzy
 msgid "Select a host first."
 msgstr "Vel ein vertsmaskin først."
 
 #. checking new MAC
-#: src/include/dhcp-server/dialogs2.rb:2047
+#: src/include/dhcp-server/dialogs2.rb:1999
 #, fuzzy
 msgid "The input value must be defined."
 msgstr "Verdet må spesifiserast."
 
 #. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2086
+#: src/include/dhcp-server/dialogs2.rb:2038
 #, fuzzy
 msgid ""
 "If you enter the expert settings, you cannot return \n"
@@ -1057,17 +1013,17 @@
 "Vil du halda fram?"
 
 #. remove leading '-'
-#: src/include/dhcp-server/dialogs2.rb:2133
+#: src/include/dhcp-server/dialogs2.rb:2085
 #, fuzzy
 msgid "\"-%1\" is not a valid DHCP server commandline option"
 msgstr "\"-%1\" er ikkje eit gyldig kommandolinjevalg for DHCP-serveren"
 
-#: src/include/dhcp-server/dialogs2.rb:2144
+#: src/include/dhcp-server/dialogs2.rb:2096
 #, fuzzy
 msgid "DHCP server commandline option \"-%1\" requires an argument"
 msgstr "Kommandolinjevalget \"-%1\" for DHCP-serveren krev eit argument"
 
-#: src/include/dhcp-server/dialogs2.rb:2155
+#: src/include/dhcp-server/dialogs2.rb:2107
 #, fuzzy
 msgid ""
 "You have specified an alternate configuration file for the DHCP server.\n"
@@ -1087,7 +1043,7 @@
 "Vil du halda likevel fram?\n"
 
 #. dialog caption, %1 is step number
-#: src/include/dhcp-server/dialogs2.rb:2236
+#: src/include/dhcp-server/dialogs2.rb:2179
 #, fuzzy
 msgid "DHCP Server Wizard (%1 of 4)"
 msgstr "Veiviser for DHCP-servar (%1 av 4)"
@@ -1099,8 +1055,7 @@
 #: src/include/dhcp-server/dns-helps.rb:18
 #, fuzzy
 msgid ""
-"<p><b><big>Adding a New Range of DNS Records</big></b><br />"
-"\n"
+"<p><b><big>Adding a New Range of DNS Records</big></b><br />\n"
 "<b>First IP Address</b> defines\n"
 "the starting address of the range and <b>Last IP Address</b> defines\n"
 "the last one. <b>Hostname Base</b> is a string that determines how hostnames\n"
@@ -1109,11 +1064,9 @@
 "If no <tt>%i</tt> is defined, the number is added at the end of the\n"
 "string. <tt>%i</tt> can be used only once in <b>Hostname Base</b>.\n"
 "<b>Start</b> defines the first number that is used for the first\n"
-"hostname. Hostnames are created incrementally.</p>"
-"\n"
+"hostname. Hostnames are created incrementally.</p>\n"
 msgstr ""
-"<p><big><b>Leggja til eit nytt område for DNS-oppføringer</b></big><br />"
-"\n"
+"<p><big><b>Leggja til eit nytt område for DNS-oppføringer</b></big><br />\n"
 "<b>Første IP-adresse</b> angjev\n"
 "startadressen for området. <b>Siste IP-adresse</b> angjev\n"
 "den siste. <b>Vertsnavnbase</b> er ein streng som definerer korleis vertsnavn\n"
@@ -1122,98 +1075,79 @@
 "Viss ingen <tt>%i</tt> er definert, vil verdet leggjast til på slutten av\n"
 "strengen. <tt>%i</tt> kan berre nyttast éin gong i <b>Vertsnavnbase</b>.\n"
 "<b>Start</b> angjev det første verdet som vert for brukt første\n"
-"vertsnavn. Vertsnavn vert oppretta inkrementelt.</p>"
-"\n"
+"vertsnavn. Vertsnavn vert oppretta inkrementelt.</p>\n"
 
 #. TRANSLATORS: DNS Wizard - step 1 (part 1)
 #: src/include/dhcp-server/dns-helps.rb:33
 #, fuzzy
 msgid ""
-"<p><b><big>DNS Wizard</big></b><br />"
-"\n"
+"<p><b><big>DNS Wizard</big></b><br />\n"
 "In this wizard, create a new DNS zone\n"
 "directly from the DHCP server configuration. This DNS zone is important\n"
 "if you want to identify your DHCP clients by hostname. The DNS zone\n"
 "translates names to the assigned IP addresses. You can also\n"
-"create a reverse zone that translates IP addresses to names.</p>"
-"\n"
+"create a reverse zone that translates IP addresses to names.</p>\n"
 msgstr ""
-"<p><big><b>DNS-veiviser</b></big><br />"
-"\n"
+"<p><big><b>DNS-veiviser</b></big><br />\n"
 "Med denne veiviseren kan du enkelt oppretta ein ny DNS-sone\n"
 "direkte frå DHCP-serverkonfigurasjonen. Denne DNS-sona er viktig\n"
 "viss du òg vil identifisera DHCP-klientane med vertsnavn. DNS-sona\n"
 "omset namn til IP-adresser som er tilordnet til dei. Du kan òg\n"
-"oppretta ein baklengssone, som omset IP-adresser til namn.</p>"
-"\n"
+"oppretta ein baklengssone, som omset IP-adresser til namn.</p>\n"
 
 #. TRANSLATORS: DNS Wizard - step 1 (part 2)
 #: src/include/dhcp-server/dns-helps.rb:42
 #, fuzzy
 msgid ""
 "<p><b>New Zone Name</b> or <b>Reverse Zone Name</b>\n"
-"are taken from your current DHCP server and network settings and cannot be changed.</p>"
-"\n"
+"are taken from your current DHCP server and network settings and cannot be changed.</p>\n"
 msgstr ""
 "<p><b>Namn på ny sone</b> eller <b>Namn på baklengssone</b>\n"
-"verta frå henta gjeldande DHCP-servar og nettverksinnstillinger, og kan difor ikkje endrast.</p>"
-"\n"
+"verta frå henta gjeldande DHCP-servar og nettverksinnstillinger, og kan difor ikkje endrast.</p>\n"
 
 #. TRANSLATORS: DNS Wizard - step 1 (part 3)
 #: src/include/dhcp-server/dns-helps.rb:46
 #, fuzzy
 msgid ""
 "<p>Select <b>Also Create Reverse Zone</b> to create a zone \n"
-"to contain reverse entries of the main DNS zone.</p>"
-"\n"
+"to contain reverse entries of the main DNS zone.</p>\n"
 msgstr ""
 "<p>Kryss av for <b>Opprett òg baklengssone</b> viss du vil\n"
-"oppretta ei sone som inneheld reverserte oppføringer i tilhøve til hoved-DNS-sona.</p>"
-"\n"
+"oppretta ei sone som inneheld reverserte oppføringer i tilhøve til hoved-DNS-sona.</p>\n"
 
 #. TRANSLATORS: DNS Wizard - step 2 (part 1)
 #: src/include/dhcp-server/dns-helps.rb:50
 #, fuzzy
 msgid ""
-"<p><big><b>Name Servers</b></big><br />"
-"\n"
+"<p><big><b>Name Servers</b></big><br />\n"
 "Name servers are needed for proper DNS server functionality.\n"
-"They administer all the DNS zone records.</p>"
-"\n"
+"They administer all the DNS zone records.</p>\n"
 msgstr ""
-"<p><big><b>Navneservere</b></big><br />"
-"\n"
+"<p><big><b>Navneservere</b></big><br />\n"
 "Navneservere vert kravd for at DNS-serveren skal fungera riktig.\n"
-"Desse administrerer alle oppføringer i DNS-sona.</p>"
-"\n"
+"Desse administrerer alle oppføringer i DNS-sona.</p>\n"
 
 #. TRANSLATORS: DNS Wizard - step 2 (part 2)
 #: src/include/dhcp-server/dns-helps.rb:56
 #, fuzzy
 msgid ""
-"<p><b><big>DNS Queries</big></b><br />"
-"\n"
+"<p><b><big>DNS Queries</big></b><br />\n"
 "Every DNS query (for example searching an IP address for a\n"
 "hostname in a DNS zone) first asks the parent zone\n"
 "(<tt>com</tt> for <tt>example.com</tt>) for the current zone\n"
 "name servers. Then it sends a DNS query to these name servers requesting\n"
-"the desired IP address.<br />"
-"\n"
+"the desired IP address.<br />\n"
 "Therefore, always specify the current DNS server hostname as one of\n"
-"the zone name servers.</p>"
-"\n"
+"the zone name servers.</p>\n"
 msgstr ""
-"<p><big><b>DNS-førespurnader</b></big><br />"
-"\n"
+"<p><big><b>DNS-førespurnader</b></big><br />\n"
 "Alle DNS-førespurnader som t.d. må finna ein IP-adresse for eit\n"
 "vertsnavn i ein DNS-sone, søkjer først i den overordna sona\n"
 "(<tt>com</tt> til dømes.com <tt></tt>) over\n"
 "navneservere for gjeldande sone, og sender deretter ein DNS-førespurnad til desse navneserverne for å få\n"
-"eit svar med den aktuelle IP-adressa.<br />"
-"\n"
+"eit svar med den aktuelle IP-adressa.<br />\n"
 "Difor må du bruka vertsnavnet til gjeldande DNS-servar som ein av\n"
-"sonenavneserverne.</p>"
-"\n"
+"sonenavneserverne.</p>\n"
 
 #. TRANSLATORS: DNS Wizard - step 2 (part 3)
 #: src/include/dhcp-server/dns-helps.rb:67
@@ -1222,14 +1156,12 @@
 "<p>To add a <b>New Name Server</b>, click <b>Add</b>, complete the form,\n"
 "then click <b>Ok</b>. If the new name server name is included in the current\n"
 "DNS zone, also enter its IP address. This is mandatory because it is used\n"
-"during the zone creation.</p>"
-"\n"
+"during the zone creation.</p>\n"
 msgstr ""
 "<p>For å leggja til ein <b>Ny navneserver</b>, klikk <b>Legg til</b>, fyll ut skjemaet\n"
 "og klikk deretter <b>OK</b>. Viss det nye navneservernavnet vert omfatta av gjeldande\n"
 "DNS-sone, må IP-adressa verta òg angjeven. Dette er obligatorisk fordi informasjonen vil brukast\n"
-"når sona vert oppretta.</p>"
-"\n"
+"når sona vert oppretta.</p>\n"
 
 #. TRANSLATORS: DNS Wizard - step 2 (part 4)
 #. TRANSLATORS: DNS Wizard - step 3 (part 5)
@@ -1238,74 +1170,60 @@
 #, fuzzy
 msgid ""
 "<p>To edit or delete an entry, select it and click\n"
-"<b>Edit</b> or <b>Delete</b>.</p>"
-"\n"
+"<b>Edit</b> or <b>Delete</b>.</p>\n"
 msgstr ""
 "<p>For å redigera eller slette ein oppføring, vel henne og klikk\n"
-"på <b>Rediger</b>- eller <b>Slett</b>-knappen.</p>"
-"\n"
+"på <b>Rediger</b>- eller <b>Slett</b>-knappen.</p>\n"
 
 #. TRANSLATORS: DNS Wizard - step 3 (part 1)
 #: src/include/dhcp-server/dns-helps.rb:80
 #, fuzzy
 msgid ""
-"<p><b><big>DNS Records</big></b><br />"
-"\n"
+"<p><b><big>DNS Records</big></b><br />\n"
 "Define DNS hostnames for all DHCP clients. You do not need to define\n"
 "all hostnames one by one. Set simple rules for how\n"
 "the hostnames are created. These rules define the ranges of IP addresses to use\n"
-"and the string from which hostnames are generated for a range.</p>"
-"\n"
+"and the string from which hostnames are generated for a range.</p>\n"
 msgstr ""
-"<p><big><b>DNS-oppføringer</b></big><br />"
-"\n"
+"<p><big><b>DNS-oppføringer</b></big><br />\n"
 "Her definerer du DNS-vertsnavn for alle DHCP-klientar. Du treng ikkje å definera\n"
 "alle vertsnavn kvar for seg. Du kan definera éin eller fleire enkle regler om korleis\n"
 "vertsnavn skal opprettast. Desse reglene angjev område for IP-adresser som skal brukast\n"
-"og ein streng som skal brukast for å generera vertsnavn for eit område.</p>"
-"\n"
+"og ein streng som skal brukast for å generera vertsnavn for eit område.</p>\n"
 
 #. TRANSLATORS: DNS Wizard - step 3 (part 2)
 #: src/include/dhcp-server/dns-helps.rb:88
 #, fuzzy
 msgid ""
-"<p><b><big>Range of DNS Records</big></b><br />"
-"\n"
+"<p><b><big>Range of DNS Records</big></b><br />\n"
 "For example, create a set of hostnames from <tt>dhcp-133-a</tt>\n"
 "to <tt>dhcp-233-a</tt> with IP addresses from <tt>192.168.5.88</tt>\n"
-"to <tt>192.168.5.188</tt>.</p>"
-"\n"
+"to <tt>192.168.5.188</tt>.</p>\n"
 msgstr ""
-"<p><big><b>Område for DNS-oppføringer</b></big><br />"
-"\n"
+"<p><big><b>Område for DNS-oppføringer</b></big><br />\n"
 "Du kan til dømes oppretta eit sett vertsnavn frå <tt>dhcp-133-a</tt>\n"
 "til <tt>dhcp-233-a</tt> med IP-adresser frå <tt>192.168.5.88</tt>\n"
-"til <tt>192.168.5.188</tt>.</p>"
-"\n"
+"til <tt>192.168.5.188</tt>.</p>\n"
 
 #. TRANSLATORS: DNS Wizard - step 3 (part 3)
 #: src/include/dhcp-server/dns-helps.rb:95
 #, fuzzy
 msgid ""
 "<p>To add a new range of DNS records, click <b>Add</b>,\n"
-"complete the form, then click <b>Ok</b>.</p>"
-"\n"
+"complete the form, then click <b>Ok</b>.</p>\n"
 msgstr ""
 "<p>For å leggja til eit nytt område for DNS-oppføringer, klikk <b>Legg til</b>,\n"
-"fyll ut skjemaet og klikk <b>OK</b>.</p>"
-"\n"
+"fyll ut skjemaet og klikk <b>OK</b>.</p>\n"
 
 #. TRANSLATORS: DNS Wizard - summary (part 1)
 #: src/include/dhcp-server/dns-helps.rb:107
 #, fuzzy
 msgid ""
 "<p>This is a summary of all data\n"
-"entered in the configuration wizard so far.</p>"
-"\n"
+"entered in the configuration wizard so far.</p>\n"
 msgstr ""
 "<p>Her finn du eit oversyn over alt\n"
-"du har lagt inn i konfigurasjonsveiviseren.</p>"
-"\n"
+"du har lagt inn i konfigurasjonsveiviseren.</p>\n"
 
 #. TRANSLATORS: DNS Wizard - summary (part 2)
 #: src/include/dhcp-server/dns-helps.rb:111
@@ -1314,32 +1232,26 @@
 "<p>Click <b>Accept</b> to save the settings for\n"
 "the DNS server and return to the DHCP server configuration.\n"
 "The settings are not saved permanently until you complete the \n"
-"DHCP server configuration.</p>"
-"\n"
+"DHCP server configuration.</p>\n"
 msgstr ""
 "<p>Klikk <b>Godta</b> for å lager innstillingane for\n"
 "DNS-serveren og gå tilbake til DHCP-serverkonfigurasjonen.\n"
 "Innstillingane vert ikkje lagra permanent før du fullfører \n"
-"DHCP-serverkonfigurasjonen.</p>"
-"\n"
+"DHCP-serverkonfigurasjonen.</p>\n"
 
 #. TRANSLATORS: DNS for Experts (editing current settings) (part 1)
 #: src/include/dhcp-server/dns-helps.rb:119
 #, fuzzy
 msgid ""
-"<p><b><big>DNS Synchronization</big></b><br />"
-"\n"
+"<p><b><big>DNS Synchronization</big></b><br />\n"
 "This is an advanced tool for editing DNS server settings to match your\n"
 "DHCP settings. Only 'A' records--DNS records that convert hostnames to\n"
-"IP addresses--are maintained here.</p>"
-"\n"
+"IP addresses--are maintained here.</p>\n"
 msgstr ""
-"<p><big><b>DNS-synkronisering</b></big><br />"
-"\n"
+"<p><big><b>DNS-synkronisering</b></big><br />\n"
 "Dette er eit avansert verktøy for redigering av gjeldande DNS-serverinnstillinger slik at dei samsvarer med\n"
 "DHCP-innstillingane. Bara 'A'-oppføringer – DNS-oppføringer som omset vertsnavn til\n"
-"IP-adresser – kan verta her administrerte.</p>"
-"\n"
+"IP-adresser – kan verta her administrerte.</p>\n"
 
 #. TRANSLATORS: DNS for Experts (editing current settings) (part 2)
 #: src/include/dhcp-server/dns-helps.rb:126
@@ -1348,14 +1260,12 @@
 "<b>Current Subnet</b> and <b>Netmask</b> show the current network settings.\n"
 "<b>Domain</b> is taken from the current DHCP configuration.\n"
 "<b>First IP Address</b> and <b>Second IP Address</b> match the current\n"
-"Dynamic DHCP range.</p>"
-"\n"
+"Dynamic DHCP range.</p>\n"
 msgstr ""
 "<b>Gjeldande undernettverk</b> og <b>Nettverksmaske</b> viser gjeldande nettverksinnstillinger.\n"
 "<b>Domane</b> er henta frå gjeldande DHCP-konfigurasjon.\n"
 "<b>Første IP-adresse</b> og <b>Andre IP-adresse</b> tilsvarer gjeldande\n"
-"dynamiske DHCP-område.</p>"
-"\n"
+"dynamiske DHCP-område.</p>\n"
 
 #. TRANSLATORS: DNS for Experts (editing current settings) (part 3)
 #: src/include/dhcp-server/dns-helps.rb:133
@@ -1363,13 +1273,11 @@
 msgid ""
 "<p>\n"
 "To create a DNS zone from scratch, use <b>Run Wizard</b>\n"
-"from <b>Special Tasks</b>.</p>"
-"\n"
+"from <b>Special Tasks</b>.</p>\n"
 msgstr ""
 "<p>\n"
 "Viss du vil oppretta ein heilt ny DNS-sone, vel <b>Køyr veiviser</b>\n"
-"i menyen <b>Spesielle oppgåver</b>.</p>"
-"\n"
+"i menyen <b>Spesielle oppgåver</b>.</p>\n"
 
 #. TRANSLATORS: DNS for Experts (editing current settings) (part 4)
 #: src/include/dhcp-server/dns-helps.rb:139
@@ -1382,8 +1290,7 @@
 "reverse zone, select <b>Synchronize with Reverse Zone</b>.\n"
 "Use <b>Remove DNS Records Matching Range</b> \n"
 "from <b>Special Tasks</b> to delete any information relating to this range of IP addresses from the DNS server. To create a new range of DNS records, select\n"
-"<b>Add New Range of DNS Records</b> from <b>Special Tasks</b>.</p>"
-"\n"
+"<b>Add New Range of DNS Records</b> from <b>Special Tasks</b>.</p>\n"
 msgstr ""
 "<p>\n"
 " For å oppretta eller fjerne ein einskild DNS-oppføring,\n"
@@ -1392,8 +1299,7 @@
 "baklengssonen, vel <b>Synkroniser med baklengssone</b>.\n"
 "Vel <b>Fjern sansvarssone for DNS-oppføringer</b> \n"
 "under <b>Spesielle oppgåver</b> for å slette eventuell informasjon i samband med dette IP-adresseområdet frå DNS-serveren. For å oppretta eit nytt område fro DNS-oppføringer, vel\n"
-"<b>Legg til nytt område for DNS-oppføringer</b> under <b>Spesielle oppgåver</b>.</p>"
-"\n"
+"<b>Legg til nytt område for DNS-oppføringer</b> under <b>Spesielle oppgåver</b>.</p>\n"
 
 #. old_range: $[
 #. "base"  : "dhcp-%",
@@ -1451,7 +1357,7 @@
 #. TRANSLATORS: popup error
 #. TRANSLATORS: popup error
 #: src/include/dhcp-server/dns-server-dialogs.rb:228
-#: src/include/dhcp-server/dns-server-management.rb:455
+#: src/include/dhcp-server/dns-server-management.rb:454
 #, fuzzy
 msgid "The last IP address must be higher than the first one."
 msgstr "Den siste IP-adressa må vera høgare enn den første."
@@ -1481,7 +1387,7 @@
 #. TRANSLATORS: popup error, followed by a newline and a valid hostname description
 #. TRANSLATORS: popup error, followed by a newline and a valid hostname description
 #: src/include/dhcp-server/dns-server-dialogs.rb:453
-#: src/include/dhcp-server/dns-server-management.rb:256
+#: src/include/dhcp-server/dns-server-management.rb:255
 #, fuzzy
 msgid "Invalid hostname."
 msgstr "Ugyldig vertsnavn."
@@ -1493,9 +1399,9 @@
 #. TRANSLATORS: popup error, followed by a newline and a valid IPv4 description
 #: src/include/dhcp-server/dns-server-dialogs.rb:462
 #: src/include/dhcp-server/dns-server-dialogs.rb:490
-#: src/include/dhcp-server/dns-server-management.rb:265
-#: src/include/dhcp-server/dns-server-management.rb:394
-#: src/include/dhcp-server/dns-server-management.rb:402
+#: src/include/dhcp-server/dns-server-management.rb:264
+#: src/include/dhcp-server/dns-server-management.rb:393
+#: src/include/dhcp-server/dns-server-management.rb:401
 #, fuzzy
 msgid "Invalid IP address."
 msgstr "Ugyldig IP-adresse."
@@ -1515,20 +1421,20 @@
 "IP-adresser (%2-%3) som er definerte for DHCP-serveren.\n"
 
 #. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:157
+#: src/include/dhcp-server/dns-server-management.rb:156
 #, fuzzy
 msgid "Regenerating DNS zone entries..."
 msgstr "Genererer DNS-soneoppføringer på nytt …"
 
 #. TRANSLATORS: dialog frame label
-#: src/include/dhcp-server/dns-server-management.rb:224
+#: src/include/dhcp-server/dns-server-management.rb:223
 #, fuzzy
 msgid "Adding a New DNS Record"
 msgstr "Leggja til ny DNS-oppføring"
 
 #. TRANSLATORS: text entry
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:227
+#: src/include/dhcp-server/dns-server-management.rb:226
 #: src/include/dhcp-server/dns-server-wizard.rb:148
 #, fuzzy
 msgid "&Hostname"
@@ -1536,29 +1442,29 @@
 
 #. TRANSLATORS: busy message
 #. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:317
+#: src/include/dhcp-server/dns-server-management.rb:316
 #, fuzzy
 msgid "Adding DHCP range %1-%2 to the DNS server..."
 msgstr "Legger til DHCP-område %1-%2 for DNS-servar …"
 
 #. TRANSLATORS: dialog frame label
 #. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:353
-#: src/include/dhcp-server/dns-server-management.rb:955
+#: src/include/dhcp-server/dns-server-management.rb:352
+#: src/include/dhcp-server/dns-server-management.rb:953
 #, fuzzy
 msgid "Removing DNS Records Matching Range"
 msgstr "Fjerne samsvarsområde for DNS-oppføringer"
 
 #. TRANSLATORS: busy message
 #. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:465
+#: src/include/dhcp-server/dns-server-management.rb:464
 #, fuzzy
 msgid "Removing records in the range %1-%2 from the DNS server..."
 msgstr "Fjernar oppføringer i området %1-%2 frå DNS-servar …"
 
 #. TRANSLATORS: popup error, %1 is the zone name
 #. please, do not translate 'master' (exact DNS definition)
-#: src/include/dhcp-server/dns-server-management.rb:556
+#: src/include/dhcp-server/dns-server-management.rb:555
 #, fuzzy
 msgid ""
 "Zone %1 is not of the type master.\n"
@@ -1568,7 +1474,7 @@
 "DNS-serveren kan ikkje lagra oppføringer her.\n"
 
 #. TRANSLATORS: popup question, %1 is a DNS zone name
-#: src/include/dhcp-server/dns-server-management.rb:570
+#: src/include/dhcp-server/dns-server-management.rb:569
 #, fuzzy
 msgid ""
 "Zone %1 does not yet exist in the current DNS server configuration.\n"
@@ -1579,20 +1485,20 @@
 
 #. TRANSLATORS: popup error, %1 is a zone name
 #. TRANSLATORS: error message, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:590
+#: src/include/dhcp-server/dns-server-management.rb:589
 #: src/include/dhcp-server/dns-server-wizard.rb:1107
 #, fuzzy
 msgid "Cannot create zone %1."
 msgstr "Kan ikkje oppretta sona %1."
 
 #. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:815
+#: src/include/dhcp-server/dns-server-management.rb:813
 #, fuzzy
 msgid "Synchronizing DNS reverse records..."
 msgstr "Synkroniserer reverserte DNS-oppføringer …"
 
 #. TRANSLATORS: popup question - canceling dns synchronization with dhcp
-#: src/include/dhcp-server/dns-server-management.rb:860
+#: src/include/dhcp-server/dns-server-management.rb:858
 #, fuzzy
 msgid ""
 "If you cancel, all changes made to the DNS server will be lost.\n"
@@ -1602,73 +1508,73 @@
 "Vil du verkeleg avbryta denne handlinga?\n"
 
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:909
+#: src/include/dhcp-server/dns-server-management.rb:907
 #, fuzzy
 msgid "&Domain"
 msgstr "&Domane"
 
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:911
+#: src/include/dhcp-server/dns-server-management.rb:909
 #, fuzzy
 msgid "&Network"
 msgstr "&Nettverk"
 
 #. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:913
+#: src/include/dhcp-server/dns-server-management.rb:911
 #, fuzzy
 msgid "Net&mask"
 msgstr "Maska til&nettverk"
 
 #. TRANSLATORS: table label
-#: src/include/dhcp-server/dns-server-management.rb:923
+#: src/include/dhcp-server/dns-server-management.rb:921
 #, fuzzy
 msgid "DNS Zone Records"
 msgstr "DNS-soneoppføringer"
 
 #. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:928
+#: src/include/dhcp-server/dns-server-management.rb:926
 #, fuzzy
 msgid "Hostname"
 msgstr "Vertsnavn"
 
 #. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:930
+#: src/include/dhcp-server/dns-server-management.rb:928
 #, fuzzy
 msgid "Assigned IP"
 msgstr "Tilordnet IP"
 
 #. TRANSLATORS: push button
-#: src/include/dhcp-server/dns-server-management.rb:937
+#: src/include/dhcp-server/dns-server-management.rb:935
 #, fuzzy
 msgid "&Add..."
 msgstr "Le&gg til …"
 
 #. TRANSLATORS: menu button
-#: src/include/dhcp-server/dns-server-management.rb:945
+#: src/include/dhcp-server/dns-server-management.rb:943
 #, fuzzy
 msgid "&Special Tasks"
 msgstr "&Spesielle oppgåver"
 
 #. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:953
+#: src/include/dhcp-server/dns-server-management.rb:951
 #, fuzzy
 msgid "Add New Range of DNS Records"
 msgstr "Legg til nytt område for DNS-oppføringer"
 
 #. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:959
+#: src/include/dhcp-server/dns-server-management.rb:957
 #, fuzzy
 msgid "Run Wizard to Rewrite the DNS Zone from Scratch"
 msgstr "Køyr veiviseren for å oppretta DNS-sona på nytt"
 
 #. TRANSLATORS: checkbox, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:1031
+#: src/include/dhcp-server/dns-server-management.rb:1029
 #, fuzzy
 msgid "Synchronize with Reverse Zone %1"
 msgstr "Synkroniser med baklengssone %1"
 
 #. TRANSLATORS: dialog caption
-#: src/include/dhcp-server/dns-server-management.rb:1084
+#: src/include/dhcp-server/dns-server-management.rb:1082
 #, fuzzy
 msgid "DHCP Server: DNS Server Synchronization"
 msgstr "DHCP-servar: Synkronisering av DNS-servar"
@@ -1918,12 +1824,8 @@
 #. %4 is a number 'start' used incremental replacement for '%i'
 #: src/include/dhcp-server/dns-server-wizard.rb:912
 #, fuzzy
-msgid ""
-"Range: %1-%2<br />"
-"Hostname Base: %3, Starting With: %4"
-msgstr ""
-"Område: %1-%2<br />"
-"Vertsnavnbase: %3, startar med: %4"
+msgid "Range: %1-%2<br />Hostname Base: %3, Starting With: %4"
+msgstr "Område: %1-%2<br />Vertsnavnbase: %3, startar med: %4"
 
 #. TRANSLATORS: popup error
 #: src/include/dhcp-server/dns-server-wizard.rb:1011
@@ -1998,38 +1900,31 @@
 #: src/include/dhcp-server/helps.rb:16
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing DHCP Server Configuration</big></b><br>"
-"\n"
+"<p><b><big>Initializing DHCP Server Configuration</big></b><br>\n"
 "Please wait...</p>"
 msgstr ""
-"<p><b><big>Initialiserer konfigurasjon av DHCP-servar</big></b><br>"
-"\n"
+"<p><b><big>Initialiserer konfigurasjon av DHCP-servar</big></b><br>\n"
 "Vent…</p>"
 
 #. help text 1/1
 #: src/include/dhcp-server/helps.rb:20
 #, fuzzy
 msgid ""
-"<p><b><big>Saving DHCP Server Configuration</big></b><br>"
-"\n"
+"<p><b><big>Saving DHCP Server Configuration</big></b><br>\n"
 "Please wait...</p>"
 msgstr ""
-"<p><b><big>Lagrar konfigurasjon for DHCP-servar</big></b><br>"
-"\n"
+"<p><b><big>Lagrar konfigurasjon for DHCP-servar</big></b><br>\n"
 "Vent…</p>"
 
 #. help text 1/2
-#. help text 1/2
-#: src/include/dhcp-server/helps.rb:24 src/include/dhcp-server/helps.rb:233
+#: src/include/dhcp-server/helps.rb:24
 #, fuzzy
 msgid ""
-"<p><b><big>Network Interfaces</big></b><br>"
-"\n"
+"<p><b><big>Network Interfaces</big></b><br>\n"
 "Select the network interfaces to which the DHCP server should listen from\n"
 "<b>Available Interfaces</b>.</p>"
 msgstr ""
-"<p><b><big>Nettverksgrensesnitt</big></b><br>"
-"\n"
+"<p><b><big>Nettverksgrensesnitt</big></b><br>\n"
 "Vel nettverksgrensesnittene som DHCP-serveren skal lytta på\n"
 "<b>Tilgjengelege grensesnitt</b>.</p>"
 
@@ -2037,40 +1932,24 @@
 #: src/include/dhcp-server/helps.rb:30
 #, fuzzy
 msgid ""
-"<p><b><big>Firewall Settings</big></b><br>"
-"\n"
+"<p><b><big>Firewall Settings</big></b><br>\n"
 "To open the firewall to allow access to the service from \n"
 "remote computers through the selected interface, set\n"
 "<b>Open Firewall for Selected Interface</b>. \n"
 "This option is only available if the firewall\n"
 "is enabled.</p>"
 msgstr ""
-"<p><b><big>Brannmurinnstillinger</big></b><br>"
-"\n"
+"<p><b><big>Brannmurinnstillinger</big></b><br>\n"
 "Du kan opna brannmuren for å gje tilgjenge til tenesta frå eksterne maskiner\n"
 "via det valde grensesnittet ved å velja\n"
 "<b>Opne brannmur for valt grensesntt</b>.\n"
 "Dette alternativet er tilgjengeleg berre dersom brannmuren\n"
 "er aktivert.</p>"
 
-#. help text 1/5
+#. help text 2/5
 #: src/include/dhcp-server/helps.rb:39
 #, fuzzy
 msgid ""
-"<p><b><big>DHCP Server</big></b></p>"
-"\n"
-"<p>To run the DHCP server every time your computer is started, set\n"
-"<b>Start DHCP Server</b>.</p>"
-msgstr ""
-"<p><b><big>Start DHCP-servar</big></b><br>"
-"\n"
-"For å køyra DHCP-serveren kvar gong datamaskina startar opp, vel\n"
-"<b>Start DHCP-servar</b>.</p>"
-
-#. help text 2/5
-#: src/include/dhcp-server/helps.rb:45
-#, fuzzy
-msgid ""
 "<p>\n"
 "To run the DHCP server in chroot jail, set\n"
 "<b>Run DHCP Server in Chroot Jail</b>. Starting any daemon in a chroot jail\n"
@@ -2082,7 +1961,7 @@
 "aukar tryggleiken og rådast til sterkt.</p>"
 
 #. help text 3/5
-#: src/include/dhcp-server/helps.rb:52
+#: src/include/dhcp-server/helps.rb:46
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -2094,7 +1973,7 @@
 "aktivum <b>LDAP-støytte</b>.</p>"
 
 #. help text 4/5
-#: src/include/dhcp-server/helps.rb:58
+#: src/include/dhcp-server/helps.rb:52
 #, fuzzy
 msgid ""
 "<p><b>Configured Declarations</b> shows the configuration options in use.\n"
@@ -2110,111 +1989,97 @@
 "Vel ein deklarasjon og klikk <b>Slett</b> for å slette henne.</p>"
 
 #. help text 5/5
-#: src/include/dhcp-server/helps.rb:66
+#: src/include/dhcp-server/helps.rb:60
 #, fuzzy
 msgid ""
-"<p><b><big>Advanced Functions</big></b><br>"
-"\n"
+"<p><b><big>Advanced Functions</big></b><br>\n"
 "Use <b>Advanced</b> to display the log of the DHCP server,\n"
 "change network interfaces to which the DHCP server listens,\n"
 "or manage TSIG keys that can be used for authentication of \n"
 "dynamic DNS updates.</p>"
 msgstr ""
-"<p><b><big>Avanserte funksjonar</big></b><br>"
-"\n"
+"<p><b><big>Avanserte funksjonar</big></b><br>\n"
 "Bruk <b>Avansert</b> for å vise loggen for DHCP-serveren,\n"
 "endra nettverksgrensesnittene som DHCP-serveren lyttar på\n"
 "eller administrera TSIG-nøklar som kan brukast ved autentisering av \n"
 "dynamiske DNS-oppdateringar.</p>"
 
 #. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:74
+#: src/include/dhcp-server/helps.rb:68
 #, fuzzy
 msgid ""
-"<p><b><big>Subnet Configuration</big></b><br>"
-"\n"
+"<p><b><big>Subnet Configuration</big></b><br>\n"
 "Set the <b>Network Address</b> and <b>Network Mask</b> of the subnet.</p>"
 msgstr ""
-"<p><b><big>Nettverksadresse og nettverksmaske</big></b><br>"
-"\n"
+"<p><b><big>Nettverksadresse og nettverksmaske</big></b><br>\n"
 "Angje <b>Nettverksadresse</b> og <b>Nettverksmaske</b>.</p>"
 
 #. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:78
+#: src/include/dhcp-server/helps.rb:72
 #, fuzzy
 msgid ""
-"<p><b><big>Host with Fixed Address</big></b><br>"
-"\n"
+"<p><b><big>Host with Fixed Address</big></b><br>\n"
 "Set the name of the host for which to set the fixed address or other\n"
 "special options in <b>Hostname</b>.</p>"
 msgstr ""
-"<p><b><big>Vertsmaskin med fast adresse</big></b><br>"
-"\n"
+"<p><b><big>Vertsmaskin med fast adresse</big></b><br>\n"
 "Angje namnet på vertsmaskinen som skal tilordnes den faste adressa eller andre\n"
 "spesielle val.</p>"
 
 #. help text 1/3, alt. 3
-#: src/include/dhcp-server/helps.rb:84
+#: src/include/dhcp-server/helps.rb:78
 #, fuzzy
 msgid ""
-"<p><b><big>Group-Specific Options</big></b><br>"
-"\n"
+"<p><b><big>Group-Specific Options</big></b><br>\n"
 "Set the name of the group of declarations in <b>Group Name</b>.  \n"
 "It is just for your identification.\n"
 "The name does not affect behavior of the DHCP server.</p>"
 msgstr ""
-"<p><b><big>Gruppespesifikke val</big></b><br>"
-"\n"
+"<p><b><big>Gruppespesifikke val</big></b><br>\n"
 "Angje eit namn for deklarasjonsgruppen under <b>Gruppenavn</b>. \n"
 " Dette er berre for identifikasjonsformål.\n"
 "Namnet påverkar ikkje funksjonen til DHCP-serveren.</p>"
 
 #. help text 1/3, alt. 4
-#: src/include/dhcp-server/helps.rb:91
+#: src/include/dhcp-server/helps.rb:85
 #, fuzzy
 msgid ""
-"<p><b><big>Pool of Addresses</big></b><br>"
-"\n"
+"<p><b><big>Pool of Addresses</big></b><br>\n"
 "Set the name of the pool of addresses in <b>Pool Name</b>. \n"
 "It is just for your identification.\n"
 "The name does not affect behavior of the DHCP server.</p>"
 msgstr ""
-"<p><b><big>Adresseutvalg</big></b><br>"
-"\n"
+"<p><b><big>Adresseutvalg</big></b><br>\n"
 "Angje eit namn for adresseutvalget under <b>Namn på utval</b>. \n"
 ". Dette er berre for identifikasjonsformål.\n"
 "Namnet påverkar ikkje funksjonen til DHCP-serveren.</p>"
 
 #. help text 1/3, alt. 5
-#: src/include/dhcp-server/helps.rb:98
+#: src/include/dhcp-server/helps.rb:92
 #, fuzzy
 msgid ""
-"<p><b><big>Shared Network</big></b><br>"
-"\n"
+"<p><b><big>Shared Network</big></b><br>\n"
 "Set the name for the shared network in <b>Shared Network Name</b>. \n"
 "It is just for your identification.\n"
 "The name does not affect behavior of the DHCP server.</p>"
 msgstr ""
-"<p><b><big>Delt nettverk</big></b><br>"
-"\n"
+"<p><b><big>Delt nettverk</big></b><br>\n"
 "Vel eit namn for det delte nettverket under <b>Namn på delt nettverk</b>. \n"
 ". Dette er berre for identifikasjonsformål.\n"
 "Namnet påverkar ikkje funksjonen til DHCP-serveren.</p>"
 
 #. help text 1/3, alt. 6
-#: src/include/dhcp-server/helps.rb:105
+#: src/include/dhcp-server/helps.rb:99
 #, fuzzy
 msgid ""
-"<p><b><big>Class</big></b><br>"
-"\n"
+"<p><b><big>Class</big></b><br>\n"
 "Set the name of the class of hosts in <b>Class Name</b>.</p>"
 msgstr ""
-"<p><b><big>Klasse</big></b><br>"
-"\n"
+"<p><b><big>Klasse</big></b><br>\n"
 "Angje eit namn for vertsmaskinklassen under <b>Klassenavn</b>.</p>"
 
 #. help text 2/3
-#: src/include/dhcp-server/helps.rb:109
+#: src/include/dhcp-server/helps.rb:103
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -2230,7 +2095,7 @@
 "eit alternativ, vel alternativet og klikk <b>Slett</b>.</p>"
 
 #. help text 3/3
-#: src/include/dhcp-server/helps.rb:117
+#: src/include/dhcp-server/helps.rb:111
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -2240,101 +2105,87 @@
 "Bruk <b>Dynamisk DNS</b> for å justera dynamisk DNS for vertsmaskinene i subnettet.</p>"
 
 #. help text 1/4
-#: src/include/dhcp-server/helps.rb:121
+#: src/include/dhcp-server/helps.rb:115
 #, fuzzy
 msgid ""
-"<p><b><big>Enabling Dynamic DNS</big></b><br>"
-"\n"
+"<p><b><big>Enabling Dynamic DNS</big></b><br>\n"
 "To enable Dynamic DNS updates for this subnet, set\n"
 "<b>Enable Dynamic DNS for This Subnet</b>.</p>"
 msgstr ""
-"<p><b><big>Aktivering av dynamisk DNS</big></b><br>"
-"\n"
+"<p><b><big>Aktivering av dynamisk DNS</big></b><br>\n"
 "For å aktivare dynamiske DNS-oppdateringar for dette subnettet, vel\n"
 "<b>Aktivum dynamisk DNS for dette subnettet</b>.</p>"
 
 #. help text 2/4
-#: src/include/dhcp-server/helps.rb:127
+#: src/include/dhcp-server/helps.rb:121
 #, fuzzy
 msgid ""
-"<p><b><big>TSIG Key</big></b><br>"
-"\n"
+"<p><b><big>TSIG Key</big></b><br>\n"
 "To make Dynamic DNS updates, the authentication key must be set. Use\n"
 "<b>TSIG Key</b> to select the key to use for authentication. The key must\n"
 "be the same for both DHCP and DNS servers. Specify the key for both forward\n"
 "and reverse zone.</p>"
 msgstr ""
-"<p><b><big>TSIG-nøkkel</big></b><br>"
-"\n"
+"<p><b><big>TSIG-nøkkel</big></b><br>\n"
 "For å utføra dynamiske DNS-oppdateringar må autentiseringskoden definerast. Nytte\n"
 "<b>TSIG-nøkkel</b> for å velja koda som skal verta for brukt autentisering. Koda må\n"
 "vera identisk for DHCP- og DNS-serveren. Spesifiser koda for både framlengs\n"
 "og baklengs navnesone.</p>"
 
 #. help text 3/4
-#: src/include/dhcp-server/helps.rb:135
+#: src/include/dhcp-server/helps.rb:129
 #, fuzzy
 msgid ""
-"<p><b><big>Global DHCP Server Settings</big></b><br>"
-"\n"
+"<p><b><big>Global DHCP Server Settings</big></b><br>\n"
 "Global settings of DHCP server must be updated to make Dynamic\n"
 "DNS work properly. To do it automatically, set\n"
 "<b>Update Global Dynamic DNS Settings</b>.</p>"
 msgstr ""
-"<p><b><big>Generelle innstillingar for DHCP-servar</big></b><br>"
-"\n"
+"<p><b><big>Generelle innstillingar for DHCP-servar</big></b><br>\n"
 "Generelle innstillingar for DHCP-servar må oppdaterast for at dynamisk\n"
 "DNS skal fungera riktig. Du kan gjera dette automatisk med valet\n"
 "<b>Oppdater generelle innstillingar for dynamisk DNS</b>.</p>"
 
 #. help text 4/4
-#: src/include/dhcp-server/helps.rb:142
+#: src/include/dhcp-server/helps.rb:136
 #, fuzzy
 msgid ""
-"<p><b><big>Zones to Update</big></b><br>"
-"\n"
+"<p><b><big>Zones to Update</big></b><br>\n"
 "Specify forward and reverse zones to update. For both, also specify \n"
 "their primary name server. If the name server runs on the same host as the DHCP\n"
 "server, you can leave the fields empty.</p>"
 msgstr ""
-"<p><b><big>Sonar som skal oppdaterast</big></b><br>"
-"\n"
+"<p><b><big>Sonar som skal oppdaterast</big></b><br>\n"
 "Spesifiser framlengs- og baklengssonene som skal oppdaterast. Spesifiser òg\n"
 "den primære navneserveren for begge. Viss navneserveren køyrer på same vertsmaskin som DHCP-\n"
 "serveren, kan du la felta vera tomme.</p>"
 
 #. help text
-#: src/include/dhcp-server/helps.rb:149
+#: src/include/dhcp-server/helps.rb:143
 #, fuzzy
 msgid ""
-"<p><b><big>DHCP Server Start-Up Arguments</big></b><br>"
-"\n"
+"<p><b><big>DHCP Server Start-Up Arguments</big></b><br>\n"
 "Here you can specify parameters that you want DHCP Server to be started with \n"
 "(e.g. \"-p 1234\") for a non-standard port to listen on). For all possible options,\n"
 "consult dhcpd manual page. If left blank, default values will be used.</p>"
 msgstr ""
-"<p><b><big>Oppstartsargumenter for DHCP-servar</big></b><br>"
-"\n"
+"<p><b><big>Oppstartsargumenter for DHCP-servar</big></b><br>\n"
 "Her kan du definera parametrar som DHCP-serveren skal starta med \n"
 "(t.d. \"-p 1234\") for å laut på ein annan port ein standardporten). Du finn ei skildring av alle moglege val\n"
 "på manualsiden for dhcpd. Standardverdier vil brukast dersom ingen argument vert angjevne.</p>"
 
 #. Wizard Installation - Step 1 (version for expert UI)
-#: src/include/dhcp-server/helps.rb:156
+#: src/include/dhcp-server/helps.rb:150
 #, fuzzy
 msgid ""
-"<p><b><big>Network Card Selection</big></b><br>"
-"\n"
-"Select one or more of the listed network cards to use for the DHCP server.</p>"
-"\n"
+"<p><b><big>Network Card Selection</big></b><br>\n"
+"Select one or more of the listed network cards to use for the DHCP server.</p>\n"
 msgstr ""
-"<p><b><big>Val av nettverkskort</big></b><br>"
-"\n"
-"Vel eit eller fleire nettverkskort som skal verta for brukt DHCP-serveren.</p>"
-"\n"
+"<p><b><big>Val av nettverkskort</big></b><br>\n"
+"Vel eit eller fleire nettverkskort som skal verta for brukt DHCP-serveren.</p>\n"
 
 #. Optional field - used with LDAP support
-#: src/include/dhcp-server/helps.rb:160
+#: src/include/dhcp-server/helps.rb:154
 #, fuzzy
 msgid ""
 "Optionally, you can also specify <b>DHCP Server Name</b>\n"
@@ -2344,20 +2195,18 @@
 "(namnet på LDAP-objektet dhcpServer) dersom dette avvik frå vertsnavnet.\n"
 
 #. Wizard Installation - Step 2 1/9
-#: src/include/dhcp-server/helps.rb:164
+#: src/include/dhcp-server/helps.rb:158
 #, fuzzy
 msgid ""
-"<p><b><big>Global Settings</big></b><br>"
-"\n"
+"<p><b><big>Global Settings</big></b><br>\n"
 "Here, make several DHCP settings.</p>"
 msgstr ""
-"<p><b><big>Generelle innstillingar</big></b><br>"
-"\n"
+"<p><b><big>Generelle innstillingar</big></b><br>\n"
 "Her kan du definera fleire DHCP-innstillingar.</p>"
 
 #. Wizard Installation - Step 2 2/9
 #. Wizard Installation - Step 2 3/9 (2 is removed)
-#: src/include/dhcp-server/helps.rb:171
+#: src/include/dhcp-server/helps.rb:165
 #, fuzzy
 msgid ""
 "<p><b>Domain Name</b> sets the domain for which the DHCP server\n"
@@ -2367,7 +2216,7 @@
 "tildeler IP-adresser til klientane.</p>"
 
 #. Wizard Installation - Step 2 4/9
-#: src/include/dhcp-server/helps.rb:175
+#: src/include/dhcp-server/helps.rb:169
 #, fuzzy
 msgid ""
 "<p><b>Primary Name Server IP</b> and <b>Secondary Name Server IP</b> \n"
@@ -2379,7 +2228,7 @@
 "Desse verda må vera IP-adresser.</p>"
 
 #. Wizard Installation - Step 2 5/9
-#: src/include/dhcp-server/helps.rb:181
+#: src/include/dhcp-server/helps.rb:175
 #, fuzzy
 msgid ""
 "<p><b>Default Gateway</b> inserts this\n"
@@ -2389,7 +2238,7 @@
 "verdet som standardrute i klientane sine rutingtabell.</p>"
 
 #. Wizard Installation - Step 2 6/9
-#: src/include/dhcp-server/helps.rb:185
+#: src/include/dhcp-server/helps.rb:179
 #, fuzzy
 msgid ""
 "<p><b>Time Server</b> tells clients to use this server\n"
@@ -2397,13 +2246,13 @@
 msgstr "<p><b>Tidsserver</b> fortel klientane at dei skal bruka denne serveren til tidssynkronisering.</p>"
 
 #. Wizard Installation - Step 2 7/9
-#: src/include/dhcp-server/helps.rb:189
+#: src/include/dhcp-server/helps.rb:183
 #, fuzzy
 msgid "<p><b>Print Server</b> offers this server as the default print server.</p>"
 msgstr "<p><b>Utskriftsserver</b> definerer standard utskriftsserver.</p>"
 
 #. Wizard Installation - Step 2 8/9
-#: src/include/dhcp-server/helps.rb:193
+#: src/include/dhcp-server/helps.rb:187
 #, fuzzy
 msgid ""
 "<p><b>WINS Server</b> offers this server as the WINS server\n"
@@ -2413,7 +2262,7 @@
 "(Windows Internet Naming Service).</p>"
 
 #. Wizard Installation - Step 2 9/9
-#: src/include/dhcp-server/helps.rb:197
+#: src/include/dhcp-server/helps.rb:191
 #, fuzzy
 msgid ""
 "<p><b>Default Lease Time</b> sets the time after which the leased IP expires\n"
@@ -2423,63 +2272,51 @@
 "slik at klienten må be om ein ny IP-adresse.</p>"
 
 #. Wizard Installation - Step 3 1/4
-#: src/include/dhcp-server/helps.rb:201
+#: src/include/dhcp-server/helps.rb:195
 #, fuzzy
 msgid ""
-"<p><b><big>Subnet Information</big></b></br>"
-"\n"
+"<p><b><big>Subnet Information</big></b></br>\n"
 "View information about the current subnet, such as its address,\n"
 "netmask, minimum and maximum IP addresses available for the clients.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Subnettinformasjon</big></b></br>"
-"\n"
+"<p><b><big>Subnettinformasjon</big></b></br>\n"
 "Her kan du visa informasjon om valt undernettverk, som adresse\n"
 "og nettverksmaske og dessutan høgaste og lågaste IP-adresser som er tilgjengeleg for klientane.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Wizard Installation - Step 3 2/4
-#: src/include/dhcp-server/helps.rb:208
+#: src/include/dhcp-server/helps.rb:202
 #, fuzzy
 msgid ""
-"<p><b><big>IP Address Range</big></b><br>"
-"\n"
+"<p><b><big>IP Address Range</big></b><br>\n"
 "Set the <b>First IP Address</b> and the <b>Last IP Address</b>\n"
 "of the address range to be leased to clients. These addresses must have the same netmask.\n"
 "For instance, <tt>192.168.1.1</tt> and <tt>192.168.1.64</tt>. Check the <b>\n"
 "Allow Dynamic BOOTP</b> flag if the specified range may be dynamically\n"
-"assigned to BOOTP clients as well as DHCP clients</p>"
-".\n"
+"assigned to BOOTP clients as well as DHCP clients</p>.\n"
 msgstr ""
-"<p><b><big>IP-adresseområde</big></b><br>"
-"\n"
+"<p><b><big>IP-adresseområde</big></b><br>\n"
 "Her angjev du <b>Første IP-adresse</b> og <b>Siste IP-addresse</b>\n"
 "som klientane skal tildelast. Desse adressene må ha same nettverksmaske,\n"
 "til dømes <tt>192.168.1.1</tt> og <tt>192.168.1.64</tt>. Kryss av for\n"
 "<b>Tillat dynamisk BOOTP</b>for å tilordne adresser dynamisk til BOOTP-klientar \n"
-"og ordinære DHCP-klientar.</p>"
-"\n"
+"og ordinære DHCP-klientar.</p>\n"
 
 #. Wizard Installation - Step 3 3/4
-#: src/include/dhcp-server/helps.rb:217
+#: src/include/dhcp-server/helps.rb:211
 #, fuzzy
 msgid ""
-"<p><b><big>Lease Time</big></b><br>"
-"\n"
+"<p><b><big>Lease Time</big></b><br>\n"
 "Set the <b>Default</b> lease time for the current IP address range,\n"
-"which sets the optimal IP refreshing time for clients.<br>"
-"</p>"
+"which sets the optimal IP refreshing time for clients.<br></p>"
 msgstr ""
-"<p><b><big>Tildelingstid</big></b><br>"
-"\n"
+"<p><b><big>Tildelingstid</big></b><br>\n"
 "Her angjev du <b>Standard</b> tildelingstid for det gjeldande IP-adresseområdet.\n"
-"Dette definerer han optimale IP-oppdateringstiden for klientane.<br>"
-"</p>"
+"Dette definerer han optimale IP-oppdateringstiden for klientane.<br></p>"
 
 #. Wizard Installation - Step 3 4/4
-#: src/include/dhcp-server/helps.rb:223
+#: src/include/dhcp-server/helps.rb:217
 #, fuzzy
 msgid ""
 "<p><b>Maximum</b> (optional value) sets the maximum time period\n"
@@ -2489,63 +2326,57 @@
 "når denne IP-adressa er sperra på DHCP-serveren for klienten.</p>"
 
 #. Help text
-#: src/include/dhcp-server/helps.rb:227
+#: src/include/dhcp-server/helps.rb:221
 #, fuzzy
 msgid ""
-"<p><b><big>Expert Configuration</big></b><br>"
-"\n"
+"<p><b><big>Expert Configuration</big></b><br>\n"
 "To enter the complete configuration of the DHCP server, click\n"
 "<b>DHCP Server Expert Configuration</b>.</p>"
 msgstr ""
-"<p><b><big>Avansert konfigurasjon</big></b><br>"
-"\n"
+"<p><b><big>Avansert konfigurasjon</big></b><br>\n"
 "For å konfigurera DHCP-serveren manuelt, klikk\n"
 "<b>Avansert konfigurasjon av DHCP-servar</b>.</p>"
 
 #. host management help 1/3
-#: src/include/dhcp-server/helps.rb:239
+#: src/include/dhcp-server/helps.rb:227
 #, fuzzy
 msgid ""
-"<p><b><big>Host Management</big></b><br>"
-"\n"
+"<p><b><big>Host Management</big></b><br>\n"
 "Use this dialog to edit hosts with static address binding.</p>"
 msgstr ""
-"<p><b><big>Administrasjon av vertsmaskin</big></b><br>"
-"\n"
+"<p><b><big>Administrasjon av vertsmaskin</big></b><br>\n"
 "Bruk denne dialogen for å redigera vertsmaskiner med statisk adressebinding.</p>"
 
 #. host management help 1/3
-#: src/include/dhcp-server/helps.rb:243
+#: src/include/dhcp-server/helps.rb:231
 #, fuzzy
 msgid ""
 "<p>To add a new new host, set its <b>Name</b>,\n"
 "<b>Hardware Address</b>, and <b>IP Address</b>\n"
-"then click <b>Add</b>.</p>"
-"\n"
+"then click <b>Add</b>.</p>\n"
 "<p>To modify a configured host, select it in the table,\n"
 "change all values, and click <b>Change in List</b>.</p>"
 msgstr ""
 "<p>For å leggja til ein ny vertsmaskin, angje <b>Namn</b>,\n"
 "<b>Maskinvareadress</b> og <b>IP-adresse</b>.\n"
-"Klikk deretter <b>Legg til</b>.</p>"
-"\n"
+"Klikk deretter <b>Legg til</b>.</p>\n"
 "<p>For å endra ein konfigurert vertsmaskin, vel henne i tabellen,\n"
 "rediger alle verda og klikk <b>Endre i liste</b>.</p>"
 
 #. host management help 1/3
-#: src/include/dhcp-server/helps.rb:251
+#: src/include/dhcp-server/helps.rb:239
 #, fuzzy
 msgid "<p>To remove a host, select it and click <b>Delete from List</b>.</p>"
 msgstr "<p>For å fjerne ein vertsmaskin, vel henne og klikk <b>Slett frå liste</b>.</p>"
 
 #. help text 1/7
-#: src/include/dhcp-server/helps.rb:263
+#: src/include/dhcp-server/helps.rb:251
 #, fuzzy
 msgid "<p>Select the type of declaration to add.</p>"
 msgstr "<p>Vel deklarasjonstypen som skal verta til lagd.</p>"
 
 #. help text 2/7, optional
-#: src/include/dhcp-server/helps.rb:269
+#: src/include/dhcp-server/helps.rb:257
 #, fuzzy
 msgid ""
 "<p>To add a network declaration,\n"
@@ -2555,7 +2386,7 @@
 "vel <b>Subnett</b>.</p>"
 
 #. help text 3/7, optional
-#: src/include/dhcp-server/helps.rb:276
+#: src/include/dhcp-server/helps.rb:264
 #, fuzzy
 msgid ""
 "<p>To add a host that needs special parameters\n"
@@ -2565,7 +2396,7 @@
 "(vanlegvis ei fast adresse), vel <b>Vertsmaskin</b>.</p>"
 
 #. help text 4/7, optional
-#: src/include/dhcp-server/helps.rb:285
+#: src/include/dhcp-server/helps.rb:273
 #, fuzzy
 msgid ""
 "<p>To add a shared network (physical network with\n"
@@ -2575,7 +2406,7 @@
 "fleire logiske nettverk), vel <b>Delt nettverk</b>.</p>"
 
 #. help text 5/7, optional
-#: src/include/dhcp-server/helps.rb:294
+#: src/include/dhcp-server/helps.rb:282
 #, fuzzy
 msgid ""
 "<p>To add a group of other declarations (usually\n"
@@ -2585,7 +2416,7 @@
 "fordi dei deler nokre innstillingar, vel <b>Gruppe</b>.</p>"
 
 #. help text 6/7, optional
-#: src/include/dhcp-server/helps.rb:303
+#: src/include/dhcp-server/helps.rb:291
 #, fuzzy
 msgid ""
 "<p>To add a pool of addresses that will be treated\n"
@@ -2597,7 +2428,7 @@
 "subnett, vel <b>Adresseutvalg</b>.</p>"
 
 #. help text 7/7, optional
-#: src/include/dhcp-server/helps.rb:314
+#: src/include/dhcp-server/helps.rb:302
 #, fuzzy
 msgid ""
 "<p>To create a condition class that can be used for\n"
@@ -2611,25 +2442,25 @@
 #. selection box
 #. selection box
 #. selection box
-#: src/include/dhcp-server/options.rb:454
-#: src/include/dhcp-server/options.rb:475
-#: src/include/dhcp-server/options.rb:568
-#: src/include/dhcp-server/options.rb:781
-#: src/include/dhcp-server/options.rb:857
+#: src/include/dhcp-server/options.rb:453
+#: src/include/dhcp-server/options.rb:474
+#: src/include/dhcp-server/options.rb:567
+#: src/include/dhcp-server/options.rb:780
+#: src/include/dhcp-server/options.rb:856
 #, fuzzy
 msgid "A&ddresses"
 msgstr "A&dressar"
 
 #. popup message
-#: src/include/dhcp-server/options.rb:470
+#: src/include/dhcp-server/options.rb:469
 #, fuzzy
 msgid "The entered address is not valid."
 msgstr "Denne adressa er ikkje gyldig."
 
 #. message popup
 #. message popup
-#: src/include/dhcp-server/options.rb:490
-#: src/include/dhcp-server/options.rb:543
+#: src/include/dhcp-server/options.rb:489
+#: src/include/dhcp-server/options.rb:542
 #, fuzzy
 msgid "At least one address must be specified."
 msgstr "Minst éi adresse må spesifiserast."
@@ -2640,110 +2471,110 @@
 #. @param [String] key string option key
 #. @param [Hash] event map event to be handled
 #. selection box
-#: src/include/dhcp-server/options.rb:512
-#: src/include/dhcp-server/options.rb:528
-#: src/include/dhcp-server/options.rb:819
+#: src/include/dhcp-server/options.rb:511
+#: src/include/dhcp-server/options.rb:527
+#: src/include/dhcp-server/options.rb:818
 #, fuzzy
 msgid "&Values"
 msgstr "&Verd"
 
 #. message popup
-#: src/include/dhcp-server/options.rb:563
+#: src/include/dhcp-server/options.rb:562
 #, fuzzy
 msgid "The entered addresses are not valid."
 msgstr "Desse adressene er ikkje gyldige."
 
 #. message popup
-#: src/include/dhcp-server/options.rb:583
+#: src/include/dhcp-server/options.rb:582
 #, fuzzy
 msgid "At least one address pair must be specified."
 msgstr "Minst eit adressepar må spesifiserast."
 
 #. table item, means switched on
 #. table item, means switched on
-#: src/include/dhcp-server/options.rb:620
-#: src/include/dhcp-server/options.rb:661
+#: src/include/dhcp-server/options.rb:619
+#: src/include/dhcp-server/options.rb:660
 #, fuzzy
 msgid "On"
 msgstr "På"
 
 #. table item, means switched off
 #. table item, means switched off
-#: src/include/dhcp-server/options.rb:623
-#: src/include/dhcp-server/options.rb:664
+#: src/include/dhcp-server/options.rb:622
+#: src/include/dhcp-server/options.rb:663
 #, fuzzy
 msgid "Off"
 msgstr "Av"
 
 #. popup message
-#: src/include/dhcp-server/options.rb:694
+#: src/include/dhcp-server/options.rb:693
 #, fuzzy
 msgid "A value must be specified."
 msgstr "Eit verd må spesifiserast."
 
 #. text entry
-#: src/include/dhcp-server/options.rb:786
+#: src/include/dhcp-server/options.rb:785
 #, fuzzy
 msgid "&New Address"
 msgstr "&Ny adresse"
 
 #. int field
-#: src/include/dhcp-server/options.rb:824
+#: src/include/dhcp-server/options.rb:823
 #, fuzzy
 msgid "&New Value"
 msgstr "&Nytt Verd"
 
 #. label (in role of help text)
-#: src/include/dhcp-server/options.rb:861
+#: src/include/dhcp-server/options.rb:860
 #, fuzzy
 msgid "Separate multiple addresses with spaces."
 msgstr "Adressene må vera adskilt av mellomrom."
 
 #. push button
-#: src/include/dhcp-server/options.rb:864
+#: src/include/dhcp-server/options.rb:863
 #, fuzzy
 msgid "&Add Address Pair"
 msgstr "&Legg til adressepar"
 
 #. popup message
-#: src/include/dhcp-server/options.rb:1008
+#: src/include/dhcp-server/options.rb:1007
 #, fuzzy
 msgid "The lowest address must be lower than the highest one."
 msgstr "Den lågaste adressa må vera lågare enn den høgaste."
 
 #. label -- help text
-#: src/include/dhcp-server/options.rb:1024
+#: src/include/dhcp-server/options.rb:1023
 #, fuzzy
 msgid "If you change this, also update the syslog configuration."
 msgstr "Viss du endrar dette, må du òg oppdatera syslog-konfigurasjonen."
 
 #. combo box
-#: src/include/dhcp-server/options.rb:1036
+#: src/include/dhcp-server/options.rb:1035
 #, fuzzy
 msgid "&Hardware Type"
 msgstr "&Maskinvaretype"
 
 #. test entry, MAC better not to be translated,
 #. translation would decrease the understandability
-#: src/include/dhcp-server/options.rb:1046
+#: src/include/dhcp-server/options.rb:1045
 #, fuzzy
 msgid "&MAC Address"
 msgstr "&MAC-adresse"
 
 #. text entry
-#: src/include/dhcp-server/options.rb:1089
+#: src/include/dhcp-server/options.rb:1088
 #, fuzzy
 msgid "&Lowest IP Address"
 msgstr "&Lågaste IP-adresse"
 
 #. text entry
-#: src/include/dhcp-server/options.rb:1091
+#: src/include/dhcp-server/options.rb:1090
 #, fuzzy
 msgid "&Highest IP Address"
 msgstr "&Høgaste IP-adresse"
 
 #. Yes-No popup
-#: src/include/dhcp-server/widgets.rb:174
+#: src/include/dhcp-server/widgets.rb:191
 #, fuzzy
 msgid ""
 "If you leave the DHCP server configuration without saving,\n"
@@ -2753,7 +2584,7 @@
 "vil alle endringar vil gå tapt. Vil du avslutta likevel?"
 
 #. yes-no popup
-#: src/include/dhcp-server/widgets.rb:355
+#: src/include/dhcp-server/widgets.rb:311
 #, fuzzy
 msgid ""
 "The port in firewall is not open. The DHCP server\n"
@@ -2765,7 +2596,7 @@
 "Vil du halda fram?"
 
 #. TRANSLATORS: popup error message, %1 is list of network interfaces
-#: src/include/dhcp-server/widgets.rb:383
+#: src/include/dhcp-server/widgets.rb:339
 #, fuzzy
 msgid ""
 "The network interfaces listed below are not mentioned in any firewall zone.\n"
@@ -2777,7 +2608,7 @@
 "De kan tilordnes ei sone i brannmurmodulen i YaST."
 
 #. TRANSLATORS: popup error message, %1 a network interface name
-#: src/include/dhcp-server/widgets.rb:398
+#: src/include/dhcp-server/widgets.rb:354
 #, fuzzy
 msgid ""
 "Network interface %1 is not mentioned in any firewall zone.\n"
@@ -2788,8 +2619,8 @@
 
 #. popup message
 #. popup message
-#: src/include/dhcp-server/widgets.rb:424
-#: src/include/dhcp-server/widgets.rb:653
+#: src/include/dhcp-server/widgets.rb:374
+#: src/include/dhcp-server/widgets.rb:588
 #, fuzzy
 msgid ""
 "This function is not available during\n"
@@ -2798,236 +2629,222 @@
 "Denne funksjonen er ikkje tilgjengeleg under\n"
 "førebuingar til autoinstallasjon."
 
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:445
-#, fuzzy
-msgid "Restart DHCP Server"
-msgstr "Start DHCP-serveren på nytt"
-
-#. menubutton entry, try to keep short
-#: src/include/dhcp-server/widgets.rb:450
-#, fuzzy
-msgid "Save Settings and Restart DHCP Server"
-msgstr "Lagre innstillingane og start DHCP-serveren på nytt"
-
 #. tree widget
 #. tree widget
-#: src/include/dhcp-server/widgets.rb:548
-#: src/include/dhcp-server/widgets.rb:1097
+#: src/include/dhcp-server/widgets.rb:484
+#: src/include/dhcp-server/widgets.rb:1076
 #, fuzzy
 msgid "&Configured Declarations"
 msgstr "&Konfigurerte deklarasjonar"
 
 #. push button
-#: src/include/dhcp-server/widgets.rb:637
+#: src/include/dhcp-server/widgets.rb:572
 #, fuzzy
 msgid "&Dynamic DNS"
 msgstr "&Dynamisk DNS"
 
 #. combo box
 #. combo box
-#: src/include/dhcp-server/widgets.rb:733
-#: src/include/dhcp-server/widgets.rb:1239
+#: src/include/dhcp-server/widgets.rb:668
+#: src/include/dhcp-server/widgets.rb:1219
 #, fuzzy
 msgid "Forward Zone TSIG &Key"
 msgstr "TSIG-&nøkkel for forlengssone"
 
 #. combo box
 #. combo box
-#: src/include/dhcp-server/widgets.rb:742
-#: src/include/dhcp-server/widgets.rb:1246
+#: src/include/dhcp-server/widgets.rb:677
+#: src/include/dhcp-server/widgets.rb:1226
 #, fuzzy
 msgid "Reverse Zone TSIG &Key"
 msgstr "TSIG-&nøkkel for baklengssone"
 
 #. popup headline
-#: src/include/dhcp-server/widgets.rb:861
+#: src/include/dhcp-server/widgets.rb:796
 #, fuzzy
 msgid "Select File with Authentication Key"
 msgstr "Vel fila med autentiseringsnøkkelen"
 
-#. check box
-#: src/include/dhcp-server/widgets.rb:1060
-#, fuzzy
-msgid "&Start DHCP Server"
-msgstr "&Start DHCP-serveren"
+#. FIXME CWM should be able to handle virtual widgets
+#: src/include/dhcp-server/widgets.rb:1042
+msgid "Apply Changes"
+msgstr ""
 
 #. check box
-#: src/include/dhcp-server/widgets.rb:1070
+#: src/include/dhcp-server/widgets.rb:1049
 #, fuzzy
 msgid "&Run DHCP Server in Chroot Jail"
 msgstr "&Køyr DHCP-serveren i Chroot-varetekt"
 
-#. menu button
-#: src/include/dhcp-server/widgets.rb:1111
+#: src/include/dhcp-server/widgets.rb:1099
 #, fuzzy
 msgid "Ad&vanced"
 msgstr "A&vansert"
 
 #. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1114
+#: src/include/dhcp-server/widgets.rb:1102
 #, fuzzy
 msgid "Display &Log"
 msgstr "Vis &logg"
 
 #. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1116
+#: src/include/dhcp-server/widgets.rb:1104
 #, fuzzy
 msgid "&Interface Configuration"
 msgstr "&Grensesnittkonfigurasjon"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1136
+#: src/include/dhcp-server/widgets.rb:1116
 #, fuzzy
 msgid "&Network Address"
 msgstr "&Nettverksadresse"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1138
+#: src/include/dhcp-server/widgets.rb:1118
 #, fuzzy
 msgid "Network &Mask"
 msgstr "Maska til&nettverk"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1156
+#: src/include/dhcp-server/widgets.rb:1136
 #, fuzzy
 msgid "Group &Name"
 msgstr "Gruppe&namn"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1164
+#: src/include/dhcp-server/widgets.rb:1144
 #, fuzzy
 msgid "Pool &Name"
 msgstr "&Namn på utval"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1172
+#: src/include/dhcp-server/widgets.rb:1152
 #, fuzzy
 msgid "Shared Network &Name"
 msgstr "&Namn på delt nettverk"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1180
+#: src/include/dhcp-server/widgets.rb:1160
 #, fuzzy
 msgid "Class &Name"
 msgstr "Klasse&namn"
 
 #. multi selection box
-#: src/include/dhcp-server/widgets.rb:1190
+#: src/include/dhcp-server/widgets.rb:1170
 #, fuzzy
 msgid "Available Interfaces"
 msgstr "Tilgjengelege grensesnitt"
 
 #. check box
-#: src/include/dhcp-server/widgets.rb:1205
+#: src/include/dhcp-server/widgets.rb:1185
 #, fuzzy
 msgid "Open &Firewall for Selected Interfaces"
 msgstr "Opne &brannmur for valde grensesnitt"
 
 #. check box
-#: src/include/dhcp-server/widgets.rb:1231
+#: src/include/dhcp-server/widgets.rb:1211
 #, fuzzy
 msgid "&Enable Dynamic DNS for This Subnet"
 msgstr "&Aktiver dynamisk DNS for dette subnettet"
 
 #. check box
-#: src/include/dhcp-server/widgets.rb:1253
+#: src/include/dhcp-server/widgets.rb:1233
 #, fuzzy
 msgid "&Update Global Dynamic DNS Settings"
 msgstr "&Oppdater globale dynamiske DNS-innstillingar"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1263
+#: src/include/dhcp-server/widgets.rb:1243
 #, fuzzy
 msgid "&Zone"
 msgstr "&Sone"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1290
+#: src/include/dhcp-server/widgets.rb:1270
 #, fuzzy
 msgid "&Primary DNS Server"
 msgstr "&Primær DNS-servar"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1296
+#: src/include/dhcp-server/widgets.rb:1276
 #, fuzzy
 msgid "Re&verse Zone"
 msgstr "&Baklengssone"
 
 #. text entry
-#: src/include/dhcp-server/widgets.rb:1305
+#: src/include/dhcp-server/widgets.rb:1285
 #, fuzzy
 msgid "Pr&imary DNS Server"
 msgstr "PR&imær DNS-servar"
 
 #. push button
-#: src/include/dhcp-server/widgets.rb:1335
+#: src/include/dhcp-server/widgets.rb:1315
 #, fuzzy
 msgid "DHCP Server &Expert Configuration..."
 msgstr "&Avansert konfigurasjon av DHCP-servar …"
 
 #. Dhcp-server read dialog caption
-#: src/modules/DhcpServer.pm:1388
+#: src/modules/DhcpServer.pm:1401
 #, fuzzy
 msgid "Initializing DHCP Server Configuration"
 msgstr "Initialiserer oppsett av DHCP-servar"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1392
+#: src/modules/DhcpServer.pm:1405
 #, fuzzy
 msgid "Check the environment"
 msgstr "Kontroller miljøet"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1394
+#: src/modules/DhcpServer.pm:1407
 #, fuzzy
 msgid "Read firewall settings"
 msgstr "Les brannmurinnstillinger"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1396
+#: src/modules/DhcpServer.pm:1409
 #, fuzzy
 msgid "Read DHCP server settings"
 msgstr "Les innstillingar for DHCP-servar"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1398
+#: src/modules/DhcpServer.pm:1411
 #, fuzzy
 msgid "Read DNS server settings"
 msgstr "Les innstillingar for DNS-servar"
 
 #. progress step
-#: src/modules/DhcpServer.pm:1402
+#: src/modules/DhcpServer.pm:1415
 #, fuzzy
 msgid "Checking the environment..."
 msgstr "Kontrollerer miljøet …"
 
 #. progress step
-#: src/modules/DhcpServer.pm:1404
+#: src/modules/DhcpServer.pm:1417
 #, fuzzy
 msgid "Reading firewall settings..."
 msgstr "Lesar brannmurinnstillinger …"
 
 #. progress step
-#: src/modules/DhcpServer.pm:1406
+#: src/modules/DhcpServer.pm:1419
 #, fuzzy
 msgid "Reading DHCP server settings..."
 msgstr "Les innstillingar for DHCP-servar …"
 
 #. progress step
-#: src/modules/DhcpServer.pm:1408
+#: src/modules/DhcpServer.pm:1421
 #, fuzzy
 msgid "Reading DNS server settings..."
 msgstr "Les innstillingar for DNS-servar …"
 
 #. progress step
-#: src/modules/DhcpServer.pm:1410 src/modules/DhcpServer.pm:1638
+#: src/modules/DhcpServer.pm:1423 src/modules/DhcpServer.pm:1651
 #, fuzzy
 msgid "Finished"
 msgstr "Fullført"
 
 #. TRANSLATORS: error report popup
-#: src/modules/DhcpServer.pm:1440
+#: src/modules/DhcpServer.pm:1453
 #, fuzzy
 msgid ""
 "This server needs at least one\n"
@@ -3044,8 +2861,8 @@
 "\n"
 "Avsluttar."
 
-#. error report
-#: src/modules/DhcpServer.pm:1475
+#. error report 
+#: src/modules/DhcpServer.pm:1488
 #, fuzzy
 msgid ""
 "Cannot determine hostname. LDAP-based configuration of \n"
@@ -3055,7 +2872,7 @@
 "DHCP-servar vil ikkje vera tilgjengeleg."
 
 #. yes-no popup
-#: src/modules/DhcpServer.pm:1543
+#: src/modules/DhcpServer.pm:1556
 #, fuzzy
 msgid ""
 "The DHCP server does not seem to have been\n"
@@ -3065,103 +2882,103 @@
 "konfigurert enno. Vil du oppretta ein ny konfigurasjon?"
 
 #. Dhcp-server read dialog caption */
-#: src/modules/DhcpServer.pm:1616
+#: src/modules/DhcpServer.pm:1629
 #, fuzzy
 msgid "Saving DHCP Server Configuration"
 msgstr "Lagrar konfigurasjon for DHCP-servar"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1621
+#: src/modules/DhcpServer.pm:1634
 #, fuzzy
 msgid "Write DHCP server settings"
 msgstr "Les innstillingar for DHCP-servar"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1623
+#: src/modules/DhcpServer.pm:1636
 #, fuzzy
 msgid "Write firewall settings"
 msgstr "Lagre brannmurinnstillinger"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1625
+#: src/modules/DhcpServer.pm:1638
 #, fuzzy
 msgid "Restart DHCP server"
 msgstr "Start DHCP-serveren på nytt"
 
 #. progress stage
-#: src/modules/DhcpServer.pm:1627
+#: src/modules/DhcpServer.pm:1640
 #, fuzzy
 msgid "Write DNS server settings"
 msgstr "Lagre innstillingar for DNS-servar"
 
 #. progress step
-#: src/modules/DhcpServer.pm:1630
+#: src/modules/DhcpServer.pm:1643
 #, fuzzy
 msgid "Writing DHCP server settings..."
 msgstr "Lagrar innstillingar for DHCP-servar …"
 
 #. progress step
-#: src/modules/DhcpServer.pm:1632
+#: src/modules/DhcpServer.pm:1645
 #, fuzzy
 msgid "Writing firewall settings..."
 msgstr "Lagrar brannmurinnstillinger …"
 
 #. progress step
-#: src/modules/DhcpServer.pm:1634
+#: src/modules/DhcpServer.pm:1647
 #, fuzzy
 msgid "Restarting DHCP server..."
 msgstr "Startar DHCP-serveren på nytt …"
 
 #. progress step
-#: src/modules/DhcpServer.pm:1636
+#: src/modules/DhcpServer.pm:1649
 #, fuzzy
 msgid "Writing DNS server settings..."
 msgstr "Lagrar innstillingar for DNS-servar …"
 
 #. error report
-#: src/modules/DhcpServer.pm:1749
+#: src/modules/DhcpServer.pm:1762
 #, fuzzy
 msgid "Error occurred while restarting the DHCP daemon."
 msgstr "Det oppstod ein feil under omstart av DHCP-nissen."
 
 #. summary string
-#: src/modules/DhcpServer.pm:1888
+#: src/modules/DhcpServer.pm:1901
 #, fuzzy
 msgid "The DHCP server is started at boot time"
 msgstr "DHCP-serveren startar når systemet vert opp starta"
 
 #. summary string
-#: src/modules/DhcpServer.pm:1893
+#: src/modules/DhcpServer.pm:1906
 #, fuzzy
 msgid "The DHCP server is not started at boot time"
 msgstr "DHCP-ein startar ikkje når systemet vert opp starta"
 
 #. summary string, %1 is list of network interfaces
-#: src/modules/DhcpServer.pm:1901
+#: src/modules/DhcpServer.pm:1914
 #, fuzzy
 msgid "Listen On: %1"
 msgstr "Lote på: %1"
 
 #. summary string, %1 is IP address range
-#: src/modules/DhcpServer.pm:1920
+#: src/modules/DhcpServer.pm:1933
 #, fuzzy
 msgid "Dynamic Address Range: %1"
 msgstr "Dynamisk adresseområde: %1"
 
 #. error message
-#: src/modules/DhcpServer.pm:2313
+#: src/modules/DhcpServer.pm:2328
 #, fuzzy
 msgid "Invalid LDAP configuration. Cannot use LDAP."
 msgstr "Ugyldig LDAP-konfigurasjon. Kan ikkje bruka LDAP."
 
 #. error report
-#: src/modules/DhcpServer.pm:2553 src/modules/DhcpServer.pm:2594
+#: src/modules/DhcpServer.pm:2568 src/modules/DhcpServer.pm:2609
 #, fuzzy
 msgid "Support for multiple dhcpServiceDN not implemented."
 msgstr "Støtte for fleire dhcpServiceDN er ikkje implementert."
 
 #. error report
-#: src/modules/DhcpServer.pm:2559
+#: src/modules/DhcpServer.pm:2574
 #, fuzzy
 msgid "DHCP service DN is not defined."
 msgstr "DN for DHCP-teneste ikkje spesifisert."
@@ -3170,32 +2987,86 @@
 #. Error report, %1 is LDAP record key
 #. Error report
 #. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2674 src/modules/DhcpServer.pm:2708
-#: src/modules/DhcpServer.pm:2772 src/modules/DhcpServer.pm:2847
+#: src/modules/DhcpServer.pm:2689 src/modules/DhcpServer.pm:2723
+#: src/modules/DhcpServer.pm:2787 src/modules/DhcpServer.pm:2862
 #, fuzzy
 msgid "Error occurred while creating %1."
 msgstr "Det oppstod ein feil under uppretting av %1."
 
-#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2739
+#. error report, %1 is LDAP record key 
+#: src/modules/DhcpServer.pm:2754
 #, fuzzy
 msgid "Error occurred while updating %1."
 msgstr "Det oppstod ein feil under oppdatering av %1."
 
 #. error report, %1=ldap domain, %2=dhcp server
-#: src/modules/DhcpServer.pm:2810
+#: src/modules/DhcpServer.pm:2825
 #, fuzzy
 msgid "Error occurred while creating cn=%2,ou=DHCP,%1."
 msgstr "Det oppstod ein feil under oppretting av cn=%2,ou=DHCP,%1."
 
 #. error report, /etc/dhcpd.conf is filename
-#: src/modules/DhcpServer.pm:2907
+#: src/modules/DhcpServer.pm:2922
 #, fuzzy
 msgid "Error occurred while writing /etc/dhcpd.conf."
 msgstr "Det oppstod ein feil under lagring av /etc/dhcpd.conf."
 
 #, fuzzy
+#~ msgid "DHCP server is running"
+#~ msgstr "DHCP-serveren køyrer"
+
+#, fuzzy
+#~ msgid "DHCP server is not running"
+#~ msgstr "DHCP-serveren køyrer ikkje"
+
+#, fuzzy
+#~ msgid "&Start DHCP Server Now"
+#~ msgstr "&Start DHCP-serveren no"
+
+#, fuzzy
+#~ msgid "S&top DHCP Server Now"
+#~ msgstr "S&topp DHCP-serveren no"
+
+#, fuzzy
+#~ msgid "Save Settings and Restart DHCP Server &Now"
+#~ msgstr "Lagre innstillingane og start DHCP-serveren på nytt &no"
+
+#, fuzzy
+#~ msgid "Start DHCP Server Now"
+#~ msgstr "Start DHCP-serveren no"
+
+#, fuzzy
+#~ msgid "Stop DHCP Server Now"
+#~ msgstr "Stopp DHCP-serveren no"
+
+#, fuzzy
+#~ msgid "Save Settings and Restart DHCP Server Now"
+#~ msgstr "Lagre innstillingane og start DHCP-serveren på nytt no"
+
+#, fuzzy
 #~ msgid ""
+#~ "<p><b><big>DHCP Server</big></b></p>\n"
+#~ "<p>To run the DHCP server every time your computer is started, set\n"
+#~ "<b>Start DHCP Server</b>.</p>"
+#~ msgstr ""
+#~ "<p><b><big>Start DHCP-servar</big></b><br>\n"
+#~ "For å køyra DHCP-serveren kvar gong datamaskina startar opp, vel\n"
+#~ "<b>Start DHCP-servar</b>.</p>"
+
+#, fuzzy
+#~ msgid "Restart DHCP Server"
+#~ msgstr "Start DHCP-serveren på nytt"
+
+#, fuzzy
+#~ msgid "Save Settings and Restart DHCP Server"
+#~ msgstr "Lagre innstillingane og start DHCP-serveren på nytt"
+
+#, fuzzy
+#~ msgid "&Start DHCP Server"
+#~ msgstr "&Start DHCP-serveren"
+
+#, fuzzy
+#~ msgid ""
 #~ "IP address %1 does not match\n"
 #~ "the current network %2/%3\n"
 #~ msgstr ""

Modified: branches/plus-SLE12-SP2/yast/nn/po/dns-server.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/dns-server.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/dns-server.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -493,8 +493,8 @@
 #. Dialog Label - DNS - expert settings
 #. Tree Menu Item - DNS - expert settings
 #: src/include/dns-server/cmdline.rb:846
-#: src/include/dns-server/dialog-main.rb:443
-#: src/include/dns-server/dialog-main.rb:446
+#: src/include/dns-server/dialog-main.rb:441
+#: src/include/dns-server/dialog-main.rb:444
 #, fuzzy
 msgid "Forwarders"
 msgstr "Videresendere"
@@ -649,8 +649,8 @@
 #. Dialog Label - DNS - expert settings
 #. Tree Menu Item - DNS - expert settings
 #: src/include/dns-server/dialog-installwizard.rb:79
-#: src/include/dns-server/dialog-main.rb:517
-#: src/include/dns-server/dialog-main.rb:520
+#: src/include/dns-server/dialog-main.rb:515
+#: src/include/dns-server/dialog-main.rb:518
 #, fuzzy
 msgid "DNS Zones"
 msgstr "DNS-sonar"
@@ -676,7 +676,7 @@
 #. check box
 #. TRANSLATORS: checkbox label, turning LDAP support on or off
 #: src/include/dns-server/dialog-installwizard.rb:175
-#: src/include/dns-server/dialog-main.rb:291
+#: src/include/dns-server/dialog-main.rb:289
 #, fuzzy
 msgid "&LDAP Support Active"
 msgstr "&LDAP-støytte aktivert"
@@ -706,36 +706,36 @@
 msgstr "&Avansert konfigurasjon av DNS-servar …"
 
 #. Dialog label DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:261
+#: src/include/dns-server/dialog-main.rb:259
 #, fuzzy
 msgid "DNS Server"
 msgstr "DNS-servar"
 
 #. FIXME: new startup
-#: src/include/dns-server/dialog-main.rb:419
+#: src/include/dns-server/dialog-main.rb:417
 #, fuzzy
 msgid "Apply Changes"
 msgstr "E&ndre"
 
 #. Dialog Label - DNS - expert settings
 #. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:425
-#: src/include/dns-server/dialog-main.rb:428
+#: src/include/dns-server/dialog-main.rb:423
+#: src/include/dns-server/dialog-main.rb:426
 #, fuzzy
 msgid "Start-Up"
 msgstr "Oppstart"
 
 #. Dialog Label - DNS - expert settings
 #. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:456
-#: src/include/dns-server/dialog-main.rb:459
+#: src/include/dns-server/dialog-main.rb:454
+#: src/include/dns-server/dialog-main.rb:457
 #, fuzzy
 msgid "Basic Options"
 msgstr "Grunnleggjande val"
 
 #. Dialog Label - DNS - expert settings
+#: src/include/dns-server/dialog-main.rb:467
 #: src/include/dns-server/dialog-main.rb:469
-#: src/include/dns-server/dialog-main.rb:471
 #, fuzzy
 msgid "Logging"
 msgstr "Logging"
@@ -744,8 +744,8 @@
 #. Tree Menu Item - DNS - expert settings
 #. multi selection box
 #. multi selection box
-#: src/include/dns-server/dialog-main.rb:482
-#: src/include/dns-server/dialog-main.rb:485
+#: src/include/dns-server/dialog-main.rb:480
+#: src/include/dns-server/dialog-main.rb:483
 #: src/include/dns-server/dialog-masterzone.rb:163
 #: src/include/dns-server/dialog-masterzone.rb:2729
 #, fuzzy
@@ -754,8 +754,8 @@
 
 #. Dialog Label - DNS - expert settings
 #. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:499
-#: src/include/dns-server/dialog-main.rb:502
+#: src/include/dns-server/dialog-main.rb:497
+#: src/include/dns-server/dialog-main.rb:500
 #, fuzzy
 msgid "TSIG Keys"
 msgstr "TSIG-nøklar"
@@ -1727,53 +1727,41 @@
 #: src/include/dns-server/helps.rb:20
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing DNS Server Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
+"<p><b><big>Initializing DNS Server Configuration</big></b><br>\n"
+"Please wait...<br></p>"
 msgstr ""
-"<p><b><big>Initialiserer konfigurasjon av DNS-servar</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
+"<p><b><big>Initialiserer konfigurasjon av DNS-servar</big></b><br>\n"
+"Vent…<br></p>"
 
 #. Read dialog help 2/2
 #: src/include/dns-server/helps.rb:24
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization</big></b><br>"
-"\n"
+"<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"
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
 "Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>"
 
 #. Write dialog help 1/2
 #: src/include/dns-server/helps.rb:28
 #, fuzzy
 msgid ""
-"<p><b><big>Saving DNS Server Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
+"<p><b><big>Saving DNS Server Configuration</big></b><br>\n"
+"Please wait...<br></p>"
 msgstr ""
-"<p><b><big>Lagrar konfigurasjon for DNS-servar</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
+"<p><b><big>Lagrar konfigurasjon for DNS-servar</big></b><br>\n"
+"Vent…<br></p>"
 
 #. Write dialog help 2/2
 #: src/include/dns-server/helps.rb:32
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs you whether it is safe to do so.</p>"
 msgstr ""
-"<p><b><big>Avbryta lagring</big></b><br>"
-"\n"
+"<p><b><big>Avbryta lagring</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.</p>"
 
@@ -1782,13 +1770,11 @@
 #: src/include/dns-server/helps.rb:39
 #, fuzzy
 msgid ""
-"<p><b><big>Start DNS Server</big></b><br>"
-"\n"
+"<p><b><big>Start DNS Server</big></b><br>\n"
 "To run the DNS server every time your computer is started, set\n"
 "<b>Start DNS Server</b>.</p>"
 msgstr ""
-"<p><b><big>Start DNS-servar</big></b><br>"
-"\n"
+"<p><b><big>Start DNS-servar</big></b><br>\n"
 "For å køyra DNS-serveren kvar gong maskina startar opp, vel\n"
 "<b>Start DNS-servar</b>.</p>"
 
@@ -1796,14 +1782,12 @@
 #: src/include/dns-server/helps.rb:45
 #, fuzzy
 msgid ""
-"<p><b><big>Chroot Jail</big></b><br>"
-"\n"
+"<p><b><big>Chroot Jail</big></b><br>\n"
 "To run the DNS server in chroot jail, set\n"
 "<b>Run DNS Server in Chroot Jail</b>. Starting any daemon in a chroot jail\n"
 "is more secure and strongly recommended.</p>"
 msgstr ""
-"<p><b><big>Chroot-varetekt</big></b><br>"
-"\n"
+"<p><b><big>Chroot-varetekt</big></b><br>\n"
 "For å køyra DNS-serveren i chroot-varetekt, vel\n"
 "<b>Køyr DNS-servar i chroot-varetekt</b>. Å starta alle nissar i choot-varetekt\n"
 "aukar tryggleiken og rådast til sterkt.</p>"
@@ -1812,15 +1796,13 @@
 #: src/include/dns-server/helps.rb:52
 #, fuzzy
 msgid ""
-"<p><b><big>Editing DNS Zones</big></b><br>"
-"\n"
+"<p><b><big>Editing DNS Zones</big></b><br>\n"
 "To edit settings of a DNS zone, choose the appropriate\n"
 "entry of the table and click <B>Edit</B>.\n"
 "To add a new DNS zone, use <B>Add</B>. To remove\n"
 "a configured DNS zone, select it and click <B>Delete</B>.</P>"
 msgstr ""
-"<p><b><big>Redigering av DNS-sonar</big></b><br>"
-"\n"
+"<p><b><big>Redigering av DNS-sonar</big></b><br>\n"
 "For å redigera innstillingane for ein DNS-sone, vel ein oppføring\n"
 "i tabellen og klikk <B>Rediger</B>.\n"
 "For å leggja til ein ny DNS-sone, bruk <B>Legg til</B>. For å slette\n"
@@ -1830,16 +1812,14 @@
 #: src/include/dns-server/helps.rb:60
 #, fuzzy
 msgid ""
-"<p><b><big>Advanced Functions</big></b><br>"
-"\n"
+"<p><b><big>Advanced Functions</big></b><br>\n"
 "To edit global options,\n"
 "adjust firewall settings,\n"
 "manage the TSIG keys for dynamic updates of the zones,\n"
 "or display the log of the DNS server,\n"
 "use <b>Advanced</b>.</p>"
 msgstr ""
-"<p><b><big>Avanserte funksjonar</big></b><br>"
-"\n"
+"<p><b><big>Avanserte funksjonar</big></b><br>\n"
 "For å redigera generelle alternativ,\n"
 "justera brannmurinnstillingene,\n"
 "{administrera TSIG-nøklar for dynamisk oppdatering av sonene\n"
@@ -1851,28 +1831,24 @@
 #: src/include/dns-server/helps.rb:70
 #, fuzzy
 msgid ""
-"<p><b><big>Zone Name</big></b><br>"
-"\n"
+"<p><b><big>Zone Name</big></b><br>\n"
 "Enter the name of the zone (domain) in <b>Zone Name</b>.</p>"
 msgstr ""
-"<p><b><big>Sonenavn</big></b><br>"
-"\n"
+"<p><b><big>Sonenavn</big></b><br>\n"
 "Angje sonenavnet (domenet) under <b>Sonenavn</b>.</p>"
 
 #. help 2/5, alt. 1
 #: src/include/dns-server/helps.rb:74
 #, fuzzy
 msgid ""
-"<p><b><big>Dynamic DNS Zone Updates</big></b><br>"
-"\n"
+"<p><b><big>Dynamic DNS Zone Updates</big></b><br>\n"
 "The zone can be updated automatically, usually because of dynamically\n"
 "assigned IP addresses by DHCP server. To allow DDNS updates, set\n"
 "<b>Allow Dynamic Updates</b> and the <b>TSIG Key</b>\n"
 "to use for authentication. The key must be the same for\n"
 "both DHCP and DNS servers.</p>"
 msgstr ""
-"<p><b><big>Dynamisk oppdatering av DNS-sonar</big></b><br>"
-"\n"
+"<p><b><big>Dynamisk oppdatering av DNS-sonar</big></b><br>\n"
 "Sona kan oppdaterast automatisk, normalt på grunn av dynamisk\n"
 "tildelte IP-addresser frå DHCP-serveren. For å tillata DNS-oppdateringar, vel\n"
 "<b>Tillat dynamiske oppdateringar</b> og angje <b>TSIG-nøkkelen</b>\n"
@@ -1883,13 +1859,11 @@
 #: src/include/dns-server/helps.rb:83
 #, fuzzy
 msgid ""
-"<p><b><big>Editing a DNS Zone</big></b><br>"
-"\n"
+"<p><b><big>Editing a DNS Zone</big></b><br>\n"
 "To edit the zone settings, choose the appropriate\n"
 "entry of the table then click <b>Edit</b>.</p>"
 msgstr ""
-"<p><b><big>Redigering av ein DNS-sone</big></b><br>"
-"\n"
+"<p><b><big>Redigering av ein DNS-sone</big></b><br>\n"
 "For å redigera soneinnstillingene, vel ein\n"
 "oppføring i tabellen og klikk <b>Rediger</b>.</p>"
 
@@ -1907,13 +1881,11 @@
 #: src/include/dns-server/helps.rb:93
 #, fuzzy
 msgid ""
-"<p><b><big>SOA Record</big></b><br>"
-"\n"
+"<p><b><big>SOA Record</big></b><br>\n"
 "To edit the SOA (Start of Authority) record of the zone, click\n"
 "<b>Edit SOA</b>.</p>"
 msgstr ""
-"<p><b><big>SOA-oppføring</big></b><br>"
-"\n"
+"<p><b><big>SOA-oppføring</big></b><br>\n"
 "For å redigera SOA-oppføringen (Start of Authority) for sona, klikk\n"
 "<b>Rediger SOA</b>.</p>"
 
@@ -1921,14 +1893,12 @@
 #: src/include/dns-server/helps.rb:99
 #, fuzzy
 msgid ""
-"<p><b><big>Master Servers</big></b><br>"
-"\n"
+"<p><b><big>Master Servers</big></b><br>\n"
 "Set the IP addresses of the master name servers for this zone. Use <b>Add</b>\n"
 "to add a new master name server. Select an existing one then click <b>Delete</b>\n"
 "to remove an existing one.</p>"
 msgstr ""
-"<p><b><big>Hovedservere</big></b><br>"
-"\n"
+"<p><b><big>Hovedservere</big></b><br>\n"
 "Vel IP-addresser for hovednavneserverne for denne sona. Bruk <b>Legg til</b>\n"
 "for å leggja til ein ny hovednavneserver. Vel ein eksisterande navneserver og klikk <b>Slett</b>\n"
 "for å slette henne.</p>"
@@ -1937,15 +1907,13 @@
 #: src/include/dns-server/helps.rb:106
 #, fuzzy
 msgid ""
-"<p><b><big>Zone Type</big></b><br>"
-"\n"
+"<p><b><big>Zone Type</big></b><br>\n"
 "To make this name server the primary source of the data of the zone,\n"
 "select <b>Master</b>. To make it the secondary name server, select <b>Slave</b>\n"
 "or <b>Stub</b>, so the data of the zone will be mirrored from the master\n"
 "server.</p>"
 msgstr ""
-"<p><b><big>Sonetype</big></b><br>"
-"\n"
+"<p><b><big>Sonetype</big></b><br>\n"
 "For å gjera denne navneserveren til sona si primære datakilde,\n"
 "vel <b>Hoved</b>. For å gjera han til sekundær navneserver, vel <b>Slave</b>\n"
 "eller <b>Stub</b>, slik at dataet til sona vert spegla frå hovedsoneserveren.\n"
@@ -1955,16 +1923,13 @@
 #: src/include/dns-server/helps.rb:114
 #, fuzzy
 msgid ""
-"<p><b><big>Zone Direction</big></b><br>"
-"\n"
+"<p><b><big>Zone Direction</big></b><br>\n"
 "DNS is used both for translating from domain names to IP addresses and back.\n"
 "Select if this zone will be used to translate from domain names to IP\n"
 "addresses (<b>Forward</b>) or from IP addresses to domain names\n"
-"(<b>Reverse</b>).</p>"
-"\n"
+"(<b>Reverse</b>).</p>\n"
 msgstr ""
-"<p><b><big>Soneretning</big></b><br>"
-"\n"
+"<p><b><big>Soneretning</big></b><br>\n"
 "DNS vert nytta til å omsetja domenenavn til IP-addresser og omvend.\n"
 "Definer om denne sona skal omsetja domenenavn til IP-\n"
 "addresser (vel <b>Framlengs>) eller frå IP-addresser til domenenavn\n"
@@ -1975,14 +1940,11 @@
 #: src/include/dns-server/helps.rb:123
 #, fuzzy
 msgid ""
-"<p><b><big>Interface Classes</big></b><br>"
-"\n"
+"<p><b><big>Interface Classes</big></b><br>\n"
 "Select which interface classes should have access to the DNS server. The\n"
-"interface classes are defined in the firewall configuration component.</p>"
-"\n"
+"interface classes are defined in the firewall configuration component.</p>\n"
 msgstr ""
-"<p><b><big>Grensesnittklasser</big></b><br>"
-"\n"
+"<p><b><big>Grensesnittklasser</big></b><br>\n"
 "Vel kva for grensesnittklasser som skal gje tilgjenge til DNS-serveren.\n"
 "Grensesnittklassene vert definerte i\n"
 "konfigurasjonsmodulen for brannmur.</p>"
@@ -1991,15 +1953,12 @@
 #: src/include/dns-server/helps.rb:129
 #, fuzzy
 msgid ""
-"<p><b><big>Adapting Firewall Settings</big></b><br>"
-"\n"
+"<p><b><big>Adapting Firewall Settings</big></b><br>\n"
 "To adapt the firewall settings so that the DNS server can be accessed\n"
 "via all network interfaces to which it listens, check\n"
-"<b>Adapt Firewall Settings</b>.</p>"
-"\n"
+"<b>Adapt Firewall Settings</b>.</p>\n"
 msgstr ""
-"<p><b><big>Tilpassa brannmurinnstillinger</big></b><br>"
-"\n"
+"<p><b><big>Tilpassa brannmurinnstillinger</big></b><br>\n"
 "For å tilpassa brannmurinnstillingene slik at det er tilgjenge til DNS-serveren\n"
 "via alle nettverksgrensesnitt han lyttar på, kryssar du av for\n"
 "<b>Tilpass brannmurinnsinnstillinger.</p>"
@@ -2010,12 +1969,10 @@
 #: src/include/dns-server/helps.rb:137 src/include/dns-server/helps.rb:386
 #, fuzzy
 msgid ""
-"<p><b><big>SOA Record Configuration</big></b><br>"
-"\n"
+"<p><b><big>SOA Record Configuration</big></b><br>\n"
 "Set the entries of the SOA record.</p>"
 msgstr ""
-"<p><b><big>Konfigurasjon av SOA-oppføring</big></b><br>"
-"\n"
+"<p><b><big>Konfigurasjon av SOA-oppføring</big></b><br>\n"
 "Rediger innhaldet i SOA-oppføringen.</p>"
 
 #. help text 2/9 - TTL
@@ -2043,8 +2000,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Administrator's Mail</b> must contain the e-mail address of\n"
-"the administrator responsible for the zone.</p>"
-"\n"
+"the administrator responsible for the zone.</p>\n"
 msgstr ""
 "<p><b>E-post til administrator</b> må innehalda e-postadressen til\n"
 "administratoren som er ansvarleg for sona.</p>"
@@ -2055,8 +2011,7 @@
 msgid ""
 "<p><b>Serial</b> number is used for determining if the zone has changed on\n"
 "the master servers (so that slave servers do not always need to synchronize the\n"
-"entire zone).</p>"
-"\n"
+"entire zone).</p>\n"
 msgstr ""
 "<p><b>Serienummer</b> vert brukt for å avgjera om sona er endra på\n"
 "hovedservere (slik at slaveserverne ikkje alltid må synkronisera\n"
@@ -2112,16 +2067,14 @@
 #: src/include/dns-server/helps.rb:178
 #, fuzzy
 msgid ""
-"<p><b><big>TSIG Key Management</big></b><br>"
-"\n"
+"<p><b><big>TSIG Key Management</big></b><br>\n"
 "Define TSIG keys used for dynamic zone updates.\n"
 "To add a new TSIG key, use the \n"
 "<b>File Name</b> text field or the <b>Browse</b> button then click <b>Add</b>.\n"
 "To delete an existing TSIG key, select it in the list and click <b>Delete</b>.\n"
 "</p>"
 msgstr ""
-"<p><b><big>Administrasjon av TSIG-nøklar</big></b><br>"
-"\n"
+"<p><b><big>Administrasjon av TSIG-nøklar</big></b><br>\n"
 "Definer TSIG-nøklane som vert til brukte dynamiske soneoppdateringer.\n"
 "For å leggja til ein ny TSIG-nøkkel, bruk tekstfeltet \n"
 "<b>Filnavn> eller <b>Bla gjennom</b>-knappen, og klikk deretter <b>Legg til</b>.\n"
@@ -2132,29 +2085,23 @@
 #: src/include/dns-server/helps.rb:187
 #, fuzzy
 msgid ""
-"<p><b><big>Booting</big></b><br>"
-"\n"
+"<p><b><big>Booting</big></b><br>\n"
 "To start the DNS server every time your computer is booted, set\n"
-"<b>On</b>. Otherwise set <b>Off</b>.</p>"
-" "
+"<b>On</b>. Otherwise set <b>Off</b>.</p> "
 msgstr ""
-"<p><b><big>Oppstart</big></b><br>"
-"\n"
+"<p><b><big>Oppstart</big></b><br>\n"
 "For å starta DNS-serveren kvar gong maskina vert opp starta, vel\n"
-"<b>På</b>. Viss ikkje, vel <b>Av</b>.</p>"
-" "
+"<b>På</b>. Viss ikkje, vel <b>Av</b>.</p> "
 
 #. Expert Mode Configuration - Start Up 1/3
 #: src/include/dns-server/helps.rb:194
 #, fuzzy
 msgid ""
-"<p><b><big>LDAP Support</big></b><br>"
-"\n"
+"<p><b><big>LDAP Support</big></b><br>\n"
 "To store the DNS zones in LDAP instead of native configuration files,\n"
 "set <b>LDAP Support Active</b>.</p>"
 msgstr ""
-"<p><b><big>LDAP-støytte</big></b><br>"
-"\n"
+"<p><b><big>LDAP-støytte</big></b><br>\n"
 "For å lager DNS-sonar i LDAP i staden for i lokale konfigurasjonsfiler,\n"
 "vel <b>LDAP-støtte aktivert</b>.</p>"
 
@@ -2162,35 +2109,27 @@
 #: src/include/dns-server/helps.rb:201
 #, fuzzy
 msgid ""
-"<p><b><big>Switch On or Off</big></b><br>"
-"\n"
+"<p><b><big>Switch On or Off</big></b><br>\n"
 "To start or stop the DNS server immediately, use \n"
 "<b>Start DNS Server Now</b> or\n"
-"<b>Stop DNS Server Now</b>.</p>"
-"\n"
+"<b>Stop DNS Server Now</b>.</p>\n"
 msgstr ""
-"<p><b><big>Slå Av eller På</big></b><br>"
-"\n"
+"<p><b><big>Slå Av eller På</big></b><br>\n"
 "For å starta eller stoppa DNS-serveren straks, bruk \n"
 "<b>Start DNS-serveren no</b> eller\n"
-"<b>Stopp DNS-serveren no</b>.</p>"
-"\n"
+"<b>Stopp DNS-serveren no</b>.</p>\n"
 
 #. Expert Mode Configuration - Forwarders 1/3
 #: src/include/dns-server/helps.rb:208
 #, fuzzy
 msgid ""
-"<p><b><big>Forwarders</big></b><br>"
-"\n"
+"<p><b><big>Forwarders</big></b><br>\n"
 "Forwarders are DNS servers to which your DNS server should send queries\n"
-"it cannot answer.</p>"
-"\n"
+"it cannot answer.</p>\n"
 msgstr ""
-"<p><b><big>Videresendere</big></b><br>"
-"\n"
+"<p><b><big>Videresendere</big></b><br>\n"
 "Videresendere er DNS-servera som din DNS-servar skal senda førespurnader han ikkje\n"
-"kan besvare til.</p>"
-"\n"
+"kan besvare til.</p>\n"
 
 #. Expert Mode Configuration - Forwarders 2/3
 #. _("<p>To ask forwarders during name resolution and in case of fail do full
@@ -2212,12 +2151,10 @@
 #: src/include/dns-server/helps.rb:225
 #, fuzzy
 msgid ""
-"<p><b><big>Edit DNS Server Options</big></b><br>"
-"\n"
+"<p><b><big>Edit DNS Server Options</big></b><br>\n"
 "Use this dialog to edit options of the DNS server.</p>"
 msgstr ""
-"<p><b><big>Rediger alternativ for DNS-servar</big></b><br>"
-"\n"
+"<p><b><big>Rediger alternativ for DNS-servar</big></b><br>\n"
 "Bruk denne dialogen for å redigera alternativa for DNS-serveren.</p>"
 
 #. Expert Mode Configuration - Basic Options 2/3
@@ -2225,18 +2162,14 @@
 #, fuzzy
 msgid ""
 "<p>To add new options, select the <b>Option</b>,\n"
-"enter its <b>Value</b>, and click <b>Add</b>.</p>"
-"\n"
+"enter its <b>Value</b>, and click <b>Add</b>.</p>\n"
 "<p>To modify a configured option, select it in the table,\n"
-"change the <b>Value</b>, and click <b>Change</b>.</p>"
-"\n"
+"change the <b>Value</b>, and click <b>Change</b>.</p>\n"
 msgstr ""
 "<p>For å leggja til nye alternativ, vel eit <b>Alternativ</b>,\n"
-"angje eit <b>Verd</b> og klikk <b>Legg til</b>.</p>"
-"\n"
+"angje eit <b>Verd</b> og klikk <b>Legg til</b>.</p>\n"
 "<p>For å endra eit konfigurert alternativ, vel alternativet i tabellen,\n"
-"rediger <b>verdet</b> og klikk <b>Endre</b>.</p>"
-"\n"
+"rediger <b>verdet</b> og klikk <b>Endre</b>.</p>\n"
 
 #. Expert Mode Configuration - Basic Options 3/3
 #: src/include/dns-server/helps.rb:236
@@ -2248,12 +2181,10 @@
 #: src/include/dns-server/helps.rb:238
 #, fuzzy
 msgid ""
-"<p><b><big>Logging</big></b><br>"
-"\n"
+"<p><b><big>Logging</big></b><br>\n"
 "Use this dialog to define various options of the DNS server logging.</p>"
 msgstr ""
-"<p><b><big>Logging</big></b><br>"
-"\n"
+"<p><b><big>Logging</big></b><br>\n"
 "Bruk denne dialogen for å definera ulike loggalternativer for DNS-serveren.</p>"
 
 #. Expert Mode Configuration - Logging 2/3
@@ -2266,16 +2197,14 @@
 "<b>Log to File</b> and set the <b>Filename</b> to which to save the log and \n"
 "the <b>Maximum Size</b> of the log file.\n"
 "The DNS server automatically rotates the log files. Use <b>Maximum Versions</b>\n"
-"to specify how many log files should be saved.</p>"
-"\n"
+"to specify how many log files should be saved.</p>\n"
 msgstr ""
 "<p>\n"
 "Vel <b>Lager i systemlogg</b> for å lager systemmeldinger for DNS-serveren i systemloggen.\n"
 "For å lager loggmeldinger for DNS-serveren i ein eiga fil, vel <b>Lager i fil</b> og angje eit <b>Filnavn</b> der loggen skal verta samt lagra \n"
 "<b>Maksimal storleik</b> for loggfilen.\n"
 "DNS-serveren skiftar ut loggfilene automatisk. Bruk <b>Maksimalt mengd versjonar</b>\n"
-"for å angje kor mange loggfiler som skal lagrast.</p>"
-"\n"
+"for å angje kor mange loggfiler som skal lagrast.</p>\n"
 
 #. Expert Mode Configuration - Logging 3/3
 #: src/include/dns-server/helps.rb:252
@@ -2287,8 +2216,7 @@
 "<b>Log Zone Updates</b> logs when DNS has been updated.\n"
 "<b>Log Zone Transfers</b> logs when zone is completely transferred to the \n"
 "secondary\n"
-"name server.</p>"
-"\n"
+"name server.</p>\n"
 msgstr ""
 "<p><b>Andre typar logging</b>\n"
 "Angje kva for handlingar som skal loggast. Vanlege handlingar vert alltid logga.\n"
@@ -2296,24 +2224,19 @@
 "Vel <b>Logg soneoppdateringer</b> for å logga DNS-oppdateringar.\n"
 "Vel <b>Logg soneoverføringer</b> for å logga når overføring av sona til ein \n"
 "sekundær\n"
-"navneserver er fullførd.</p>"
-"\n"
+"navneserver er fullførd.</p>\n"
 
 #. Expert Mode Configuration - ACLs 1/2
 #: src/include/dns-server/helps.rb:262
 #, fuzzy
 msgid ""
-"<p><b><big>ACLs</big></b><br>"
-"\n"
+"<p><b><big>ACLs</big></b><br>\n"
 "In this dialog, define access control lists to control\n"
-"access to zones.</p>"
-"\n"
+"access to zones.</p>\n"
 msgstr ""
-"<p><b><big>ACLer</big></b><br>"
-"\n"
+"<p><b><big>ACLer</big></b><br>\n"
 "I denne dialogen kan du definera tilgangskontrollister for å kontrollera\n"
-"tilgjenget til sonar.</p>"
-"\n"
+"tilgjenget til sonar.</p>\n"
 
 #. Expert Mode Configuration - ACLs 2/2
 #: src/include/dns-server/helps.rb:268
@@ -2321,31 +2244,25 @@
 msgid ""
 "<p>To add a new ACL entry, just enter the option's <b>Name</b>\n"
 "and <b>Value</b> then click <b>Add</b>.  To remove an \n"
-"ACL entry, select it and click <b>Delete</b>.</p>"
-"\n"
+"ACL entry, select it and click <b>Delete</b>.</p>\n"
 msgstr ""
 "<p>Legg til ein ACL-oppføring ved å angje namnet til <b>Valet</b>\n"
 "og <b>Verd</b>. Klikk deretter på <b>Legg til</b>. For å slette ein ACL-oppføring \n"
-"som allereie er definert, vel henne og klikk <b>Slett</b>.</p>"
-"\n"
+"som allereie er definert, vel henne og klikk <b>Slett</b>.</p>\n"
 
 #. Expert Mode Configuration - Keys 1/3
 #: src/include/dns-server/helps.rb:274
 #, fuzzy
 msgid ""
-"<p><b><big>TSIG Keys</big></b><br>"
-"\n"
+"<p><b><big>TSIG Keys</big></b><br>\n"
 "TSIG keys are used for authentication when remotely\n"
 "changing the configuration of the DNS server. This is needed\n"
-"for the dynamic updates of DNS zones (DDNS).</p>"
-"\n"
+"for the dynamic updates of DNS zones (DDNS).</p>\n"
 msgstr ""
-"<p><b><big>TSIG-nøklar</big></b><br>"
-"\n"
+"<p><b><big>TSIG-nøklar</big></b><br>\n"
 "TSIG-nøklar vert nytta til autentisering når DNS-serverens\n"
 "konfigurasjon skal endrast eksternt. Dette er naudsynt\n"
-"for dynamisk oppdatering av DNS-soner (DDNS).</p>"
-"\n"
+"for dynamisk oppdatering av DNS-soner (DDNS).</p>\n"
 
 #. Expert Mode Configuration - Keys 2/3
 #: src/include/dns-server/helps.rb:281
@@ -2354,14 +2271,12 @@
 "<p>To add an already created key, set the <b>Filename</b>\n"
 "(or use the <b>Browse</b> button to select it) and click <b>Add</b>.\n"
 "To generate a new key, enter the <b>Filename</b> and the <b>Key ID</b>\n"
-"then click <b>Generate</b>. The new key will be generated and also added.</p>"
-"\n"
+"then click <b>Generate</b>. The new key will be generated and also added.</p>\n"
 msgstr ""
 "<p>For å leggja til ein eksisterande nøkkel, angje <b>Filnavn</b>\n"
 "(eller bruk <b>Bla gjennom</b>-knappen for å velja fila), og klikk <b>Legg til</b>.\n"
 "For å generera ein ny nøkkel, angje <b>Filnavn</b> og <b>Nøkkel-ID</b>.\n"
-"Klikk deretter på <b>Generer</b>. Den nye nøkkelen vil genererast og lagt til.</p>"
-"\n"
+"Klikk deretter på <b>Generer</b>. Den nye nøkkelen vil genererast og lagt til.</p>\n"
 
 #. Expert Mode Configuration - Keys 3/3
 #: src/include/dns-server/helps.rb:288
@@ -2377,27 +2292,21 @@
 #: src/include/dns-server/helps.rb:294
 #, fuzzy
 msgid ""
-"<p><b><big>DNS Zones</big></b><br>"
-"\n"
-"Use this dialog to manage the DNS zones.</p>"
-"\n"
+"<p><b><big>DNS Zones</big></b><br>\n"
+"Use this dialog to manage the DNS zones.</p>\n"
 msgstr ""
-"<p><b><big>DNS-sonar</big></b><br>"
-"\n"
-"I denne dialogen kan du administrera DNS-sonene.</p>"
-"\n"
+"<p><b><big>DNS-sonar</big></b><br>\n"
+"I denne dialogen kan du administrera DNS-sonene.</p>\n"
 
 #. Expert Mode Configuration - Zones #2
 #: src/include/dns-server/helps.rb:298
 #, fuzzy
 msgid ""
 "<p>To add a new zone, enter its <b>Zone Name</b>, select the <b>Zone Type</b>,\n"
-"and click <b>Add</b>.</p>"
-"\n"
+"and click <b>Add</b>.</p>\n"
 msgstr ""
 "<p>For å leggja til ei sone, angje <b>Sonenavn</b>, vel <b>Sonetype</b>\n"
-"og klikk <b>Legg til</b>.</p>"
-"\n"
+"og klikk <b>Legg til</b>.</p>\n"
 
 #. Expert Mode Configuration - Zones #3
 #: src/include/dns-server/helps.rb:302
@@ -2406,14 +2315,12 @@
 "<p>To add a new IPv4 reverse zone, enter a part of the reverse IPv4 address followed by\n"
 "<tt>.in-addr.arpa</tt> as its <b>Zone Name</b> (for example, zone name\n"
 "<tt>0.168.192.in-addr.arpa</tt> for network <tt>192.168.0.0/24</tt>), select\n"
-"the <b>Zone Type</b>, and click <b>Add</b>.</p>"
-"\n"
+"the <b>Zone Type</b>, and click <b>Add</b>.</p>\n"
 msgstr ""
 "<p>For å leggja til ein ny IPv4-baklengs sone, legg til ein del av ein baklengs IPv4-adresse følgt av\n"
 "<tt>.in-addr.arpa</tt> som <b>sonenavn</b> (t.d. sonenavn\n"
 "<tt>0.168.192.in-addr.arpa</tt> for nettverket <tt>192.168.0.0/24</tt>). Vel\n"
-"<b>sonetype</b> og klikk <b>Legg til</b>.</p>"
-"\n"
+"<b>sonetype</b> og klikk <b>Legg til</b>.</p>\n"
 
 #. Expert Mode Configuration - Zones #4
 #. %1, %2, %3, and %4 are replaced with examples
@@ -2425,16 +2332,14 @@
 "supported: Standard form: <tt>%2</tt>;\n"
 "Forward form: <tt>%3</tt>;\n"
 "Forward form without netmask bits: <tt>%4</tt>\n"
-"(by default <tt>64</tt> netmask bits are used).</p>"
-"\n"
+"(by default <tt>64</tt> netmask bits are used).</p>\n"
 msgstr ""
 "<p>For å leggja til ein ny IPv6-baklengssone, angje ein del av IPv6-baklengsadressen etterfulgt av\n"
 "<tt>%1</tt> som <b>Sonenavn</b>. Fleire format for angivelse av sonenavn\n"
 "vert støtta: Standardform: <tt>%2</tt>;\n"
 "Videreformidlingsform: <tt>%3</tt>;\n"
 "Videreformidlingsform utan nettverksmaskebits: <tt>%4</tt>\n"
-"(som standard vert nytta<tt>64</tt> nettverksmaskebits).</p>"
-"\n"
+"(som standard vert nytta<tt>64</tt> nettverksmaskebits).</p>\n"
 
 #. Expert Mode Configuration - Zones #5
 #: src/include/dns-server/helps.rb:326
@@ -2442,29 +2347,23 @@
 msgid ""
 "<p>To modify settings for a zone, such as zone transport and name and\n"
 "mail servers, select it, and click <b>Edit</b>.\n"
-"To remove a configured zone, select it and click <b>Delete</b>.</p>"
-"\n"
+"To remove a configured zone, select it and click <b>Delete</b>.</p>\n"
 msgstr ""
 "<p>For å endra innstillingar for ei sone, t.d. sonetransport og dessutan navne- og\n"
 "e-postservere, vel ei sone og klikk <b>Rediger sone</b>.\n"
-"For å fjerne ei konfigurert sone, vel henne og klikk <b>Slett sone</b>.</p>"
-"\n"
+"For å fjerne ei konfigurert sone, vel henne og klikk <b>Slett sone</b>.</p>\n"
 
 #. Zone Editor - Help for tab - Basics  1/3
 #: src/include/dns-server/helps.rb:334
 #, fuzzy
 msgid ""
-"<p><b><big>DDNS and Zone Transport</big></b><br>"
-"\n"
+"<p><b><big>DDNS and Zone Transport</big></b><br>\n"
 "Use this dialog to change dynamic DNS settings of the zone and control access\n"
-"to the zone.</p>"
-"\n"
+"to the zone.</p>\n"
 msgstr ""
-"<p><b><big>DNS og sonetransport</big></b><br>"
-"\n"
+"<p><b><big>DNS og sonetransport</big></b><br>\n"
 "Bruk denne dialogen for å endra dynamiske DNS-innstillingar for sona og kontrollera tilgjenget\n"
-"til sona.</p>"
-"\n"
+"til sona.</p>\n"
 
 #. Zone Editor - Help for tab - Basics  2/3
 #: src/include/dns-server/helps.rb:342
@@ -2473,14 +2372,12 @@
 "<p>\n"
 "To allow dynamic updates of the zone, set <b>Allow Dynamic Updates</b>\n"
 "and select the <b>TSIG Key</b>. At least one TSIG key must be defined\n"
-"before the zone can be updated dynamically.</p>"
-"\n"
+"before the zone can be updated dynamically.</p>\n"
 msgstr ""
 "<p>\n"
 "For å tillata dynamisk oppdatering av sona, vel <b>Tillat dynamiske oppdateringar</b>\n"
 "og vel ein <b>TSIG-nøkkel</b>. Minst éin TSIG-nøkkel må definerast\n"
-"før dynamisk oppdatering av sona er mogleg.</p>"
-"\n"
+"før dynamisk oppdatering av sona er mogleg.</p>\n"
 
 #. Zone Editor - Help for tab - Basics  3/3
 #: src/include/dns-server/helps.rb:350
@@ -2505,8 +2402,7 @@
 "<p>\n"
 "Reverse zone records can be generated from another master zone.\n"
 "Select the <b>Automatically Generate Records From</b>\n"
-"check-box and choose the zone to generate the records from.</p>"
-"\n"
+"check-box and choose the zone to generate the records from.</p>\n"
 msgstr ""
 "<p>\n"
 "Oppføringer for ein baklengssone kan genererast frå ein annan hovedsone.\n"
@@ -2529,39 +2425,31 @@
 #: src/include/dns-server/helps.rb:371
 #, fuzzy
 msgid ""
-"<p><b><big>NS Records</big></b><br>"
-"\n"
+"<p><b><big>NS Records</big></b><br>\n"
 "To add a new name server, enter the name server address and click <b>Add</b>.\n"
 "To remove one of the listed name servers, select it and click\n"
-"<b>Delete</b>.</p>"
-"\n"
+"<b>Delete</b>.</p>\n"
 msgstr ""
-"<p><b><big>NS-oppføringer</big></b><br>"
-"\n"
+"<p><b><big>NS-oppføringer</big></b><br>\n"
 "For å leggja til ein ny navneserver, angje navneserverens adresse og klikk <b>Legg til</b>.\n"
 "For å slette ein av navneserverne på lista, vel henne og klikk\n"
-"<b>Slett</b>.</p>"
-"\n"
+"<b>Slett</b>.</p>\n"
 
 #. Zone Editor - Help for tab - Mail Servers
 #: src/include/dns-server/helps.rb:378
 #, fuzzy
 msgid ""
-"<p><b><big>MX Records</big></b><br>"
-"\n"
+"<p><b><big>MX Records</big></b><br>\n"
 "To add a new mail server, enter the <b>Address</b> and <b>Priority</b>\n"
 "and click <b>Add</b>.\n"
 "To remove one of the listed mail servers, select it and click\n"
-"<b>Delete</b>.</p>"
-"\n"
+"<b>Delete</b>.</p>\n"
 msgstr ""
-"<p><b><big>MX-oppføringer</big></b><br>"
-"\n"
+"<p><b><big>MX-oppføringer</big></b><br>\n"
 "For å leggja til ei ny e-postserver, angje e-postserverens <b>Adresse</b> og <b>Prioritet</b>\n"
 "og klikk <b>Legg til</b>.\n"
 "Vel ei e-postserver på lista og klikk\n"
-"<b>Slett</b> for å slette henne.</p>"
-"\n"
+"<b>Slett</b> for å slette henne.</p>\n"
 
 #. Zone Editor - Help for tab - Zone (SOA) 2/7
 #: src/include/dns-server/helps.rb:390
@@ -2570,8 +2458,7 @@
 "<p><b>Serial</b> is the number used for determining if the zone has \n"
 "changed on\n"
 "the master servers (then slave servers do not always need to synchronize the\n"
-"entire zone).</p>"
-"\n"
+"entire zone).</p>\n"
 msgstr ""
 "<p><b>Seriell</b> vert brukt for å avgjera om sona er endra på\n"
 "hovedservere (slik at slaveserverne ikkje alltid må synkronisera\n"
@@ -2604,14 +2491,12 @@
 #: src/include/dns-server/helps.rb:419
 #, fuzzy
 msgid ""
-"<p><b><big>Records</big></b><br>"
-"\n"
+"<p><b><big>Records</big></b><br>\n"
 "In this dialog, edit the resource records of the zone. To add new resource\n"
 "records, set the <b>Record Key</b>, <b>Type</b>, and <b>Value</b> then\n"
 "click <b>Add</b>.</p>"
 msgstr ""
-"<p><b><big>Oppføringer</big></b><br>"
-"\n"
+"<p><b><big>Oppføringer</big></b><br>\n"
 "I denne dialogen kan du redigera ressursoppføringene for sona. For å leggja til nye\n"
 "ressursoppføringer, angje <b>Oppføringsnøkkel</b>, <b>Type</b> og <b>Verd</b> og\n"
 "klikk <b>Legg til</b>.</p>"
@@ -2633,12 +2518,10 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"Each type of record has its own syntax defined in the RFC.</p>"
-"\n"
+"Each type of record has its own syntax defined in the RFC.</p>\n"
 msgstr ""
 "<p>\n"
-"Kvar oppføringstype har sin eigen syntaks som er definert i RFC.</p>"
-"\n"
+"Kvar oppføringstype har sin eigen syntaks som er definert i RFC.</p>\n"
 
 #. Zone Editor - Help for tab - Records 4/7 (alt. 1)
 #: src/include/dns-server/helps.rb:436
@@ -2663,16 +2546,14 @@
 "qualified hostname followed by a dot.\n"
 "<b>Value</b> is a hostname relative to the current zone or a fully\n"
 "qualified hostname followed by a dot. It must be represented by\n"
-"an A record.</p>"
-"\n"
+"an A record.</p>\n"
 msgstr ""
 "<p><b>CNAME: Alias for domenenavn</b>\n"
 "<b>Oppføringsnøkkel</b> er eit vertsnavn relativt til gjeldande sone eller eit\n"
 "gyldig vertsnavn etterfulgt av eit punktum.\n"
 "<b>Verd</b> er eit vertsnavn relativt til gjeldande sone eller eit\n"
 "gyldig vertsnavn etterfulgt av eit punktum. Verdet må representerast av\n"
-"ein A-oppføring.</p>"
-"\n"
+"ein A-oppføring.</p>\n"
 
 #. Zone Editor - Help for tab - Records 6/7 (alt. 1)
 #. Zone Editor - Help for tab - Records 5/5 (alt. 2)
@@ -2683,15 +2564,13 @@
 "<b>Record Key</b> is a zone name relative to the current zone or an absolute\n"
 "domain name followed by a dot.\n"
 "<b>Value</b> is a hostname relative to the current zone or fully qualified\n"
-"hostname followed by a dot.  It must be represented by an A record.</p>"
-"\n"
+"hostname followed by a dot.  It must be represented by an A record.</p>\n"
 msgstr ""
 "<p><b>NS: Navneserver</b>\n"
 "<b>Oppføringsnøkkel</b>er eit sonenavn relativt til gjeldande sone eller eit absolutt\n"
 "domenenavn etterfulgt av eit punktum.\n"
 "<b>Verd</b> er eit vertsnavn relativt til gjeldande sone eller eit gyldig\n"
-"vertsnavn etterfulgt av eit punktum. Verdet må representerast av ein A-oppføring.</p>"
-"\n"
+"vertsnavn etterfulgt av eit punktum. Verdet må representerast av ein A-oppføring.</p>\n"
 
 #. Zone Editor - Help for tab - Records 7/7 (alt. 1)
 #: src/include/dns-server/helps.rb:460
@@ -2701,15 +2580,13 @@
 "<b>Record Key</b> is a hostname or zone name relative to the current zone\n"
 "or an absolute hostname or zone name followed by a dot.\n"
 "<b>Value</b> is a hostname relative to the current zone or fully qualified\n"
-"hostname followed by a dot.  It must be represented by an A record.</p>"
-"\n"
+"hostname followed by a dot.  It must be represented by an A record.</p>\n"
 msgstr ""
 "<p><b>MX: E-postsystem</b>\n"
 "<b>Oppføringsnøkkel</b> er eit vertsmaskin- eller sonenavn relativt til gjeldande sone\n"
 "eller eit absolutt vertsmaskin- eller sonenavn etterfulgt av eit punktum.\n"
 "<b>Verd</b> er eit vertsnavn relativt til gjeldande sone eller eit gyldig\n"
-"vertsnavn etterfulgt av eit punktum. Verdet må representerast av ein A-oppføring.</p>"
-"\n"
+"vertsnavn etterfulgt av eit punktum. Verdet må representerast av ein A-oppføring.</p>\n"
 
 #. Zone Editor - Help for tab - Records 4/5 (alt. 2)
 #: src/include/dns-server/helps.rb:468
@@ -2722,8 +2599,7 @@
 " or a part of reverse zone name relative to the current zone\n"
 "(such as <tt>1</tt> for IP address <tt>192.168.0.1</tt> in zone\n"
 "<tt>0.168.192.in-addr.arpa.</tt>).\n"
-"<b>Value</b> is a fully qualified hostname followed by a dot.</p>"
-"\n"
+"<b>Value</b> is a fully qualified hostname followed by a dot.</p>\n"
 msgstr ""
 "<p><b>PTR: Bakleies omsetjing</b>\n"
 "<b>Oppføringsnøkkel</b> er eit gyldig bakleies sonenavn (konvertert frå IP-addressen)\n"
@@ -2732,22 +2608,17 @@
 " eller ein del av eit bakleies sonenavn relativt til gjeldande sone\n"
 "(t.d. <tt>1</tt> for IP-adressa <tt>192.168.0.1</tt> i sona\n"
 "<tt>0.168.192.in-addr.arpa.</tt>).\n"
-"<b>Verd</b> er eit gyldig vertsnavn etterfulgt av eit punktum.</p>"
-"\n"
+"<b>Verd</b> er eit gyldig vertsnavn etterfulgt av eit punktum.</p>\n"
 
 #. Final step of the installation wizard - 1/5
 #: src/include/dns-server/helps.rb:487
 #, fuzzy
 msgid ""
-"<p><b><big>Finishing the Configuration</big></b></p>"
-"\n"
-"<p>Check the entered settings before finishing the configuration.</p>"
-" \n"
+"<p><b><big>Finishing the Configuration</big></b></p>\n"
+"<p>Check the entered settings before finishing the configuration.</p> \n"
 msgstr ""
-"<p><b><big>Fullføra konfigurasjonen</big></b></p>"
-"\n"
-"<p>Kontrollar innstillingane før du fullfører konfigurasjonen.</p>"
-" \n"
+"<p><b><big>Fullføra konfigurasjonen</big></b></p>\n"
+"<p>Kontrollar innstillingane før du fullfører konfigurasjonen.</p> \n"
 
 #. Final step of the installation wizard - 2/5
 #: src/include/dns-server/helps.rb:491
@@ -2765,13 +2636,11 @@
 msgid ""
 "<p>\n"
 "To start the DNS server every time your computer is booted, set the \n"
-"start-up behavior to <b>On</b>. Otherwise set it to <b>Off</b>.</p>"
-" \n"
+"start-up behavior to <b>On</b>. Otherwise set it to <b>Off</b>.</p> \n"
 msgstr ""
 "<p>\n"
 "For å starta DNS-serveren kvar gong maskina vert opp starta, vel\n"
-"<b>På</b>. Viss ikkje, vel <b>Av</b>.</p>"
-" "
+"<b>På</b>. Viss ikkje, vel <b>Av</b>.</p> "
 
 #. Final step of the installation wizard - 4/5
 #: src/include/dns-server/helps.rb:502
@@ -2801,13 +2670,11 @@
 #: src/include/dns-server/helps.rb:515
 #, fuzzy
 msgid ""
-"<p><big><b>Slave DNS Zone</b></big><br>"
-"\n"
+"<p><big><b>Slave DNS Zone</b></big><br>\n"
 "Each slave zone must have the master name server defined. Use\n"
 "<b>Master DNS Server IP</b> to define the master name server.</p>"
 msgstr ""
-"<p><big><b>Slave-DNS-sone</b></big><br>"
-"\n"
+"<p><big><b>Slave-DNS-sone</b></big><br>\n"
 "Ein hovednavneserver må definerast for kvar slavesone. Nytte\n"
 "<b>Hoved-DNS-serverens IP</b> for å definera hovednavneserveren.</p>"
 
@@ -2815,15 +2682,13 @@
 #: src/include/dns-server/helps.rb:521
 #, fuzzy
 msgid ""
-"<p><big><b>Zone Transport</b></big><br>"
-"\n"
+"<p><big><b>Zone Transport</b></big><br>\n"
 "To allow transports of the zone, set <b>Enable Zone Transport</b>\n"
 "and select the <b>ACLs</b> to check when a remote host\n"
 "attempts to transfer the zone. At least one ACL must be defined\n"
 "to allow zone transports.</p>"
 msgstr ""
-"<p><big><b>Sonetransport</b></big><br>"
-"\n"
+"<p><big><b>Sonetransport</b></big><br>\n"
 "Vel <b>Aktivum sonetransport</b> for å tillata transport av sona,\n"
 "og vel <b>ACLer</b> som skal kontrollerast når ein ekstern vertsmaskin\n"
 "freistar å transportera sona. Minst éin ACL må definerast\n"
@@ -2833,13 +2698,11 @@
 #: src/include/dns-server/helps.rb:529
 #, fuzzy
 msgid ""
-"<p><big><b>Forward DNS Zone</b></big><br>"
-"\n"
+"<p><big><b>Forward DNS Zone</b></big><br>\n"
 "This type of DNS zone only forwards DNS queries to forwarders\n"
 "defined in it.</p>"
 msgstr ""
-"<p><big><b>DNS-sone for vidaresending</b></big><br>"
-"\n"
+"<p><big><b>DNS-sone for vidaresending</b></big><br>\n"
 "Denne DNS-sonetypen vidaresender berre DNS-førespurnader til videresendere\n"
 "som er definert for sona.</p>"
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/docker.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/docker.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/docker.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"

Modified: branches/plus-SLE12-SP2/yast/nn/po/drbd.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/drbd.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/drbd.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -179,65 +179,45 @@
 #: src/include/drbd/helps.rb:36
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing DRBD Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Initializing DRBD Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Initialiserer drbd-oppsett</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer drbd-oppsett</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/drbd/helps.rb:40
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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 avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
+"Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/drbd/helps.rb:44
 #, fuzzy
 msgid ""
-"<p><b><big>Saving DRBD Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Saving DRBD Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Lagrar drbd-oppsett</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar drbd-oppsett</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/drbd/helps.rb:48
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryt lagring:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/drbd/helps.rb:54
 #, fuzzy
@@ -251,162 +231,97 @@
 
 #: 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"
+"<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"
-"<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
+#: src/include/drbd/helps.rb:86
 #, fuzzy
 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"
+"<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. Should not include \".\" in hostname.</p>\n"
+"\t\t<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>\n"
+"\t\t<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Otherwise, you may omit the name, or the word minor and its number. If you omit the name a default of /dev/drbd'minor number' will be used.\n"
+"\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>\n"
+"\t\t<p>\"Disk\":  DRBD uses this block device to actually store and retrieve the data.  Never access such a device while DRBD is running on top of  it.</p>\n"
+"\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n"
+"\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated by yast automatically. A host can have different \"node-id\" in different resources.</p>\n"
 "\t\t"
-"<p>\"Name\" is mandatory and must match the Linux host name (uname -n) of one of the nodes. Should not include \".\" in hostname.</p>"
-"\n"
-"\t\t"
-"<p>\"Address:Port\": A resource needs one IP address per device, which is used to wait for incoming connections from the partner device to reach the device. Each DRBD resource needs a TCP port which is used to connect to the node's partner device.</p>"
-"\n"
-"\t\t"
-"<p>\"Device\": The name of the block device node of the resource being described. You must use this device with your application (file system) and you must not use the low level block device which is specified with the disk parameter,following its minor number. Otherwise, you may omit the name, or the word minor and its number. If you omit the name a default of /dev/drbd'minor number' will be used.\n"
-"\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>"
-"\n"
-"\t\t"
-"<p>\"Disk\":  DRBD uses this block device to actually store and retrieve the data.  Never access such a device while DRBD is running on top of  it.</p>"
-"\n"
-"\t\t"
-"<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>"
-"\n"
-"\t\t"
 msgstr ""
 
-#: src/include/drbd/helps.rb:88
+#: src/include/drbd/helps.rb:89
 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<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>"
+"\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>degr-wfc-timeout</b>: Wait for connection timeout, if this node was a degraded cluster</p>"
+"\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"
-"<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
+#: src/include/drbd/helps.rb:113
 #, fuzzy
 msgid "<p><b><big>LVM Configuration</big></b></p>"
 msgstr "<p><b><big>Globalt oppsett for DRBD</big></b></p>"
 
-#: src/include/drbd/helps.rb:115
+#: src/include/drbd/helps.rb:116
 msgid ""
 "\n"
-"\t\t"
-"<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>"
-"\n"
-"\t\t"
-"<p>To use LVM with DRBD, it is necessary to change some options in the LVM configuration file and to remove stale cache entries on the nodes.</p>"
-"\t\t"
-"<p>Refer to 'man lvm.conf' for further information including the file layout.</p>"
-"\n"
+"\t\t<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>\n"
+"\t\t<p>To use LVM with DRBD, it is necessary to change some options in the LVM configuration file and to remove stale cache entries on the nodes.</p>\t\t<p>Refer to 'man lvm.conf' for further information including the file layout.</p>\n"
 "\t\t\t\t\t\t\t\t\t\t  \n"
-"\t\t"
-"<p><b>Device Filter</b>: This masks the underlying block device from the list of devices LVM scans for Physical Volume signatures. This way, LVM is instructed to read Physical Volume signatures from DRBD devices, rather than from the underlying backing block devices.</p>"
-"\t\t"
-"<p><b>AutoFilter</b>: According to the configuration of drbd, LVM filter will always be changed automatically. To change it manually, disable the checkbox of AutoFilter.</p>"
+"\t\t<p><b>Device Filter</b>: This masks the underlying block device from the list of devices LVM scans for Physical Volume signatures. This way, LVM is instructed to read Physical Volume signatures from DRBD devices, rather than from the underlying backing block devices.</p>\t\t<p><b>AutoFilter</b>: According to the configuration of drbd, LVM filter will always be changed automatically. To change it manually, disable the checkbox of AutoFilter.</p>\n"
+"\t\t<p>The filter consists of an array of regular expressions. These expressions can be delimited by a character of your choice, and prefixed with either an 'a' (for accept) or 'r' (for reject).</p>\t\t<p>For example, setting filter as [\"r|/dev/sda.*|\"]</p>\n"
 "\n"
-"\t\t"
-"<p>The filter consists of an array of regular expressions. These expressions can be delimited by a character of your choice, and prefixed with either an 'a' (for accept) or 'r' (for reject).</p>"
-"\t\t"
-"<p>For example, setting filter as [\"r|/dev/sda.*|\"]</p>"
+"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Should disable the LVM cache when combined drbd with LVM.</p>\n"
 "\n"
+"\t\t<p><b>LVMetad</b>: When lvmetad is enabled, the volume group metadata and PV state flags are obtained from the lvmetad instance and no scanning is done by the individual commands. Because lvmetad's cache cannot be synchronized between nodes, users are advised to disable lvmetad in cluster environments.</p>\n"
 "\n"
 "\t\t"
-"<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Disable cache when for network storage, like nfs. </p>"
-"\n"
-"\n"
-"\t\t"
 msgstr ""
 
-#: src/include/drbd/helps.rb:130
+#: src/include/drbd/helps.rb:133
 #, fuzzy
 msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
 msgstr "<p><b><big>Globalt oppsett for DRBD</big></b></p>"
 
-#: src/include/drbd/helps.rb:133
+#: src/include/drbd/helps.rb:136
 #, fuzzy
 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 ein av gyldighetskontrollene i drbdadm</p>"
 
-#: src/include/drbd/helps.rb:136
+#: src/include/drbd/helps.rb:139
 #, fuzzy
 msgid ""
 "<p><b>Dialog Refresh:</b> The user dialog counts and displays the seconds it waited so\n"
@@ -423,7 +338,7 @@
 "                Dialogen vil oppdatera telleverdien i samsvar med sekundverdien i 'Oppdater dialog'.\n"
 "                Bruk 0 for å deaktivere oppdatering av skjermen heilt. </p>"
 
-#: src/include/drbd/helps.rb:144
+#: src/include/drbd/helps.rb:147
 #, fuzzy
 msgid ""
 "<p><b>Minor Count:</b>\n"
@@ -439,200 +354,220 @@
 "           som denne fila angjev. </p>"
 
 #. Summary dialog help 1/3
-#: src/include/drbd/helps.rb:152
+#: src/include/drbd/helps.rb:155
 #, fuzzy
 msgid ""
-"<p><b><big>DRBD Configuration</big></b><br>"
-"\n"
-"Configure drbd here.<br>"
-"</p>"
-"\n"
+"<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"
+"<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:156
+#: src/include/drbd/helps.rb:159
 #, fuzzy
 msgid ""
-"<p><b><big>Adding a drbd:</big></b><br>"
-"\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"
+"Then press <b>Configure</b>.</p>\n"
 msgstr ""
-"<p><b><big>Legg til ein drbd:</big></b><br>"
-"\n"
+"<p><b><big>Legg til ein drbd:</big></b><br>\n"
 "Vel ein drbd frå lista over registrerte drbd.\n"
 "Viss ein drbd ikkje vart registrert, bruk <b>Andre (ikkje registrert)</b>.\n"
-"Klikk deretter <b>Sett opp</b>.</p>"
-"\n"
+"Klikk deretter <b>Sett opp</b>.</p>\n"
 
 #. Summary dialog help 3/3
-#: src/include/drbd/helps.rb:163
+#: src/include/drbd/helps.rb:166
 #, fuzzy
 msgid ""
-"<p><b><big>Editing or Deleting:</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting:</big></b><br>\n"
 "If you press <b>Edit</b>, an additional dialog in which to change\n"
-"the configuration opens.</p>"
-"\n"
+"the configuration opens.</p>\n"
 msgstr ""
-"<p><b><big>Redigera eller slette:</big></b><br>"
-"\n"
+"<p><b><big>Redigera eller slette:</big></b><br>\n"
 "Viss du klikkar <b>Rediger</b>, får du opp ein ny dialog der\n"
-"du kan endra konfigurasjonen.</p>"
-"\n"
+"du kan endra konfigurasjonen.</p>\n"
 
 #. Ovreview dialog help 1/3
-#: src/include/drbd/helps.rb:169
+#: src/include/drbd/helps.rb:172
 #, fuzzy
 msgid ""
-"<p><b><big>DRBD Configuration Overview</big></b><br>"
-"\n"
+"<p><b><big>DRBD Configuration Overview</big></b><br>\n"
 "Obtain an overview of installed drbds. Additionally\n"
-"edit their configurations.<br>"
-"</p>"
-"\n"
+"edit their configurations.<br></p>\n"
 msgstr ""
-"<p><b><big>Oversyn over drbd-oppsett</big></b><br>"
-"\n"
+"<p><b><big>Oversyn over drbd-oppsett</big></b><br>\n"
 "Her finn du eit oversyn over installerte drbd-er. Du kan òg\n"
-"redigera oppsetta.<br>"
-"</p>"
-"\n"
+"redigera oppsetta.<br></p>\n"
 
 #. Ovreview dialog help 2/3
-#: src/include/drbd/helps.rb:175
+#: src/include/drbd/helps.rb:178
 #, fuzzy
 msgid ""
-"<p><b><big>Adding a drbd:</big></b><br>"
-"\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 ein drbd:</big></b><br>"
-"\n"
+"<p><b><big>Legg til ein drbd:</big></b><br>\n"
 "Klikk <b>Legg til</b> for å setja opp ein drbd.</p>"
 
 #. Ovreview dialog help 3/3
-#: src/include/drbd/helps.rb:179
+#: src/include/drbd/helps.rb:182
 #, fuzzy
 msgid ""
-"<p><b><big>Editing or Deleting:</big></b><br>"
-"\n"
+"<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"
+"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
 msgstr ""
-"<p><b><big>Rediger eller slett:</big></b><br>"
-"\n"
+"<p><b><big>Rediger eller slett:</big></b><br>\n"
 "Vel ein drbd du vil endra eller sletta.\n"
-"Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter ønske.</p>"
-"\n"
+"Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter ønske.</p>\n"
 
 #. Configure1 dialog help 1/2
-#: src/include/drbd/helps.rb:185
+#: src/include/drbd/helps.rb:188
 #, fuzzy
 msgid ""
-"<p><b><big>Configuration Part One</big></b><br>"
-"\n"
+"<p><b><big>Configuration Part One</big></b><br>\n"
 "Press <b>Next</b> to continue.\n"
-"<br>"
-"</p>"
+"<br></p>"
 msgstr ""
-"<p><b><big>Konfigurasjon, første del</big></b><br>"
-"\n"
+"<p><b><big>Konfigurasjon, første del</big></b><br>\n"
 "Trykk <b>Neste</b> for å halda fram.\n"
-"<br>"
-"</p>"
+"<br></p>"
 
 #. Configure1 dialog help 2/2
 #. Configure2 dialog help 2/2
-#: src/include/drbd/helps.rb:191 src/include/drbd/helps.rb:203
+#: src/include/drbd/helps.rb:194 src/include/drbd/helps.rb:206
 #, fuzzy
 msgid ""
-"<p><b><big>Selecting Something</big></b><br>"
-"\n"
+"<p><b><big>Selecting Something</big></b><br>\n"
 "It is not possible. You must code it first. :-)\n"
 "</p>"
 msgstr ""
-"<p><b><big>Velja noko:</big></b><br>"
-"\n"
+"<p><b><big>Velja noko:</big></b><br>\n"
 "Du må hacke litt før du kan velja noko :-)\n"
 "</p>"
 
 #. Configure2 dialog help 1/2
-#: src/include/drbd/helps.rb:197
+#: src/include/drbd/helps.rb:200
 #, fuzzy
 msgid ""
-"<p><b><big>Configuration Part Two</big></b><br>"
-"\n"
+"<p><b><big>Configuration Part Two</big></b><br>\n"
 "Press <b>Next</b> to continue.\n"
-"<br>"
-"</p>"
-"\n"
+"<br></p>\n"
 msgstr ""
-"<p><b><big>Konfigurasjon, andre del</big></b><br>"
-"\n"
+"<p><b><big>Konfigurasjon, andre del</big></b><br>\n"
 "Trykk <b>Neste</b> for å halda fram.\n"
-"<br>"
-"</p>"
-"\n"
+"<br></p>\n"
 
 #. Default is always true (auto)
-#: src/include/drbd/lvm_conf.rb:36
+#: src/include/drbd/lvm_conf.rb:44
 #, fuzzy
 msgid "LVM Filter Configuration of DRBD"
 msgstr "Globalt oppsett av DRBD"
 
-#: src/include/drbd/lvm_conf.rb:44
+#: src/include/drbd/lvm_conf.rb:52
 msgid "Modify LVM Device filter Automatically"
 msgstr ""
 
-#: src/include/drbd/lvm_conf.rb:54
+#: src/include/drbd/lvm_conf.rb:62
 msgid "Device Filter"
 msgstr ""
 
-#: src/include/drbd/lvm_conf.rb:64
+#: src/include/drbd/lvm_conf.rb:72
 msgid "Writing the LVM cache"
 msgstr ""
 
-#: src/include/drbd/lvm_conf.rb:73
+#: src/include/drbd/lvm_conf.rb:81
 msgid "Enable LVM Cache"
 msgstr ""
 
+#: src/include/drbd/lvm_conf.rb:86
+msgid "Warning!  Should disable LVM cache for using drbd."
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:97
+msgid "Use lvmetad for LVM"
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:106
+msgid "Use LVM metad"
+msgstr ""
+
+#: src/include/drbd/lvm_conf.rb:111
+msgid "Warning!  Should not use lvmetad for cluster."
+msgstr ""
+
 #. encoding: utf-8
-#: src/include/drbd/resource_conf.rb:134
+#: src/include/drbd/resource_conf.rb:143
 #, fuzzy
 msgid "Resource Name"
 msgstr "Ressursnavn"
 
-#. Update new add disk used of drbd res for LVM filter
-#. Ignore the removed disk
-#: src/include/drbd/resource_conf.rb:326
+#: src/include/drbd/resource_conf.rb:150
+msgid "Nodes"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:153
+msgid "Add"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:154
+msgid "Edit"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:155
+msgid "Delete"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:187
+msgid "Save"
+msgstr ""
+
+#. Since n_name can't be edit, so set direct is OK
+#: src/include/drbd/resource_conf.rb:329
 #, fuzzy
 msgid "Protocol"
 msgstr "Protokoll"
 
-#. myHelp("basic_conf");
-#: src/include/drbd/resource_conf.rb:572
+#. return `cancel or a string
+#: src/include/drbd/resource_conf.rb:569
+msgid "OK"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:570
+msgid "Cancel"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:584
 #, fuzzy
-msgid "Node names must be different."
+msgid "Node name can not be empty."
 msgstr "Andre nodenavn må angjevast."
 
-#: src/include/drbd/resource_conf.rb:578
+#. myHelp("basic_conf");
+#: src/include/drbd/resource_conf.rb:687
 msgid "Node names must not include \".\" , using the local hostname."
 msgstr ""
 
-#: src/include/drbd/resource_conf.rb:608
+#: src/include/drbd/resource_conf.rb:707
 #, fuzzy
 msgid "Please fill out all fields."
 msgstr "Fyll ut alle felt."
 
+#: src/include/drbd/resource_conf.rb:716
+msgid "Please configure at least two nodes."
+msgstr ""
+
+#. No need to check integrity since it will disabled when configuring
+#: src/include/drbd/resource_conf.rb:751
+msgid "Enter the node name:"
+msgstr ""
+
+#: src/include/drbd/resource_conf.rb:757
+#, fuzzy
+msgid "Node name must be different."
+msgstr "Andre nodenavn må angjevast."
+
 #. encoding: utf-8
 #. Package:	Configuration of heartbeat
 #. Authors:	Martin Lazar 
@@ -751,92 +686,92 @@
 #.
 #. Representation of the configuration of drbd.
 #. Input and output routines.
-#: src/modules/Drbd.rb:110
+#: src/modules/Drbd.rb:115
 msgid "Failed to merge separated DRBD conf files\n"
 msgstr ""
 
-#: src/modules/Drbd.rb:132
+#: src/modules/Drbd.rb:137
 msgid "Failed to write drbd.conf.YaST2prepare"
 msgstr ""
 
 #. DRBD read dialog caption
-#: src/modules/Drbd.rb:185
+#: src/modules/Drbd.rb:192
 #, fuzzy
 msgid "Initializing DRBD Configuration"
 msgstr "Initialiserer DRBD-oppsett"
 
 #. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:193
+#: src/modules/Drbd.rb:200
 #, fuzzy
 msgid "Read global settings"
 msgstr "Les globale innstillingar"
 
-#: src/modules/Drbd.rb:194
+#: src/modules/Drbd.rb:201
 #, fuzzy
 msgid "Read resources"
 msgstr "Les ressursar"
 
-#: src/modules/Drbd.rb:195
+#: src/modules/Drbd.rb:202
 #, fuzzy
 msgid "Read LVM configurations"
 msgstr "Drbd-oppsett"
 
-#: src/modules/Drbd.rb:196
+#: src/modules/Drbd.rb:203
 #, fuzzy
 msgid "Read daemon status"
 msgstr "Les nissestatus"
 
-#: src/modules/Drbd.rb:197 src/modules/Drbd.rb:204
+#: src/modules/Drbd.rb:204 src/modules/Drbd.rb:211
 #, fuzzy
 msgid "Read SuSEFirewall Settings"
 msgstr "Les globale innstillingar"
 
-#: src/modules/Drbd.rb:200
+#: src/modules/Drbd.rb:207
 #, fuzzy
 msgid "Reading global settings..."
 msgstr "Les globale innstillingar …"
 
-#: src/modules/Drbd.rb:201
+#: src/modules/Drbd.rb:208
 #, fuzzy
 msgid "Reading resources..."
 msgstr "Les ressursar …"
 
-#: src/modules/Drbd.rb:202
+#: src/modules/Drbd.rb:209
 #, fuzzy
 msgid "Reading LVM configurations..."
 msgstr "Lagrar DRBD-oppsett"
 
-#: src/modules/Drbd.rb:203
+#: src/modules/Drbd.rb:210
 #, fuzzy
 msgid "Reading daemon status..."
 msgstr "Lesar nissestatus …"
 
-#: src/modules/Drbd.rb:205 src/modules/Drbd.rb:629
+#: src/modules/Drbd.rb:212 src/modules/Drbd.rb:662
 #, fuzzy
 msgid "Finished"
 msgstr "Fullført"
 
 #. new_map = remove(new_map, key);
-#: src/modules/Drbd.rb:497
+#: src/modules/Drbd.rb:515
 msgid "Failed to backup drbd.conf"
 msgstr ""
 
-#: src/modules/Drbd.rb:506
+#: src/modules/Drbd.rb:524
 msgid "Failed to clean drbd.conf for drbdadm test"
 msgstr ""
 
-#: src/modules/Drbd.rb:530
+#: src/modules/Drbd.rb:548
 msgid ""
 "Invalid configuration of resource %1\n"
 "%2"
 msgstr ""
 
-#: src/modules/Drbd.rb:549
+#: src/modules/Drbd.rb:567
 msgid "Failed to bring drbd.conf back"
 msgstr ""
 
 #. DRBD write dialog caption
-#: src/modules/Drbd.rb:605
+#: src/modules/Drbd.rb:638
 #, fuzzy
 msgid "Writing DRBD Configuration"
 msgstr "Lagrar DRBD-oppsett"
@@ -845,57 +780,57 @@
 #. won't change modified flag
 #. return true if !@modified
 #. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:617
+#: src/modules/Drbd.rb:650
 #, fuzzy
 msgid "Write global settings"
 msgstr "Lagre generelle innstillingar"
 
-#: src/modules/Drbd.rb:618
+#: src/modules/Drbd.rb:651
 #, fuzzy
 msgid "Write resources"
 msgstr "Lagre ressursane"
 
-#: src/modules/Drbd.rb:619
+#: src/modules/Drbd.rb:652
 #, fuzzy
 msgid "Write LVM configurations"
 msgstr "Lagrar DRBD-oppsett"
 
-#: src/modules/Drbd.rb:620
+#: src/modules/Drbd.rb:653
 #, fuzzy
 msgid "Set daemon status"
 msgstr "Definer nissestatus"
 
-#: src/modules/Drbd.rb:621
+#: src/modules/Drbd.rb:654
 #, fuzzy
 msgid "Write the SuSEfirewall settings"
 msgstr "Lagre generelle innstillingar"
 
-#: src/modules/Drbd.rb:624
+#: src/modules/Drbd.rb:657
 #, fuzzy
 msgid "Writing global settings..."
 msgstr "Lagrar generelle innstillingar …"
 
-#: src/modules/Drbd.rb:625
+#: src/modules/Drbd.rb:658
 #, fuzzy
 msgid "Writing resources..."
 msgstr "Lagrar ressursar …"
 
-#: src/modules/Drbd.rb:626
+#: src/modules/Drbd.rb:659
 #, fuzzy
 msgid "Writing LVM configurations..."
 msgstr "Lagrar DRBD-oppsett"
 
-#: src/modules/Drbd.rb:627
+#: src/modules/Drbd.rb:660
 #, fuzzy
 msgid "Setting daemon status..."
 msgstr "Definerer nissestatus …"
 
-#: src/modules/Drbd.rb:628
+#: src/modules/Drbd.rb:661
 #, fuzzy
 msgid "Writing the SuSEFirewall settings"
 msgstr "Lagrar generelle innstillingar …"
 
-#: src/modules/Drbd.rb:639
+#: src/modules/Drbd.rb:672
 msgid "Failed to make directory /etc/drbd.d"
 msgstr ""
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/fcoe-client.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/fcoe-client.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/fcoe-client.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -367,130 +367,90 @@
 #: src/include/fcoe-client/helps.rb:35
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing fcoe-client Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Initializing fcoe-client Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Initialiserer oppsett av fcoe-klient</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer oppsett av fcoe-klient</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/fcoe-client/helps.rb:39
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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 avbryta oppsettverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
+"Du kan trygt avbryta oppsettverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/fcoe-client/helps.rb:43
 #, fuzzy
 msgid ""
-"<p><b><big>Saving fcoe-client Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Saving fcoe-client Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Lagrar oppsett for fcoe-klient</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar oppsett for fcoe-klient</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/fcoe-client/helps.rb:47
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryt lagring:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Summary dialog help 1/3
 #: src/include/fcoe-client/helps.rb:54
 #, fuzzy
 msgid ""
-"<p><b><big>FcoeClient Configuration</big></b><br>"
-"\n"
-"Configure fcoe-client here.<br>"
-"</p>"
-"\n"
+"<p><b><big>FcoeClient Configuration</big></b><br>\n"
+"Configure fcoe-client here.<br></p>\n"
 msgstr ""
-"<p><b><big>Oppset av FcoeClient</big></b><br>"
-"\n"
-"Sett opp fcoe-klienten her.<br>"
-"</p>"
-"\n"
+"<p><b><big>Oppset av FcoeClient</big></b><br>\n"
+"Sett opp fcoe-klienten her.<br></p>\n"
 
 #. Summary dialog help 2/3
 #: src/include/fcoe-client/helps.rb:58
 #, fuzzy
 msgid ""
-"<p><b><big>Adding a fcoe-client:</big></b><br>"
-"\n"
+"<p><b><big>Adding a fcoe-client:</big></b><br>\n"
 "Choose a fcoe-client from the list of detected fcoe-clients.\n"
 "If your fcoe-client was not detected, use <b>Other (not detected)</b>.\n"
-"Then press <b>Configure</b>.</p>"
-"\n"
+"Then press <b>Configure</b>.</p>\n"
 msgstr ""
-"<p><b><big>Leggja til ein fcoe-klient:</big></b><br>"
-"\n"
+"<p><b><big>Leggja til ein fcoe-klient:</big></b><br>\n"
 "Vel ein fcoe-klient frå lista over fcoe-klientar som er funnen. \n"
 "Viss fcoe-klienten ikkje vart funnen, bruk <b>Annan (ikkje funnet)</b>.\n"
-"Trykk deretter <b>Sett opp</b>.</p>"
-"\n"
+"Trykk deretter <b>Sett opp</b>.</p>\n"
 
 #. Summary dialog help 3/3
 #: src/include/fcoe-client/helps.rb:65
 #, fuzzy
 msgid ""
-"<p><b><big>Editing or Deleting:</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting:</big></b><br>\n"
 "If you press <b>Edit</b>, an additional dialog in which to change\n"
-"the configuration opens.</p>"
-"\n"
+"the configuration opens.</p>\n"
 msgstr ""
-"<p><b><big>Redigera eller slette:</big></b><br>"
-"\n"
+"<p><b><big>Redigera eller slette:</big></b><br>\n"
 "Viss du klikkar <b>Rediger</b>, får du opp ein ny dialog der\n"
-"du kan endra konfigurasjonen.</p>"
-"\n"
+"du kan endra konfigurasjonen.</p>\n"
 
 #. Services dialog help 1/3
 #: src/include/fcoe-client/helps.rb:71
 #, fuzzy
-msgid ""
-"<p><b><big>Starting of services</big><br>"
-"</b><br>"
-"Enable or disable the start of the services <b>fcoe</b> and <b>lldpad</b> at boot time.</p>"
+msgid "<p><b><big>Starting of services</big><br></b><br>Enable or disable the start of the services <b>fcoe</b> and <b>lldpad</b> at boot time.</p>"
 msgstr ""
-"<p><b><big>Start av tenester</big><br>"
-"</b><br>"
-"\n"
+"<p><b><big>Start av tenester</big><br></b><br>\n"
 "Du kan aktivera eller deaktivere start av tenestene\n"
-"<b>fcoe</b> og <b>lldpad</b> ved oppstart av systemet.</p>"
-"\n"
+"<b>fcoe</b> og <b>lldpad</b> ved oppstart av systemet.</p>\n"
 
 #. Services dialog help 2/3
 #: src/include/fcoe-client/helps.rb:76
@@ -511,20 +471,13 @@
 #: src/include/fcoe-client/helps.rb:88
 #, fuzzy
 msgid "<p><b><big>Network interface overview</big></b></p>"
-msgstr ""
-"<p><b><big>Oversyn over nettverksgrensesnitt</big></b><br>"
-"</p>"
+msgstr "<p><b><big>Oversyn over nettverksgrensesnitt</big></b><br></p>"
 
 #. Interfaces dialog help 2/5
 #: src/include/fcoe-client/helps.rb:92
 #, fuzzy
-msgid ""
-"<p>The interfaces dialog shows all detected netcards including the status of VLAN and FCoE configuration.<br>"
-"FCoE is possible if a VLAN interface is configured for FCoE on the switch.<br>"
-"For every netcard (network interface), this is shown in column <i>FCoE VLAN Interface</i>.</p>"
-msgstr ""
-"<p>Grensesnittdialogen viser alle registrerte nettverkskort og dessutan status for VLAN- og FCoE-oppsettet.<br>"
-"FCoE kan nyttast viss VLAN-grensesnittet er sett opp for FCoE (avkryssingsboks). For alle nettverkskort (nettverksgrensesnitt) visast dette i kolonnen <i>«FCoE VLAN-grensesnitt</i>».</p>"
+msgid "<p>The interfaces dialog shows all detected netcards including the status of VLAN and FCoE configuration.<br>FCoE is possible if a VLAN interface is configured for FCoE on the switch.<br>For every netcard (network interface), this is shown in column <i>FCoE VLAN Interface</i>.</p>"
+msgstr "<p>Grensesnittdialogen viser alle registrerte nettverkskort og dessutan status for VLAN- og FCoE-oppsettet.<br>FCoE kan nyttast viss VLAN-grensesnittet er sett opp for FCoE (avkryssingsboks). For alle nettverkskort (nettverksgrensesnitt) visast dette i kolonnen <i>«FCoE VLAN-grensesnitt</i>».</p>"
 
 #. Interfaces dialog help 3/5
 #: src/include/fcoe-client/helps.rb:99
@@ -534,19 +487,11 @@
 #. Interfaces dialog help 4/5
 #: src/include/fcoe-client/helps.rb:103
 #, fuzzy
-msgid ""
-"<p>The values for <i>FCoE VLAN Interface</i> in detail:<br>"
-"<b>not available</b>: Fibre Channel over Ethernet is not possible (must be enabled on the switch first).<br>"
-"<b>not configured</b>: FCoE is possible but not yet activated.<br>"
-"Press <b>Create FCoE VLAN Interface</b> to activate.<br>"
-"If the FCoE VLAN interface has already been created, the name is shown in the column, e.g. eth3.200.</p>"
+msgid "<p>The values for <i>FCoE VLAN Interface</i> in detail:<br><b>not available</b>: Fibre Channel over Ethernet is not possible (must be enabled on the switch first).<br><b>not configured</b>: FCoE is possible but not yet activated.<br>Press <b>Create FCoE VLAN Interface</b> to activate.<br>If the FCoE VLAN interface has already been created, the name is shown in the column, e.g. eth3.200.</p>"
 msgstr ""
-"<p>Detaljert om verda for <i>FCoE VLAN-grensesnitt</i>:<br>"
-"\n"
-"<b>ikkje tilgjengeleg</b> tyder at FCoE ikkje kan nyttast (må aktiverast ved å kryssa av først)<br>"
-"\n"
-"<b>ikkje sat opp</b>: FCoE kan nyttast men er ikkje aktiverte enno. Trykk på <b>Opprett FCoE VLAN-grensesnitt</b> for å gjera dette.<br>"
-"\n"
+"<p>Detaljert om verda for <i>FCoE VLAN-grensesnitt</i>:<br>\n"
+"<b>ikkje tilgjengeleg</b> tyder at FCoE ikkje kan nyttast (må aktiverast ved å kryssa av først)<br>\n"
+"<b>ikkje sat opp</b>: FCoE kan nyttast men er ikkje aktiverte enno. Trykk på <b>Opprett FCoE VLAN-grensesnitt</b> for å gjera dette.<br>\n"
 " Viss FCoE VLAN-grensesnittet allereie er oppretta, vert vist namnet i kolonnen, t.d. eth3.200.</p>"
 
 #. Interfaces dialog help 4/5
@@ -571,21 +516,13 @@
 #: src/include/fcoe-client/helps.rb:125
 #, fuzzy
 msgid ""
-"<p>The values are:<br>"
-"\n"
-"<b>Debug</b>: <i>yes</i> or <i>no</i><br>"
-"This is used to enable or disable debugging messages from the fcoe service script and <i>fcoemon</i>.<br>"
-"<b>Use syslog</b>: <i>yes</i> or <i>no</i><br>"
-"Messages are sent to the system log if set to <i>yes</i> (data are logged to /var/log/messages).</p>"
+"<p>The values are:<br>\n"
+"<b>Debug</b>: <i>yes</i> or <i>no</i><br>This is used to enable or disable debugging messages from the fcoe service script and <i>fcoemon</i>.<br><b>Use syslog</b>: <i>yes</i> or <i>no</i><br>Messages are sent to the system log if set to <i>yes</i> (data are logged to /var/log/messages).</p>"
 msgstr ""
-"<p>Verda er:<br>"
-"\n"
-"<b>Feilsøking</b>: <i>ja</i> eller <i>nei</i><br>"
-"\n"
-"Dette vert brukt for å aktivare feilsøkingsmeldinger frå fcoe-tenesta si skript og <i>fcoemon</i>»<br>"
-"\n"
-"<b>Nytte syslog</b>: <i>ja</i> eller <i>nei</i><br>"
-"\n"
+"<p>Verda er:<br>\n"
+"<b>Feilsøking</b>: <i>ja</i> eller <i>nei</i><br>\n"
+"Dette vert brukt for å aktivare feilsøkingsmeldinger frå fcoe-tenesta si skript og <i>fcoemon</i>»<br>\n"
+"<b>Nytte syslog</b>: <i>ja</i> eller <i>nei</i><br>\n"
 " Meldingar vert send til systemloggen viss <i>ja</i> er vald (data loggast i /var/log/messages).</p>"
 
 #. edit dialog help 1/3
@@ -597,9 +534,7 @@
 #. Edit dialog help 2/3
 #: src/include/fcoe-client/helps.rb:137
 #, fuzzy
-msgid ""
-"<p>The daemon <i>fcoemon</i> reads these configuration files on initialization.<br>"
-"There is a file for every interface and the values indicate whether FCoE instances should be created and if DCB is required.</p>"
+msgid "<p>The daemon <i>fcoemon</i> reads these configuration files on initialization.<br>There is a file for every interface and the values indicate whether FCoE instances should be created and if DCB is required.</p>"
 msgstr ""
 "<p><i>fcoemon</i>-nissen les desse oppsettfilene under initialisering.\n"
 "           Det er ei fil for kvart grensesnitt, og verda viser om FCoE-instansar\n"
@@ -608,27 +543,14 @@
 #. Edit dialog help 3/3
 #: src/include/fcoe-client/helps.rb:143
 #, fuzzy
-msgid ""
-"<p>The values are:<br>"
-"<b>FCoE Enable</b>: <i>yes</i> or <i>no</i><br>"
-"Enable or disable the creation of FCoE instances.<br>"
-"<b>DCB Required</b>: <i>yes</i> or <i>no</i><br>"
-"The default is <i>yes</i>, DCB is usually required.<br>"
-"<b>AUTO VLAN</b>: <i>yes</i> or <i>no</i><br>"
-"If set to <i>yes</i> 'fcoemon' will create the VLAN interfaces automatically.</p>"
+msgid "<p>The values are:<br><b>FCoE Enable</b>: <i>yes</i> or <i>no</i><br>Enable or disable the creation of FCoE instances.<br><b>DCB Required</b>: <i>yes</i> or <i>no</i><br>The default is <i>yes</i>, DCB is usually required.<br><b>AUTO VLAN</b>: <i>yes</i> or <i>no</i><br>If set to <i>yes</i> 'fcoemon' will create the VLAN interfaces automatically.</p>"
 msgstr ""
-"<p>Verda er:<br>"
-"       \n"
-"           Aktivar FCoE: <i>ja</i> eller <i>nei</i><br>"
-"\n"
-" Aktivar eller deaktiver skiping av FCoE-instansar. <br>"
-"\n"
-"           DCB krevjast: <i>ja</i> eller <i>nei</i><br>"
-"\n"
-" Standardinnstillingen er <i>ja</i>. DCB vert vanlegvis           kravde.<br>"
-"\n"
-"<b>AUTO VLAN</b>: <i>ja</i> eller <i>nei</i><br>"
-"\n"
+"<p>Verda er:<br>       \n"
+"           Aktivar FCoE: <i>ja</i> eller <i>nei</i><br>\n"
+" Aktivar eller deaktiver skiping av FCoE-instansar. <br>\n"
+"           DCB krevjast: <i>ja</i> eller <i>nei</i><br>\n"
+" Standardinnstillingen er <i>ja</i>. DCB vert vanlegvis           kravde.<br>\n"
+"<b>AUTO VLAN</b>: <i>ja</i> eller <i>nei</i><br>\n"
 "Viss <i>ja</i>, vil 'fcoemon' automatisk oppretta VLAN-\n"
 "grensesnitt.</p>"
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/firewall-services.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/firewall-services.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/firewall-services.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:38+0200\n"
+"POT-Creation-Date: 2016-05-06 17:00+0200\n"
 "PO-Revision-Date: 2015-08-12 21:10+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"

Modified: branches/plus-SLE12-SP2/yast/nn/po/firewall.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/firewall.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/firewall.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -235,58 +235,46 @@
 #, fuzzy
 msgid ""
 "<p><b><big>Reading Firewall Configuration</big></b>\n"
-"<br>"
-"Please wait...</p>"
+"<br>Please wait...</p>"
 msgstr ""
 "<p><b><big>Lesar brannmurkonfigurasjon</big></b>\n"
-"<br>"
-"Vent…</p>"
+"<br>Vent…</p>"
 
 #. TRANSLATORS: Write dialog help
 #: src/include/firewall/helps.rb:46
 #, fuzzy
 msgid ""
 "<p><b><big>Saving Firewall Configuration</big></b>\n"
-"<br>"
-"Please wait...</p>"
+"<br>Please wait...</p>"
 msgstr ""
 "<p><b><big>Lagrar brannmurkonfigurasjon</big></b>\n"
-"<br>"
-"Vent..</p>"
+"<br>Vent..</p>"
 
 #. TRANSLATORS: Firewall interfaces dialog help
 #: src/include/firewall/helps.rb:50
 #, fuzzy
 msgid ""
 "<p><b><big>Interfaces</big></b>\n"
-"<br>"
-"Here, assign your network devices into firewall zones\n"
-"by selecting the device in the table and clicking <b>Change</b>.</p>"
+"<br>Here, assign your network devices into firewall zones\n"
+"by selecting the device in the table and clicking <b>Change</b>.</p>\n"
 "\n"
-"\n"
 "<p>Enter special strings, like <tt>any</tt>, using \n"
 "<b>Custom</b>. You can also enter interfaces not yet configured here.\n"
-"If you need masquerading, the string <tt>any</tt> is not allowed.</p>"
+"If you need masquerading, the string <tt>any</tt> is not allowed.</p>\n"
 "\n"
-"\n"
 "<p>Every network device should be assigned to a firewall zone.\n"
-"Network traffic through any unassigned interface is blocked.</p>"
-"\n"
+"Network traffic through any unassigned interface is blocked.</p>\n"
 msgstr ""
 "<p><b><big>Grensesnitt</big></b>\n"
-"<br>"
-"Her kan du tilordne nettverksenhetene til brannmursoner\n"
-"ved å velja ei eining i tabellen og klikka på <b>Endre</b>.</p>"
+"<br>Her kan du tilordne nettverksenhetene til brannmursoner\n"
+"ved å velja ei eining i tabellen og klikka på <b>Endre</b>.</p>\n"
 "\n"
-"\n"
 "<p>Angje spesielle kommandoar som <i>any</i> ved å bruka \n"
 "<b>Egendefinert</b>. Her kan du òg angje grensesnitt som ikkje er konfigurert enno.\n"
-"Viss du vil bruka maskering, er ikkje kommandoen <i>any</i> tillate.</p>"
+"Viss du vil bruka maskering, er ikkje kommandoen <i>any</i> tillate.</p>\n"
 "\n"
-"\n"
 "<p>Alle nettverksenheter bør tilordnes ein brannmursone.\n"
-"Nettverkstrafikk via eit grensesnitt som ikkje er tilordnet, vil blokkerast.</p>"
-"\n"
+"Nettverkstrafikk via eit grensesnitt som ikkje er tilordnet, vil blokkerast.</p>\n"
 
 #. Network Manager
 #. (NetworkService::IsManaged() ?
@@ -304,36 +292,27 @@
 #, fuzzy
 msgid ""
 "<p><b><big>Allowed Services</big></b>\n"
-"<br>"
-"Specify services or ports that should be accessible from the network.\n"
-"Networks are divided into firewall zones.</p>"
+"<br>Specify services or ports that should be accessible from the network.\n"
+"Networks are divided into firewall zones.</p>\n"
 "\n"
-"\n"
 "<p>To allow a service, select the <b>Zone</b> and the\n"
 "<b>Service to Allow</b> then press <b>Add</b>.\n"
-"To remove an allowed service, select the <b>Zone</b> and the <b>Allowed Service</b> then press <b>Delete</b>.</p>"
+"To remove an allowed service, select the <b>Zone</b> and the <b>Allowed Service</b> then press <b>Delete</b>.</p>\n"
 "\n"
-"\n"
 "<p>By deselecting <b>Protect Firewall from Internal Zone</b>, you remove\n"
 "protection from the zone. All services and ports in your internal network will\n"
-"be unprotected.</p>"
-"\n"
+"be unprotected.</p>\n"
 msgstr ""
 "<p><b><big>Tillatne tenester</big></b>\n"
-"<br>"
-"Her spesifiserer du tenester eller portar som skal vera tilgjengelege frå nettverket.\n"
-"Nettverk er delt inn i brannmursoner.</p>"
+"<br>Her spesifiserer du tenester eller portar som skal vera tilgjengelege frå nettverket.\n"
+"Nettverk er delt inn i brannmursoner.</p>\n"
 "\n"
-"\n"
 "<p>For å tillata ei teneste, vel <b>Sone</b> og\n"
-"<b>Tillati teneste</b>, og klikk på <b>Legg til</b>.</p>"
+"<b>Tillati teneste</b>, og klikk på <b>Legg til</b>.</p>\n"
+"For å fjerne ei tillati teneste, vel <b>Sone</b> og <b>Tillati teneste<b>, og klikk på <b>Fjern</b>.</p>\n"
 "\n"
-"For å fjerne ei tillati teneste, vel <b>Sone</b> og <b>Tillati teneste<b>, og klikk på <b>Fjern</b>.</p>"
-"\n"
-"\n"
 "<p>Fjern avkryssingen for <b>Deaktiver brannmur for intern sone</b> for å fjerne\n"
-"vernet for heile sona. Alle tenester og portar i denne sona vil vera ubeskyttet.</p>"
-"\n"
+"vernet for heile sona. Alle tenester og portar i denne sona vil vera ubeskyttet.</p>\n"
 
 #. TRANSLATORS: Allowed services dialog help 2/2
 #: src/include/firewall/helps.rb:89
@@ -341,47 +320,39 @@
 msgid ""
 "<p>Additional settings can be configured using <b>Advanced</b>.\n"
 "Entries must be separated by a space. There you can allow TCP, UDP, and RPC ports and\n"
-"IP protocols.</p>"
-"\n"
+"IP protocols.</p>\n"
 "<p>TCP and UDP ports can be entered as port names (<tt>ftp-data</tt>),\n"
 "port numbers (<tt>3128</tt>), and port ranges (<tt>8000:8520</tt>).\n"
 "RPC ports must be entered as service names (<tt>portmap</tt> or <tt>nlockmgr</tt>).\n"
 "Enter IP protocols as the protocol name (<tt>esp</tt>).\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>Fleire innstillingar kan konfigurerast under <b>Avansert</b>.\n"
 "Oppføringer må vera adskilt av eit eit mellomrom. Her kan du aktivera TCP-, UDP- og RPC-portar og dessutan\n"
-"IP-protokollar.</p>"
-"\n"
+"IP-protokollar.</p>\n"
 "<p>TCP- og UDP-portar kan angjevast som portnavn (<tt>ftp-data</tt>),\n"
 "portnummer (<tt>3128</tt>) og portområder (<tt>8000:8520</tt>).\n"
 "RPC-portar må angjevast som tjenestenavn (<tt>portmap</tt> eller <tt>nlockmgr</tt>).\n"
 "Angje IP-protokollar med protokollnavnet (<tt>esp</tt>).\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. TRANSLATORS: Base masquerade dialog help
 #: src/include/firewall/helps.rb:100
 #, fuzzy
 msgid ""
 "<p><b><big>Masquerading</big></b>\n"
-"<br>"
-"Masquerading is a function that hides your internal network behind your firewall and allows\n"
+"<br>Masquerading is a function that hides your internal network behind your firewall and allows\n"
 "your internal network to access the external network, such as the Internet, transparently. Requests\n"
 "from the external network to the internal one are blocked.\n"
 "Select <b>Masquerade Networks</b> to masquerade your networks\n"
-"to the external network.</p>"
-"\n"
+"to the external network.</p>\n"
 msgstr ""
 "<p><b><big>Maskering</big></b>\n"
-"<br>"
-"Maskering er ein funksjon som skjuler det interne nettverket ditt bak brannmuren, men gjev\n"
+"<br>Maskering er ein funksjon som skjuler det interne nettverket ditt bak brannmuren, men gjev\n"
 "det interne nettverket transparent tilgjenge til eksterne nettverk, til dømes Internett. Førespurnader\n"
 "frå det eksterne nettverket til det interne vert blokkert.\n"
 "Vel <b>Maskar nettverk</b> for å maskera nettverka\n"
-"for eksterne nettverk.</p>"
-"\n"
+"for eksterne nettverk.</p>\n"
 
 #. TRANSLATORS: Redirect-masquerade table dialog help
 #: src/include/firewall/helps.rb:109
@@ -390,183 +361,142 @@
 "<p>\n"
 "Although requests from the external network cannot reach your internal network, it is possible to\n"
 "transparently redirect any requested ports on your firewall to any internal IP.  \n"
-"To add a new redirect rule, press <b>Add</b> and complete the redirect form.</p>"
+"To add a new redirect rule, press <b>Add</b> and complete the redirect form.</p>\n"
 "\n"
-"\n"
-"<p>To removed any redirect rule, select it in the table and press <b>Delete</b>.</p>"
-"\n"
+"<p>To removed any redirect rule, select it in the table and press <b>Delete</b>.</p>\n"
 msgstr ""
 "<p>\n"
 "Sjølv om førespurnader frå det eksterne nettverket ikkje når fram til det interne nettverket, er det mogleg å\n"
 "tillata transparent omdirigering av alle forespurte portar i brannmuren til kva for ein som helst intern IP.\n"
-"Legg til ein ny omdirigeringsregel ved å klikka på <b>Legg til</b> og fylla ut omdirigeringsskjemaet.</p>"
+"Legg til ein ny omdirigeringsregel ved å klikka på <b>Legg til</b> og fylla ut omdirigeringsskjemaet.</p>\n"
 "\n"
-"\n"
-"<p>Ein omdirigeringsregel kan fjernast ved å velja han i tabellen og klikka på <b>Slett</b>.</p>"
-"\n"
+"<p>Ein omdirigeringsregel kan fjernast ved å velja han i tabellen og klikka på <b>Slett</b>.</p>\n"
 
 #. TRANSLATORS: Simple broadcast configuration dialog help
 #: src/include/firewall/helps.rb:118
 #, fuzzy
 msgid ""
 "<p><b><big>Broadcast Configuration</big></b>\n"
-"<br>"
-"Broadcast packets are special UDP packets sent to the whole network to find \n"
+"<br>Broadcast packets are special UDP packets sent to the whole network to find \n"
 "neighboring computers or send information to each computer in the network.\n"
-"For example, CUPS servers provide information about their printing queues using broadcast packets.</p>"
+"For example, CUPS servers provide information about their printing queues using broadcast packets.</p>\n"
 "\n"
-"\n"
 "<p>SuSEfirewall2 services selected in allowed interfaces automatically add needed broadcast\n"
 "ports here. To remove any or add any others, edit lists of space-separated ports for\n"
-"particular zones.</p>"
+"particular zones.</p>\n"
 "\n"
-"\n"
 "<p>Other dropped broadcast packets are logged. It could be quite a lot of packets in wider networks.\n"
 "To suppress logging of these packets, deselect <b>Log Not Accepted Broadcast Packets</b>\n"
-"for the desired zones.</p>"
-"\n"
+"for the desired zones.</p>\n"
 msgstr ""
 "<p><b><big>Kringkastingskonfigurasjon</big></b>\n"
-"<br>"
-"Kringkasta pakker er spesielle UDP-pakker som vert til send heile nettverket for å finne \n"
+"<br>Kringkasta pakker er spesielle UDP-pakker som vert til send heile nettverket for å finne \n"
 "tilkoblede datamaskiner eller for å senda informasjon til alle maskinene i nettverket.\n"
-"CUP sin-servera sendar til dømes informasjon om utskriftskøer ved hjelp av kringkasta pakker."
-"<p>\n"
+"CUP sin-servera sendar til dømes informasjon om utskriftskøer ved hjelp av kringkasta pakker.<p>\n"
 "\n"
 "<p>SuSEfirewall2-tenester som er valde for tillatne grensesnitt, legg automatisk til naudsynte\n"
 "kringkastingsporter her. For å fjerne nokon av desse eller leggja til andre kan du redigera lister med portar adskilt av komene for\n"
-"spesielle soner.</p>"
+"spesielle soner.</p>\n"
 "\n"
-"\n"
 "<p>Andre avviste kringkasta pakker vert logga. I store nettverk kan dette dreia seg om mange pakker.\n"
 "For å stansa loggingen av desse pakkene, fjern avkryssingen for <b>Ikkje logg avviste kringkasta pakker</b>\n"
-"for aktuelle soner.</p>"
-"\n"
+"for aktuelle soner.</p>\n"
 
 #: src/include/firewall/helps.rb:132
 #, fuzzy
 msgid ""
-"<p><b><big>Broadcast Reply</big></b><br>"
-"\n"
+"<p><b><big>Broadcast Reply</big></b><br>\n"
 "Firewall usually drops packets that are sent by another machines as their reply\n"
-"to broadcast packets sent by your system, e.g., Samba browsing or SLP browsing.</p>"
+"to broadcast packets sent by your system, e.g., Samba browsing or SLP browsing.</p>\n"
 "\n"
-"\n"
 "<p>Here you can configure which packets are allowed to pass through the firewall. Use <b>Add</b>\n"
 "button to add a new rule. You will have to choose the firewall zone and also choose from\n"
-"some already defined services or set your rule completely manually.</p>"
-"\n"
+"some already defined services or set your rule completely manually.</p>\n"
 msgstr ""
-"<p><b><big>Kringkastingssvar<big></b><br>"
-"\n"
+"<p><b><big>Kringkastingssvar<big></b><br>\n"
 "Brannmuren forkastar vanlegvis pakker som er send frå andre maskiner som svar\n"
-"på kringkasta pakker frå ditt eige system, t.d., Samba- eller SLP-søk.</p>"
+"på kringkasta pakker frå ditt eige system, t.d., Samba- eller SLP-søk.</p>\n"
 "\n"
-"\n"
 "<p>Her kan du angje kva for pakker som vert tillatne å passera gjennom brannmuren. Bruk <b>Legg til</b>-\n"
 "knappen for å leggja til ein ny regel. Du må velja brannmursone og dessutan velja éin eller\n"
-"fleire tenester som allereie er definert, eller definera ein eigen regel heilt manuelt.</p>"
-"\n"
+"fleire tenester som allereie er definert, eller definera ein eigen regel heilt manuelt.</p>\n"
 
 #. TRANSLATORS: Base IPsec configuration dialog help
 #: src/include/firewall/helps.rb:142
 #, fuzzy
 msgid ""
 "<p><b><big>IPsec Support</big></b>\n"
-"<br>"
-"IPsec is an encrypted communication between trusted hosts or networks through untrusted networks, such as\n"
+"<br>IPsec is an encrypted communication between trusted hosts or networks through untrusted networks, such as\n"
 "the Internet. This dialog opens IPsec for an external zone using\n"
-"<b>Enabled</b>.</p>"
+"<b>Enabled</b>.</p>\n"
 "\n"
-"\n"
 "<p><b>Details</b> configures how to handle successfully decrypted\n"
-"IPsec packets.  For example, they could be handled as if they were from the internal zone.</p>"
-"\n"
+"IPsec packets.  For example, they could be handled as if they were from the internal zone.</p>\n"
 msgstr ""
 "<p><b><big>IPsec-støytte</big></b>\n"
-"<br>"
-"IPsec er kryptert kommunikasjon mellom pålitelege vertsmaskiner eller nettverk vigd upålitelige nettverk, til dømes Internett. Denne dialogen opnar IPsec for ei ekstern sone viss du vel\n"
-"<b>Aktivert</b>.</p>"
+"<br>IPsec er kryptert kommunikasjon mellom pålitelege vertsmaskiner eller nettverk vigd upålitelige nettverk, til dømes Internett. Denne dialogen opnar IPsec for ei ekstern sone viss du vel\n"
+"<b>Aktivert</b>.</p>\n"
 "\n"
-"\n"
 "<p>Under <b>Detaljar</b> konfigurerer du korleis IPsec-pakkar med godkjent\n"
-"dekryptering skal handterast. Dei kan til dømes handterast som om komer frå den interne sona.</p>"
-"\n"
+"dekryptering skal handterast. Dei kan til dømes handterast som om komer frå den interne sona.</p>\n"
 
 #. TRANSLATORS: Base Logging configuration dialog help
 #: src/include/firewall/helps.rb:152
 #, fuzzy
 msgid ""
 "<p><b><big>Logging Level</big></b>\n"
-"<br>"
-"This is a base configuration dialog for IP packet logging settings. Here,\n"
-"configure logging for incoming connection packets. Outgoing ones are not logged at all.</p>"
+"<br>This is a base configuration dialog for IP packet logging settings. Here,\n"
+"configure logging for incoming connection packets. Outgoing ones are not logged at all.</p>\n"
 "\n"
-"\n"
 "<p>There are two groups of logged IP packets: <b>Accepted Packets</b> and <b>Not Accepted Packets</b>.\n"
 "You can choose from three levels of logging for each group: <b>Log All</b> for logging every\n"
 "packet, <b>Log Only Critical</b> for logging only interesting ones, or <b>Do Not Log Any</b>\n"
-"for no logging. You should log at least critical accepted packets.</p>"
-"\n"
+"for no logging. You should log at least critical accepted packets.</p>\n"
 msgstr ""
 "<p><b><big>Nivå for logging</big></b>\n"
-"<br>"
-"Dette er ein grunnleggjande dialog for logging av IP-pakker. Her\n"
-"konfigurerer du korleis innkommende tilkoblingspakker skal loggast. Utgående pakker vert ikkje logga i det heile.</p>"
+"<br>Dette er ein grunnleggjande dialog for logging av IP-pakker. Her\n"
+"konfigurerer du korleis innkommende tilkoblingspakker skal loggast. Utgående pakker vert ikkje logga i det heile.</p>\n"
 "\n"
-"\n"
 "<p>IP-pakkar som kan loggast, vert delt inn i to grupper: <b>Godkjende pakker</b> og <b>Ikkje godkjende pakker</b>.\n"
 "For kvar gruppe kan du velja mellom tre nivå for logging: <b>Logg alle</b> for å logga alle\n"
 "pakkar, <b>Logg berre kritiske</b> for å logga berre interessante pakker eller <b>Ikkje logg nokon</b>\n"
-"for å deaktivere all logging. Du bør i det minste logga kritiske, godkjende pakker.</p>"
-"\n"
+"for å deaktivere all logging. Du bør i det minste logga kritiske, godkjende pakker.</p>\n"
 
 #. TRANSLATORS: Base Summary dialog help
 #: src/include/firewall/helps.rb:163
 #, fuzzy
 msgid ""
 "<p><b><big>Summary</big></b>\n"
-"<br>"
-"Here, find a summary of your configuration settings.\n"
+"<br>Here, find a summary of your configuration settings.\n"
 "This summary is divided into general configuration and parts for each firewall zone.\n"
-"Every existing zone is summarized here.</p>"
+"Every existing zone is summarized here.</p>\n"
 "\n"
-"\n"
 "<p><b>Firewall Starting</b> shows whether the firewall is started in the\n"
-"<b>boot process</b> or only <b>manually</b>.</p>"
+"<b>boot process</b> or only <b>manually</b>.</p>\n"
 "\n"
+"<p>Firewall zones must have a network interface assigned to list the following items in the summary:</p>\n"
 "\n"
-"<p>Firewall zones must have a network interface assigned to list the following items in the summary:</p>"
+"<p><b>Interfaces</b>: All interfaces are listed using their configuration name and device name.</p>\n"
 "\n"
-"\n"
-"<p><b>Interfaces</b>: All interfaces are listed using their configuration name and device name.</p>"
-"\n"
-"\n"
 "<p><b>Open Services, Ports, and Protocols</b>: This lists all allowed network services, additional\n"
 "TCP (Transmission Control Protocol), UDP (User Datagram Protocol), and RPC (Remote Procedure Call)\n"
-"ports, and IP (Internet Protocol) protocols.</p>"
-"\n"
+"ports, and IP (Internet Protocol) protocols.</p>\n"
 msgstr ""
 "<p><b><big>Sammendrag</big></b>\n"
-"<br>"
-"Her finn du eit sammendrag av konfigurasjonsinnstillingene.\n"
+"<br>Her finn du eit sammendrag av konfigurasjonsinnstillingene.\n"
 "Sammendraget er delt inn ein generell del og sammendrag for kvar enkelt brannmursone.\n"
-"Alle eksisterande soner er oppførde her.</p>"
+"Alle eksisterande soner er oppførde her.</p>\n"
 "\n"
-"\n"
 "<p><b>Oppstart av brannmur</b> viser om brannmuren vert aktivert ved oppstart\n"
-"<b>av maskina</b> eller berre <b>manuelt</b>.</p>"
+"<b>av maskina</b> eller berre <b>manuelt</b>.</p>\n"
 "\n"
+"<p>Brannmursonene må ha eit tilordnet nettverksgrensesnitt for at elementa nedanfor skal inngå i sammendraget:</p>\n"
 "\n"
-"<p>Brannmursonene må ha eit tilordnet nettverksgrensesnitt for at elementa nedanfor skal inngå i sammendraget:</p>"
-"\n"
-"\n"
 "<p><b>Grensesnitt</b>: Alle grensesnitt er oppførde med konfigurasjonsnavn og enhetsnavn.\n"
 "\n"
 "<p><b>Opne tenester, portar og protokollar</b>: Her er alle nettverkstjenester og dessutan ekstra\n"
 "TCP- (Transmission Control Protocol), UDP- (User Datagram Protocol) og RPC-portar (Remote Procedure Call)\n"
-"og IP-portar (Internet Protocol) oppført.</p>"
-"\n"
+"og IP-portar (Internet Protocol) oppført.</p>\n"
 
 #. TRANSLATORS: Additional Services dialog help 1/6
 #: src/include/firewall/helps.rb:181
@@ -648,101 +578,81 @@
 #: src/include/firewall/helps.rb:219
 #, fuzzy
 msgid ""
-"<p><b><big>Firewall</big></b><br />"
-"\n"
-"A firewall is a defensive mechanism that protects your computer from network attacks.</p>"
-"\n"
+"<p><b><big>Firewall</big></b><br />\n"
+"A firewall is a defensive mechanism that protects your computer from network attacks.</p>\n"
 msgstr ""
-"<p><b><big>Brannmur</big></b><br />"
-"\n"
+"<p><b><big>Brannmur</big></b><br />\n"
 "Ein brannmur er ein forsvarsmekanisme som vernar maskina mot angrep via nettverket.</p>"
 
 #. TRANSLATORS: general help for Custom Rules 1/5
 #: src/include/firewall/helps.rb:223
 #, fuzzy
 msgid ""
-"<p><b><big>Custom Rules</big></b><br>"
-"\n"
+"<p><b><big>Custom Rules</big></b><br>\n"
 "Set special firewall rules that allow new connections\n"
-"matching these rules.</p>"
-"\n"
+"matching these rules.</p>\n"
 msgstr ""
-"<p><b><big>Egendefinerte regler</big></b><br>"
-"\n"
+"<p><b><big>Egendefinerte regler</big></b><br>\n"
 "Her kan du definera regler for brannmuren som tillèt samband\n"
-"som samsvarer med desse reglene."
-"<p>"
+"som samsvarer med desse reglene.<p>"
 
 #. TRANSLATORS: general help for Custom Rules 2/5
 #. TRANSLATORS: help for Custom Rules - Adding new rule 1/4
 #: src/include/firewall/helps.rb:229 src/include/firewall/helps.rb:256
 #, fuzzy
 msgid ""
-"<p><b>Source Network</b><br>"
-"\n"
+"<p><b>Source Network</b><br>\n"
 "Network or IP address where the connection comes from,\n"
 "e.g., <tt>192.168.0.1</tt> or <tt>192.168.0.0/255.255.255.0</tt>\n"
-"or <tt>192.168.0.0/24</tt> or <tt>0/0</tt> (which means <tt>all</tt>).</p>"
-"\n"
+"or <tt>192.168.0.0/24</tt> or <tt>0/0</tt> (which means <tt>all</tt>).</p>\n"
 msgstr ""
-"<p><b>Kildenettverk</b><br>"
-"\n"
+"<p><b>Kildenettverk</b><br>\n"
 "Nettverk eller IP-adresse som tilkoblingen kjem frå,\n"
 "f.eks <tt>192.168.0.1</tt> eller <tt>192.168.0.0/255.255.255.0</tt>\n"
-"eller <tt>192.168.0.0/24</tt> eller <tt>0/0</tt> (som tyder <tt>alle</tt>)."
-"<p>"
+"eller <tt>192.168.0.0/24</tt> eller <tt>0/0</tt> (som tyder <tt>alle</tt>).<p>"
 
 #. TRANSLATORS: general help for Custom Rules 3/5
 #. TRANSLATORS: help for Custom Rules - Adding new rule 2/4
 #: src/include/firewall/helps.rb:236 src/include/firewall/helps.rb:263
 #, fuzzy
 msgid ""
-"<p><b>Protocol</b><br>"
-"\n"
+"<p><b>Protocol</b><br>\n"
 "Protocol used by that packet. Special protocol <tt>RPC</tt> is used for\n"
 "RPC services.</p>"
 msgstr ""
-"<p><b>Protokoll</b><br>"
-"\n"
+"<p><b>Protokoll</b><br>\n"
 "Kva for ein protokoll pakka nyttar. Spesialprotokollen <tt>RPC</tt> vert nytta\n"
-"for RPC-tenester."
-"<p>"
+"for RPC-tenester.<p>"
 
 #. TRANSLATORS: general help for Custom Rules 4/5
 #. TRANSLATORS: help for Custom Rules - Adding new rule 3/4
 #: src/include/firewall/helps.rb:242 src/include/firewall/helps.rb:269
 #, fuzzy
 msgid ""
-"<p><b>Destination Port</b><br>"
-"\n"
+"<p><b>Destination Port</b><br>\n"
 "Port name, port number or range of ports that are allowed to be\n"
 "accessed, e.g., <tt>smtp</tt> or <tt>25</tt> or <tt>100:110</tt>.\n"
 "In case of <tt>RPC</tt> protocol, use the RPC service name.\n"
 "This entry is optional.</p>"
 msgstr ""
-"<p><b>Målport</b><br>"
-"\n"
+"<p><b>Målport</b><br>\n"
 "Portnavn, portnummer eller eit område av portar som det er tillate\n"
 "å aksessera, f.eks <tt>smtp</tt> eller <tt>25</tt> eller <tt>100:110</tt>.\n"
 "Viss det gjeld <tt>RPC</tt>-protokollen, nytt RPC-tjenestenavnet.\n"
-"Dette valet er valfritt."
-"<p>"
+"Dette valet er valfritt.<p>"
 
 #. TRANSLATORS: general help for Custom Rules 5/5
 #. TRANSLATORS: help for Custom Rules - Adding new rule 4/4
 #: src/include/firewall/helps.rb:250 src/include/firewall/helps.rb:277
 #, fuzzy
 msgid ""
-"<p><b>Source Port</b><br>"
-"\n"
+"<p><b>Source Port</b><br>\n"
 "Port name, port number or range of ports where the packet\n"
 "originates from. This entry is optional.</p>"
 msgstr ""
-"<p><b>Kildeport</b><br>"
-"\n"
+"<p><b>Kildeport</b><br>\n"
 "Portnavn, portnummer eller område av portar som\n"
-"avsenderport. Dete valet er valfritt."
-"<p>"
+"avsenderport. Dete valet er valfritt.<p>"
 
 #: src/include/firewall/helps.rb:289
 #, fuzzy

Modified: branches/plus-SLE12-SP2/yast/nn/po/firstboot.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/firstboot.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/firstboot.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2015-08-26 20:24+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"
@@ -37,15 +37,11 @@
 #. help text
 #: src/clients/firstboot_auto.rb:89
 msgid ""
-"<p>Check <b>Enable Firstboot Sequence</b> to start YaST firstboot utility on the first boot after configuration.</p>"
-"\n"
-"<p>Check the documentation of yast2-firstboot module for further information.</p>"
-"\n"
+"<p>Check <b>Enable Firstboot Sequence</b> to start YaST firstboot utility on the first boot after configuration.</p>\n"
+"<p>Check the documentation of yast2-firstboot module for further information.</p>\n"
 msgstr ""
-"<p>Kryss av for <b>Set opp ved første oppstart</b> for å starta firstboot-verktøyet ved første oppstart av systemet.</p>"
-"\n"
-"<p>Sjå hjelpeteksten til modulen yast2-firstboot for meir informasjon.</p>"
-"\n"
+"<p>Kryss av for <b>Set opp ved første oppstart</b> for å starta firstboot-verktøyet ved første oppstart av systemet.</p>\n"
+"<p>Sjå hjelpeteksten til modulen yast2-firstboot for meir informasjon.</p>\n"
 
 #. encoding: utf-8
 #. ------------------------------------------------------------------------------
@@ -117,13 +113,13 @@
 msgstr "Namn"
 
 #: src/clients/firstboot_config.rb:68
-msgid "Module Name"
-msgstr "Modulnamn"
-
-#: src/clients/firstboot_config.rb:68
 msgid "Status"
 msgstr "Status"
 
+#: src/clients/firstboot_config.rb:68
+msgid "Module Name"
+msgstr "Modulnamn"
+
 #. translators: dialog text
 #: src/clients/firstboot_desktop.rb:90
 msgid ""
@@ -136,15 +132,11 @@
 #. help text fro desktop dialog
 #: src/clients/firstboot_desktop.rb:105
 msgid ""
-"<p>"
-"<h3>Desktop Selections</h3>"
-"\n"
+"<p><h3>Desktop Selections</h3>\n"
 "This system has more than one desktop environment installed. Select\n"
 "the desktop to enable as the default desktop.</p>"
 msgstr ""
-"<p>"
-"<h3>Skrivebordsval</h3>"
-"\n"
+"<p><h3>Skrivebordsval</h3>\n"
 "Dette systemet har meir enn eitt skrivebordsmiljø installert.\n"
 "Vel kva skrivebord du vil bruka som standard.</p>"
 
@@ -175,12 +167,10 @@
 #: src/clients/firstboot_finish.rb:75
 msgid ""
 "<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"
+"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
 msgstr ""
 "<p>&product; er no installert på maskina di.\n"
-"Når du har trykt <b>Fullfør</b>, kan du logga inn på systemet.</p>"
-"\n"
+"Når du har trykt <b>Fullfør</b>, kan du logga inn på systemet.</p>\n"
 
 #. congratulation text 3/4
 #. Translators: If there exists a SuSE web-page for your language
@@ -191,12 +181,8 @@
 
 #. congratulation text 4/4
 #: src/clients/firstboot_finish.rb:83
-msgid ""
-"<p>Have a lot of fun!<br>"
-"Your SuSE Development Team</p>"
-msgstr ""
-"<p>Ha det gøy!<br>"
-"SuSE-utviklarane</p>"
+msgid "<p>Have a lot of fun!<br>Your SuSE Development Team</p>"
+msgstr "<p>Ha det gøy!<br>SuSE-utviklarane</p>"
 
 #. help 1/4 for dialog "Congratulation Dialog"
 #: src/clients/firstboot_finish.rb:112
@@ -207,24 +193,19 @@
 #: src/clients/firstboot_finish.rb:114
 msgid ""
 "<p><b>Finish</b> will close the YaST installation and continue\n"
-"to the login screen.</p>"
-"\n"
-msgstr ""
-"<p>Trykk <b>Fullfør</b> for å avslutta YaST-installeringa gå til innloggingsvindauget.</p>"
-"\n"
+"to the login screen.</p>\n"
+msgstr "<p>Trykk <b>Fullfør</b> for å avslutta YaST-installeringa gå til innloggingsvindauget.</p>\n"
 
 #. help 3/4 for dialog "Congratulation Dialog"
 #: src/clients/firstboot_finish.rb:118
 msgid ""
 "<p>If you choose the default graphical desktop KDE, you can\n"
 "adjust some KDE settings to your hardware. Also notice\n"
-"our SuSE Welcome Dialog.</p>"
-"\n"
+"our SuSE Welcome Dialog.</p>\n"
 msgstr ""
 "<p>Viss du vel KDE, det grafiske standardskrivebordet, kan du\n"
 "tilpassa nokre KDE-innstillingar til maskinvara di. Sjå òg\n"
-"velkomstvindauget.</p>"
-"\n"
+"velkomstvindauget.</p>\n"
 
 #. help 4/4 for dialog "Congratulation Dialog"
 #: src/clients/firstboot_finish.rb:128
@@ -232,14 +213,12 @@
 "<p>If desired, experts can use the full range of SuSE's configuration\n"
 "modules at this time. Check <b>Start YaST Control Center</b> and it will start\n"
 "after <b>Finish</b>. Note: The Control Center does not have a back button to\n"
-"return to this installation sequence.</p>"
-"\n"
+"return to this installation sequence.</p>\n"
 msgstr ""
 "<p>Viss du er ein avansert brukar, har du no tilgang til alle oppsettmodulane i SuSE no.\n"
 "Kryss av for <b>Start YaST kontrollsenter</b> for å opna dette\n"
 "etter at du trykkjer <b>Fullfør</b>. Merk at kontrollsenteret ikkje har nokon tilbakeknapp for å\n"
-"gå tilbake tilbake til denne installasjonsprosessen.</p>"
-"\n"
+"gå tilbake tilbake til denne installasjonsprosessen.</p>\n"
 
 #. popup text
 #: src/clients/firstboot_language.rb:123
@@ -278,27 +257,23 @@
 "<p>\n"
 "Choose the <b>Language</b> and the <b>Keyboard Layout</b> to be used during\n"
 "configuration and in the installed system.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel <b>språk</b> og <b>tastaturoppsettet</b> du vil bruka under\n"
 "oppsettet og etter at systemet er installert.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text, continued
 #: src/clients/firstboot_language_keyboard.rb:120
 msgid ""
 "<p>\n"
 "Click <b>Next</b> to proceed to the next dialog.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Trykk <b>Neste</b> for å gå vidare til neste steg.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text, continued
 #: src/clients/firstboot_language_keyboard.rb:126
@@ -306,14 +281,12 @@
 "<p>\n"
 "Select <b>Abort</b> to abort the\n"
 "installation process at any time.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel <b>Avbryt</b> for å avbryta\n"
 "installeringa når som helst.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. error message
 #: src/clients/firstboot_language_keyboard.rb:271

Modified: branches/plus-SLE12-SP2/yast/nn/po/fonts.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/fonts.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/fonts.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2015-08-12 21:12+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"
@@ -20,59 +20,59 @@
 #. in case of changing profiles, please reflect
 #. edits in test/data/sysconfig.fonts-config.*
 #. otherwise testsuite will fail
-#: src/lib/fonts/fonts-config-state.rb:58
+#: src/lib/fonts/fonts-config-state.rb:59
 msgid "Bitmap Fonts"
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:103
+#: src/lib/fonts/fonts-config-state.rb:104
 msgid "Unlike 'outline fonts' (fonts described mathematically via curves; chosen in the rest of profiles), 'bitmap fonts' represents group of fonts, which contain bitmap for each glyph and size. Thus, only several sizes exist for each font. They are very fast to render, because there's no need to compute the bitmap and are considered more readable especially on small sizes (even, some outline fonts contains so called 'embedded bitmaps', bitmap versions of itself, for small sizes). Bitmap fonts are rendered black and white, not smoothed."
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:106
+#: src/lib/fonts/fonts-config-state.rb:107
 msgid "Black and White Rendering"
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:123
+#: src/lib/fonts/fonts-config-state.rb:124
 msgid "Fonts rendered without antialiasing (grayscale smoothing), black and white. In contrast with smoothed fonts, they are much more readable without any drawback of smoothing (fuzzy or uneven stems etc.). In connection with good hinted fonts (e. g. Liberation 1 fonts), this setting can give bitmap quality fonts while maintaining scalability."
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:126
+#: src/lib/fonts/fonts-config-state.rb:127
 msgid "Black and White Rendering for Monospaced Fonts"
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:143
+#: src/lib/fonts/fonts-config-state.rb:144
 msgid "Monospaced fonts rendered not smoothed, other fonts (sans-serif, sans and unspecified) will use default setting. Default family preference list is used."
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:146
+#: src/lib/fonts/fonts-config-state.rb:147
 msgid "Default"
 msgstr "Standard"
 
-#: src/lib/fonts/fonts-config-state.rb:163
+#: src/lib/fonts/fonts-config-state.rb:164
 msgid "Fonts are smoothed with antialiasing. Unlike black and white rendered fonts, this setting can produce 'beautiful' fonts sometimes to the detriment of readability. TrueType fonts, which are known to have good hinting instructions are rendered with bytecode interpreter, otherwise FreeType autohinter is used on the 'hintslight' hinting level. Using font native hinting instructions produces glyphs displayed with thiner stems. Default family preference list is used (nowdays TrueType fonts with good instructions are prefered)."
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:166
+#: src/lib/fonts/fonts-config-state.rb:167
 msgid "CFF Fonts"
 msgstr "CFF-skrifter"
 
-#: src/lib/fonts/fonts-config-state.rb:206
+#: src/lib/fonts/fonts-config-state.rb:207
 msgid "Given Adobe's contribution to FreeType library, CFF fonts can be considered good compromise between readability and smoothness of rendered glyphs."
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:209
+#: src/lib/fonts/fonts-config-state.rb:210
 msgid "Exclusive Autohinter Rendering"
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:226
+#: src/lib/fonts/fonts-config-state.rb:227
 msgid "Unlike in default profile, even for good hinted fonts, FreeType's autohinter is used (on the 'hintslight' level). That leads to thicker, but sometimes fuzzier (and therefore less readable), glyphs. Default family preference list is used."
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:229 src/lib/fonts/fonts-dialog.rb:818
+#: src/lib/fonts/fonts-config-state.rb:230 src/lib/fonts/fonts-dialog.rb:818
 msgid "Subpixel Rendering"
 msgstr ""
 
-#: src/lib/fonts/fonts-config-state.rb:254
+#: src/lib/fonts/fonts-config-state.rb:255
 msgid "Use subpixel rendering capability of LCD monitor. Requires subpixel rendering enabled FreeType library."
 msgstr ""
 
@@ -115,9 +115,7 @@
 #: src/lib/fonts/fonts-dialog.rb:342
 #, fuzzy
 #| msgid "<p><b>Specimen for %s</b></p>"
-msgid ""
-"<p><b>Scripts</b>"
-"<ul>"
+msgid "<p><b>Scripts</b><ul>"
 msgstr "<p><b>Skriftprøve for %s</b></p>"
 
 #. nothing to do nowadays
@@ -347,9 +345,7 @@
 msgstr ""
 
 #: src/lib/fonts/fonts-dialog.rb:1030
-msgid ""
-"This setting can be changed:"
-"<ul>"
+msgid "This setting can be changed:<ul>"
 msgstr ""
 
 #: src/lib/fonts/fonts-dialog.rb:1031
@@ -369,9 +365,7 @@
 msgstr ""
 
 #: src/lib/fonts/fonts-dialog.rb:1037
-msgid ""
-"User, which chooses <b>Default</b> preset, uses distribution default.</li>"
-"</ul>"
+msgid "User, which chooses <b>Default</b> preset, uses distribution default.</li></ul>"
 msgstr ""
 
 #: src/lib/fonts/fonts-dialog.rb:1038
@@ -393,9 +387,7 @@
 msgstr ""
 
 #: src/lib/fonts/fonts-dialog.rb:1043
-msgid ""
-"<p><b>Presets</b> button serves a possibility to choose predefined profiles: "
-"<ul>"
+msgid "<p><b>Presets</b> button serves a possibility to choose predefined profiles: <ul>"
 msgstr ""
 
 #: src/lib/fonts/fonts-dialog.rb:1045
@@ -456,12 +448,8 @@
 
 #: src/lib/fonts/fonts-dialog.rb:1083 src/lib/fonts/fonts-dialog.rb:1097
 #: src/lib/fonts/fonts-dialog.rb:1118
-msgid ""
-"<p>See: %s"
-"<p>"
-msgstr ""
-"<p>Sjå: %s"
-"<p>"
+msgid "<p>See: %s<p>"
+msgstr "<p>Sjå: %s<p>"
 
 #: src/lib/fonts/fonts-dialog.rb:1087
 msgid "<h3>Hinting</h3>"

Modified: branches/plus-SLE12-SP2/yast/nn/po/ftp-server.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/ftp-server.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/ftp-server.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -1128,7 +1128,8 @@
 #. Expert Settings widget
 #.
 #. @return [Hash{String => Object}] map for Expert screen
-#: src/include/ftp-server/dialogs.rb:637 src/include/ftp-server/dialogs.rb:1213
+#: src/include/ftp-server/dialogs.rb:637
+#: src/include/ftp-server/dialogs.rb:1213
 #, fuzzy
 msgid "Br&owse"
 msgstr "Bla gjenn&om"
@@ -1492,63 +1493,45 @@
 #: src/include/ftp-server/helps.rb:17
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing FTP Server Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Initializing FTP Server Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Initialiserer konfigurasjon av FTP-servar</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer konfigurasjon av FTP-servar</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/ftp-server/helps.rb:21
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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 avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
+"Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/ftp-server/helps.rb:25
 #, fuzzy
 msgid ""
-"<p><b><big>Saving FTP Server Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Saving FTP Server Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Lagrar konfigurasjon for FTP-servar</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar konfigurasjon for FTP-servar</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/ftp-server/helps.rb:29
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryt lagring:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. -----------================= START_UP SCREEN =============----------
 #.
@@ -1556,15 +1539,12 @@
 #: src/include/ftp-server/helps.rb:40
 #, fuzzy
 msgid ""
-"<p><b>Selected Service</b><br>"
-"\n"
+"<p><b>Selected Service</b><br>\n"
 "     The frame shows which daemon is currently configured: <b>vsftpd, pure-ftpd,   \n"
 "     </b>. If you have installed both daemons you can switch between them.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Valt teneste</b><br>"
-"\n"
+"<p><b>Valt teneste</b><br>\n"
 "     Viser kva for ein nisse som er sett opp no: <b>vsftpd, pure-ftpd,   \n"
 "     </b>. Du kan byta mellom dei to nissane dersom begge er installerte.\n"
 "</p>"
@@ -1575,153 +1555,121 @@
 #: src/include/ftp-server/helps.rb:50
 #, fuzzy
 msgid ""
-"<p><b>Welcome Message</b><br>"
-"\n"
+"<p><b>Welcome Message</b><br>\n"
 "Specify the name of a file containing the\n"
 "text to display when someone connects to the server.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Velkomstmelding</b><br>"
-"\n"
+"<p><b>Velkomstmelding</b><br>\n"
 "Dette valet er namnet på ei fil som inneheld \n"
 "teksta som vert vist når nokon kobler til serveren.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. general chroot  help 1/1
 #: src/include/ftp-server/helps.rb:57
 #, fuzzy
 msgid ""
-"<p><b>Chroot</b><br>"
-"\n"
+"<p><b>Chroot</b><br>\n"
 "When enabled, local users will be (by default) placed in a \n"
 "chroot() jail in their home directory after login.\n"
 "<b>Warning:</b> This option has security implications, \n"
 "especially if users have upload permission\n"
 "or shell access. Only enable Chroot if you know what you are doing.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Chroot</b><br>"
-"\n"
+"<p><b>Chroot</b><br>\n"
 "Viss dette er aktivert, vil lokale brukarar (som standard) plasserast i \n"
 "chroot()-varetekt i sin eigen hjemmekatalog når dei loggar inn.\n"
 "<b>Advarsel:</b> Dette valet påverkar tryggleiken, \n"
 "spesielt viss brukarane har opplastingsrettigheter \n"
 "eller tilgjenge til eit skal. Valet bør berre aktiverast viss du veit kva du gjer.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. general logging  help 1/1
 #: src/include/ftp-server/helps.rb:67
 #, fuzzy
 msgid ""
-"<p><b>Verbose Logging</b><br>"
-"\n"
+"<p><b>Verbose Logging</b><br>\n"
 "When enabled, all FTP requests and responses are logged.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Utvida logging</b><br>"
-"\n"
+"<p><b>Utvida logging</b><br>\n"
 "Aktiverast for å logga alle ftp-førespurnader og -svar.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. general umask  help - only pure-ftpd 1/1
 #: src/include/ftp-server/helps.rb:73
 #, fuzzy
 msgid ""
-"<p><b>Umask</b><br>"
-"\n"
+"<p><b>Umask</b><br>\n"
 "File creation mask. (umask for files):(umask for dirs). \n"
 "177:077 if you feel paranoid.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Umask</b><br>"
-"\n"
+"<p><b>Umask</b><br>\n"
 "Maske for oppretting av filer. (umask for filar):(umask for katalogar). \n"
 "177:077 viss du er paranoid.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. general umask for anonymous  help - only vsftpd 1/1
 #: src/include/ftp-server/helps.rb:80
 #, fuzzy
 msgid ""
-"<p><b>Umask for Anonymous:</b><br>"
-"\n"
+"<p><b>Umask for Anonymous:</b><br>\n"
 "The value to which the umask for file creation is set for anonymous users. \n"
 "If you want to specify octal values, remember the \"0\" prefix, otherwise \n"
 "the value will be treated as a base 10 integer.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Umask for anonym:</b><br>"
-"\n"
+"<p><b>Umask for anonym:</b><br>\n"
 "Angje umask-verdet for oppretting av filer som vert definert for anonyme brukarar. \n"
 "Hugsar prefikset  \"0\" viss du angjev oktalverdier. Viss ikkje, \n"
 "vil verdet vart handsama som eit basa 10-heiltal.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. general umask for authenticated users  help - only vsftpd 1/1
 #: src/include/ftp-server/helps.rb:88
 #, fuzzy
 msgid ""
-"<p><b>Umask for Authenticated Users:</b><br>"
-"\n"
+"<p><b>Umask for Authenticated Users:</b><br>\n"
 "The value to which the umask for file creation is set for authenticated users. \n"
 "If you want to specify octal values, remember the \"0\" prefix, otherwise \n"
 "the value will be treated as a base 10 integer.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Umask for autoriserte brukarar:</b><br>"
-"\n"
+"<p><b>Umask for autoriserte brukarar:</b><br>\n"
 "Angje umask-verdet for oppretting av filer som vert definert for autentiserte brukarar. \n"
 "Hugsar prefikset  \"0\" viss du vil angje oktalverdier. Viss ikkje,\n"
 "vil verdet handsamast som eit basa 10-heiltal.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. general FTP dir for anonymous help 1/1
 #: src/include/ftp-server/helps.rb:96
 #, fuzzy
 msgid ""
-"<p><b>FTP Directory for Anonymous Users:</b><br>"
-"\n"
+"<p><b>FTP Directory for Anonymous Users:</b><br>\n"
 "Specify a directory which is used for FTP anonymous users. \n"
 "Press <b>Browse</b> to select a directory from the local filesystem.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>FTP-katalog for anonyme brukarar:</b><br>"
-"\n"
+"<p><b>FTP-katalog for anonyme brukarar:</b><br>\n"
 "Du kan angje katalogen som vert brukt for anonyme ftp-brukarar. \n"
 "Trykk <b>Bla gjennom</b> for å velja katalogen i det lokalet filsystemet.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. general FTP dir for authenticated help 1/1
 #: src/include/ftp-server/helps.rb:103
 #, fuzzy
 msgid ""
-"<p><b>FTP Directory for Authenticated Users:</b><br>"
-"\n"
+"<p><b>FTP Directory for Authenticated Users:</b><br>\n"
 "Specify a directory which is used for FTP authenticated users. \n"
 "Press <b>Browse</b> to select a directory from the local filesystem.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>FTP-katalog for autentiserte brukarar:</b><br>"
-"\n"
+"<p><b>FTP-katalog for autentiserte brukarar:</b><br>\n"
 "Du kan angje ein katalog som vert for brukt autentiserte FTP-brukarar. \n"
 "Trykk <b>Bla gjennom</b> for å velja katalogen i det lokalet filsystemet.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. -----------================= PERFORMANCE SCREEN =============----------
 #.
@@ -1729,33 +1677,26 @@
 #: src/include/ftp-server/helps.rb:113
 #, fuzzy
 msgid ""
-"<p><b>Max Idle Time:</b><br>"
-"\n"
+"<p><b>Max Idle Time:</b><br>\n"
 "The maximum time (timeout) a remote client \n"
 "may wait between FTP commands.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Maks. inaktivitet:</b><br>"
-"\n"
+"<p><b>Maks. inaktivitet:</b><br>\n"
 "Den maksimale tida ein ekstern klient\n"
 "kan vera inaktiv mellom ftp-kommandoar.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. performance max clients per IP  help 1/1
 #: src/include/ftp-server/helps.rb:120
 #, fuzzy
 msgid ""
-"<p><b>Max Clients for One IP:</b><br>"
-"\n"
+"<p><b>Max Clients for One IP:</b><br>\n"
 "The maximum number of clients allowed to connect\n"
 "from the same source internet address. \n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Maks. klientar for ein IP:</b><br>"
-"\n"
+"<p><b>Maks. klientar for ein IP:</b><br>\n"
 "Maksimalt mengd klientar som kan koble til samstundes \n"
 "frå same internettadresse. \n"
 "</p>"
@@ -1764,15 +1705,12 @@
 #: src/include/ftp-server/helps.rb:127
 #, fuzzy
 msgid ""
-"<p><b>Max Clients:</b><br>"
-"\n"
+"<p><b>Max Clients:</b><br>\n"
 "The maximum number of clients allowed to connect. \n"
 "Any additional clients trying to connect will get an error message.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Maks. klientar:</b><br>"
-"\n"
+"<p><b>Maks. klientar:</b><br>\n"
 "Maksimalt mengd klientar som kan vera tilkoblet.\n"
 "Nye klientar ved maksimalt mengd, vil få ei feilmelding.\n"
 "</p>"
@@ -1781,13 +1719,11 @@
 #: src/include/ftp-server/helps.rb:134
 #, fuzzy
 msgid ""
-"<p><b>Local Max Rate:</b><br>"
-"\n"
+"<p><b>Local Max Rate:</b><br>\n"
 "The maximum data transfer rate permitted for local authenticated users.\n"
 "</p>"
 msgstr ""
-"<p><b>Lokal maksimumshastighet:</b><br>"
-"\n"
+"<p><b>Lokal maksimumshastighet:</b><br>\n"
 "Maksimal overføringshastighet for lokale autentiserte brukarar.\n"
 "</p>"
 
@@ -1795,15 +1731,11 @@
 #: src/include/ftp-server/helps.rb:140
 #, fuzzy
 msgid ""
-"<p><b>Anonymous Max Rate:</b><br>"
-"\n"
-"The maximum data transfer rate permitted for anonymous clients.</p>"
-"\n"
+"<p><b>Anonymous Max Rate:</b><br>\n"
+"The maximum data transfer rate permitted for anonymous clients.</p>\n"
 msgstr ""
-"<p><b>Anonym maksimumsrate</b><br>"
-"\n"
-"Maks overføringsrate for anonyme brukarar.</p>"
-"\n"
+"<p><b>Anonym maksimumsrate</b><br>\n"
+"Maks overføringsrate for anonyme brukarar.</p>\n"
 
 #. -----------================= Authentication SCREEN =============----------
 #.
@@ -1811,76 +1743,60 @@
 #: src/include/ftp-server/helps.rb:147
 #, fuzzy
 msgid ""
-"<p><b>Enable/Disable Anonymous and Local Users</b><br>"
-"\n"
+"<p><b>Enable/Disable Anonymous and Local Users</b><br>\n"
 "<b>Anonymous Only</b>: If enabled, only anonymous logins are permitted.\n"
 "<b>Authenticated Users Only</b>: If enabled, only authenticated users are permitted.\n"
 "<b>Both</b> If enabled, authenticated users and anonymous users are permitted.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Aktivar/Deaktiver anonyme og lokale brukarar</b><br>"
-"\n"
+"<p><b>Aktivar/Deaktiver anonyme og lokale brukarar</b><br>\n"
 "<b>Berre anonym</b> Viss dette er aktivert, vil berre anonym innlogging tillatast.\n"
 "<b>Berre autentiserte brukarar</b> Viss dette er aktivert, vil berre autentiserte brukarar tillatast.\n"
 "<b>Begge</b> Viss dette er aktivert, vil autentiserte og anonyme brukarar tillatast.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. authentication  Enable Upload help 1/1
 #: src/include/ftp-server/helps.rb:155
 #, fuzzy
 msgid ""
-"<p><b>Enable Upload</b><br>"
-"\n"
+"<p><b>Enable Upload</b><br>\n"
 "If enabled, FTP users can upload. To allow anonymous users \n"
 "to upload, enable <b>Anonymous Can Upload</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Aktivar opplasting</b><br>"
-"\n"
+"<p><b>Aktivar opplasting</b><br>\n"
 "Viss dette er aktivert, kan ftp-brukarar lasta opp. For anonyme brukarar må\n"
 "<b>Anonym kan lasta opp</b> veljast for å tillata opplasting.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. authentication Anonymous Can Upload help 1/1
 #: src/include/ftp-server/helps.rb:162
 #, fuzzy
 msgid ""
-"<p><b>Anonymous Can Upload</b><br>"
-"\n"
+"<p><b>Anonymous Can Upload</b><br>\n"
 "If enabled anonymous users will be permitted to upload.\n"
 "<i>vsftpd only: </i>If you want to allow anonymous users to upload, you \n"
 "need an existing directory with write permission in the home directory after login.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Anonym kan lasta opp</b><br>"
-"\n"
+"<p><b>Anonym kan lasta opp</b><br>\n"
 "Viss dette er aktivert, kan anonyme brukarar lasta opp.\n"
 "<i>Berre vsftpd: </i>Viss du vil tillata anonyme brukarar å lasta opp, \n"
 "treng du ein eksisterande katalog utan skrivebeskyttelse i hjemmekatalogen etter innlogging.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. authentication Anonymous Can Create Dirs help 1/1
 #: src/include/ftp-server/helps.rb:170
 #, fuzzy
 msgid ""
-"<p><b>Anonymous Can Create Dirs</b><br>"
-"\n"
+"<p><b>Anonymous Can Create Dirs</b><br>\n"
 "If enabled, anonymous users can create directories.\n"
 "<i>vsftpd only:</i> If you want to allow anonymous users to create directories,\n"
-"you need an existing directory with write permission in the home directory after login.</p>"
-"\n"
+"you need an existing directory with write permission in the home directory after login.</p>\n"
 msgstr ""
-"<p><b>Anonyme brukarar kan oppretta katalogar</b><br>"
-"\n"
+"<p><b>Anonyme brukarar kan oppretta katalogar</b><br>\n"
 "Tillat berre anonyme brukarar å oppretta katalogar <i>berre vsftpd</i>\n"
-"Eksisterande katalog med opplastingstilgang vert trungen.</p>"
-"\n"
+"Eksisterande katalog med opplastingstilgang vert trungen.</p>\n"
 
 #. -----------================= EXPERT SETTINGS SCREEN =============----------
 #.
@@ -1888,66 +1804,51 @@
 #: src/include/ftp-server/helps.rb:181
 #, fuzzy
 msgid ""
-"<p><b>Enable Passive Mode</b><br>"
-"\n"
+"<p><b>Enable Passive Mode</b><br>\n"
 "If enabled, the FTP server will allow passive mode for connections.   \n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Aktiver passiv modus</b><br>"
-"\n"
+"<p><b>Aktiver passiv modus</b><br>\n"
 "Viss dette er aktivert, tillèt ftp-serveren tilkobling i passiv modus.   \n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. expert settings Min Port for Pas. Mode help 1/1
 #: src/include/ftp-server/helps.rb:187
 #, fuzzy
 msgid ""
-"<p><b>Min Port for Passive Mode</b><br>"
-"\n"
+"<p><b>Min Port for Passive Mode</b><br>\n"
 "Minimum value for a port range for passive connection replies.\n"
 "This is used for protection by means of a firewall. \n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Min. port for passiv modus</b><br>"
-"\n"
+"<p><b>Min. port for passiv modus</b><br>\n"
 "Minimumsverdi for portområde ved svar på passiv tilkobling.\n"
 "Dette vert nytta ved brannmurbeskyttelse. \n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. expert settings Max Port for Pas. Mode help 1/1
 #: src/include/ftp-server/helps.rb:194
 #, fuzzy
 msgid ""
-"<p><b>Max Port for Pas. Mode</b><br>"
-"\n"
+"<p><b>Max Port for Pas. Mode</b><br>\n"
 "Maximum value for a port range for passive connection replies.\n"
 " This is used for protection by means of a firewall. \n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Maks. port for pas. modus</b><br>"
-"\n"
+"<p><b>Maks. port for pas. modus</b><br>\n"
 "Maksimumsverdi for portområde ved svar på passiv tilkobling.\n"
 " Dette vert nytta ved brannmurbeskyttelse. \n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. expert settings  Enable SSL help 1/1
 #: src/include/ftp-server/helps.rb:201
 #, fuzzy
 msgid ""
-"<p><b>Enable SSL</b><br>"
-"\n"
+"<p><b>Enable SSL</b><br>\n"
 "If enabled, SSL connections are allowed.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Aktivar SSL</b><br>"
-"\n"
+"<p><b>Aktivar SSL</b><br>\n"
 "Viss dette er aktivert, vil SSL-tilkobling tillatast.\n"
 "</p>"
 
@@ -1955,14 +1856,11 @@
 #: src/include/ftp-server/helps.rb:207
 #, fuzzy
 msgid ""
-"<p><b>Enable SSL v2</b><br>"
-"\n"
+"<p><b>Enable SSL v2</b><br>\n"
 "If enabled, SSL version 2 connections are allowed.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Aktivar SSL v2</b><br>"
-"\n"
+"<p><b>Aktivar SSL v2</b><br>\n"
 "Viss dette er aktivert, vil tilkobling med SSL- versjon 2 tillatast.\n"
 "</p>"
 
@@ -1970,14 +1868,11 @@
 #: src/include/ftp-server/helps.rb:213
 #, fuzzy
 msgid ""
-"<p><b>Enable SSL v3</b><br>"
-"\n"
+"<p><b>Enable SSL v3</b><br>\n"
 "If enabled, SSL version 3 connections are allowed.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Aktivar SSL v3</b><br>"
-"\n"
+"<p><b>Aktivar SSL v3</b><br>\n"
 "Viss dette er aktivert, vil tilkobling med SSL- versjon 3 tillatast.\n"
 "</p>"
 
@@ -1985,14 +1880,11 @@
 #: src/include/ftp-server/helps.rb:219
 #, fuzzy
 msgid ""
-"<p><b>Enable TLS</b><br>"
-"\n"
+"<p><b>Enable TLS</b><br>\n"
 "If enabled, TLS connections are allowed.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Aktivar TLS</b><br>"
-"\n"
+"<p><b>Aktivar TLS</b><br>\n"
 "Viss dette er aktivert, vil TLS-tilkobling tillatast.\n"
 "</p>"
 
@@ -2000,33 +1892,26 @@
 #: src/include/ftp-server/helps.rb:225
 #, fuzzy
 msgid ""
-"<p><b>DSA Certificate to Use for SSL-encrypted Connections</b><br>"
-"\n"
+"<p><b>DSA Certificate to Use for SSL-encrypted Connections</b><br>\n"
 "This option specifies the location of the DSA certificate to \n"
 "use for SSL-encrypted connections. Select a file by pressing <b>Browse</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>DSA-sertifikat for SSL-krypterte tilkoblinger</b><br>"
-"\n"
+"<p><b>DSA-sertifikat for SSL-krypterte tilkoblinger</b><br>\n"
 "Dette valet angjev plasseringa til DSA-sertifikatet som \n"
 "vert nytta for SSL-krypterte tilkoblinger. Trykk <b>Bla gjennom</b> for å velja ei fil.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. expert settings Disable Downloading Unvalidated Data help 1/1
 #: src/include/ftp-server/helps.rb:232
 #, fuzzy
 msgid ""
-"<p><b>Disable Downloading Unvalidated Data</b><br>"
-"\n"
+"<p><b>Disable Downloading Unvalidated Data</b><br>\n"
 "Disallow downloading of files that were uploaded \n"
 "but not validated by a local admin.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b>Deaktiver nedlasting av uvaliderte data</b><br>"
-"\n"
+"<p><b>Deaktiver nedlasting av uvaliderte data</b><br>\n"
 "Ikket tillat nedlasting av filer som er lasta opp, \n"
 "men ikkje validert, av ein lokal administrator\n"
 "</p>"
@@ -2035,15 +1920,13 @@
 #: src/include/ftp-server/helps.rb:239
 #, fuzzy
 msgid ""
-"<p><b>Security Settings</b><br>"
-"\n"
+"<p><b>Security Settings</b><br>\n"
 "<i>Disable SSL/TLS</i> Disable SSL/TLS encryption layer.\n"
 "<i>Accept SSL and TLS</i> Accept both, traditional and encrypted sessions.\n"
 "<i>Refuse Connections Without SSL/TLS</i> Refuse connections that do not use SSL/TLS security mechanisms, including anonymous sessions.\n"
 "</p>"
 msgstr ""
-"<p><b>Sikkerhetsinnstillinger</b><br>"
-"\n"
+"<p><b>Sikkerhetsinnstillinger</b><br>\n"
 "<i>Deaktiver SSL/TLS</i> Deaktiver SSL/TLS-kryptering.\n"
 "<i>Tillat SSL og TLS</i> Tillat både tradisjonelle og krypterte økter.\n"
 "<i>Ikkje tillat tilkoblinger utan SSL/TLS</i> Ikkje tillat tilkoblinger som ikkje brukar SSL/TLS-sikkerhetsmekanismer. Dette gjeld òg anonyme økter.\n"
@@ -2055,99 +1938,71 @@
 #: src/include/ftp-server/helps.rb:251
 #, fuzzy
 msgid ""
-"<p><b><big>FTP Server Configuration</big></b><br>"
-"\n"
-"Configure the FTP server.<br>"
-"</p>"
-"\n"
+"<p><b><big>FTP Server Configuration</big></b><br>\n"
+"Configure the FTP server.<br></p>\n"
 msgstr ""
-"<p><b><big>Oppsett av FTP-servar</big></b><br>"
-"\n"
-"Sett opp ftp-serveren her.<br>"
-"</p>"
-"\n"
+"<p><b><big>Oppsett av FTP-servar</big></b><br>\n"
+"Sett opp ftp-serveren her.<br></p>\n"
 
 #. Summary dialog help 2/3
 #: src/include/ftp-server/helps.rb:255
 #, fuzzy
 msgid ""
-"<p><b><big>Adding an FTP Server:</big></b><br>"
-"\n"
+"<p><b><big>Adding an FTP Server:</big></b><br>\n"
 "Choose an FTP server from the list of detected FTP servers.\n"
 "If your FTP server was not detected, use <b>Other (not detected)</b>.\n"
-"Then press <b>Configure</b>.</p>"
-"\n"
+"Then press <b>Configure</b>.</p>\n"
 msgstr ""
-"<p><b><big>Leggja til ein SLP-servar:</big></b><br>"
-"\n"
+"<p><b><big>Leggja til ein SLP-servar:</big></b><br>\n"
 "Vel ein ftp-servar frå lista over registrerte ftp-servera. \n"
 "Viss din ftp-servar ikkje vart funnen, bruk <b>Annan (ikkje funnet)</b>. \n"
-"Klikk deretter <b>Sett opp</b>.</p>"
-"\n"
+"Klikk deretter <b>Sett opp</b>.</p>\n"
 
 #. Summary dialog help 3/3
 #: src/include/ftp-server/helps.rb:262
 #, fuzzy
 msgid ""
-"<p><b><big>Editing or Deleting</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting</big></b><br>\n"
 "If you press <b>Edit</b>, an additional dialog in which to change\n"
-"the configuration opens.</p>"
-"\n"
+"the configuration opens.</p>\n"
 msgstr ""
-"<p><b><big>Redigera eller slette</big></b><br>"
-"\n"
+"<p><b><big>Redigera eller slette</big></b><br>\n"
 "Viss du klikkar <b>Rediger</b>, vert vist ein ny dialogboks der du kan\n"
-"endra oppsettet.</p>"
-"\n"
+"endra oppsettet.</p>\n"
 
 #. Ovreview dialog help 1/3
 #: src/include/ftp-server/helps.rb:268
 #, fuzzy
 msgid ""
-"<p><b><big>FTP Server Configuration Overview</big></b><br>"
-"\n"
+"<p><b><big>FTP Server Configuration Overview</big></b><br>\n"
 "Obtain an overview of the installed FTP servers. Additionally,\n"
-"edit their configurations.<br>"
-"</p>"
-"\n"
+"edit their configurations.<br></p>\n"
 msgstr ""
-"<p><b><big>Oversyn over FTP-serveroppsett</big></b><br>"
-"\n"
+"<p><b><big>Oversyn over FTP-serveroppsett</big></b><br>\n"
 "Her finn du eit oversyn over installerte ftp-servera. Du kan òg\n"
-"redigera oppsetta.<br>"
-"</p>"
-"\n"
+"redigera oppsetta.<br></p>\n"
 
 #. Ovreview dialog help 2/3
 #: src/include/ftp-server/helps.rb:274
 #, fuzzy
 msgid ""
-"<p><b><big>Adding a FTP Server</big></b><br>"
-"\n"
-"Press <b>Add</b> to configure a FTP server.</p>"
-"\n"
+"<p><b><big>Adding a FTP Server</big></b><br>\n"
+"Press <b>Add</b> to configure a FTP server.</p>\n"
 msgstr ""
-"<p><b><big>Leggja til ein FTP-servar:</big></b><br>"
-"\n"
-"Trykkar <b>Legg til</b> for å setja opp ein ftp-servar.</p>"
-"\n"
+"<p><b><big>Leggja til ein FTP-servar:</big></b><br>\n"
+"Trykkar <b>Legg til</b> for å setja opp ein ftp-servar.</p>\n"
 
 #. Ovreview dialog help 3/3
 #: src/include/ftp-server/helps.rb:278
 #, fuzzy
 msgid ""
-"<p><b><big>Editing or Deleting</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting</big></b><br>\n"
 "Choose a FTP server to change or remove.\n"
-"Then press <b>Edit</b> or <b>Delete</b> respectively.</p>"
-"\n"
+"Then press <b>Edit</b> or <b>Delete</b> respectively.</p>\n"
 msgstr ""
-"<p><b><big>Redigera eller slette:</big></b><br>"
-"\n"
+"<p><b><big>Redigera eller slette:</big></b><br>\n"
 "Vel ein ftp-servar du vil endra eller sletta.\n"
-"Trykk deretter <b>Rediger</b> eller <b>Slett</b> etter behov.</p>"
-"\n"
+"Trykk deretter <b>Rediger</b> eller <b>Slett</b> etter behov.</p>\n"
 
 #. CWMServiceStart function with no parameter returning boolean value
 #. that says if the service is started.
@@ -2432,14 +2287,8 @@
 #. anonymous dir
 #: src/modules/FtpServer.rb:1079
 #, fuzzy
-msgid ""
-"<p>"
-"<ul><i>FTP daemon is not configured.</i></ul>"
-"</p>"
-msgstr ""
-"<p>"
-"<ul><i>FTP-nissen er ikkje sett opp</i></ul>"
-"</p>"
+msgid "<p><ul><i>FTP daemon is not configured.</i></ul></p>"
+msgstr "<p><ul><i>FTP-nissen er ikkje sett opp</i></ul></p>"
 
 #. Translators: Summary head, if nothing configured
 #: src/modules/FtpServer.rb:1089

Modified: branches/plus-SLE12-SP2/yast/nn/po/geo-cluster.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/geo-cluster.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/geo-cluster.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -62,9 +62,10 @@
 #. $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $
 #. Initialization dialog caption
 #: src/include/geo-cluster/complex.rb:83
-#: src/include/geo-cluster/dialogs.rb:465
-#: src/include/geo-cluster/dialogs.rb:814
-#: src/include/geo-cluster/wizards.rb:46 src/include/geo-cluster/wizards.rb:141
+#: src/include/geo-cluster/dialogs.rb:470
+#: src/include/geo-cluster/dialogs.rb:819
+#: src/include/geo-cluster/wizards.rb:46
+#: src/include/geo-cluster/wizards.rb:141
 msgid "Geo Cluster Configuration"
 msgstr ""
 
@@ -115,17 +116,17 @@
 msgstr ""
 
 #: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85
-#: src/include/geo-cluster/dialogs.rb:804
+#: src/include/geo-cluster/dialogs.rb:809
 msgid "Add"
 msgstr ""
 
 #: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86
-#: src/include/geo-cluster/dialogs.rb:805
+#: src/include/geo-cluster/dialogs.rb:810
 msgid "Edit"
 msgstr ""
 
 #: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87
-#: src/include/geo-cluster/dialogs.rb:806
+#: src/include/geo-cluster/dialogs.rb:811
 msgid "Delete"
 msgstr ""
 
@@ -133,24 +134,25 @@
 msgid "site"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:93 src/include/geo-cluster/dialogs.rb:235
+#: src/include/geo-cluster/dialogs.rb:93
+#: src/include/geo-cluster/dialogs.rb:240
 msgid "ticket"
 msgstr ""
 
 #: src/include/geo-cluster/dialogs.rb:106
-msgid "Authentification"
+msgid "Authentication"
 msgstr ""
 
 #: src/include/geo-cluster/dialogs.rb:108
-#: src/include/geo-cluster/dialogs.rb:156
+#: src/include/geo-cluster/dialogs.rb:161
 msgid "Ca&ncel"
 msgstr ""
 
 #. return `cancel or a string
 #: src/include/geo-cluster/dialogs.rb:109
-#: src/include/geo-cluster/dialogs.rb:157
-#: src/include/geo-cluster/dialogs.rb:177
-#: src/include/geo-cluster/dialogs.rb:254
+#: src/include/geo-cluster/dialogs.rb:162
+#: src/include/geo-cluster/dialogs.rb:182
+#: src/include/geo-cluster/dialogs.rb:259
 msgid "OK"
 msgstr ""
 
@@ -159,176 +161,185 @@
 msgstr ""
 
 #: src/include/geo-cluster/dialogs.rb:128
-msgid "Authentification file"
+msgid "Authentication file"
 msgstr ""
 
 #: src/include/geo-cluster/dialogs.rb:132
-msgid "A relative path will be saved in /etc/booth, or using absolute path directly."
+msgid "The file will be written to /etc/booth."
 msgstr ""
 
 #: src/include/geo-cluster/dialogs.rb:137
-msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
+msgid "To write it to a different directory, enter an absolute path."
 msgstr ""
 
 #: src/include/geo-cluster/dialogs.rb:142
-msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other node manually."
+msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:146
-msgid "Generate Authentification Key File"
+#: src/include/geo-cluster/dialogs.rb:147
+msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other nodes manually."
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:154
+#: src/include/geo-cluster/dialogs.rb:151
+msgid "Generate Authentication Key File"
+msgstr ""
+
+#: src/include/geo-cluster/dialogs.rb:159
 msgid "Basic"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:178
-#: src/include/geo-cluster/dialogs.rb:255
+#: src/include/geo-cluster/dialogs.rb:183
+#: src/include/geo-cluster/dialogs.rb:260
 msgid "Cancel"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:192
+#: src/include/geo-cluster/dialogs.rb:197
 msgid "Please enter a valid ip address"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:233
+#: src/include/geo-cluster/dialogs.rb:238
 msgid "Enter ticket and timeout"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:239
+#: src/include/geo-cluster/dialogs.rb:244
 msgid "timeout"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:241
+#: src/include/geo-cluster/dialogs.rb:246
 msgid "retries"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:243
+#: src/include/geo-cluster/dialogs.rb:248
 msgid "weights"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:245
+#: src/include/geo-cluster/dialogs.rb:250
 msgid "expire"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:247
+#: src/include/geo-cluster/dialogs.rb:252
 msgid "acquire-after"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:249
+#: src/include/geo-cluster/dialogs.rb:254
 msgid "before-acquire-handler"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:286
+#: src/include/geo-cluster/dialogs.rb:291
 msgid "timeout is invalid"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:288
+#: src/include/geo-cluster/dialogs.rb:293
 msgid "expire is invalid"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:290
+#: src/include/geo-cluster/dialogs.rb:295
 msgid "acquireafter is invalid"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:292
+#: src/include/geo-cluster/dialogs.rb:297
 msgid "retries is invalid"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:294
+#: src/include/geo-cluster/dialogs.rb:299
 msgid "retries values lower than 3 is illegal"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:296
+#: src/include/geo-cluster/dialogs.rb:301
 msgid "weights is invalid"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:298
+#: src/include/geo-cluster/dialogs.rb:303
 msgid "ticket can not be empty"
 msgstr ""
 
 #. fill confs with global_files
-#: src/include/geo-cluster/dialogs.rb:407 src/include/geo-cluster/wizards.rb:48
+#: src/include/geo-cluster/dialogs.rb:412
+#: src/include/geo-cluster/wizards.rb:48
 msgid "Firewall Configuration"
 msgstr ""
 
 #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
 #. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:554
+#: src/include/geo-cluster/dialogs.rb:559
 msgid "Enter an IP address of your arbitrator"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:565
+#: src/include/geo-cluster/dialogs.rb:570
 msgid "Edit IP address of your arbitrator"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:581
+#: src/include/geo-cluster/dialogs.rb:586
 msgid "Enter an IP address of your site"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:592
+#: src/include/geo-cluster/dialogs.rb:597
 msgid "Edit IP address of your site"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:614
+#: src/include/geo-cluster/dialogs.rb:619
 msgid "Ticket name already exist!"
 msgstr ""
 
-#. Validation check before switch to authentification
-#. Still fall to :authentification or :ok
-#: src/include/geo-cluster/dialogs.rb:646
+#. Validation check before switch to authentication
+#. Still fall to :authentication or :ok
+#: src/include/geo-cluster/dialogs.rb:651
 msgid "Configuration name can not be empty."
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:649
+#: src/include/geo-cluster/dialogs.rb:654
 msgid "Configuration name can not be duplicated."
 msgstr ""
 
 #. "5405d4" will show like "5405"
-#: src/include/geo-cluster/dialogs.rb:657
+#: src/include/geo-cluster/dialogs.rb:662
 msgid "port is invalid!"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:663
+#: src/include/geo-cluster/dialogs.rb:668
 msgid "transport have to be filled!"
 msgstr ""
 
 #. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == ""
-#: src/include/geo-cluster/dialogs.rb:669
+#: src/include/geo-cluster/dialogs.rb:674
 msgid "arbitrator have to be filled!"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:674
+#: src/include/geo-cluster/dialogs.rb:679
 msgid "site have to be filled!"
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:679
+#: src/include/geo-cluster/dialogs.rb:684
 msgid "ticket have to be filled!"
 msgstr ""
 
 #. Validation check before switch to basic
 #. Still fall to :basic or :ok
-#: src/include/geo-cluster/dialogs.rb:733
-msgid "Failed to create authentification file "
+#: src/include/geo-cluster/dialogs.rb:738
+msgid "Failed to create authentication file "
 msgstr ""
 
-#: src/include/geo-cluster/dialogs.rb:736
-msgid "Succeed to created authentification file "
+#: src/include/geo-cluster/dialogs.rb:741
+msgid "Authentication file "
 msgstr ""
 
+#: src/include/geo-cluster/dialogs.rb:741
+msgid " created successfully."
+msgstr ""
+
 #. GeoCluster choose configure dialog caption
-#: src/include/geo-cluster/dialogs.rb:795
+#: src/include/geo-cluster/dialogs.rb:800
 msgid "GeoCluster Configuration Select"
 msgstr ""
 
 #. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
 #. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:801
+#: src/include/geo-cluster/dialogs.rb:806
 msgid "Choose configuration file:"
 msgstr ""
 
 #: src/include/geo-cluster/wizards.rb:47
-msgid "Authentification Configuration"
+msgid "Authentication Configuration"
 msgstr ""
 
 #. Initialization dialog contents

Modified: branches/plus-SLE12-SP2/yast/nn/po/gtk.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/gtk.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/gtk.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -329,32 +329,12 @@
 #~ msgstr "Vent …"
 
 #, fuzzy
-#~ msgid ""
-#~ "<h1>Purpose</h1>"
-#~ "<p>This tool lets you install, remove, and update applications.</p>"
-#~ "<p>Software in &product; is broken down and distributed in the form of packages. This way, if multiple applications require a common system file, this system file is shipped in its own package and is installed only once if needed. The user need not be concerned about such underlying <i>dependencies</i>. Likewise, the plugins and other non-essential data of a given application may be shipped in their own packages, so the user may install them only if needed.</p>"
-#~ msgstr ""
-#~ "<h1>Føremål</h1>"
-#~ "<p>Med dette verktøyet kan du installera, fjerne og oppgradera program.</p>"
-#~ "<p>Programvare til &product; vert distribuert i form av pakker. Viss fleire program krev ein vert felt systemfil, vil denne systemfilen difor distribuerast som ein eiga pakke og installerast berre dersom det er naudsynt. Brukaren treng ikkje å bekymra seg om slike underliggande <i>avhengigheter</i>. På same måte kan det henda at innstikk og andre tillegg til eit program kan distribuerast som eigne pakker, slik at brukar kan installera dei dersom behovet oppstår.</p>"
+#~ msgid "<h1>Purpose</h1><p>This tool lets you install, remove, and update applications.</p><p>Software in &product; is broken down and distributed in the form of packages. This way, if multiple applications require a common system file, this system file is shipped in its own package and is installed only once if needed. The user need not be concerned about such underlying <i>dependencies</i>. Likewise, the plugins and other non-essential data of a given application may be shipped in their own packages, so the user may install them only if needed.</p>"
+#~ msgstr "<h1>Føremål</h1><p>Med dette verktøyet kan du installera, fjerne og oppgradera program.</p><p>Programvare til &product; vert distribuert i form av pakker. Viss fleire program krev ein vert felt systemfil, vil denne systemfilen difor distribuerast som ein eiga pakke og installerast berre dersom det er naudsynt. Brukaren treng ikkje å bekymra seg om slike underliggande <i>avhengigheter</i>. På same måte kan det henda at innstikk og andre tillegg til eit program kan distribuerast som eigne pakker, slik at brukar kan installera dei dersom behovet oppstår.</p>"
 
 #, fuzzy
-#~ msgid ""
-#~ "<p>Common suffixes for complementary packages:</p>"
-#~ "<ul>"
-#~ "<li><b>-plugin-</b>: extends the application with extra functionality.</li>"
-#~ "<li><b>-devel</b>: headers for software development.</li>"
-#~ "<li><b>-debuginfo</b>: debug symbols for software testing.</li>"
-#~ "<li><b>-fr</b>, <b>-pl</b> or other language siglas: translation files (your language will be marked for installation automatically when needed).</li>"
-#~ "</ul>"
-#~ msgstr ""
-#~ "<p>Vanlege suffiks for tilleggspakker:</p>"
-#~ "<ul>"
-#~ "<li><b>-plugin-</b> (innstikk): utvidar programmet med ekstra funksjonar.</li>"
-#~ "<li><b>-devel</b> (utvikling): verta for kravt programvareutvikling.</li>"
-#~ "<li><b>-debuginfo</b>: feilsøkingssymboler for testing av programvare.</li>"
-#~ "<li><b>-fr</b>, <b>-pl</b> eller andre språkkoder: oversettelsesfiler (språket ditt vil verta automatisk merkast for installasjon ved behov).</li>"
-#~ "</ul>"
+#~ msgid "<p>Common suffixes for complementary packages:</p><ul><li><b>-plugin-</b>: extends the application with extra functionality.</li><li><b>-devel</b>: headers for software development.</li><li><b>-debuginfo</b>: debug symbols for software testing.</li><li><b>-fr</b>, <b>-pl</b> or other language siglas: translation files (your language will be marked for installation automatically when needed).</li></ul>"
+#~ msgstr "<p>Vanlege suffiks for tilleggspakker:</p><ul><li><b>-plugin-</b> (innstikk): utvidar programmet med ekstra funksjonar.</li><li><b>-devel</b> (utvikling): verta for kravt programvareutvikling.</li><li><b>-debuginfo</b>: feilsøkingssymboler for testing av programvare.</li><li><b>-fr</b>, <b>-pl</b> eller andre språkkoder: oversettelsesfiler (språket ditt vil verta automatisk merkast for installasjon ved behov).</li></ul>"
 
 #, fuzzy
 #~ msgid "<p>Both the packages that are installed on your system, and the packages that are available from the <i>repositories</i> you have configured will be listed together. <i>Status</i> filters are available in the right-bottom box.</p>"
@@ -369,110 +349,44 @@
 #~ msgstr "<h1>Bruk</h1>"
 
 #, fuzzy
-#~ msgid ""
-#~ "<h2>Install, Upgrade, Remove, Undo tab pages</h2>"
-#~ "<p>All packages are listed together unless you have selected a <i>status</i> filter from the right-bottom box. The check-box next to the package name indicates whether the package is installed or not. If a more recent version of an installed package is available, the version text will be highlighted in blue and an upgrade button conveniently placed next to it. It is highlighted red if the version installed is no longer being made available in any configured repository.</p>"
-#~ "<p>The context menu (right click on a package) provides extra options. The <b>Undo</b> option can be used to revert any changes you have made. Multiple packages may be selected (using the Control key) and modified together.</p>"
-#~ "<p>Use the <b>Version</b> list over the description box to select a specific version of a package.</p>"
-#~ "<p>Press the <b>Apply</b> button when you want your changes to be performed.</p>"
-#~ msgstr ""
-#~ "<h2>Fanene Installer, Oppgrader, Fjern og Angre</h2>"
-#~ "<p>Alle pakker er oppførde saman viss du ikkje har valt ein <i>status</i>-filter i feltet nedst til høgre. Avkrysssingsboksen ved sida av pakkenavnet viser om pakka er installert eller ikkje. Viss ein nyare versjon av ei installert pakke er tilgjengeleg, vil versjonsteksten visast med blå skrift og med ein oppgraderingsknapp ved sida av. Rød skrift viser at den installerte versjonen ikkje lenger er tilgjengeleg frå nokon av dei valde pakkebrønnene.</p>"
-#~ "<p>Kontekstmenyen (høyreklikk på ei pakke) inneheld fleire val. <b>Angrar</b> kan brukast for å reversera alle endringar du har gjort. Fleire pakker kan veljast (ved å halda Ctrl-tasten nede) og verta samstundes endra.</p>"
-#~ "<p>Bruk <b>Versjon</b>-lista over beskrivelsesfeltet for å velja ein spesifikk versjon av ei pakke.</p>"
-#~ "<p>Klikk på <b>Bruk</b>-knappen for å utføra endringane.</p>"
+#~ msgid "<h2>Install, Upgrade, Remove, Undo tab pages</h2><p>All packages are listed together unless you have selected a <i>status</i> filter from the right-bottom box. The check-box next to the package name indicates whether the package is installed or not. If a more recent version of an installed package is available, the version text will be highlighted in blue and an upgrade button conveniently placed next to it. It is highlighted red if the version installed is no longer being made available in any configured repository.</p><p>The context menu (right click on a package) provides extra options. The <b>Undo</b> option can be used to revert any changes you have made. Multiple packages may be selected (using the Control key) and modified together.</p><p>Use the <b>Version</b> list over the description box to select a specific version of a package.</p><p>Press the <b>Apply</b> button when you want your changes to be performed.</p>"
+#~ msgstr "<h2>Fanene Installer, Oppgrader, Fjern og Angre</h2><p>Alle pakker er oppførde saman viss du ikkje har valt ein <i>status</i>-filter i feltet nedst til høgre. Avkrysssingsboksen ved sida av pakkenavnet viser om pakka er installert eller ikkje. Viss ein nyare versjon av ei installert pakke er tilgjengeleg, vil versjonsteksten visast med blå skrift og med ein oppgraderingsknapp ved sida av. Rød skrift viser at den installerte versjonen ikkje lenger er tilgjengeleg frå nokon av dei valde pakkebrønnene.</p><p>Kontekstmenyen (høyreklikk på ei pakke) inneheld fleire val. <b>Angrar</b> kan brukast for å reversera alle endringar du har gjort. Fleire pakker kan veljast (ved å halda Ctrl-tasten nede) og verta samstundes endra.</p><p>Bruk <b>Versjon</b>-lista over beskrivelsesfeltet for å velja ein spesifikk versjon av ei pakke.</p><p>Klikk på <b>Bruk</b>-knappen for å utføra endringane.</p>"
 
 #, fuzzy
-#~ msgid ""
-#~ "<h2>Lock software</h2>"
-#~ "<p>Packages can be locked against automatic changes via the context menu.</p>"
-#~ "<p>Locking is only useful in very unusual cases: for instance, you may not want to install a given driver because it interferes with your system, yet you want to install some collection that includes it. Locks can be applied whether the package is installed or not.</p>"
-#~ msgstr ""
-#~ "<h2>Lås programvare</h2>"
-#~ "<p>Pakkar kan låsast via kontekstmenyen for å hindra automatiske endringar.</p>"
-#~ "<p>Låsing er nyttig berre i unntakstifeller: Det kan t.d. henda at du ikkje vil installera ein spesiell drivar fordi han påverkar med systemet, men du ynskjer likevel å installera pakkesamlingen som inneheld henne. Låsefunksjonen kan brukast anten pakka er installert eller ikkje.</p>"
+#~ msgid "<h2>Lock software</h2><p>Packages can be locked against automatic changes via the context menu.</p><p>Locking is only useful in very unusual cases: for instance, you may not want to install a given driver because it interferes with your system, yet you want to install some collection that includes it. Locks can be applied whether the package is installed or not.</p>"
+#~ msgstr "<h2>Lås programvare</h2><p>Pakkar kan låsast via kontekstmenyen for å hindra automatiske endringar.</p><p>Låsing er nyttig berre i unntakstifeller: Det kan t.d. henda at du ikkje vil installera ein spesiell drivar fordi han påverkar med systemet, men du ynskjer likevel å installera pakkesamlingen som inneheld henne. Låsefunksjonen kan brukast anten pakka er installert eller ikkje.</p>"
 
 #, fuzzy
 #~ msgid "<h2>Filters</h2>"
 #~ msgstr "<h2>Filtre</h2>"
 
 #, fuzzy
-#~ msgid ""
-#~ "<h3>Search</h3>"
-#~ "<p>Enter free text into the search-field to match their names and descriptions. (a search for 'office' will bring up the 'LibreOffice' packages as well as 'AbiWord' which carries the word 'office' in its description). You can search for multiple keywords by separating the with a white space (e.g. 'spread sheet' would return 'libreoffice-calc').You may use the search combined with a filter, like searching for a package in a given repository. Other search attributes are provided, such as to search for a given file.</p>"
-#~ msgstr ""
-#~ "<h3>Søk</h3>"
-#~ "<p>Bruk fritekst i søkefeltet for å søkja på namn og skildring si. (eit søk etter 'office' vil henta LibreOffice'-pakkene og AbiWord, som har orda «office» i skildringa). Du kan søkja etter fleire ord atskilt av mellomrom («spread sheet» vil t.d. henta libreoffice-calc). Du kan kombinera søkefunksjonen med eit filter, f.eks søkja etter ei pakke i ein spesifikk pakkebrønn. Andre søkekriterier finst òg, som å søkja etter ein spesifikk fil.</p>"
+#~ msgid "<h3>Search</h3><p>Enter free text into the search-field to match their names and descriptions. (a search for 'office' will bring up the 'LibreOffice' packages as well as 'AbiWord' which carries the word 'office' in its description). You can search for multiple keywords by separating the with a white space (e.g. 'spread sheet' would return 'libreoffice-calc').You may use the search combined with a filter, like searching for a package in a given repository. Other search attributes are provided, such as to search for a given file.</p>"
+#~ msgstr "<h3>Søk</h3><p>Bruk fritekst i søkefeltet for å søkja på namn og skildring si. (eit søk etter 'office' vil henta LibreOffice'-pakkene og AbiWord, som har orda «office» i skildringa). Du kan søkja etter fleire ord atskilt av mellomrom («spread sheet» vil t.d. henta libreoffice-calc). Du kan kombinera søkefunksjonen med eit filter, f.eks søkja etter ei pakke i ein spesifikk pakkebrønn. Andre søkekriterier finst òg, som å søkja etter ein spesifikk fil.</p>"
 
 #, fuzzy
-#~ msgid ""
-#~ "<h3>Groups</h3>"
-#~ "<p>Software for &product; is indexed so that you can find software for a specific task when you are not aware of the software selection available. A more detailed, hierarchical classification is provided by the <b>RPM Groups</b> filter.</p>"
-#~ msgstr ""
-#~ "<h3>Grupper</h3>"
-#~ "<p>Programvara for &product; er indeksert slik at du kan finna programvare for ein spesifikk oppgåve sjølv om du ikkje veit kva slags program som er tilgjengelege. Filtret <b>RPM-grupper</b> viser eit meir detaljert og hierarkisk utval.</p>"
+#~ msgid "<h3>Groups</h3><p>Software for &product; is indexed so that you can find software for a specific task when you are not aware of the software selection available. A more detailed, hierarchical classification is provided by the <b>RPM Groups</b> filter.</p>"
+#~ msgstr "<h3>Grupper</h3><p>Programvara for &product; er indeksert slik at du kan finna programvare for ein spesifikk oppgåve sjølv om du ikkje veit kva slags program som er tilgjengelege. Filtret <b>RPM-grupper</b> viser eit meir detaljert og hierarkisk utval.</p>"
 
 #, fuzzy
-#~ msgid ""
-#~ "<h3>Patterns and Languages</h3>"
-#~ "<p><b>Patterns</b> are task-oriented collections of multiple packages that install like one. The installation of the <i>File Server</i> pattern, for example, will install various packages needed for running such a server.</p>"
-#~ "<p>If you want to install a particular language, you may want to do so via the <b>Language</b> tool from the YaST control center.</p>"
-#~ msgstr ""
-#~ "<h3>Mønster og Språk</h3>"
-#~ "<p><b>Mønster</b> er oppgaveorienterte pakkesamlinger som vert samstundes installert. Installasjon av mønstret <i>Filserver</i> vil til dømes, installera ulike pakker som vert kravt for å køyra ein slik servar.</p>"
-#~ "<p>Viss du vil installera eit spesielt språk, kan du gjera dette i <b>Språk</b>-modulen i YaST.</p>"
+#~ msgid "<h3>Patterns and Languages</h3><p><b>Patterns</b> are task-oriented collections of multiple packages that install like one. The installation of the <i>File Server</i> pattern, for example, will install various packages needed for running such a server.</p><p>If you want to install a particular language, you may want to do so via the <b>Language</b> tool from the YaST control center.</p>"
+#~ msgstr "<h3>Mønster og Språk</h3><p><b>Mønster</b> er oppgaveorienterte pakkesamlinger som vert samstundes installert. Installasjon av mønstret <i>Filserver</i> vil til dømes, installera ulike pakker som vert kravt for å køyra ein slik servar.</p><p>Viss du vil installera eit spesielt språk, kan du gjera dette i <b>Språk</b>-modulen i YaST.</p>"
 
 #, fuzzy
-#~ msgid ""
-#~ "<h2>Software details in the box below</h2>"
-#~ "<p>Explore the available information about the package in the box below. Note that more information is available for installed packages than for those only available from a repository.</p>"
-#~ "<p>You can also pick a specific version of the package to install from this box.</p>"
-#~ msgstr ""
-#~ "<h2>Programvareinformasjon i det nedre feltet</h2>"
-#~ "<p>Tilgjengeleg informasjon om pakka vert vist i feltet under. Hugs at meir informasjon er tilgjengeleg for installerte pakker, enn for dei som berre er tilgjengelege frå ein pakkebrønn.</p>"
-#~ "<p>I dette feltet kan du òg velja å installera ein spesifikk versjon av pakka.</p>"
+#~ msgid "<h2>Software details in the box below</h2><p>Explore the available information about the package in the box below. Note that more information is available for installed packages than for those only available from a repository.</p><p>You can also pick a specific version of the package to install from this box.</p>"
+#~ msgstr "<h2>Programvareinformasjon i det nedre feltet</h2><p>Tilgjengeleg informasjon om pakka vert vist i feltet under. Hugs at meir informasjon er tilgjengeleg for installerte pakker, enn for dei som berre er tilgjengelege frå ein pakkebrønn.</p><p>I dette feltet kan du òg velja å installera ein spesifikk versjon av pakka.</p>"
 
 #, fuzzy
-#~ msgid ""
-#~ "<h1>Purpose</h1>"
-#~ "<p>This tool gives you control on overviewing and picking patches. You may also reverse patches that have been applied to the system.</p>"
-#~ msgstr ""
-#~ "<h1>Føremål</h1>"
-#~ "<p>Med dette verktøyet kan du visa og velja pakkeoppdateringer. Du kan òg reversera oppdateringar som er utførd tidlegare.</p>"
+#~ msgid "<h1>Purpose</h1><p>This tool gives you control on overviewing and picking patches. You may also reverse patches that have been applied to the system.</p>"
+#~ msgstr "<h1>Føremål</h1><p>Med dette verktøyet kan du visa og velja pakkeoppdateringer. Du kan òg reversera oppdateringar som er utførd tidlegare.</p>"
 
 #, fuzzy
-#~ msgid ""
-#~ "<h1>Usage</h1>"
-#~ "<h2>Categories</h2>"
-#~ "<p>Patches are grouped as follows:</p>"
-#~ "<ul>"
-#~ "<li><b>Security</b>: patches a software flaw that could be exploited to gain restricted privilege.</li>"
-#~ "<li><b>Recommended</b>: fixes non-security related flaws (e.g. data corruption, performance slowdown)</li>"
-#~ "<li><b>Optional</b>: ones that only apply to few users.</li>"
-#~ "<li><b>Documentation</b>: fixes documentation errors.</li>"
-#~ "<li><b>YaST</b>: patches for the YaST control center tools.</li>"
-#~ "</ul>"
-#~ msgstr ""
-#~ "<h1>Bruk</h1>"
-#~ "<h2>Kategoriar</h2>"
-#~ "<p>Pakkeoppdateringer er gruppert på følgjande måte:</p>"
-#~ "<ul>"
-#~ "<li>Tryggleik: Reparerer ein programvarefeil som kan utnyttast for å skaffa seg tilgjenge til systemet.</li>"
-#~ "<li> tilRådd: Reparerer programvarefeil som ikkje er sikkerhetsrelaterte (som t.d. kan øydeleggja data eller medføra redusert yting)</li>"
-#~ "<li>Valfri: Oppdateringar som berre gjeld for einskilde brukarar.</li>"
-#~ "</ul>"
-#~ "</li>"
-#~ "<li><b>Dokumentasjon</b>: Rettar opp feil i dokumentasjonen.</li>"
-#~ "<li><b>YaST</b>: Pakkeoppdateringer for modulane i YaST.</li>"
-#~ "</ul>"
+#~ msgid "<h1>Usage</h1><h2>Categories</h2><p>Patches are grouped as follows:</p><ul><li><b>Security</b>: patches a software flaw that could be exploited to gain restricted privilege.</li><li><b>Recommended</b>: fixes non-security related flaws (e.g. data corruption, performance slowdown)</li><li><b>Optional</b>: ones that only apply to few users.</li><li><b>Documentation</b>: fixes documentation errors.</li><li><b>YaST</b>: patches for the YaST control center tools.</li></ul>"
+#~ msgstr "<h1>Bruk</h1><h2>Kategoriar</h2><p>Pakkeoppdateringer er gruppert på følgjande måte:</p><ul><li>Tryggleik: Reparerer ein programvarefeil som kan utnyttast for å skaffa seg tilgjenge til systemet.</li><li> tilRådd: Reparerer programvarefeil som ikkje er sikkerhetsrelaterte (som t.d. kan øydeleggja data eller medføra redusert yting)</li><li>Valfri: Oppdateringar som berre gjeld for einskilde brukarar.</li></ul></li><li><b>Dokumentasjon</b>: Rettar opp feil i dokumentasjonen.</li><li><b>YaST</b>: Pakkeoppdateringer for modulane i YaST.</li></ul>"
 
 #, fuzzy
-#~ msgid ""
-#~ "<p>Only patches that apply to your system will be visible. You can be sure that the decision to make a patch available is not done trivially.</p>"
-#~ "<p>If you are looking for applications enhancements, you should check for <i>upgrades</i> on the <b>Software Manager</b>.</p>"
-#~ msgstr ""
-#~ "<p>Berre oppdateringar som gjeld for systemet ditt vil vera synlege. Du kan vera sikker på at alle oppdateringar er viktige.</p>"
-#~ "<p>Viss du er interessert i oppgraderte versjonar av programvara, bør du sjå etter <i>oppgraderinger</i> i <b>programvarehandsamaren</b>.</p>"
+#~ msgid "<p>Only patches that apply to your system will be visible. You can be sure that the decision to make a patch available is not done trivially.</p><p>If you are looking for applications enhancements, you should check for <i>upgrades</i> on the <b>Software Manager</b>.</p>"
+#~ msgstr "<p>Berre oppdateringar som gjeld for systemet ditt vil vera synlege. Du kan vera sikker på at alle oppdateringar er viktige.</p><p>Viss du er interessert i oppgraderte versjonar av programvara, bør du sjå etter <i>oppgraderinger</i> i <b>programvarehandsamaren</b>.</p>"
 
 #, fuzzy
 #~ msgid "Information only available for installed packages."
@@ -1201,22 +1115,8 @@
 #~ msgstr "Anna"
 
 #, fuzzy
-#~ msgid ""
-#~ "<p>Common suffixes for complementory packages:</p>"
-#~ "<ul>"
-#~ "<li><b>-plugin-</b>: extends the application with extra functionality.</li>"
-#~ "<li><b>-devel</b>: headers for software development.</li>"
-#~ "<li><b>-debuginfo</b>: debug symbols for software testing.</li>"
-#~ "<li><b>-fr</b>, <b>-pl</b> or other language siglas: translation files (your language will be marked for installation automatically when needed).</li>"
-#~ "</ul>"
-#~ msgstr ""
-#~ "<p>Vanlege suffiks for tilleggspakker:</p>"
-#~ "<ul>"
-#~ "<li><b>-plugin-</b> (innstikk): utvidar programmet med ekstra funksjonar.</li>"
-#~ "<li><b>-devel</b> (utvikling): verta for kravt programvareutvikling.</li>"
-#~ "<li><b>-debuginfo</b>: feilsøkingssymboler for testing av programvare.</li>"
-#~ "<li><b>-fr</b>, <b>-pl</b> eller andre språkkoder: toversettelsesfiler (språket ditt vil verta automatisk merkast for installasjon ved behov).</li>"
-#~ "</ul>"
+#~ msgid "<p>Common suffixes for complementory packages:</p><ul><li><b>-plugin-</b>: extends the application with extra functionality.</li><li><b>-devel</b>: headers for software development.</li><li><b>-debuginfo</b>: debug symbols for software testing.</li><li><b>-fr</b>, <b>-pl</b> or other language siglas: translation files (your language will be marked for installation automatically when needed).</li></ul>"
+#~ msgstr "<p>Vanlege suffiks for tilleggspakker:</p><ul><li><b>-plugin-</b> (innstikk): utvidar programmet med ekstra funksjonar.</li><li><b>-devel</b> (utvikling): verta for kravt programvareutvikling.</li><li><b>-debuginfo</b>: feilsøkingssymboler for testing av programvare.</li><li><b>-fr</b>, <b>-pl</b> eller andre språkkoder: toversettelsesfiler (språket ditt vil verta automatisk merkast for installasjon ved behov).</li></ul>"
 
 #, fuzzy
 #~ msgid "Search Packages on &Web..."

Modified: branches/plus-SLE12-SP2/yast/nn/po/http-server.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/http-server.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/http-server.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -285,7 +285,8 @@
 msgstr "Servermoduler"
 
 #. translators: human-readable "default host"
-#: src/include/http-server/dialogs.rb:66 src/include/http-server/dialogs.rb:172
+#: src/include/http-server/dialogs.rb:66
+#: src/include/http-server/dialogs.rb:172
 #, fuzzy
 msgid "Main Host"
 msgstr "Hovedvertsmaskin"
@@ -338,7 +339,8 @@
 #. translators: human-readable "default host"
 #. translators: human-readable "default host"
 #: src/include/http-server/dialogs.rb:302
-#: src/include/http-server/dialogs.rb:357 src/modules/HttpServerWidgets.rb:1273
+#: src/include/http-server/dialogs.rb:357
+#: src/modules/HttpServerWidgets.rb:1273
 #, fuzzy
 msgid "Default Host"
 msgstr "Standard vertsmaskin"
@@ -372,64 +374,44 @@
 #, fuzzy
 msgid ""
 "<p><b><big>Initializing HTTP Server Configuration</big></b>\n"
-"<br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
 "<p><b><big>Initialiserer konfigurasjon for HTTP-servar</big></b>\n"
-"<br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/http-server/helps.rb:24
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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>Avbryta initialisering:</big></b><br>"
-"\n"
-"Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryta initialisering:</big></b><br>\n"
+"Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/http-server/helps.rb:28
 #, fuzzy
 msgid ""
-"<p><b><big>Saving HTTP Server Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Saving HTTP Server Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Lagrar konfigurasjon for HTTP-servar</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar konfigurasjon for HTTP-servar</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/http-server/helps.rb:32
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
-"An additional dialog informs you whether it is safe to do so.</p>"
-"\n"
+"An additional dialog informs you whether it is safe to do so.</p>\n"
 msgstr ""
-"<p><b><big>Avbryta lagring</big></b><br>"
-"\n"
+"<p><b><big>Avbryta lagring</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
-"Ein ny dialog fortel deg om det er trygt å gjera dette.</p>"
-"\n"
+"Ein ny dialog fortel deg om det er trygt å gjera dette.</p>\n"
 
 #. translators: Wizard dialog 1/5
 #: src/include/http-server/helps.rb:38
@@ -469,16 +451,14 @@
 #: src/include/http-server/helps.rb:58
 #, fuzzy
 msgid ""
-"<p><b><big>Editing HTTP Server Modules</big></b><br>"
-"\n"
+"<p><b><big>Editing HTTP Server Modules</big></b><br>\n"
 "The table contains a list of all available Apache2 modules.\n"
 "The first column contains the name of the module. \n"
 "The second column shows whether the module should be\n"
 "loaded by the server. Enabled modules will be loaded. The last column displays a short description\n"
 "of the module.</p>"
 msgstr ""
-"<p><b><big>Redigering av HTTP-servermoduler</big></b><br>"
-"\n"
+"<p><b><big>Redigering av HTTP-servermoduler</big></b><br>\n"
 "Tabellen inneheld ei liste over alle tilgjengelege Apache2-modular.\n"
 "Den første kolonnen inneheld namnet til modulen. \n"
 "Den andre kolonnen viser om modulen skal\n"
@@ -490,40 +470,32 @@
 #, fuzzy
 msgid ""
 "<p>To change the status of a module, \n"
-"choose the appropriate entry of the table and click <b>Toggle Status</b>.</p>"
-"\n"
+"choose the appropriate entry of the table and click <b>Toggle Status</b>.</p>\n"
 msgstr ""
 "<p>For å endra statusen for ein modul, \n"
-"vel ein oppføring i tabellen og klikk <b>Endre status</b>.</p>"
-"\n"
+"vel ein oppføring i tabellen og klikk <b>Endre status</b>.</p>\n"
 
 #. module dialog help 3/3
 #: src/include/http-server/helps.rb:71
 #, fuzzy
 msgid ""
 "<p>If you need to add a module not listed in the table, \n"
-"use <b>Add Module</b>.</p>"
-"\n"
+"use <b>Add Module</b>.</p>\n"
 msgstr ""
 "<p>Viss du må leggja til ein modul som ikkje er oppførd i tabellen, \n"
-"kan du bruka <b>Legg til modul</b>-knappen.</p>"
-"\n"
+"kan du bruka <b>Legg til modul</b>-knappen.</p>\n"
 
 #. apache service enabling help 1/1
 #: src/include/http-server/helps.rb:75
 #, fuzzy
 msgid ""
-"<p><b><big>HTTP Server Settings</big></b><br>"
-"\n"
+"<p><b><big>HTTP Server Settings</big></b><br>\n"
 "Activate the HTTP server by choosing <b>Enabled</b>. To deactivate it, choose\n"
-"<b>Disabled</b>.</p>"
-"\n"
+"<b>Disabled</b>.</p>\n"
 msgstr ""
-"<p><b><big>Innstillingar for HTTP-servar</big></b><br>"
-"\n"
+"<p><b><big>Innstillingar for HTTP-servar</big></b><br>\n"
 "Aktivar HTTP-serveren ved å velja <b>Aktivert</b>. Deaktiver serveren ved å velja\n"
-"<b>Deaktivert</b>.</p>"
-"\n"
+"<b>Deaktivert</b>.</p>\n"
 
 #. firewall adapting help 1/1
 #: src/include/http-server/helps.rb:81
@@ -532,14 +504,12 @@
 "<p>By enabling <b>Open Firewall on Selected Ports</b>, \n"
 "adapt the firewall according the ports on which Apache2 listens. \n"
 "The interfaces of the firewall are not added or deleted. \n"
-"This option is only available if the firewall is enabled.</p>"
-"\n"
+"This option is only available if the firewall is enabled.</p>\n"
 msgstr ""
 "<p>Ved å bruka <b>Opne brannmur via valde portar</b> \n"
 "kan du tilpassa brannmuren i samsvar med portane som Apache2 lyttar på.\n"
 "Grensesnitt for brannmuren vert ikkje lagd til eller sletta. \n"
-"Dette valet er berre tilgjengeleg viss brannmuren er aktivert.</p>"
-"\n"
+"Dette valet er berre tilgjengeleg viss brannmuren er aktivert.</p>\n"
 
 #. server configuration overview help 1/2
 #: src/include/http-server/helps.rb:88
@@ -555,8 +525,7 @@
 "default (fallback) host. If the server name of the default\n"
 "host is not specified, a path to the document root of the\n"
 "default host is displayed.\n"
-"<b>Hosts</b> contains a list of hosts configured for the server.</p>"
-"\n"
+"<b>Hosts</b> contains a list of hosts configured for the server.</p>\n"
 msgstr ""
 "<p>Lista over alternativ viser\n"
 "fleire deler av serverkonfigurasjonen. <b>Lote på</b>\n"
@@ -568,8 +537,7 @@
 "standard. Viss serverennavnet til\n"
 "standardvertsmaskinen ikkje er angjevne, vert viste stigen til dokumentroten på\n"
 "standardvertsmaskinen i staden.\n"
-"<b>Vertsmaskiner</b> inneheld ei liste over vertsmaskiner som er konfigurert for serveren.</p>"
-"\n"
+"<b>Vertsmaskiner</b> inneheld ei liste over vertsmaskiner som er konfigurert for serveren.</p>\n"
 
 #. server configuration overview help 2/2
 #: src/include/http-server/helps.rb:102
@@ -587,21 +555,17 @@
 #: src/include/http-server/helps.rb:108
 #, fuzzy
 msgid ""
-"<p><b><big>Configured Hosts</big></b><br>"
-"\n"
+"<p><b><big>Configured Hosts</big></b><br>\n"
 "This is a list of already configured hosts. One of the hosts is \n"
 "marked as default (the asterisk next to the server name). A default host is used if no other host\n"
 "matches for an incoming request. To set a host as default,\n"
-"press <b>Set as Default</b>.</p>"
-"\n"
+"press <b>Set as Default</b>.</p>\n"
 msgstr ""
-"<p><b><big>Konfigurerte vertsmaskiner</big></b><br>"
-"\n"
+"<p><b><big>Konfigurerte vertsmaskiner</big></b><br>\n"
 "Dette er ei liste over allereie konfigurerte vertsmaskiner. Ein av vertsmaskinene er \n"
 "markert som standard (ei stjerne ved sida av servernavnet). Ein standardvertsmaskin vert brukt dersom ingen annan vertsmaskin\n"
 "samsvarer med ein innkommende førespurnad. For å definera ein vertsmaskin som standard,\n"
-"klikk på <b>Bruk som standard</b>.</p>"
-"\n"
+"klikk på <b>Bruk som standard</b>.</p>\n"
 
 #. hosts list help 2/2
 #: src/include/http-server/helps.rb:116
@@ -617,13 +581,11 @@
 #: src/include/http-server/helps.rb:120
 #, fuzzy
 msgid ""
-"<p><b><big>Host Configuration</big></b><br>"
-"\n"
+"<p><b><big>Host Configuration</big></b><br>\n"
 "To edit the host settings, choose the appropriate entry of the table then click <b>Edit</b>.\n"
 "To add a new option, click <b>Add</b>. To remove an option, select it and click <b>Delete</b>.</p>"
 msgstr ""
-"<p><b><big>Vertsmaskinkonfigurasjon</big></b><br>"
-"\n"
+"<p><b><big>Vertsmaskinkonfigurasjon</big></b><br>\n"
 "For å redigera innstillingane for vertsmaskinen, vel ein oppføring i tabellen og klikk <b>Rediger/b>.\n"
 "For å leggja til eit nytt alternativ, klikk <b>Legg til</b>. Vel eit alternativ og klikk <b>Slett</b> for å slette det.</p>"
 
@@ -637,8 +599,7 @@
 "\ta name-based virtual host. If you plan to configure a SSL based vhost, use <b>Resolution via IP address</b></p>"
 msgstr ""
 "<p>Bruk vala under <b>Serverdefinisjon</b> for å angje rutedefinisjonen for \n"
-"\tvirtuelle vertsmaskiner. Men viss du vel <b>Definisjon vigd HTTP-deklarasjonar</p>"
-",\n"
+"\tvirtuelle vertsmaskiner. Men viss du vel <b>Definisjon vigd HTTP-deklarasjonar</p>,\n"
 "\tvil standardserveren aldri motta førespurnader sendt til IP-adressa for\n"
 "\tein navnebasert virtuell vertsmaskin. Viss du vil setja opp ein SSL-basert virtuell vertsmaskin, nytte <b>Definisjon vigd IP-adresse</b></p>"
 
@@ -646,17 +607,13 @@
 #: src/include/http-server/helps.rb:133
 #, fuzzy
 msgid ""
-"<p><b><big><i>Listen</i> Settings for a Host</big></b><br>"
-"\n"
+"<p><b><big><i>Listen</i> Settings for a Host</big></b><br>\n"
 "The <i>Listen</i> directive allows selection of ports and network interfaces\n"
-"where the HTTP server should listen for incoming requests.</p>"
-"\n"
+"where the HTTP server should listen for incoming requests.</p>\n"
 msgstr ""
-"<p><b><big><i></i>-innstillingar for vertsmaskin</big></b><br>"
-"\n"
+"<p><b><big><i></i>-innstillingar for vertsmaskin</big></b><br>\n"
 "Under <i>Lytt på</i> kan du velja portar og nettverksgrensesnitt\n"
-"der HTTP-serveren skal lytta etter innkommende førespurnader.</p>"
-"\n"
+"der HTTP-serveren skal lytta etter innkommende førespurnader.</p>\n"
 
 #. listen dialog editor help 2/2
 #: src/include/http-server/helps.rb:139
@@ -672,19 +629,15 @@
 #: src/include/http-server/helps.rb:143
 #, fuzzy
 msgid ""
-"<p><b><big>SSL Configuration</big></b><br>"
-"\n"
+"<p><b><big>SSL Configuration</big></b><br>\n"
 "This is a list of options related to the SSL (Secure Socket Layer) settings\n"
 "of the host. SSL allows communicating securely with the host by \n"
-"encrypting communication.</p>"
-"\n"
+"encrypting communication.</p>\n"
 msgstr ""
-"<p><b><big>SSL-konfigurasjon</big></b><br>"
-"\n"
+"<p><b><big>SSL-konfigurasjon</big></b><br>\n"
 "Dette er ei liste over alternativ i samband med SSL-innstillingane (Secure Socket Layer)\n"
 "for vertsmaskinen. SSL sørgar for sikker kommunikasjon med vertsmaskinen ved \n"
-"å kryptera innholde.</p>"
-"\n"
+"å kryptera innholde.</p>\n"
 
 #. ssl options dialog help 2/4
 #: src/include/http-server/helps.rb:150
@@ -693,14 +646,12 @@
 "<p>General behavior is determined by the SSL option. The host can\n"
 "not support SSL at all (<tt>No SSL</tt>), allow both non-SSL and SSL access (<tt>Allowed</tt>),\n"
 "or accept only connections encrypted via SSL (<tt>Required</tt>).\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>Dei generelle eigenskapane vert definerte av SSL-alternativet. Du kan velja at vertsmaskinen\n"
 "ikkje skal støtte SSL i det heile (<tt>Ingen SSL</tt>), at han skal gje tilgjenge både med og utan SSL (<tt>Tillaten</tt>)\n"
 "eller berre tillata kommunikasjon som er kryptert via SSL (<tt>Obligatorisk</tt>).\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. ssl options dialog help 3/4
 #: src/include/http-server/helps.rb:157
@@ -720,38 +671,32 @@
 "importing server certificates. <b>Import Server Certificate</b> \n"
 "allows use of a special purpose certificate. \n"
 "<b>Use Common Certificate</b> configures usage of the\n"
-"common certificate issued for this host.</p>"
-"\n"
+"common certificate issued for this host.</p>\n"
 msgstr ""
 "<p>Frå <b>Sertifikat</b>-menyen \n"
 "kan du importerast serversertifikater. Bruk <b>Importar serversertifikat</b> \n"
 "for å ta i bruk eit sertifikat for eit bestemt føremål . \n"
 "<b>Bruk normalt sertifikat</b> konfigurerer nytta av\n"
-"det normale sertifikatet som er tildelt denne vertsmaskinen.</p>"
-"\n"
+"det normale sertifikatet som er tildelt denne vertsmaskinen.</p>\n"
 
 #. ssl options dialog help 4/4
 #: src/include/http-server/helps.rb:171
 #, fuzzy
 msgid ""
 "<p><b>Note:</b> If you enable use of SSL for a host, the <tt>mod_ssl</tt> \n"
-"module should be loaded by the server.</p>"
-"\n"
+"module should be loaded by the server.</p>\n"
 msgstr ""
 "<p><b>Merk:</b> Viss du aktiverer SSL for ein vertsmaskin, må modulen <tt>mod_ssl</tt> \n"
-"lastast av serveren.</p>"
-"\n"
+"lastast av serveren.</p>\n"
 
 #. new host dialog help 1/3
 #: src/include/http-server/helps.rb:175
 #, fuzzy
 msgid ""
-"<p><b><big>New Host</big></b><br>"
-"\n"
+"<p><b><big>New Host</big></b><br>\n"
 "This dialog allows you to enter a basic information about a new virtual host.</p>"
 msgstr ""
-"<p><b><big>Ny vertsmaskin</big></b><br>"
-"\n"
+"<p><b><big>Ny vertsmaskin</big></b><br>\n"
 "I denne dialogen kan du leggja inn grunnleggjande informasjon om ein ny virtuell vertsmaskin.</p>"
 
 #. new host dialog help 2/3
@@ -763,23 +708,20 @@
 "of the HTTP headers of the server response. <b>Server Contents Root</b>\n"
 "is an absolute path to a directory containing all documents provided by\n"
 "this virtual host. <b>Administrator E-Mail</b> allows setup of an e-mail\n"
-"address for feedback about this host.</p>"
-"\n"
+"address for feedback about this host.</p>\n"
 msgstr ""
 "<p><b>Serveridentifikasjon</b> definerer innhaldet i og\n"
 "presentasjonen av ein ny virtuell vertsmaskin. <b>Servernavn</b> er DNS-namnet som vert angjeve som ein del\n"
 "av HTTP-deklarasjonane i serverens respons. <b>Serverens rotinnhold</b>\n"
 "er ein absolutt stig til katalogen som inneheld alle dokumenta til\n"
 "denne virtuelle vertsmaskinen. Under <b>E-post for administrator</b> kan du angje ei e-postadresse\n"
-"for tilbakemeldinger om denne vertsmaskinen.</p>"
-"\n"
+"for tilbakemeldinger om denne vertsmaskinen.</p>\n"
 
 #. new host dialog help 3/3
 #: src/include/http-server/helps.rb:188
 #, fuzzy
 msgid ""
-"<p><big><b>Server Resolution</b></big><br>"
-"\n"
+"<p><big><b>Server Resolution</b></big><br>\n"
 "Apache2 must be able to determine which virtual host\n"
 "settings it should use to create a response for an HTTP request. \n"
 "There are two basic approaches. If using HTTP headers\n"
@@ -787,11 +729,9 @@
 "the HTTP request headers. The other possibility is to determine the virtual host\n"
 "by the IP address used by the client when connecting to the server.\n"
 "If you plan to configure SSL-based vhost, use <b>Resolution via IP address</b>\n"
-"Consult the Apache2 manual for further details.</p>"
-"\n"
+"Consult the Apache2 manual for further details.</p>\n"
 msgstr ""
-"<p><big><b>Serverdefinisjon</b></big><br>"
-"\n"
+"<p><big><b>Serverdefinisjon</b></big><br>\n"
 "Apache 2 treng informasjon om kva for innstillingar for\n"
 "virtuell vertsmaskin som skal nyttast ved respons på ein HTTP-førespurnad. \n"
 "Det er i prinsippet to hovedmetoder. Ved å bruka HTTP-deklarasjonar\n"
@@ -799,19 +739,16 @@
 "HTTP-deklarasjonane til førespurnaden. Ein anna høve er å definera den virtuelle vertsmaskinen\n"
 "ut frå IP-adressa som vert nytta av klienten ved tilkobling til serveren.\n"
 "Viss du vil setja opp ein SSL-basert virtuell vertsmaskin, nytte <b>Definisjon vigd IP-adresse</b>\n"
-"Du finn meir informasjon i brukerveiledningen for Apache2.</p>"
-"\n"
+"Du finn meir informasjon i brukerveiledningen for Apache2.</p>\n"
 
 #. advanced new host dialog 1/5
 #: src/include/http-server/helps.rb:200
 #, fuzzy
 msgid ""
-"<p><b><big>Details for New Host</big></b><br>"
-"\n"
+"<p><b><big>Details for New Host</big></b><br>\n"
 "This dialog allows you to specify additional information about a new virtual host.</p>"
 msgstr ""
-"<p><b><big>Informasjon om ny vertsmaskin</big></b><br>"
-"\n"
+"<p><b><big>Informasjon om ny vertsmaskin</big></b><br>\n"
 "I denne dialogen kan du spesifisera tilleggsinformasjon om ein ny virtuell vertsmaskin.</p>"
 
 #. advanced new host dialog 2/5
@@ -831,8 +768,7 @@
 "<p>For HTTPS access to this virtual host, select <b>Enable SSL Support</b>.\n"
 "\n"
 "Then enter the path for the certificate file in <b>Certificate File\n"
-"Path</b>.This option is only available for IP-based vhosts.</p>"
-"\n"
+"Path</b>.This option is only available for IP-based vhosts.</p>\n"
 msgstr ""
 "<p>For HTTPS-tilgjenge til denne virtuelle vertsmaskinen, vel <b>Aktivum SSL-støtte</b>.\n"
 "\n"

Modified: branches/plus-SLE12-SP2/yast/nn/po/inetd.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/inetd.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/inetd.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -122,12 +122,12 @@
 msgid "The 'id' option cannot be combined with other options."
 msgstr "Alternativet 'id' kan ikkje kombinerast med andre alternativ."
 
-#: src/clients/inetd.rb:401 src/include/inetd/dialogs.rb:356
+#: src/clients/inetd.rb:401 src/include/inetd/dialogs.rb:353
 #, fuzzy
 msgid "Status"
 msgstr "Status"
 
-#: src/clients/inetd.rb:402 src/include/inetd/dialogs.rb:357
+#: src/clients/inetd.rb:402 src/include/inetd/dialogs.rb:354
 #, fuzzy
 msgid "Service"
 msgstr "Teneste"
@@ -142,17 +142,17 @@
 msgid "Prot."
 msgstr "Prot."
 
-#: src/clients/inetd.rb:405 src/include/inetd/dialogs.rb:360
+#: src/clients/inetd.rb:405 src/include/inetd/dialogs.rb:357
 #, fuzzy
 msgid "Wait"
 msgstr "Vent"
 
-#: src/clients/inetd.rb:406 src/include/inetd/dialogs.rb:361
+#: src/clients/inetd.rb:406 src/include/inetd/dialogs.rb:358
 #, fuzzy
 msgid "User"
 msgstr "Brukar"
 
-#: src/clients/inetd.rb:407 src/include/inetd/dialogs.rb:362
+#: src/clients/inetd.rb:407 src/include/inetd/dialogs.rb:359
 #, fuzzy
 msgid "Server"
 msgstr "Servar"
@@ -170,13 +170,13 @@
 msgstr "Av"
 
 #. determine wait mode (convert to string)
-#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:855
+#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:851
 #: src/include/inetd/routines.rb:211
 #, fuzzy
 msgid "Yes"
 msgstr "Ja"
 
-#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:855
+#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:851
 #: src/include/inetd/routines.rb:213
 #, fuzzy
 msgid "No"
@@ -195,151 +195,151 @@
 
 #. Translators: In autoinstallation mode:
 #. The package name is stored in %1. This is Popup::ContinueCancel.
-#: src/include/inetd/dialogs.rb:164
+#: src/include/inetd/dialogs.rb:160
 #, fuzzy
 msgid "Package %1 will be installed during the write process."
 msgstr "Pakka %1 vil installerast under lagringsprosessen."
 
 #. if (true) { // for debugging
 #. Translators: The package name is stored in %1. This is Popup::Message.
-#: src/include/inetd/dialogs.rb:183
+#: src/include/inetd/dialogs.rb:179
 #, fuzzy
 msgid "Package %1 was not installed. The service cannot be edited."
 msgstr "Pakka %1 vart ikkje installert. Tenesta kan ikkje redigerast."
 
 #. Translators: The package name is stored in %1
-#: src/include/inetd/dialogs.rb:205
+#: src/include/inetd/dialogs.rb:201
 #, fuzzy
 msgid "Package %1 was successfully installed."
 msgstr "Pakka %1 vart installert."
 
 #. This is main inetd module dialog.
 #. @return dialog result
-#: src/include/inetd/dialogs.rb:303
+#: src/include/inetd/dialogs.rb:299
 #, fuzzy
 msgid "&Activate All Services"
 msgstr "&Aktiver alle tenester"
 
-#: src/include/inetd/dialogs.rb:304
+#: src/include/inetd/dialogs.rb:300
 #, fuzzy
 msgid "&Deactivate All Services"
 msgstr "&Deaktiver alle tenester"
 
 #. Translators: Initial and target state of xinetd (or inetd)
-#: src/include/inetd/dialogs.rb:339
+#: src/include/inetd/dialogs.rb:334
 #, fuzzy
 msgid "D&isable"
 msgstr "D&eaktiver"
 
-#: src/include/inetd/dialogs.rb:340
+#: src/include/inetd/dialogs.rb:336
 #, fuzzy
 msgid "Enab&le"
 msgstr "Akti&ver"
 
 #. Main dialog edit inetd.conf
 #. Translators: Name of table with services (echo, chargen, ...)
-#: src/include/inetd/dialogs.rb:347
+#: src/include/inetd/dialogs.rb:344
 #, fuzzy
 msgid "Currently Available Services"
 msgstr "Tilgjengelege tenester"
 
 #. `opt(`notify),
 #. `opt(`keepSorting),
-#: src/include/inetd/dialogs.rb:355
+#: src/include/inetd/dialogs.rb:352
 #, fuzzy
 msgid "Ch"
 msgstr "Endre"
 
-#: src/include/inetd/dialogs.rb:358
+#: src/include/inetd/dialogs.rb:355
 #, fuzzy
 msgid "Type "
 msgstr "Type "
 
-#: src/include/inetd/dialogs.rb:359
+#: src/include/inetd/dialogs.rb:356
 #, fuzzy
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: src/include/inetd/dialogs.rb:363
+#: src/include/inetd/dialogs.rb:360
 #, fuzzy
 msgid "Server / Args"
 msgstr "Servar / Argm"
 
 #. Translators: Add service
-#: src/include/inetd/dialogs.rb:373
+#: src/include/inetd/dialogs.rb:370
 #, fuzzy
 msgid "&Add"
 msgstr "&Legg til"
 
 #. Translators: Edit service
-#: src/include/inetd/dialogs.rb:376
+#: src/include/inetd/dialogs.rb:373
 #, fuzzy
 msgid "&Edit"
 msgstr "&Rediger"
 
 #. Translators: Delete service
-#: src/include/inetd/dialogs.rb:379
+#: src/include/inetd/dialogs.rb:376
 #, fuzzy
 msgid "&Delete"
 msgstr "&Slett"
 
 #. Translators: Change service status
-#: src/include/inetd/dialogs.rb:387
+#: src/include/inetd/dialogs.rb:384
 #, fuzzy
 msgid "&Toggle Status (On or Off)"
 msgstr "&Endre status (På eller Av)"
 
-#: src/include/inetd/dialogs.rb:399
+#: src/include/inetd/dialogs.rb:396
 #, fuzzy
 msgid "Status for All &Services"
 msgstr "Status for alle &tenester"
 
 #. Inetd configure dialog caption
-#: src/include/inetd/dialogs.rb:413
+#: src/include/inetd/dialogs.rb:410
 #, fuzzy
 msgid "Network Service Configuration (xinetd)"
 msgstr "Oppset av nettverkstjenester (xinetd)"
 
 #. execute dialog
 #. Translators: Caption for EditOrCreateServiceDlg()
-#: src/include/inetd/dialogs.rb:504
+#: src/include/inetd/dialogs.rb:498
 #, fuzzy
 msgid "Add a New Service Entry"
 msgstr "Legg til ein ny tjenesteoppføring"
 
 #. Translators: Popup::Error
-#: src/include/inetd/dialogs.rb:534
+#: src/include/inetd/dialogs.rb:528
 #, fuzzy
 msgid "Cannot delete the service. It is not installed."
 msgstr "Kan ikkje sletta tenesta. Han er ikkje installert."
 
 #. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:558
+#: src/include/inetd/dialogs.rb:552
 #, fuzzy
 msgid "To delete a service, select one in the main dialog"
 msgstr "Vel ei teneste i hoveddialogen for å slette henne"
 
 #. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:605
+#: src/include/inetd/dialogs.rb:599
 #, fuzzy
 msgid "To activate or deactivate a service, select one in the main dialog."
 msgstr "Vel ei teneste i hoveddialogen for å aktivare eller deaktivere han."
 
 #. y2milestone("Current line %1", current_line);
 #. Translators: Caption of EditOrCreateServiceDlg()
-#: src/include/inetd/dialogs.rb:742
+#: src/include/inetd/dialogs.rb:736
 #, fuzzy
 msgid "Edit a service entry"
 msgstr "Rediger ein tjenesteoppføring"
 
 #. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:757
+#: src/include/inetd/dialogs.rb:751
 #, fuzzy
 msgid "To edit a service, select one in the main dialog"
 msgstr "Vel ei teneste i hoveddialogen for å redigera henne"
 
 #. Translators: Popup::Warning
-#: src/include/inetd/dialogs.rb:788
+#: src/include/inetd/dialogs.rb:782
 #, fuzzy
 msgid ""
 "All services are marked as disabled (locked).\n"
@@ -349,64 +349,64 @@
 "Superserveren for Internett vil verta deaktivert."
 
 #. service name
-#: src/include/inetd/dialogs.rb:811
+#: src/include/inetd/dialogs.rb:807
 #, fuzzy
 msgid "&Service"
 msgstr "&Teneste"
 
-#: src/include/inetd/dialogs.rb:813
+#: src/include/inetd/dialogs.rb:809
 #, fuzzy
 msgid "RPC Versio&n"
 msgstr "RPC-versjo&n"
 
 #. service status (running or stopped)
-#: src/include/inetd/dialogs.rb:819
+#: src/include/inetd/dialogs.rb:815
 #, fuzzy
 msgid "Service is acti&ve."
 msgstr "Tenesta er akti&vert."
 
 #. service socket type
-#: src/include/inetd/dialogs.rb:832
+#: src/include/inetd/dialogs.rb:828
 #, fuzzy
 msgid "Socket T&ype"
 msgstr "Sokkelt&ype"
 
 #. for protocol option - ediatble ComboBox
-#: src/include/inetd/dialogs.rb:843
+#: src/include/inetd/dialogs.rb:839
 #, fuzzy
 msgid "&Protocol"
 msgstr "&Protokoll"
 
 #. for flags (wait/nowait) - noneditable ComboBox
-#: src/include/inetd/dialogs.rb:854
+#: src/include/inetd/dialogs.rb:850
 #, fuzzy
 msgid "&Wait"
 msgstr "&Vent"
 
 #. user and group ComboBoxes
-#: src/include/inetd/dialogs.rb:864
+#: src/include/inetd/dialogs.rb:860
 #, fuzzy
 msgid "&User"
 msgstr "&Brukar"
 
-#: src/include/inetd/dialogs.rb:866
+#: src/include/inetd/dialogs.rb:862
 #, fuzzy
 msgid "&Group"
 msgstr "&Gruppe"
 
 #. Server arguments
-#: src/include/inetd/dialogs.rb:869
+#: src/include/inetd/dialogs.rb:865
 #, fuzzy
 msgid "S&erver"
 msgstr "S&erver"
 
-#: src/include/inetd/dialogs.rb:870
+#: src/include/inetd/dialogs.rb:866
 #, fuzzy
 msgid "Server Argumen&ts"
 msgstr "Serverargumen&ter"
 
 #. Comment above the service line in inetd.conf
-#: src/include/inetd/dialogs.rb:872
+#: src/include/inetd/dialogs.rb:868
 #, fuzzy
 msgid "Co&mment"
 msgstr "Ko&mmentar"
@@ -421,15 +421,15 @@
 #. It does not get the NIS entries.
 #. "+" is filtered out.
 #. @return [Array] groups
-#: src/include/inetd/dialogs.rb:918 src/include/inetd/dialogs.rb:956
-#: src/include/inetd/dialogs.rb:961 src/include/inetd/dialogs.rb:1000
+#: src/include/inetd/dialogs.rb:914 src/include/inetd/dialogs.rb:952
+#: src/include/inetd/dialogs.rb:957 src/include/inetd/dialogs.rb:996
 #: src/include/inetd/routines.rb:333 src/include/inetd/routines.rb:353
 #, fuzzy
 msgid "--default--"
 msgstr "--standard--"
 
 #. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:946
+#: src/include/inetd/dialogs.rb:942
 #, fuzzy
 msgid ""
 "Service is empty.\n"
@@ -439,13 +439,13 @@
 "Angje gyldige verd.\n"
 
 #. Error message
-#: src/include/inetd/dialogs.rb:952
+#: src/include/inetd/dialogs.rb:948
 #, fuzzy
 msgid "Service name contains disallowed character \"/\"."
 msgstr "Tjenestenavnet inneheld ugyldige teikn \"/\""
 
 #. Translators: sformat-ed() 3 strings
-#: src/include/inetd/dialogs.rb:960
+#: src/include/inetd/dialogs.rb:956
 #, fuzzy
 msgid "The user %1 is reserved for internal server processes only."
 msgstr "Brukaren %1 er reservert for interne serverprosesser."
@@ -466,108 +466,78 @@
 #: src/include/inetd/helps.rb:46
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing xinetd Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Initializing xinetd Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Initialiserer xinetd-oppsett-</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer xinetd-oppsett-</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/inetd/helps.rb:50
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting the Initialization Process:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<p><b><big>Aborting the Initialization Process:</big></b><br>\n"
+"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n"
 msgstr ""
-"<p><b><big>Avbryt initaliseringsprosessen:</big></b><br>"
-"\n"
-"Du kan trygt avslutta oppsettverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryt initaliseringsprosessen:</big></b><br>\n"
+"Du kan trygt avslutta oppsettverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/inetd/helps.rb:54
 #, fuzzy
 msgid ""
-"<p><b><big>Saving xinetd Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Saving xinetd Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Lagrar xinetd-oppsett</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar xinetd-oppsett</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/inetd/helps.rb:58
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting the Save Process:</big></b><br>"
-"\n"
+"<p><b><big>Aborting the Save Process:</big></b><br>\n"
 "Abort saving by pressing <b>Abort</b>.\n"
 "An additional dialog will inform you whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryt lagringsprosessen:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagringsprosessen:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein annan dialog vil gje deg melding om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Configure1 dialog help 1/2
 #: src/include/inetd/helps.rb:65
 #, fuzzy
 msgid ""
-"<p><b><big>Network Service Configuration</big></b><br>"
-"\n"
+"<p><b><big>Network Service Configuration</big></b><br>\n"
 "Click <b>Enable</b> to enable network services managed by a super-server\n"
-"configuration. To stop the super-server, click <b>Disable</b>.</p>"
-"\n"
+"configuration. To stop the super-server, click <b>Disable</b>.</p>\n"
 msgstr ""
-"<p><b><big>Oppset av nettverkstjenester</big></b><br>"
-"\n"
+"<p><b><big>Oppset av nettverkstjenester</big></b><br>\n"
 "Klikk <b>Aktivum</b> for å aktivare nettverkstjenester som vert styrt av ein superserver.\n"
-"Klikk <b>Deaktiver</b> for å deaktivere superserveren.</p>"
-"\n"
+"Klikk <b>Deaktiver</b> for å deaktivere superserveren.</p>\n"
 
 #: src/include/inetd/helps.rb:70
 #, fuzzy
 msgid ""
-"<p><b><big>Configuration Service Status:</big></b><br>"
-"\n"
+"<p><b><big>Configuration Service Status:</big></b><br>\n"
 "All services marked with <b>X</b> in column <b>Ch</b> were edited\n"
-"and will be changed in the system configuration.</p>"
-"\n"
+"and will be changed in the system configuration.</p>\n"
 msgstr ""
-"<p><b><big>Oppsettstatus for tenester:</big></b><br>"
-"\n"
+"<p><b><big>Oppsettstatus for tenester:</big></b><br>\n"
 "Alle tenester markert med <b>X</b> i kolonnen <b>Endre</b> er redigert\n"
-"og vil endrast i systemoppsettet</p>"
-"\n"
+"og vil endrast i systemoppsettet</p>\n"
 
 #: src/include/inetd/helps.rb:75
 #, fuzzy
 msgid ""
-"<p><b><big>Services Status:</big></b><br>"
-"\n"
+"<p><b><big>Services Status:</big></b><br>\n"
 "All services marked with <b>---</b> are inactive (locked).\n"
 "All services marked with <b>On</b> are active (unlocked).\n"
 "All services marked with <b>NI</b> are not installed and cannot be configured.</p>"
 msgstr ""
-"<p><b><big>Tjenestestatus:</big></b><br>"
-"\n"
+"<p><b><big>Tjenestestatus:</big></b><br>\n"
 "Alle tenester markert med <b>---</b> er deaktivert (låste).\n"
 "Alle tenester markert med <b>På</b> er aktiverte (ulåste).\n"
 "Alle tenester markert med <b>II</b> er ikkje installerte og kan ikkje verta opp sette.</p>"
@@ -575,65 +545,49 @@
 #: src/include/inetd/helps.rb:81
 #, fuzzy
 msgid ""
-"<p><b><big>Changing Service Status:</big></b><br>"
-"\n"
-"Select the service to enable or disable and press <b>Toggle Status (On or Off)</b>.</p>"
-"\n"
+"<p><b><big>Changing Service Status:</big></b><br>\n"
+"Select the service to enable or disable and press <b>Toggle Status (On or Off)</b>.</p>\n"
 msgstr ""
-"<p><b><big>Endre tjenestestatus:</big></b><br>"
-"\n"
-"Vel tenesta du vil aktivera eller deaktivere og klikk <b>Endra status (På eller Av)</b>.</p>"
-"\n"
+"<p><b><big>Endre tjenestestatus:</big></b><br>\n"
+"Vel tenesta du vil aktivera eller deaktivere og klikk <b>Endra status (På eller Av)</b>.</p>\n"
 
 #: src/include/inetd/helps.rb:84
 #, fuzzy
 msgid ""
-"<p><b><big>Editing Services:</big></b><br>"
-"\n"
-"Select the service to edit and press <b>Edit</b>.</p>"
-"\n"
+"<p><b><big>Editing Services:</big></b><br>\n"
+"Select the service to edit and press <b>Edit</b>.</p>\n"
 msgstr ""
-"<p><b><big>Redigering av tenester:</big></b><br>"
-"\n"
-"Vel tenesta du vil redigera og klikk <b>Rediger</b>.</p>"
-"\n"
+"<p><b><big>Redigering av tenester:</big></b><br>\n"
+"Vel tenesta du vil redigera og klikk <b>Rediger</b>.</p>\n"
 
 #: src/include/inetd/helps.rb:87
 #, fuzzy
 msgid ""
-"<p><b><big>Deleting Services:</big></b><br>"
-"\n"
-"Select the service to delete and press <b>Delete</b>.</p>"
-"\n"
+"<p><b><big>Deleting Services:</big></b><br>\n"
+"Select the service to delete and press <b>Delete</b>.</p>\n"
 msgstr ""
-"<p><b><big>Slette tenester:</big></b><br>"
-"\n"
-"Vel tenesta du vil sletta og klikk <b>Slett</b>.</p>"
-"\n"
+"<p><b><big>Slette tenester:</big></b><br>\n"
+"Vel tenesta du vil sletta og klikk <b>Slett</b>.</p>\n"
 
 #: src/include/inetd/helps.rb:90
 #, fuzzy
 msgid ""
 "<p><b><big>Adding a New Entry:</big></b>\n"
-"Click <b>Create</b> and complete the form.</p>"
-"\n"
+"Click <b>Create</b> and complete the form.</p>\n"
 msgstr ""
 "<p><b><big>Leggja til ny oppføring:</big></b>\n"
-"Klikk <b>Opprett</b> og fyll ut skjemaet.</p>"
-"\n"
+"Klikk <b>Opprett</b> og fyll ut skjemaet.</p>\n"
 
 #: src/include/inetd/helps.rb:93
 #, fuzzy
 msgid ""
 "<p><b><big>Canceling Configuration:</big></b>\n"
 "Leave the configuration untouched by pressing the <b>Cancel</b> button.\n"
-"If you do so, all your changes will be lost and the original configuration will remain.</p>"
-"\n"
+"If you do so, all your changes will be lost and the original configuration will remain.</p>\n"
 msgstr ""
 "<p><b><big>Avbryt oppsett:</big></b>\n"
 "Avbryt oppsettet ved å klikka på <b>Avbryt</b>-knappen.\n"
-"Viss du gjer dette, vil alle endringar gå tapt og det originale oppsettet vil ikkje endrast.</p>"
-"\n"
+"Viss du gjer dette, vil alle endringar gå tapt og det originale oppsettet vil ikkje endrast.</p>\n"
 
 #. Help for the EditOrCreateServiceDlg () dialog.
 #. @return The help text.
@@ -642,13 +596,11 @@
 msgid ""
 "\n"
 "<p>To create a valid entry (service) for the super-server,\n"
-"enter</p>"
-"\n"
+"enter</p>\n"
 msgstr ""
 "\n"
 "<p>For å oppretta ein gyldig oppføring (teneste) for superserveren,\n"
-"angje</p>"
-"\n"
+"angje</p>\n"
 
 #: src/include/inetd/helps.rb:109
 #, fuzzy
@@ -666,8 +618,7 @@
 "</ul>"
 msgstr ""
 "<ul>\n"
-"<li>Tjenestennavn{"
-"<li>RPC-versjon (valfritt)\n"
+"<li>Tjenestennavn{<li>RPC-versjon (valfritt)\n"
 "<li>Sokkeltype\n"
 "<li>Protokoll\n"
 "<li>wait/nowait\n"
@@ -679,23 +630,17 @@
 
 #: src/include/inetd/helps.rb:122
 #, fuzzy
-msgid ""
-"<p>This is a short description. For details, see <b>info xinetd.conf</b>.</p>"
-"\n"
-msgstr ""
-"<p>Dette er ei kort skildring. Du finn meir informasjon i <b>info xinetd.conf</b>.</p>"
-"\n"
+msgid "<p>This is a short description. For details, see <b>info xinetd.conf</b>.</p>\n"
+msgstr "<p>Dette er ei kort skildring. Du finn meir informasjon i <b>info xinetd.conf</b>.</p>\n"
 
 #: src/include/inetd/helps.rb:125
 #, fuzzy
 msgid ""
 "<p>Enter a valid service name into the <b>service</b> field.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>Angje eit gyldig tjenestenavn i <b>teneste</b>-feltet.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/inetd/helps.rb:128
 #, fuzzy
@@ -703,27 +648,23 @@
 "<p>The <b>socket type</b> should be stream, dgram, raw, or seqpacket,\n"
 "depending on whether the service is stream-based, is datagram-based,\n"
 "requires direct access to IP, or requires reliable sequential datagram\n"
-"transmission.</p>"
-"\n"
+"transmission.</p>\n"
 msgstr ""
 "<p><b>Sokkeltype</b> skal vera stream, dgram, raw eller seqpacket,\n"
 "avhengig av om tenesta er streambasert, datagrambasert,\n"
 "krev direkte tilgjenge til IP eller krev ein påliteleg, sekvensiell\n"
-"datagramoverføring.</p>"
-"\n"
+"datagramoverføring.</p>\n"
 
 #: src/include/inetd/helps.rb:134
 #, fuzzy
 msgid ""
 "<p>The <b>protocol</b> must be a valid protocol as specified in /etc/protocols.\n"
 "Examples include <i>tcp</i>,<i>udp</i>,<i>rpc/tcp</i>, and <i>rpc/udp</i>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p><b>Protokollen</b> må vera gyldig i samsvar med /etc/protocols.\n"
 "Dette kan t.d. vera <i>tcp</i>,<i>udp</i>,<i>rpc/tcp</i> og <i>rpc/udp</i>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/inetd/helps.rb:139
 #, fuzzy
@@ -739,8 +680,7 @@
 "xinetd accepts the connection. \n"
 "<i>udp/dgram</i> services normally expect the value to be <b>yes</b>,\n"
 "because udp is not connection oriented. <i>tcp/stream</i> servers\n"
-"normally expect the value to be <b>no</b>.</p>"
-"\n"
+"normally expect the value to be <b>no</b>.</p>\n"
 msgstr ""
 "<p>Oppføringen <b>wait/nowait</b> spesifiserer om tenesta er\n"
 "enkel- eller multitrådet, og dessutan om xinetd og\n"
@@ -753,8 +693,7 @@
 "aksepterer tilkoblingen.\n"
 "<i>udp/dgram</i>-tenester forventar normalt at verdet er <b>yes</b>\n"
 "fordi udp ikkje er tilkoblingsorientert. <i>tcp/stream</i>-servera\n"
-"forventar normalt at verdet er <b>no</b>.</p>"
-"\n"
+"forventar normalt at verdet er <b>no</b>.</p>\n"
 
 #: src/include/inetd/helps.rb:153
 #, fuzzy
@@ -762,13 +701,11 @@
 "<p>The server will be run with the permissions of the user selected in\n"
 "<b>User</b>. This is useful to make services run with permissions\n"
 "less than root.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>Serveren vil køyra med rettane til brukaren som er vald under\n"
 "<b>Brukar</b>. Dette er nyttig for å køyra tenester med lågare rettar enn rot.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/inetd/helps.rb:159
 #, fuzzy
@@ -777,15 +714,13 @@
 "be executed by the super-server when a request reaches its socket.\n"
 "Parameters for this program can be specified in <b>Server Arguments</b>.\n"
 "\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>In <b>Servar</b>: skriv inn stigen til programmet som skal\n"
 "køyrast av superserveren når ein førespurnad kjem til sokkelen.\n"
 "Parametrar for dette programmet kan definerast under <b>Serverargumenter</b>.\n"
 "\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Translators: This string you can leave unchanged
 #: src/include/inetd/routines.rb:194
@@ -815,75 +750,69 @@
 msgstr "Initialiserer …"
 
 #. Inetd read dialog caption
-#: src/modules/Inetd.rb:188
+#: src/modules/Inetd.rb:185
 #, fuzzy
 msgid "Initializing inetd Configuration"
 msgstr "Initialiserer oppsett av inetd"
 
-#: src/modules/Inetd.rb:196
+#: src/modules/Inetd.rb:193
 #, fuzzy
 msgid "Read the Configuration"
 msgstr "Les oppsettet"
 
-#: src/modules/Inetd.rb:197
+#: src/modules/Inetd.rb:194
 #, fuzzy
 msgid "Reading the configuration..."
 msgstr "Les oppsettet …"
 
 #. read database
-#: src/modules/Inetd.rb:197 src/modules/Inetd.rb:214 src/modules/Inetd.rb:278
-#: src/modules/Inetd.rb:306
+#: src/modules/Inetd.rb:194 src/modules/Inetd.rb:212 src/modules/Inetd.rb:276
+#: src/modules/Inetd.rb:340
 #, fuzzy
 msgid "Finished"
 msgstr "Fullført"
 
 #. Inetd read dialog caption
-#: src/modules/Inetd.rb:269
+#: src/modules/Inetd.rb:267
 #, fuzzy
 msgid "Saving inetd Configuration"
 msgstr "Lagrar inetd-oppsett"
 
-#: src/modules/Inetd.rb:277
+#: src/modules/Inetd.rb:275
 #, fuzzy
 msgid "Write the settings"
 msgstr "Lagre innstillingane"
 
-#: src/modules/Inetd.rb:278
+#: src/modules/Inetd.rb:276
 #, fuzzy
 msgid "Writing the settings..."
 msgstr "Lagrar innstillingane …"
 
 #. in future: catch errors
-#: src/modules/Inetd.rb:303
+#: src/modules/Inetd.rb:337
 #, fuzzy
 msgid "Cannot write settings!"
 msgstr "Kan ikkje lagra innstillingane!"
 
 #. "enabled" defaults to true
-#: src/modules/Inetd.rb:598
+#: src/modules/Inetd.rb:607
 #, fuzzy
-msgid ""
-"<p>"
-"<ul><i>All services are marked as stopped.</i></ul>"
-"</p>"
-msgstr ""
-"<p>"
-"<ul><i>All tenester er markerte som deaktivert.</i></ul>"
-"</p>"
+msgid "<p><ul><i>All services are marked as stopped.</i></ul></p>"
+msgstr "<p><ul><i>All tenester er markerte som deaktivert.</i></ul></p>"
 
 #. Translators: Summary head, if nothing configured
-#: src/modules/Inetd.rb:609
+#: src/modules/Inetd.rb:618
 #, fuzzy
 msgid "Network services"
 msgstr "Nettverkstjenester"
 
 #. Translators: Summary head, if something configured
-#: src/modules/Inetd.rb:613
+#: src/modules/Inetd.rb:623
 #, fuzzy
 msgid "Network services are managed via %1"
 msgstr "Nettverkstjenester vert administrerte via %1"
 
-#: src/modules/Inetd.rb:616
+#: src/modules/Inetd.rb:627
 #, fuzzy
 msgid "These services will be enabled"
 msgstr "Desse tenestene vil aktiverast"

Modified: branches/plus-SLE12-SP2/yast/nn/po/installation.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/installation.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/installation.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-27 10:52+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2015-09-09 16:28+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"
@@ -34,7 +34,7 @@
 #. dialog caption
 #. TRANSLATORS: progress message
 #: src/include/installation/inst_inc_all.rb:64
-#: src/lib/installation/clients/inst_installation_options.rb:154
+#: src/lib/installation/clients/inst_installation_options.rb:151
 msgid "Initializing..."
 msgstr "Gjer klar …"
 
@@ -201,28 +201,28 @@
 #. Text for confirmation popup before the update really starts 3/3
 #. Text for confirmation popup before the update really starts 3/3
 #: src/include/installation/misc.rb:204 src/include/installation/misc.rb:222
-#: src/lib/installation/proposal_runner.rb:136
+#: src/lib/installation/proposal_runner.rb:133
 msgid "<p>Go back and check the settings if you are unsure.</p>"
 msgstr "<p>Viss du er usikker, kan du gå tilbake og sjå over desse vala på nytt.</p>"
 
 #. Heading for confirmation popup before the update really starts
 #. Heading for confirmation popup before the update really starts
 #: src/include/installation/misc.rb:210
-#: src/lib/installation/proposal_runner.rb:124
+#: src/lib/installation/proposal_runner.rb:121
 msgid "Confirm Update"
 msgstr "Stadfest oppgradering"
 
 #. Text for confirmation popup before the update really starts 1/3
 #. Text for confirmation popup before the update really starts 1/3
 #: src/include/installation/misc.rb:214
-#: src/lib/installation/proposal_runner.rb:128
+#: src/lib/installation/proposal_runner.rb:125
 msgid "<p>Information required to perform an update is now complete.</p>"
 msgstr "<p>All nødvendig informasjon for oppgraderinga er no klar.</p>"
 
 #. Text for confirmation popup before the update really starts 2/3
 #. Text for confirmation popup before the update really starts 2/3
 #: src/include/installation/misc.rb:216
-#: src/lib/installation/proposal_runner.rb:130
+#: src/lib/installation/proposal_runner.rb:127
 msgid ""
 "\n"
 "<p>If you continue now, data on your hard disk will be overwritten\n"
@@ -235,7 +235,7 @@
 #. Label for the button that confirms startint the installation
 #. Label for the button that confirms startint the installation
 #: src/include/installation/misc.rb:225
-#: src/lib/installation/proposal_runner.rb:139
+#: src/lib/installation/proposal_runner.rb:136
 msgid "Start &Update"
 msgstr "Start &oppgradering"
 
@@ -272,51 +272,7 @@
 msgstr "Svartelistar einingar …"
 
 #. progress step title
-#: src/lib/installation/clients/clone_finish.rb:43
-msgid "Generating AutoYaST profile if needed..."
-msgstr "Genererer om nødvendig AutoYaST-profil …"
-
-#. TRANSLATORS: help text
-#: src/lib/installation/clients/clone_proposal.rb:39
-msgid ""
-"<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n"
-"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
-"needs a profile to know what the installed system should look like. If this option is\n"
-"selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>"
-msgstr ""
-"<p>Bruk <b>Klon systemoppsett</b> viss du vil oppretta ein AutoYaST-profil.\n"
-"Med AutoYaST kan heile installeringa gjerast utan medverknad frå brukaren.\n"
-"AutoYaST treng en profil for å veta korleis det installerte systemet skal sjå ut.\n"
-"Når du kryssar av for dette, vert det lagra ein profil for systemet i <tt>/root/autoinst.xml</tt>.</p>"
-
-#: src/lib/installation/clients/clone_proposal.rb:60
-msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?"
-msgstr "Vil du lagra AutoYaST-profilen til «/root/autoinst.xml» ved slutten av installeringa?"
-
-#. this is a heading
-#: src/lib/installation/clients/clone_proposal.rb:71
-msgid "Clone System Configuration"
-msgstr "Klon systemoppsett"
-
-#. this is a menu entry
-#: src/lib/installation/clients/clone_proposal.rb:73
-msgid "&Clone System Configuration"
-msgstr "&Klon sytemoppsett"
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/lib/installation/clients/clone_proposal.rb:101
-msgid "The AutoYaST profile will be written under /root/autoinst.xml (do not write it</a>)."
-msgstr "AutoYaST-profilen vert lagra til «/root/autoinst.xml» (ikkje lagra han</a>)."
-
-#. TRANSLATORS: Installation overview
-#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
-#: src/lib/installation/clients/clone_proposal.rb:110
-msgid "The AutoYaST profile will not be saved (write it</a>)."
-msgstr "AutoYaST-profilen vert ikkje lagra (lagra han</a>)."
-
-#. progress step title
-#: src/lib/installation/clients/copy_files_finish.rb:81
+#: src/lib/installation/clients/copy_files_finish.rb:82
 msgid "Copying files to installed system..."
 msgstr "Kopierer filer til installert system …"
 
@@ -396,14 +352,12 @@
 "<p><b>Installation from Images</b> is used to speed the installation up.\n"
 "Images contain compressed snapshots of an installed system matching your\n"
 "selection of patterns. The rest of the packages which are not contained in the\n"
-"images will be installed from packages the standard way.</p>"
-"\n"
+"images will be installed from packages the standard way.</p>\n"
 msgstr ""
 "<p>Med <b>installering frå diskbilete</b> går installeringa raskare.\n"
 "Diskbilete er komprimerte kopiar av eit installert system basert på ei\n"
 "samling pakkar. Andre pakkar (som ikkje finst i diskbiletet) vert installerte\n"
-"som enkeltpakkar på vanleg måte.</p>"
-"\n"
+"som enkeltpakkar på vanleg måte.</p>\n"
 
 #: src/lib/installation/clients/deploy_image_auto.rb:235
 msgid ""
@@ -516,7 +470,7 @@
 msgstr "Oppdateringar for %1 %2"
 
 #: src/lib/installation/clients/inst_addon_update_sources.rb:172
-#: src/lib/installation/clients/inst_system_analysis.rb:304
+#: src/lib/installation/clients/inst_system_analysis.rb:306
 msgid "Unknown Product"
 msgstr "Ukjent produkt"
 
@@ -545,140 +499,130 @@
 "Vel om du vil køyra ei oppdatering frå Internett no.\n"
 "Du kan hoppa over dette steget no, og køyra oppdateringa seinare.\n"
 
-#. ----------------------------------------------------------------------
-#. Build dialog
-#. ----------------------------------------------------------------------
-#. heading text
-#: src/lib/installation/clients/inst_complex_welcome.rb:65
+#. This client shows main dialog for choosing the language,
+#. keyboard and accepting the license.
+#: src/lib/installation/clients/inst_complex_welcome.rb:33
 msgid "Language, Keyboard and License Agreement"
 msgstr "Språk, tastatur og lisensavtale"
 
-#. combo box label
-#. combobox
-#. TRANSLATORS: Combo box
-#: src/lib/installation/clients/inst_complex_welcome.rb:71
-#: src/lib/installation/clients/inst_release_notes.rb:217
-#: src/lib/installation/clients/inst_release_notes.rb:431
-msgid "&Language"
-msgstr "&Språk"
+#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
+#. Assure that relnotes have been downloaded first
+#. exit codes (see "man curl"):
+#. 7 = Failed to connect to host.
+#. 28 = Operation timeout.
+#. push button
+#: src/lib/installation/clients/inst_complex_welcome.rb:161
+#: src/lib/installation/clients/inst_download_release_notes.rb:126
+#: src/lib/installation/clients/inst_system_analysis.rb:304
+msgid "Re&lease Notes..."
+msgstr "&Versjonsmerknadar …"
 
-#. combo box label
-#: src/lib/installation/clients/inst_complex_welcome.rb:79
-msgid "&Keyboard Layout"
-msgstr "&Tastaturoppsett"
-
-#. bnc #359456
-#. TRANSLATORS: check-box
-#: src/lib/installation/clients/inst_complex_welcome.rb:91
-msgid "I &Agree to the License Terms."
-msgstr "Eg &godkjenner lisensavtala."
-
-#. this type of contents will be shown only for initial installation dialog
-#: src/lib/installation/clients/inst_complex_welcome.rb:110
-msgid "K&eyboard Test"
-msgstr "&Tastaturtest"
-
-#. TRANSLATORS: dialog caption
-#: src/lib/installation/clients/inst_complex_welcome.rb:119
-#: src/lib/installation/clients/inst_complex_welcome.rb:299
-msgid "License Agreement"
-msgstr "Lisensavtale"
-
-#. TRANSLATORS: button label
-#: src/lib/installation/clients/inst_complex_welcome.rb:141
-msgid "License &Translations..."
-msgstr "Lisens&omsetjingar …"
-
 #. help text for initial (first time) language screen
-#: src/lib/installation/clients/inst_complex_welcome.rb:153
+#: src/lib/installation/clients/inst_complex_welcome.rb:169
 msgid ""
 "<p>\n"
 "Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n"
 "installation and for the installed system.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel <b>språket</b> og <b>tastaturoppsettet</b> du vil bruka\n"
 "under installeringa og etter at systemet er installert.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text, continued
 #. Describes the #ICW_B1 button
-#: src/lib/installation/clients/inst_complex_welcome.rb:161
+#: src/lib/installation/clients/inst_complex_welcome.rb:177
 msgid ""
 "<p>\n"
 "The license must be accepted before the installation continues.\n"
 "Use <b>License Translations...</b> to show the license in all available translations.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Du må godkjenna lisensavtala før du kan halda fram med installeringa.\n"
 "Vel <b>Lisensomsetjingar</b> for å vise alle tilgjengelege omsetjingar av avtala.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:168
+#: src/lib/installation/clients/inst_complex_welcome.rb:184
 msgid ""
 "<p>\n"
 "Click <b>Next</b> to proceed to the next dialog.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel <b>Neste</b> for å gå vidare til neste steg.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:174
+#: src/lib/installation/clients/inst_complex_welcome.rb:190
 msgid ""
 "<p>\n"
 "Nothing will happen to your computer until you confirm\n"
 "all your settings in the last installation dialog.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Ikkje noko vil skje med datamaskina før du stadfestar\n"
 "alle innstillingane i det siste installasjonssteget.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:181
+#: src/lib/installation/clients/inst_complex_welcome.rb:197
 msgid ""
 "<p>\n"
 "Select <b>Abort</b> to abort the\n"
 "installation process at any time.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Du kan når som helst velja <b>Avbryt</b>\n"
 "for å avbryta installeringa.\n"
-"</p>"
-"\n"
+"</p>\n"
 
-#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
-#. Assure that relnotes have been downloaded first
-#. exit codes (see "man curl"):
-#. 7 = Failed to connect to host.
-#. 28 = Operation timeout.
-#. push button
-#: src/lib/installation/clients/inst_complex_welcome.rb:211
-#: src/lib/installation/clients/inst_download_release_notes.rb:126
-#: src/lib/installation/clients/inst_system_analysis.rb:302
-msgid "Re&lease Notes..."
-msgstr "&Versjonsmerknadar …"
+#. TRANSLATORS: dialog caption
+#: src/lib/installation/clients/inst_complex_welcome.rb:213
+#: src/lib/installation/clients/inst_complex_welcome.rb:415
+msgid "License Agreement"
+msgstr "Lisensavtale"
 
-#: src/lib/installation/clients/inst_complex_welcome.rb:323
+#. combo box label
+#. combobox
+#. TRANSLATORS: Combo box
+#: src/lib/installation/clients/inst_complex_welcome.rb:237
+#: src/lib/installation/clients/inst_release_notes.rb:217
+#: src/lib/installation/clients/inst_release_notes.rb:431
+msgid "&Language"
+msgstr "&Språk"
+
+#. combo box label
+#: src/lib/installation/clients/inst_complex_welcome.rb:247
+msgid "&Keyboard Layout"
+msgstr "&Tastaturoppsett"
+
+#. TRANSLATORS: check-box
+#: src/lib/installation/clients/inst_complex_welcome.rb:261
+msgid "I &Agree to the License Terms."
+msgstr "Eg &godkjenner lisensavtala."
+
+#. Report error about missing license acceptance
+#. !/usr/bin/env rspec
+#: src/lib/installation/clients/inst_complex_welcome.rb:287
+#: test/inst_complex_welcome_test.rb:106
 msgid "You must accept the license to install this product"
 msgstr "Du må godta lisensvilkåra for å kunna installera produktet"
 
+#. this type of contents will be shown only for initial installation dialog
+#: src/lib/installation/clients/inst_complex_welcome.rb:406
+msgid "K&eyboard Test"
+msgstr "&Tastaturtest"
+
+#. TRANSLATORS: button label
+#: src/lib/installation/clients/inst_complex_welcome.rb:436
+msgid "License &Translations..."
+msgstr "Lisens&omsetjingar …"
+
 #. TRANSLATORS: check box, see #ZMD
 #: src/lib/installation/clients/inst_congratulate.rb:107
 msgid "&Disable ZMD Service"
@@ -688,12 +632,10 @@
 #: src/lib/installation/clients/inst_congratulate.rb:114
 msgid ""
 "<p>Select <b>Disable ZMD Service</b> to stop and disable\n"
-"the ZMD service during system start.</p>"
-"\n"
+"the ZMD service during system start.</p>\n"
 msgstr ""
 "<p>Vel <b>Slå av ZMD-tenesta</b> for å stengja og\n"
-"deaktivera ZMD-tenesta under oppstart av systemet.</p>"
-"\n"
+"deaktivera ZMD-tenesta under oppstart av systemet.</p>\n"
 
 #. Check box: start the clone process and store the AutoYaST
 #. profile in /root/autoinst.xml
@@ -715,12 +657,10 @@
 #: src/lib/installation/clients/inst_congratulate.rb:165
 msgid ""
 "<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"
+"After clicking <b>Finish</b>, you can log in to the system.</p>\n"
 msgstr ""
 "<p>&product; er no ferdig installert på maskina.\n"
-"Når du trykkjer <b>Fullfør</b>, kan du logga inn på systemet.</p>"
-"\n"
+"Når du trykkjer <b>Fullfør</b>, kan du logga inn på systemet.</p>\n"
 
 #. congratulation text 3/4
 #: src/lib/installation/clients/inst_congratulate.rb:169
@@ -729,12 +669,8 @@
 
 #. congratulation text 4/4
 #: src/lib/installation/clients/inst_congratulate.rb:172
-msgid ""
-"<p>Have a lot of fun!<br>"
-"Your SUSE Development Team</p>"
-msgstr ""
-"<p>Ha det gøy!<br>"
-"Helsing SUSE-utviklarane</p>"
+msgid "<p>Have a lot of fun!<br>Your SUSE Development Team</p>"
+msgstr "<p>Ha det gøy!<br>Helsing SUSE-utviklarane</p>"
 
 #. help 1/4 for dialog "Congratulation Dialog"
 #: src/lib/installation/clients/inst_congratulate.rb:196
@@ -745,25 +681,21 @@
 #: src/lib/installation/clients/inst_congratulate.rb:198
 msgid ""
 "<p><b>Finish</b> will close the YaST installation and take you\n"
-"to the login screen.</p>"
-"\n"
+"to the login screen.</p>\n"
 msgstr ""
 "<p>Vel <b>Fullfør</b> for å fullføra installeringa og\n"
-"gå til innloggingsbiletet.</p>"
-"\n"
+"gå til innloggingsbiletet.</p>\n"
 
 #. help 3/4 for dialog "Congratulation Dialog"
 #: src/lib/installation/clients/inst_congratulate.rb:203
 msgid ""
 "<p>If you choose the default graphical desktop KDE, you can\n"
 "adjust some KDE settings to your hardware. Also notice\n"
-"our SUSE Welcome Dialog.</p>"
-"\n"
+"our SUSE Welcome Dialog.</p>\n"
 msgstr ""
 "<p>Viss du vel KDE, det grafiske standardskrivebordet, kan du\n"
 "tilpassa nokre KDE-innstillingar til maskinvara di. Sjå òg\n"
-"velkomstvindauget.</p>"
-"\n"
+"velkomstvindauget.</p>\n"
 
 #. Show this help only in case of KDE as the default windowmanager
 #: src/lib/installation/clients/inst_congratulate.rb:215
@@ -793,7 +725,7 @@
 msgstr "Pakken «autoyast2» er ikkje installert. Kloning ikkje mogleg."
 
 #. OEM image if target disk is defined
-#: src/lib/installation/clients/inst_deploy_image.rb:46
+#: src/lib/installation/clients/inst_deploy_image.rb:49
 msgid "The system will reboot now..."
 msgstr "Maskina vert no starta på nytt …"
 
@@ -802,8 +734,8 @@
 #. twice more steps
 #. FIXME: 2 minutes
 #. own workflow for OEM image deployment
-#: src/lib/installation/clients/inst_deploy_image.rb:106
-#: src/lib/installation/clients/inst_deploy_image.rb:351
+#: src/lib/installation/clients/inst_deploy_image.rb:109
+#: src/lib/installation/clients/inst_deploy_image.rb:354
 #: src/lib/installation/clients/inst_prepareprogress.rb:110
 #: src/lib/installation/clients/inst_prepareprogress.rb:152
 msgid "Deploying Images..."
@@ -811,7 +743,7 @@
 
 #. BNC #444209
 #. false == error
-#: src/lib/installation/clients/inst_deploy_image.rb:167
+#: src/lib/installation/clients/inst_deploy_image.rb:170
 msgid ""
 "Deploying images has failed.\n"
 "Aborting the installation...\n"
@@ -820,7 +752,7 @@
 "Avbryt installeringa …\n"
 
 #. TRANSLATORS: pop-up message
-#: src/lib/installation/clients/inst_deploy_image.rb:199
+#: src/lib/installation/clients/inst_deploy_image.rb:202
 msgid ""
 "Debugging has been turned on.\n"
 "YaST will open a software manager for you to check the current status of packages."
@@ -829,20 +761,20 @@
 "Opnar ein pakkehandsamar, slik at du kan kontrollera gjeldande status for pakkar."
 
 #. unknown image
-#: src/lib/installation/clients/inst_deploy_image.rb:375
+#: src/lib/installation/clients/inst_deploy_image.rb:378
 msgid "Downloading image at speed %1/s"
 msgstr "Laster ned diskbilete med farten %1/s"
 
-#: src/lib/installation/clients/inst_deploy_image.rb:380
+#: src/lib/installation/clients/inst_deploy_image.rb:383
 msgid "Downloading image %1 at speed %2/s"
 msgstr "Laster ned diskbiletet %1 med farten %2/s"
 
 #. reset the label
-#: src/lib/installation/clients/inst_deploy_image.rb:442
+#: src/lib/installation/clients/inst_deploy_image.rb:445
 msgid "Deploying image..."
 msgstr "Tek i bruk diskbilete …"
 
-#: src/lib/installation/clients/inst_deploy_image.rb:445
+#: src/lib/installation/clients/inst_deploy_image.rb:448
 msgid "Deploying image %1..."
 msgstr "Tek i bruk diskbiletet %1 …"
 
@@ -868,33 +800,36 @@
 msgstr "Hardisk å leggja diskbilete på"
 
 #. popup label
-#: src/lib/installation/clients/inst_disks_activate.rb:60
+#: src/lib/installation/clients/inst_disks_activate.rb:65
 msgid "Detecting Available Controllers"
 msgstr "Søkjer etter tilgjengelege kontrollarar"
 
 #. dialog caption
-#: src/lib/installation/clients/inst_disks_activate.rb:76
+#: src/lib/installation/clients/inst_disks_activate.rb:81
 msgid "Disk Activation"
 msgstr "Diskbruk"
 
-#: src/lib/installation/clients/inst_disks_activate.rb:86
+#: src/lib/installation/clients/inst_disks_activate.rb:91
 msgid "Configure &DASD Disks"
 msgstr "Set opp &DASD-diskar"
 
-#: src/lib/installation/clients/inst_disks_activate.rb:92
+#: src/lib/installation/clients/inst_disks_activate.rb:97
 msgid "Configure &ZFCP Disks"
 msgstr "Set opp &ZFCP-diskar"
 
-#: src/lib/installation/clients/inst_disks_activate.rb:98
+#: src/lib/installation/clients/inst_disks_activate.rb:103
 msgid "Configure &FCoE Interfaces"
 msgstr "Set opp &FCoE-diskar"
 
-#: src/lib/installation/clients/inst_disks_activate.rb:110
+#: src/lib/installation/clients/inst_disks_activate.rb:117
 msgid "Configure &iSCSI Disks"
 msgstr "Set opp &iSCSI-diskar"
 
-#: src/lib/installation/clients/inst_disks_activate.rb:111
-msgid "Change Net&work Configuration"
+#. Finish
+#: src/lib/installation/clients/inst_disks_activate.rb:178
+#, fuzzy
+#| msgid "Change Net&work Configuration"
+msgid "Net&work Configuration..."
 msgstr "Endra &nettverksoppsett"
 
 #. TRANSLATORS: dialog caption
@@ -913,7 +848,7 @@
 #. bug #302384
 #: src/lib/installation/clients/inst_download_release_notes.rb:134
 #: src/lib/installation/clients/inst_initialization.rb:56
-#: src/lib/installation/clients/inst_installation_options.rb:152
+#: src/lib/installation/clients/inst_installation_options.rb:149
 msgid "Initializing"
 msgstr "Gjer klar"
 
@@ -953,53 +888,53 @@
 msgstr "Laga oversikt over fullføringsskript som skal køyrast …"
 
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:204
+#: src/lib/installation/clients/inst_finish.rb:203
 msgid "Copy files to installed system"
 msgstr "Kopier filer til installert system"
 
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:211
+#: src/lib/installation/clients/inst_finish.rb:210
 msgid "Save configuration"
 msgstr "Lagra oppsett"
 
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:218
+#: src/lib/installation/clients/inst_finish.rb:217
 msgid "Save installation settings"
 msgstr "Lagra installasjonsinnstillingar"
 
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:227
+#: src/lib/installation/clients/inst_finish.rb:226
 msgid "Install boot manager"
 msgstr "Installer oppstartslaster"
 
 #. progress stage
-#: src/lib/installation/clients/inst_finish.rb:234
+#: src/lib/installation/clients/inst_finish.rb:233
 msgid "Prepare system for initial boot"
 msgstr "Klargjer systemet for første oppstart"
 
 #. merge steps from add-on products
 #. bnc #438678
-#: src/lib/installation/clients/inst_finish.rb:338
+#: src/lib/installation/clients/inst_finish.rb:337
 msgid "Checking stage: %1..."
 msgstr "Kontrollerer steg: %1 …"
 
 #. a fallback busy message
-#: src/lib/installation/clients/inst_finish.rb:425
+#: src/lib/installation/clients/inst_finish.rb:424
 msgid "Calling step %1..."
 msgstr "Køyrer steg %1 …"
 
 #. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
-#: src/lib/installation/clients/inst_finish.rb:445
+#: src/lib/installation/clients/inst_finish.rb:444
 msgid " * %1"
 msgstr " * %1"
 
 #. Anything else
-#: src/lib/installation/clients/inst_finish.rb:482
+#: src/lib/installation/clients/inst_finish.rb:481
 msgid "Finished"
 msgstr "Ferdig"
 
 #. get the latest errors
-#: src/lib/installation/clients/inst_finish.rb:614
+#: src/lib/installation/clients/inst_finish.rb:613
 msgid "Installation Error"
 msgstr "Feil ved installering"
 
@@ -1024,27 +959,27 @@
 msgstr "Klargjer første systemoppsett …"
 
 #. dialog caption
-#: src/lib/installation/clients/inst_installation_options.rb:83
+#: src/lib/installation/clients/inst_installation_options.rb:80
 msgid "Installation Options"
 msgstr "Installasjonsval"
 
 #. check box
-#: src/lib/installation/clients/inst_installation_options.rb:181
+#: src/lib/installation/clients/inst_installation_options.rb:177
 msgid "&Add Online Repositories Before Installation"
 msgstr "&Legg til pakkebrønnar før installering"
 
 #. check box
-#: src/lib/installation/clients/inst_installation_options.rb:193
+#: src/lib/installation/clients/inst_installation_options.rb:189
 msgid "In&clude Add-on Products from Separate Media"
 msgstr "&Ta med tilleggsprodukt frå andre medium"
 
 #. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:204
+#: src/lib/installation/clients/inst_installation_options.rb:200
 msgid "<p><big><b>Installation Options</b></big></p>"
 msgstr "<p><big><b>Installasjonsval</b></big></p>"
 
 #. help text for installation option
-#: src/lib/installation/clients/inst_installation_options.rb:207
+#: src/lib/installation/clients/inst_installation_options.rb:203
 msgid ""
 "<p>\n"
 "To use suggested remote repositories during installation or update, select\n"
@@ -1055,20 +990,18 @@
 "foreslåtte eksterne pakkebrønnar under installeringa eller oppgraderinga.</p>"
 
 #. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:213
+#: src/lib/installation/clients/inst_installation_options.rb:209
 msgid ""
 "<p>\n"
 "To install an add-on product from separate media together with &product;, select\n"
-"<b>Include Add-on Products from Separate Media</b>.</p>"
-"\n"
+"<b>Include Add-on Products from Separate Media</b>.</p>\n"
 msgstr ""
 "<p>\n"
 "Vel <b>Ta med tilleggsprodukt frå andre medium</b> for òg å installera\n"
-"andre tilleggsprodukt saman med &product;.</p>"
-"\n"
+"andre tilleggsprodukt saman med &product;.</p>\n"
 
 #. help text: additional help for installation
-#: src/lib/installation/clients/inst_installation_options.rb:216
+#: src/lib/installation/clients/inst_installation_options.rb:212
 msgid "<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i> site.</p>"
 msgstr "<p>Viss du treng eigne maskinvaredrivarar for installeringa, sjå <i>http://drivers.suse.com/</i>.</p>"
 
@@ -1117,23 +1050,19 @@
 #: src/lib/installation/clients/inst_network_check.rb:139
 msgid ""
 "<p>The current installation system does not\n"
-"have a configured network.</p>"
-"\n"
+"have a configured network.</p>\n"
 msgstr ""
 "<p>Det er ikkje sett opp noko nettverk\n"
-"for systemet.</p>"
-"\n"
+"for systemet.</p>\n"
 
 #. TRANSLATORS: help text, part 2/2
 #: src/lib/installation/clients/inst_network_check.rb:143
 msgid ""
 "<p>A configured network is needed for using remote repositories\n"
-"or add-on products. If you do not use remote repositories, skip the configuration.</p>"
-"\n"
+"or add-on products. If you do not use remote repositories, skip the configuration.</p>\n"
 msgstr ""
 "<p>Du må setja opp nettverket dersom du ønskjer å bruka eksterne pakkebrønnar\n"
-"eller tilleggsprodukt. Viss du ikkje vil bruka dette, kan du hoppa over oppsettet.</p>"
-"\n"
+"eller tilleggsprodukt. Viss du ikkje vil bruka dette, kan du hoppa over oppsettet.</p>\n"
 
 #. error popup
 #: src/lib/installation/clients/inst_network_check.rb:185
@@ -1227,12 +1156,10 @@
 #: src/lib/installation/clients/inst_release_notes.rb:260
 msgid ""
 "<p>The <b>release notes</b> for the installed Linux system provide a brief\n"
-"summary of new features and changes.</p>"
-"\n"
+"summary of new features and changes.</p>\n"
 msgstr ""
 "<p><b>Versjonsmerknadene</b> for det installerte Linux-systemet\n"
-"inneheld eit kort oversikt over endringar og nye funksjonar.</p>"
-"\n"
+"inneheld eit kort oversikt over endringar og nye funksjonar.</p>\n"
 
 #. informative message in RichText widget
 #: src/lib/installation/clients/inst_release_notes.rb:457
@@ -1243,12 +1170,10 @@
 #: src/lib/installation/clients/inst_scenarios.rb:108
 msgid ""
 "<p>Select the scenario that meets your needs best.\n"
-"Additional software can be selected later in software proposal.</p>"
-"\n"
+"Additional software can be selected later in software proposal.</p>\n"
 msgstr ""
 "<p>Vel det bruksområdet som best svarar til behova dine.\n"
-"Du kan velja fleire program seinare i installeringa.</p>"
-"\n"
+"Du kan velja fleire program seinare i installeringa.</p>\n"
 
 #. TRANSLATORS: pop-up message
 #: src/lib/installation/clients/inst_scenarios.rb:138
@@ -1343,7 +1268,7 @@
 msgstr "Søkjer no etter maskinvare og installerte system."
 
 #. additonal error when HW was not found
-#: src/lib/installation/clients/inst_system_analysis.rb:240
+#: src/lib/installation/clients/inst_system_analysis.rb:242
 msgid ""
 "\n"
 "Check 'drivers.suse.com' if you need specific hardware drivers for installation."
@@ -1352,7 +1277,7 @@
 "Sjå «http://drivers.suse.com/» viss du treng eigne maskinvaredrivarar for installeringa."
 
 #. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:254
+#: src/lib/installation/clients/inst_system_analysis.rb:256
 msgid ""
 "No hard disks were found for the installation.\n"
 "Please check your hardware!\n"
@@ -1362,7 +1287,7 @@
 "Kontroller maskinvara.\n"
 "%1\n"
 
-#: src/lib/installation/clients/inst_system_analysis.rb:264
+#: src/lib/installation/clients/inst_system_analysis.rb:266
 msgid ""
 "No hard disks were found for the installation.\n"
 "During an automatic installation, they might be detected later.\n"
@@ -1373,7 +1298,7 @@
 "(spesielt på S/390- og iSCSI-system).\n"
 
 #. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:275
+#: src/lib/installation/clients/inst_system_analysis.rb:277
 msgid ""
 "No hard disks and no hard disk controllers were\n"
 "found for the installation.\n"
@@ -1386,7 +1311,7 @@
 "%1\n"
 
 #. popup message
-#: src/lib/installation/clients/inst_system_analysis.rb:320
+#: src/lib/installation/clients/inst_system_analysis.rb:322
 msgid ""
 "Failed to initialize the software repositories.\n"
 "Aborting the installation."
@@ -1394,6 +1319,32 @@
 "Klarte ikkje gjera klar pakkebrønnar.\n"
 "Avbryt installeringa."
 
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:184
+msgid ""
+"A valid update could not be found at\n"
+"%s.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:190
+msgid ""
+"Could not fetch update from\n"
+"%s.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: %s is an URL
+#: src/lib/installation/clients/inst_update_installer.rb:215
+msgid ""
+"Downloading installer updates from \n"
+"%s\n"
+"failed.\n"
+"\n"
+"Would you like to check your network configuration?"
+msgstr ""
+
 #. TRANSLATORS: Table item status (repository)
 #: src/lib/installation/clients/inst_upgrade_urls.rb:109
 msgid "Removed"
@@ -1447,8 +1398,8 @@
 #. menu button
 #. menu button
 #: src/lib/installation/clients/inst_upgrade_urls.rb:247
-#: src/lib/installation/proposal_runner.rb:659
-#: src/lib/installation/proposal_runner.rb:783
+#: src/lib/installation/proposal_runner.rb:647
+#: src/lib/installation/proposal_runner.rb:762
 msgid "&Change..."
 msgstr "&Endra …"
 
@@ -1646,26 +1597,22 @@
 msgid ""
 "<p>There are a few more steps to take before your system is ready to\n"
 "use. YaST will now guide you through some basic configuration.  Click\n"
-"<b>Next</b> to continue. </p>"
-"\n"
+"<b>Next</b> to continue. </p>\n"
 "            \n"
 msgstr ""
 "<p>Det gjenstår nokre få steg før systemet er klart til\n"
 "bruk. YaST vil no rettleia deg gjennom grunnoppsettet.\n"
-"Trykk <b>Neste</b> for å halda fram.</p>"
-"\n"
+"Trykk <b>Neste</b> for å halda fram.</p>\n"
 "            \n"
 
 #. help ttext
 #: src/lib/installation/clients/inst_welcome.rb:85
 msgid ""
 "<p>Click <b>Next</b> to perform the\n"
-"basic configuration of the system.</p>"
-"\n"
+"basic configuration of the system.</p>\n"
 msgstr ""
 "<p>Trykk <b>Neste</b> for å starta\n"
-"grunnoppsett av systemet.</p>"
-"\n"
+"grunnoppsett av systemet.</p>\n"
 
 #. TRANSLATORS: error message
 #: src/lib/installation/clients/installation.rb:83
@@ -1688,7 +1635,7 @@
 msgstr "Set opp snøgglager for programkopling …"
 
 #. progress step title
-#: src/lib/installation/clients/network_finish.rb:68
+#: src/lib/installation/clients/network_finish.rb:60
 msgid "Saving network configuration..."
 msgstr "Lagrar nettverksoppsett …"
 
@@ -1815,33 +1762,22 @@
 msgstr "Krympar PREP-partisjon …"
 
 #. question in a popup box
-#: src/lib/installation/proposal_runner.rb:207
+#: src/lib/installation/proposal_runner.rb:204
 msgid "Really reset everything to default values?"
 msgstr "Er du sikker på at du vil tilbakestille alt til standardvala?"
 
 #. explain consequences of a decision
-#: src/lib/installation/proposal_runner.rb:209
+#: src/lib/installation/proposal_runner.rb:206
 msgid "You will lose all changes."
 msgstr "Alle endringane dine går då tapt."
 
-#. while input loop
-#: src/lib/installation/proposal_runner.rb:251
-msgid "Location of Stored Configuration"
-msgstr "Plassering til lagra oppsett"
-
-#. force write, so it always write profile even if user do not want
-#. to store profile after installation
-#: src/lib/installation/proposal_runner.rb:257
-msgid "Failed to store configuration. Details can be found in log."
-msgstr "Klarte ikkje lagra oppsett. Du finn meir informasjon i loggen."
-
 #. message show when user has disabled the configuration
-#: src/lib/installation/proposal_runner.rb:268
+#: src/lib/installation/proposal_runner.rb:252
 msgid "Skipping configuration upon user request"
 msgstr "Hoppar over oppsett etter ønske frå brukar"
 
 #. error message is a popup
-#: src/lib/installation/proposal_runner.rb:288
+#: src/lib/installation/proposal_runner.rb:272
 msgid ""
 "The proposal contains an error that must be\n"
 "resolved before continuing.\n"
@@ -1850,25 +1786,25 @@
 "retta før du kan halda fram.\n"
 
 #. busy message
-#: src/lib/installation/proposal_runner.rb:394
+#: src/lib/installation/proposal_runner.rb:381
 msgid "Adapting the proposal to the current settings..."
 msgstr "Tilpassar forslaget til gjeldande innstillingar …"
 
 #. busy message;
 #. Initial contents of proposal subwindow while proposals are calculated
-#: src/lib/installation/proposal_runner.rb:398
-#: src/lib/installation/proposal_runner.rb:687
+#: src/lib/installation/proposal_runner.rb:385
+#: src/lib/installation/proposal_runner.rb:667
 msgid "Analyzing your system..."
 msgstr "Analyserer systemet …"
 
 #. fallback proposal, means usually an internal error
-#: src/lib/installation/proposal_runner.rb:500
+#: src/lib/installation/proposal_runner.rb:487
 msgid "ERROR: No proposal"
 msgstr "Feil: Ingen forslag"
 
 #. Submodules handle their own error reporting
 #. text for a message box
-#: src/lib/installation/proposal_runner.rb:539
+#: src/lib/installation/proposal_runner.rb:526
 msgid ""
 "Configuration saved.\n"
 "There were errors."
@@ -1881,42 +1817,36 @@
 #. Translators: About 40 characters max,
 #. use newlines for longer translations.
 #. radio button
-#: src/lib/installation/proposal_runner.rb:634
+#: src/lib/installation/proposal_runner.rb:621
 msgid "&Skip Configuration"
 msgstr "&Hopp over oppsett"
 
 #. radio button
-#: src/lib/installation/proposal_runner.rb:643
+#: src/lib/installation/proposal_runner.rb:630
 msgid "&Use Following Configuration"
 msgstr "&Bruk dette oppsettet"
 
-#. menu button
-#: src/lib/installation/proposal_runner.rb:667
-#: src/lib/installation/proposal_runner.rb:778
-msgid "&Export Configuration"
-msgstr "&Eksporter oppsett"
-
 #. Help message between headline and installation proposal / settings summary.
 #. May contain newlines, but don't make it very much longer than the original.
-#: src/lib/installation/proposal_runner.rb:713
+#: src/lib/installation/proposal_runner.rb:693
 msgid "Click a headline to make changes or use the \"Change...\" menu below."
 msgstr "Trykk på ei overskrift for å endra, eller bruk menyen «Endra» nedanfor."
 
-#: src/lib/installation/proposal_runner.rb:717
+#: src/lib/installation/proposal_runner.rb:697
 msgid "Click a headline to make changes."
 msgstr "Trykk på overskriftene for å endra noko."
 
 #. menu button item
-#: src/lib/installation/proposal_runner.rb:777
+#: src/lib/installation/proposal_runner.rb:757
 msgid "&Reset to defaults"
 msgstr "&Tilbakestill til standardvala"
 
 #. FATE #120373
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
 msgid "&Update"
 msgstr "&Oppgradering"
 
-#: src/lib/installation/proposal_runner.rb:800
+#: src/lib/installation/proposal_runner.rb:779
 msgid "&Install"
 msgstr "&Installer"
 
@@ -1931,106 +1861,92 @@
 "<p>\n"
 "Change the values by clicking on the respective headline\n"
 "or by using the <b>Change...</b> menu.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Du kan endra verdiane ved å trykkja på overskriftene,\n"
 "eller ved å bruka menyen <b>Endra</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Help text for installation proposal, continued
 #: src/lib/installation/proposal_store.rb:85
 msgid ""
 "<p>\n"
 "Your hard disk has not been modified yet. You can still safely abort.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Harddisken er ikkje endra enno, så du kan framleis trygt avbryta installeringa.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Help text for installation proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:417
+#: src/lib/installation/proposal_store.rb:426
 msgid ""
 "<p>\n"
 "Select <b>Install</b> to perform a new installation with the values displayed.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel <b>Installer</b> for starta installeringa med desse vala.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. so update
 #. Help text for update proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:425
+#: src/lib/installation/proposal_store.rb:434
 msgid ""
 "<p>\n"
 "Select <b>Update</b> to perform an update with the values displayed.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel <b>Oppgrader</b> for å starta oppgraderinga med desse vala.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Help text for network configuration proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:434
+#: src/lib/installation/proposal_store.rb:443
 msgid ""
 "<p>\n"
 "Put the network settings into effect by pressing <b>Next</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Trykk <b>Neste</b> for å ta i bruk nettverksinnstillingane.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Help text for service configuration proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:442
+#: src/lib/installation/proposal_store.rb:451
 msgid ""
 "<p>\n"
 "Put the service settings into effect by pressing <b>Next</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Trykk <b>Neste</b> for å ta i bruk tenesteinnstillingane.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Help text for hardware configuration proposal
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:450
+#: src/lib/installation/proposal_store.rb:459
 msgid ""
 "<p>\n"
 "Put the hardware settings into effect by pressing <b>Next</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Trykk <b>Neste</b> for å ta i bruk maskinvareinnstillingane.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Proposal in uml module
-#: src/lib/installation/proposal_store.rb:457
+#: src/lib/installation/proposal_store.rb:466
 msgid "<P><B>UML Installation Proposal</B></P>"
 msgstr "<P><B>Forslag til UML-installasjon</B></P>"
 
 #. help text
-#: src/lib/installation/proposal_store.rb:459
+#: src/lib/installation/proposal_store.rb:468
 msgid ""
 "<P>UML (User Mode Linux) installation allows you to start independent\n"
 "Linux virtual machines in the host system.</P>"
@@ -2041,17 +1957,15 @@
 #. Generic help text for other proposals (not basic installation or
 #. hardhware configuration.
 #. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:473
+#: src/lib/installation/proposal_store.rb:482
 msgid ""
 "<p>\n"
 "To use the settings as displayed, press <b>Next</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Trykk <b>Neste</b> for å bruka desse vala.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Text to display
 #.
@@ -2060,6 +1974,18 @@
 msgid "Enabling remote administration..."
 msgstr "Gjer klar for fjernadministrering …"
 
+#. skip forward or backward
+#: src/lib/installation/select_system_role.rb:48
+#, fuzzy
+#| msgid "System Probing"
+msgid "System Role"
+msgstr "Maskinvare- og systemoppdaging"
+
+#. A Continue-Cancel popup
+#: src/lib/installation/select_system_role.rb:82
+msgid "Changing the system role may undo adjustments you may have done."
+msgstr ""
+
 #. Writes configuration
 #.
 #. It creates a snapshot when no second stage is required and
@@ -2067,10 +1993,73 @@
 #.
 #. @return [TrueClass,FalseClass] True if snapshot was created;
 #. otherwise it returns false.
-#: src/lib/installation/snapshots_finish.rb:40
+#: src/lib/installation/snapshots_finish.rb:41
 msgid "Creating root filesystem snapshot..."
 msgstr "Lagar augeblinksbilete av rotfilsystemet …"
 
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:156
+msgid "Cannot find URL '%1' via protocol HTTP(S). Server returned code %2."
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:176
+msgid "Cannot find URL '%1' via protocol FTP. Server returned code %2."
+msgstr ""
+
+#. FIXME: I have doubts this will ever work. Too early.
+#: src/lib/transfer/file_from_url.rb:192
+msgid "Reading file on %1/%2 failed.\n"
+msgstr ""
+
+#: src/lib/transfer/file_from_url.rb:208
+msgid "Reading file on %1 failed.\n"
+msgstr ""
+
+#. autoyast tried to mount the CD but had no success.
+#. autoyast tried to mount a NFS directory which failed
+#. autoyast tried to mount a NFS directory which failed
+#: src/lib/transfer/file_from_url.rb:271 src/lib/transfer/file_from_url.rb:327
+#: src/lib/transfer/file_from_url.rb:371
+msgid "Mounting %1 failed."
+msgstr ""
+
+#. autoyast tried to read a file but had no success.
+#: src/lib/transfer/file_from_url.rb:302
+msgid "Reading a file on CD failed. Path: %1/%2."
+msgstr ""
+
+#. autoyast tried to copy a file via NFS which failed
+#. autoyast tried to copy a file via NFS which failed
+#: src/lib/transfer/file_from_url.rb:350 src/lib/transfer/file_from_url.rb:394
+msgid "Remote file %1 cannot be retrieved"
+msgstr ""
+
+#. this is workaround for bnc#849767
+#. because of changes in autoyast startup this code is now
+#. called much sooner (before Storage stuff is initialized)
+#. call dummy method to trigger Storage initialization
+#: src/lib/transfer/file_from_url.rb:519
+msgid "%1 is not mounted and mount failed"
+msgstr ""
+
+#. autoyast tried to copy a file but that file can't be found
+#: src/lib/transfer/file_from_url.rb:539
+msgid "File %1 cannot be found"
+msgstr ""
+
+#. Device
+#: src/lib/transfer/file_from_url.rb:561
+msgid "Cannot find URL '%1' via protocol TFTP."
+msgstr ""
+
+#. the user wanted autoyast to fetch it's profile via an unknown protocol
+#: src/lib/transfer/file_from_url.rb:568
+#, fuzzy
+#| msgid "Unknown Product"
+msgid "Unknown protocol %1."
+msgstr "Ukjent produkt"
+
 #. checking whether images are supported
 #. BNC #409927
 #. Checking files for signatures
@@ -2107,19 +2096,55 @@
 "Klarte ikkje løysa pakkekonfliktene automatisk.\n"
 "Opnar programhandsamaren, slik at du kan løysa dei manuelt."
 
+#~ msgid "Generating AutoYaST profile if needed..."
+#~ msgstr "Genererer om nødvendig AutoYaST-profil …"
+
+#~ msgid ""
+#~ "<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n"
+#~ "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
+#~ "needs a profile to know what the installed system should look like. If this option is\n"
+#~ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>"
+#~ msgstr ""
+#~ "<p>Bruk <b>Klon systemoppsett</b> viss du vil oppretta ein AutoYaST-profil.\n"
+#~ "Med AutoYaST kan heile installeringa gjerast utan medverknad frå brukaren.\n"
+#~ "AutoYaST treng en profil for å veta korleis det installerte systemet skal sjå ut.\n"
+#~ "Når du kryssar av for dette, vert det lagra ein profil for systemet i <tt>/root/autoinst.xml</tt>.</p>"
+
+#~ msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?"
+#~ msgstr "Vil du lagra AutoYaST-profilen til «/root/autoinst.xml» ved slutten av installeringa?"
+
+#~ msgid "Clone System Configuration"
+#~ msgstr "Klon systemoppsett"
+
+#~ msgid "&Clone System Configuration"
+#~ msgstr "&Klon sytemoppsett"
+
+#~ msgid "The AutoYaST profile will be written under /root/autoinst.xml (do not write it</a>)."
+#~ msgstr "AutoYaST-profilen vert lagra til «/root/autoinst.xml» (ikkje lagra han</a>)."
+
+#~ msgid "The AutoYaST profile will not be saved (write it</a>)."
+#~ msgstr "AutoYaST-profilen vert ikkje lagra (lagra han</a>)."
+
+#~ msgid "Location of Stored Configuration"
+#~ msgstr "Plassering til lagra oppsett"
+
+#~ msgid "Failed to store configuration. Details can be found in log."
+#~ msgstr "Klarte ikkje lagra oppsett. Du finn meir informasjon i loggen."
+
+#~ msgid "&Export Configuration"
+#~ msgstr "&Eksporter oppsett"
+
 #~ msgid "ERROR: Missing Title"
 #~ msgstr "Feil: Manglar tittel"
 
 #~ msgid ""
 #~ "<p>Some proposals might be\n"
 #~ "locked by the system administrator and therefore cannot be changed. If a\n"
-#~ "locked proposal needs to be changed, ask your system administrator.</p>"
-#~ "\n"
+#~ "locked proposal needs to be changed, ask your system administrator.</p>\n"
 #~ msgstr ""
 #~ "<p>Nokre forslag kan vera låste av systemadministratoren, og\n"
 #~ "kan såleis ikkje endrast. Ta kontakt med systemadministratoren\n"
-#~ "dersom du ønskjer å endra eit låst forslag.</p>"
-#~ "\n"
+#~ "dersom du ønskjer å endra eit låst forslag.</p>\n"
 
 #~ msgid "Initializing the installation environment..."
 #~ msgstr "Gjer klar installasjonsmiljøet …"
@@ -2245,13 +2270,11 @@
 #~ msgid ""
 #~ "<p>To configure a network card, select it from the list\n"
 #~ "and click the <b>Next</b> button.\n"
-#~ "Otherwise, click <b>Cancel</b>.</p>"
-#~ "\n"
+#~ "Otherwise, click <b>Cancel</b>.</p>\n"
 #~ msgstr ""
 #~ "<p>Dersom du vil setja opp eit nettverkskort,\n"
 #~ "vel det frå lista og trykk <b>Neste</b>.\n"
-#~ "Trykk elles <b>Avbryt</b>.</p>"
-#~ "\n"
+#~ "Trykk elles <b>Avbryt</b>.</p>\n"
 
 #~ msgid "IP address cannot be empty."
 #~ msgstr "IP-adressa kan ikkje vera tom."
@@ -2340,48 +2363,36 @@
 
 #~ msgid ""
 #~ "<p><big><b>Network Setup</b></big>\n"
-#~ "<br>"
-#~ "Configure your network card.\n"
+#~ "<br>Configure your network card.\n"
 #~ "Select either DHCP or static setup. DHCP fits for most cases.\n"
 #~ "For details contact your Internet provider or your network\n"
-#~ "administrator.</p>"
-#~ "\n"
+#~ "administrator.</p>\n"
 #~ msgstr ""
 #~ "<p><big><b>Nettverksoppsett</b></big>\n"
-#~ "<br>"
-#~ "Set opp nettverkskortet.\n"
+#~ "<br>Set opp nettverkskortet.\n"
 #~ "Vel anten DHCP eller ei statisk adresse. DHCP passar i dei tilfelle.\n"
 #~ "Kontakt nettleverandøren eller nettverksadministratoren din\n"
-#~ "viss du treng meir informasjon.</p>"
-#~ "\n"
+#~ "viss du treng meir informasjon.</p>\n"
 
 #~ msgid ""
 #~ "<p><big><b>Proxy</b></big>\n"
-#~ "<br>"
-#~ "Proxy is a server-based cache for accessing the web.\n"
+#~ "<br>Proxy is a server-based cache for accessing the web.\n"
 #~ "In most cases, if you have a direct connection to the Internet,\n"
-#~ "you do not need to use one.</p>"
-#~ "\n"
+#~ "you do not need to use one.</p>\n"
 #~ msgstr ""
 #~ "<p><big><b>Mellomtenar</b></big>\n"
-#~ "<br>"
-#~ "Ein mellomtenar er ei maskin om står mellom maskina di og Internett.\n"
+#~ "<br>Ein mellomtenar er ei maskin om står mellom maskina di og Internett.\n"
 #~ "I dei fleste tilfella har du direkte tilgang til Internett, slik at det ikkje er\n"
-#~ "nødvendig å bruka ein mellomtenar.</p>"
-#~ "\n"
+#~ "nødvendig å bruka ein mellomtenar.</p>\n"
 
 #~ msgid ""
-#~ "<p>Command: <tt>%1</tt> has failed.</p>"
-#~ "\n"
+#~ "<p>Command: <tt>%1</tt> has failed.</p>\n"
 #~ "<p>The output of the command was:\n"
-#~ "<pre>%2</pre>"
-#~ "</p>"
+#~ "<pre>%2</pre></p>"
 #~ msgstr ""
-#~ "<p>Feil med kommandoen <tt>%1</tt>.</p>"
-#~ "\n"
+#~ "<p>Feil med kommandoen <tt>%1</tt>.</p>\n"
 #~ "<p>Resultat frå kommandoen:\n"
-#~ "<pre>%2</pre>"
-#~ "</p>"
+#~ "<pre>%2</pre></p>"
 
 #~ msgid "Setting up Network Failed"
 #~ msgstr "Feil ved oppsett av nettverk"
@@ -2546,15 +2557,13 @@
 #~ "Select <b>New Installation</b> if there is no existing Linux system on your\n"
 #~ "machine or if you want to replace an existing Linux system completely,\n"
 #~ "discarding all its configuration data.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
 #~ "<p>\n"
 #~ "Vel <b>Nyinstallering</b> viss det ikkje finst noko Linux-system på\n"
 #~ "maskina frå før, eller viss du vil byta ut eit eksisterande Linux-systemet\n"
 #~ "og alle tilhøyrande innstillingar.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #~ msgid ""
 #~ "<p>\n"
@@ -2575,15 +2584,13 @@
 #~ "configure your network and hardware automatically. Otherwise you will\n"
 #~ "be offered a configuration proposal with the possibility to tune all the\n"
 #~ "settings manually. Inexperienced users are advised to use automatic\n"
-#~ "configuration.</p>"
-#~ "\n"
+#~ "configuration.</p>\n"
 #~ msgstr ""
 #~ "<p>\n"
 #~ "Vel <b>Bruk automatisk oppsett</b> for å la installasjonsprogrammet\n"
 #~ "setja opp nettverk og maskinvare automatisk. Viss ikkje, vil du\n"
 #~ "få eit forslag til oppsett der du kan justera alle innstillingane manuelt.\n"
-#~ "Me rår uerfarne brukarar til å velja automatisk oppsett.</p>"
-#~ "\n"
+#~ "Me rår uerfarne brukarar til å velja automatisk oppsett.</p>\n"
 
 #~ msgid "<p>Update mode does not support automatic configuration.</p>"
 #~ msgstr "<p>Du kan ikkje bruka automatisk oppsett ved oppgradering.</p>"
@@ -2591,13 +2598,11 @@
 #~ msgid ""
 #~ "<p>The feature <b>Update</b> is only\n"
 #~ "available if an existing Linux system has been detected.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
 #~ "<p>Funksjonen <b>Oppgrader</b> er berre tilgjengeleg viss\n"
 #~ "installasjonsprogrammet fann eit eksisterande Linux-system.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #~ msgid "&Show Release Notes"
 #~ msgstr "&Vis versjonsmerknader"
@@ -2609,13 +2614,11 @@
 #~ "<p><b>These are the release notes for the initial release. They are\n"
 #~ "part of the installation media. During installation, if a connection\n"
 #~ "to the Internet is available, you can download updated release notes\n"
-#~ "from the SUSE Linux Web server.</b></p>"
-#~ "\n"
+#~ "from the SUSE Linux Web server.</b></p>\n"
 #~ msgstr ""
 #~ "<p><b>Dette er versjonsmerknadene laga for den opphavlege versjonen,\n"
 #~ "og følgjer med på installasjonsmediet. Viss du har tilgang til Internett under\n"
-#~ "installeringa, kan du lasta ned oppdaterte versjonsmerknader frå nettet.</b></p>"
-#~ "\n"
+#~ "installeringa, kan du lasta ned oppdaterte versjonsmerknader frå nettet.</b></p>\n"
 
 #~ msgid "Configuring the superuser's environment..."
 #~ msgstr "Set opp miljø for superbrukar …"
@@ -2726,13 +2729,11 @@
 #~ msgid ""
 #~ "<p><tt>SuSEconfig</tt> must write the configuration\n"
 #~ "of your &product; system. Depending on the CPU and the amount of memory,\n"
-#~ "this process can take some time.</p>"
-#~ "\n"
+#~ "this process can take some time.</p>\n"
 #~ msgstr ""
 #~ "<p>Må lagra oppsettet for &product;-systemet.\n"
 #~ "Avhengig av CPU og minnekapasitet, kan denne\n"
-#~ "prosessen ta litt tid.</p>"
-#~ "\n"
+#~ "prosessen ta litt tid.</p>\n"
 
 #~ msgid "Progress"
 #~ msgstr "Framgang"

Modified: branches/plus-SLE12-SP2/yast/nn/po/instserver.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/instserver.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/instserver.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -74,29 +74,29 @@
 msgstr "Endre medium"
 
 #. %1 is the current cd number
-#: src/include/instserver/dialogs.rb:230
+#: src/include/instserver/dialogs.rb:241
 #, fuzzy
 msgid "Insert CD %1 then press continue."
 msgstr "Sett inn CD %1 og klikk Hald fram."
 
-#: src/include/instserver/dialogs.rb:235
+#: src/include/instserver/dialogs.rb:246
 #, fuzzy
 msgid "Select ISO image %1 then press continue."
 msgstr "Vel ISO-diskbildet %1 og klikk Hald fram."
 
 #. %2 is the product name and version
-#: src/include/instserver/dialogs.rb:241
+#: src/include/instserver/dialogs.rb:252
 #, fuzzy
 msgid "Insert CD %1 of %2."
 msgstr "Sett inn CD %1 av %2."
 
-#: src/include/instserver/dialogs.rb:242
+#: src/include/instserver/dialogs.rb:253
 #, fuzzy
 msgid "Select ISO image %1 of %2."
 msgstr "Vel ISO-diskbilde %1 av %2."
 
 #. popup request, %1 is CD medium name
-#: src/include/instserver/dialogs.rb:281
+#: src/include/instserver/dialogs.rb:292
 #, fuzzy
 msgid ""
 "Insert\n"
@@ -106,13 +106,13 @@
 "%1"
 
 #. popup request, %1 is ISO name
-#: src/include/instserver/dialogs.rb:310
+#: src/include/instserver/dialogs.rb:321
 #, fuzzy
 msgid "Select %1"
 msgstr "Vel %1"
 
 #. add-on medium (e.g. service pack) doesn't match configured repository
-#: src/include/instserver/dialogs.rb:551
+#: src/include/instserver/dialogs.rb:573
 #, fuzzy
 msgid ""
 "The medium requires product %1, which is not provided\n"
@@ -126,72 +126,74 @@
 "Vel først grunnproduktmediet."
 
 #. else, we create CD1, CD2, etc. (for code10 always)
-#: src/include/instserver/dialogs.rb:669
+#: src/include/instserver/dialogs.rb:697
 #, fuzzy
 msgid "Copying CD contents to local directory"
 msgstr "Kopierer CD-innhald til lokal katalog"
 
-#: src/include/instserver/dialogs.rb:670
+#: src/include/instserver/dialogs.rb:698
 #, fuzzy
 msgid "This may take a while..."
 msgstr "Dette kan ta eit bel …"
 
 #. TODO: report more details (stderr)
 #. rename the directory
-#: src/include/instserver/dialogs.rb:727 src/modules/Instserver.rb:1341
+#: src/include/instserver/dialogs.rb:755 src/modules/Instserver.rb:1361
 #, fuzzy
 msgid "Error while moving repository content."
 msgstr "Feil under overføring av innhald i pakkebrønn."
 
 #. Instserver configuration dialog caption
 #. Instserver configuration dialog caption
-#: src/include/instserver/dialogs.rb:949 src/include/instserver/dialogs.rb:1162
+#: src/include/instserver/dialogs.rb:978
+#: src/include/instserver/dialogs.rb:1191
 #, fuzzy
 msgid "Repository Configuration"
 msgstr "Pakkebrønnoppsett"
 
 #. Instserver configure1 dialog contents
-#: src/include/instserver/dialogs.rb:965
+#: src/include/instserver/dialogs.rb:994
 #, fuzzy
 msgid "Read &CD or DVD Medium"
 msgstr "Les &CD- eller DVD-medium"
 
-#: src/include/instserver/dialogs.rb:971
+#: src/include/instserver/dialogs.rb:1000
 #, fuzzy
 msgid "Data &Source"
 msgstr "Data&kjelde"
 
-#: src/include/instserver/dialogs.rb:979
+#: src/include/instserver/dialogs.rb:1008
 #, fuzzy
 msgid "Use &ISO Images"
 msgstr "Bruk &ISO-diskbilder"
 
-#: src/include/instserver/dialogs.rb:988
+#: src/include/instserver/dialogs.rb:1017
 #, fuzzy
 msgid "Di&rectory with CD Images:"
 msgstr "Ka&talog med CD-diskbilder:"
 
-#: src/include/instserver/dialogs.rb:991 src/include/instserver/dialogs.rb:1371
+#: src/include/instserver/dialogs.rb:1020
+#: src/include/instserver/dialogs.rb:1400
 #, fuzzy
 msgid "Select &Directory"
 msgstr "Vel &katalog"
 
 #. abort?
 #. abort?
-#: src/include/instserver/dialogs.rb:1034
-#: src/include/instserver/dialogs.rb:1440
+#: src/include/instserver/dialogs.rb:1063
+#: src/include/instserver/dialogs.rb:1469
 #, fuzzy
 msgid "Select Directory"
 msgstr "Vel katalog"
 
 #. abort?
-#: src/include/instserver/dialogs.rb:1051
-#: src/include/instserver/dialogs.rb:1215
+#: src/include/instserver/dialogs.rb:1080
+#: src/include/instserver/dialogs.rb:1244
 #, fuzzy
 msgid "Installation server name missing."
 msgstr "Installasjonsservernavn manglar."
 
-#: src/include/instserver/dialogs.rb:1066
+#: src/include/instserver/dialogs.rb:1095
 #, fuzzy
 msgid ""
 "Contents already exist in this directory.\n"
@@ -201,7 +203,7 @@
 "Cdane vert ikkje kopierte."
 
 #. for translators: popup question (prefer more shorter lines than few long lines)
-#: src/include/instserver/dialogs.rb:1094
+#: src/include/instserver/dialogs.rb:1123
 #, fuzzy
 msgid ""
 "Add an additional product (Service Pack, Additional\n"
@@ -211,23 +213,23 @@
 "fleire pakker osb.) i pakkebrønnen?"
 
 #. Instserver configure1 dialog contents
-#: src/include/instserver/dialogs.rb:1170
+#: src/include/instserver/dialogs.rb:1199
 #, fuzzy
 msgid "Repository &Name:"
 msgstr "Pakkebrønn&namn:"
 
-#: src/include/instserver/dialogs.rb:1175
+#: src/include/instserver/dialogs.rb:1204
 #, fuzzy
 msgid "A&nnounce as Installation Service with SLP"
 msgstr "A&ngi som installasjonstjeneste med SLP"
 
-#: src/include/instserver/dialogs.rb:1223
+#: src/include/instserver/dialogs.rb:1252
 #, fuzzy
 msgid "Invalid repository name."
 msgstr "Ugyldig pakkebrønnnavn."
 
 #. an error message - entered repository name already exists
-#: src/include/instserver/dialogs.rb:1231
+#: src/include/instserver/dialogs.rb:1260
 #, fuzzy
 msgid ""
 "Repository '%1' already exists,\n"
@@ -237,7 +239,7 @@
 "Vel eit anna namn."
 
 #. create directory only for a new repository
-#: src/include/instserver/dialogs.rb:1244
+#: src/include/instserver/dialogs.rb:1273
 #, fuzzy
 msgid ""
 "Error while creating <tt>repository</tt> directory.\n"
@@ -251,7 +253,7 @@
 "ikkje er skrivebeskyttet, og prøv igjen.\n"
 
 #. confirm removal of a repository, the action is done immediately and cannot be reverted
-#: src/include/instserver/dialogs.rb:1263
+#: src/include/instserver/dialogs.rb:1292
 #, fuzzy
 msgid ""
 "Repository '%1' has been marked to delete.\n"
@@ -267,104 +269,104 @@
 "Vil du verkeleg slette det gamle innhaldet og oppretta det på nytt?"
 
 #. Instserver server dialog caption
-#: src/include/instserver/dialogs.rb:1347
+#: src/include/instserver/dialogs.rb:1376
 #, fuzzy
 msgid "Initial Setup -- Initial Setup"
 msgstr "Første oppsett -- Første oppsett"
 
-#: src/include/instserver/dialogs.rb:1363
+#: src/include/instserver/dialogs.rb:1392
 #, fuzzy
 msgid "Do Not Configure Any Net&work Services"
 msgstr "Ikkje sett opp nokon nett&verkstjenester"
 
-#: src/include/instserver/dialogs.rb:1368
+#: src/include/instserver/dialogs.rb:1397
 #, fuzzy
 msgid "Di&rectory to Contain Repositories:"
 msgstr "Katalog som skal innehalda a&rkiver:"
 
 #. radio button label
-#: src/include/instserver/dialogs.rb:1383
+#: src/include/instserver/dialogs.rb:1412
 #, fuzzy
 msgid "&Configure as HTTP Repository"
 msgstr "&Sett opp som HTTP-pakkebrønn"
 
 #. radio button label
-#: src/include/instserver/dialogs.rb:1391
+#: src/include/instserver/dialogs.rb:1420
 #, fuzzy
 msgid "&Configure as FTP Repository"
 msgstr "&Sett opp som FTP-pakkebrønn"
 
 #. radio button label
-#: src/include/instserver/dialogs.rb:1399
+#: src/include/instserver/dialogs.rb:1428
 #, fuzzy
 msgid "&Configure as NFS Repository"
 msgstr "&Sett opp som NFS-pakkebrønn"
 
-#: src/include/instserver/dialogs.rb:1451
+#: src/include/instserver/dialogs.rb:1480
 #, fuzzy
 msgid "Directory path for the installation server missing."
 msgstr "Vel ei gyldig adresse for den manglande installasjonsserveren."
 
 #. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1478
+#: src/include/instserver/dialogs.rb:1507
 #, fuzzy
 msgid "Installation Server -- NFS"
 msgstr "Installasjonsserver -- NFS"
 
 #. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1496
+#: src/include/instserver/dialogs.rb:1525
 #, fuzzy
 msgid "&Host Wild Card"
 msgstr "&Jokertegn for vertsmaskin"
 
-#: src/include/instserver/dialogs.rb:1498
+#: src/include/instserver/dialogs.rb:1527
 #, fuzzy
 msgid "&Options"
 msgstr "&Alternativ"
 
 #. store the firewall setting, (activation is in SetupNFS())
-#: src/include/instserver/dialogs.rb:1556
+#: src/include/instserver/dialogs.rb:1585
 #, fuzzy
 msgid "Error occurred while configuring NFS."
 msgstr "Det oppstod ein feil under NFS-oppsettet."
 
 #. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1588
+#: src/include/instserver/dialogs.rb:1617
 #, fuzzy
 msgid "Installation Server -- FTP"
 msgstr "Installasjonsserver -- FTP"
 
 #. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1596
+#: src/include/instserver/dialogs.rb:1625
 #, fuzzy
 msgid "&FTP Server Root Directory:"
 msgstr "&FTP-serverens rotkatalog:"
 
-#: src/include/instserver/dialogs.rb:1598
+#: src/include/instserver/dialogs.rb:1627
 #, fuzzy
 msgid "&Directory Alias:"
 msgstr "&Katalogalias:"
 
 #. store the firewall setting, (activation is in SetupFTP())
-#: src/include/instserver/dialogs.rb:1655
+#: src/include/instserver/dialogs.rb:1684
 #, fuzzy
 msgid "Error occurred while configuring FTP."
 msgstr "Det oppstod ein feil under FTP-oppsettet."
 
 #. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1675
+#: src/include/instserver/dialogs.rb:1704
 #, fuzzy
 msgid "Installation Server -- HTTP"
 msgstr "Installasjonsserver -- HTTP"
 
 #. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1691
+#: src/include/instserver/dialogs.rb:1720
 #, fuzzy
 msgid "&Directory Alias"
 msgstr "&Katalogalias"
 
 #. store the firewall setting, (activation is in SetupHTTP())
-#: src/include/instserver/dialogs.rb:1748
+#: src/include/instserver/dialogs.rb:1777
 #, fuzzy
 msgid "Error creating HTTPD configuration."
 msgstr "Feil under skiping av HTTPD-oppsettet."
@@ -373,12 +375,10 @@
 #: src/include/instserver/helps.rb:16
 #, fuzzy
 msgid ""
-"<p><b><big>Network Server Configuration</big></b><br>"
-"\n"
+"<p><b><big>Network Server Configuration</big></b><br>\n"
 "</p>"
 msgstr ""
-"<p><b><big>Oppset av nettverksserver</big></b><br>"
-"\n"
+"<p><b><big>Oppset av nettverksserver</big></b><br>\n"
 "</p>"
 
 #: src/include/instserver/helps.rb:19
@@ -398,24 +398,20 @@
 "<p>If you have one of the services already running and want to do the\n"
 "server configuration manually, select not to configure \n"
 "the services.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>Viss ein av tenestene allereie køyrer og du ynskjer å utføra\n"
 "serveroppsettet manuelt, kan du velja å ikkje setja opp \n"
 "tenestene.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/instserver/helps.rb:30
 #, fuzzy
 msgid ""
-"<p><b><big>NFS Server Configuration</big></b><br>"
-"\n"
+"<p><b><big>NFS Server Configuration</big></b><br>\n"
 "</p>"
 msgstr ""
-"<p><b><big>Oppsett av NFS-servar</big></b><br>"
-"\n"
+"<p><b><big>Oppsett av NFS-servar</big></b><br>\n"
 "</p>"
 
 #: src/include/instserver/helps.rb:33
@@ -424,14 +420,12 @@
 "<p>To complete this configuration, a new entry in the file\n"
 "<em>/etc/exports</em> must be added and the NFS server must be \n"
 "installed and started.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>For å fullføra dene oppsettet må det leggjast til ein\n"
 "ny oppføring i fila <em>/etc/exports</em>, og NFS-serveren må\n"
 "installerast og vert starta.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/instserver/helps.rb:39
 #, fuzzy
@@ -439,27 +433,23 @@
 "<p>If you need to restrict access to the exported directories to certain \n"
 "hosts, add a more restrictive wild card mask. For example, use <em>192.168.1.0/24</em>\n"
 "to restrict access to the <em>192.168.1.0</em> subnet.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>Viss du vil avgrensa tilgjenget til dei eksporterte katalogane for visse \n"
 "vertsmaskiner, kan du leggja til ein meir restriktiv jokertegnmaske. Bruk til dømes <em>192.168.1.0/24</em>\n"
 "for å avgrensa tilgjenget til undernettverket <em>192.168.1.0</em>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/instserver/helps.rb:45
 #, fuzzy
 msgid ""
 "<p>Additionally, set the export options. For more details about the available\n"
 "options, see the manual page for <em>exports</em> (man exports(5))\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>Du kan òg spesifisera eksportalternativer. Du finn meir informasjon om tilgjengelege\n"
 "alternativ for manualsiden for <em>exports</em> (ein exports(5))\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/instserver/helps.rb:50
 #, fuzzy
@@ -473,23 +463,18 @@
 #: src/include/instserver/helps.rb:53
 #, fuzzy
 msgid ""
-"<p><b><big>FTP Server Configuration</big></b><br>"
-"\n"
+"<p><b><big>FTP Server Configuration</big></b><br>\n"
 "</p>"
 msgstr ""
-"<p><b><big>Oppsett av FTP-servar</big></b><br>"
-"\n"
+"<p><b><big>Oppsett av FTP-servar</big></b><br>\n"
 "</p>"
 
 #: src/include/instserver/helps.rb:56
 #, fuzzy
 msgid ""
 "<p>To complete this configuration, an FTP server must be \n"
-"installed and started.</p>"
-"\n"
-msgstr ""
-"<p>For å fullføra dette oppsettet må ein FTP-servar installerast og starta.</p>"
-"\n"
+"installed and started.</p>\n"
+msgstr "<p>For å fullføra dette oppsettet må ein FTP-servar installerast og starta.</p>\n"
 
 #: src/include/instserver/helps.rb:59
 #, fuzzy
@@ -498,26 +483,22 @@
 "the FTP server hierarchy, a mount entry is added to <tt>/etc/fstab</tt>.\n"
 "This makes the software repository directory available under the\n"
 "FTP server (using the <tt>--bind</tt> option of <tt>mount</tt>).\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>Viss den valde katalogen med pakkebrønnen er utanfor\n"
 "FTP-serveren filstruktur, vil eit monteringspunkt leggjast til i <tt>/etc/fstab</tt>,\n"
 "som gjer katalogen med pakkebrønnen tilgjengeleg på\n"
 "FTP-serveren (ved å bruka valet <tt>--bind</tt> for <tt>mount</tt>-kommandoen).\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/instserver/helps.rb:66
 #, fuzzy
 msgid ""
 "<p>The installation server will be available to clients using the following URL:\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>Installasjonsserveren vil vera tilgjengeleg for klientane på følgjande nettverksadresse:\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/instserver/helps.rb:69
 #, fuzzy
@@ -531,12 +512,10 @@
 #: src/include/instserver/helps.rb:70
 #, fuzzy
 msgid ""
-"<p><b><big>HTTP Server Configuration</big></b><br>"
-"\n"
+"<p><b><big>HTTP Server Configuration</big></b><br>\n"
 "</p>"
 msgstr ""
-"<p><b><big>Oppsett av HTTP-servar</big></b><br>"
-"\n"
+"<p><b><big>Oppsett av HTTP-servar</big></b><br>\n"
 "</p>"
 
 #: src/include/instserver/helps.rb:73
@@ -544,23 +523,19 @@
 msgid ""
 "<p>To complete this configuration, an HTTP server must be \n"
 "installed and started. The alias will be used to reference the installation\n"
-"server root directory.</p>"
-"\n"
+"server root directory.</p>\n"
 msgstr ""
 "<p>For å fullføra dette oppsettet må ein HTTP-servar installerast og starta. Aliaset vil vart nytta som referanse til\n"
-"installasjonsserverens rotkatalog.</p>"
-"\n"
+"installasjonsserverens rotkatalog.</p>\n"
 
 #: src/include/instserver/helps.rb:78
 #, fuzzy
 msgid ""
 "<p>Select a short and easy to remember alias. For example, if you select\n"
-"<em>SUSE</em> as the alias, the repositories will be available as shown below:</p>"
-"\n"
+"<em>SUSE</em> as the alias, the repositories will be available as shown below:</p>\n"
 msgstr ""
 "<p>Vel eit kort alias som er lett å hugsa. Viss du til dømes vel\n"
-"<em>SUSA</em> som alias, vil pakkebrønnene vera tilgjengelege som vist nedanfor:</p>"
-"\n"
+"<em>SUSA</em> som alias, vil pakkebrønnene vera tilgjengelege som vist nedanfor:</p>\n"
 
 #: src/include/instserver/helps.rb:81
 #, fuzzy
@@ -574,28 +549,22 @@
 #: src/include/instserver/helps.rb:84 src/include/instserver/helps.rb:94
 #, fuzzy
 msgid ""
-"<p><b>Configuration of the Repository</b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b>Configuration of the Repository</b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Pakkebrønnoppsett</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Pakkebrønnoppsett</big></b><br>\n"
+"</p>\n"
 
 #: src/include/instserver/helps.rb:85
 #, fuzzy
 msgid ""
 "<p>The repository name is used to create a directory under which all product\n"
 "CDs are copied and managed. The repository is accessed using the\n"
-"configured protocol (NFS, FTP, or HTTP).</p>"
-" \n"
+"configured protocol (NFS, FTP, or HTTP).</p> \n"
 msgstr ""
 "<p>Pakkebrønnnavnet vert nytta for å oppretta ein katalog som alle produkt-\n"
 "CD-er skal kopierast til. Pakkebrønnen er tilgjengeleg via den\n"
-"valde protokollen (NFS, FTP eller HTTP)</p>"
-" \n"
+"valde protokollen (NFS, FTP eller HTTP)</p> \n"
 
 #: src/include/instserver/helps.rb:90
 #, fuzzy
@@ -606,34 +575,28 @@
 #, fuzzy
 msgid ""
 "<p>SLP (Service Location Protocol) facilitates finding an installation server. \n"
-"If checked, the repository will be announced on the network using SLP.</p>"
-"\n"
+"If checked, the repository will be announced on the network using SLP.</p>\n"
 msgstr ""
 "<p>SLP (Service Location Protocol) gjer det lettare å finna ein installasjonsserver. \n"
-"Viss du kryssar av her, vil pakkebrønnen verta automatisk angjeve på nettverket vigd SLP.</p>"
-"\n"
+"Viss du kryssar av her, vil pakkebrønnen verta automatisk angjeve på nettverket vigd SLP.</p>\n"
 
 #: src/include/instserver/helps.rb:95
 #, fuzzy
 msgid ""
 "<p>Select a source drive from the list, insert the first medium of a base product, and press\n"
-"<b>Next</b> to copy the content into the local repository.</p>"
-"\n"
+"<b>Next</b> to copy the content into the local repository.</p>\n"
 msgstr ""
 "<p>Vel ein kildestasjon frå lista, sett inn det første mediet for eit grunnprodukt og klikk\n"
-"<b>Neste</b> for å kopiera innhaldet til den lokale pakkebrønnen.</p>"
-"\n"
+"<b>Neste</b> for å kopiera innhaldet til den lokale pakkebrønnen.</p>\n"
 
 #: src/include/instserver/helps.rb:98
 #, fuzzy
 msgid ""
 "<p>When the base media are copied to the local repository, you can add additional\n"
-"CDs to the repository (for example, Service Pack CDs or any add-on CDs).</p>"
-"\n"
+"CDs to the repository (for example, Service Pack CDs or any add-on CDs).</p>\n"
 msgstr ""
 "<p>Etter at grunnmediet er kopiert til den lokale pakkebrønnen, kan du leggja til fleire\n"
-"CD-er i pakkebrønnen (til dømes CDEN til Ei-oppdatering eller kva for ein som helst CDEN til Anna-tillegg).</p>"
-"\n"
+"CD-er i pakkebrønnen (til dømes CDEN til Ei-oppdatering eller kva for ein som helst CDEN til Anna-tillegg).</p>\n"
 
 #: src/include/instserver/helps.rb:101
 #, fuzzy
@@ -644,176 +607,127 @@
 #, fuzzy
 msgid ""
 "<p>ISO images can be used instead of CD or DVD media. If you press <b>Next</b>, you can\n"
-"select ISO image files.</p>"
-"\n"
+"select ISO image files.</p>\n"
 msgstr ""
 "<p>ISO-diskbilder kan vert i staden nytta for CD- eller DVD-medium. Trykk <b>Neste</b> for å\n"
-"velja ISO-diskbildefiler.</p>"
-"\n"
+"velja ISO-diskbildefiler.</p>\n"
 
 #. Read dialog help 1/2
 #: src/include/instserver/helps.rb:106
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Initializing Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Initialiserer oppsett</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer oppsett</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/instserver/helps.rb:110
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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 avbryta oppsettverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
+"Du kan trygt avbryta oppsettverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/instserver/helps.rb:114
 #, fuzzy
 msgid ""
-"<p><b>Saving Repository Configuration</b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b>Saving Repository Configuration</b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Lagrar pakkebrønnoppsett</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar pakkebrønnoppsett</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/instserver/helps.rb:118
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryt lagring:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Summary dialog help 1/3
 #: src/include/instserver/helps.rb:125
 #, fuzzy
 msgid ""
-"<p><b>Repository Configuration</b><br>"
-"\n"
-"Configure the installation server here.<br>"
-"</p>"
-"\n"
+"<p><b>Repository Configuration</b><br>\n"
+"Configure the installation server here.<br></p>\n"
 msgstr ""
-"<p><b><big>Pakkebrønnoppsett</big></b><br>"
-"\n"
-"Her kan du setja opp installasjonsserveren.<br>"
-"</p>"
-"\n"
+"<p><b><big>Pakkebrønnoppsett</big></b><br>\n"
+"Her kan du setja opp installasjonsserveren.<br></p>\n"
 
 #. Summary dialog help 2/3
 #: src/include/instserver/helps.rb:129
 #, fuzzy
 msgid ""
-"<p><b>Adding a Repository:</b><br>"
-"\n"
+"<p><b>Adding a Repository:</b><br>\n"
 "Unconfigured directories are detected in the repository directory and then made \n"
 "available for configuration.\n"
-"To add a repository, select it from the list of unconfigured repositories and press <b>Configure</b>.</p>"
-"\n"
+"To add a repository, select it from the list of unconfigured repositories and press <b>Configure</b>.</p>\n"
 msgstr ""
-"<p><b>Leggja til ein pakkebrønn:</b><br>"
-"\n"
+"<p><b>Leggja til ein pakkebrønn:</b><br>\n"
 "Systemet søkjer etter katalogar som ikkje er valt, i pakkebrønnkatalogen og gjer\n"
 "dei tilgjengelege for oppsett.\n"
-"Legg til ein pakkebrønn ved å velja han i lista over pakkebrønner som ikkje er vald. Klikk deretter <b>Sett opp</b>.</p>"
-"\n"
+"Legg til ein pakkebrønn ved å velja han i lista over pakkebrønner som ikkje er vald. Klikk deretter <b>Sett opp</b>.</p>\n"
 
 #. Summary dialog help 3/3
 #: src/include/instserver/helps.rb:136
 #, fuzzy
 msgid ""
-"<p><b><big>Editing or Deleting:</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting:</big></b><br>\n"
 "If you press <b>Edit</b>, an additional dialog in which to change\n"
-"the configuration opens.</p>"
-"\n"
+"the configuration opens.</p>\n"
 msgstr ""
-"<p><b><big>Redigera eller slette:</big></b><br>"
-"\n"
+"<p><b><big>Redigera eller slette:</big></b><br>\n"
 "Viss du klikkar <b>Rediger</b>, får du opp ein ny dialog der\n"
-"du kan endra oppsettet.</p>"
-"\n"
+"du kan endra oppsettet.</p>\n"
 
 #. Ovreview dialog help 1/3
 #: src/include/instserver/helps.rb:142
 #, fuzzy
 msgid ""
-"<p><b>Repositories Overview</b><br>"
-"\n"
+"<p><b>Repositories Overview</b><br>\n"
 "Get an overview of the configured repositories and edit their \n"
-"configuration if necessary.<br>"
-"</p>"
-"\n"
+"configuration if necessary.<br></p>\n"
 msgstr ""
-"<p><b><big>Oversyn over pakkebrønner</big></b><br>"
-"\n"
+"<p><b><big>Oversyn over pakkebrønner</big></b><br>\n"
 "Her vert vist eit oversyn over valde pakkebrønner. Du kan òg\n"
-"redigera desse pakkebrønnene.<br>"
-"</p>"
-"\n"
+"redigera desse pakkebrønnene.<br></p>\n"
 
 #. Ovreview dialog help 2/3
 #: src/include/instserver/helps.rb:148
 #, fuzzy
 msgid ""
-"<p><b>Adding a Repository:</b><br>"
-"\n"
-"Press <b>Add</b> to configure a repository.</p>"
-"\n"
+"<p><b>Adding a Repository:</b><br>\n"
+"Press <b>Add</b> to configure a repository.</p>\n"
 msgstr ""
-"<p><b><big>Leggja til ein pakkebrønn:</big></b><br>"
-"\n"
-"Klikk <b>Legg til</b> for å setja opp ein pakkebrønn.</p>"
-"\n"
+"<p><b><big>Leggja til ein pakkebrønn:</big></b><br>\n"
+"Klikk <b>Legg til</b> for å setja opp ein pakkebrønn.</p>\n"
 
 #. Ovreview dialog help 3/3
 #: src/include/instserver/helps.rb:152
 #, fuzzy
 msgid ""
-"<p><b><big>Editing or Deleting:</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting:</big></b><br>\n"
 "Choose the repository you want to change or remove and\n"
-"press  <b>Edit</b> or <b>Delete</b>, respectively.</p>"
-"\n"
+"press  <b>Edit</b> or <b>Delete</b>, respectively.</p>\n"
 msgstr ""
-"<p><b><big>Redigera eller slette:</big></b><br>"
-"\n"
+"<p><b><big>Redigera eller slette:</big></b><br>\n"
 "Vel ein pakkebrønn du vil endra eller sletta.\n"
-"Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter behov.</p>"
-"\n"
+"Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter behov.</p>\n"
 
 #. Read service data using _auto
-#: src/modules/Instserver.rb:306
+#: src/modules/Instserver.rb:308
 #, fuzzy
 msgid ""
 "The FTP installation server requires an FTP server package. The vsftpd package\n"
@@ -843,7 +757,7 @@
 #. @param string directory
 #. @param [String] options
 #. @return [Boolean]
-#: src/modules/Instserver.rb:569
+#: src/modules/Instserver.rb:570
 #, fuzzy
 msgid ""
 "Directory is already exported via NFS.\n"
@@ -853,86 +767,86 @@
 "Vil du la NFS-eksportane vera uendra?\n"
 
 #. Instserver read dialog caption
-#: src/modules/Instserver.rb:1155
+#: src/modules/Instserver.rb:1152
 #, fuzzy
 msgid "Initializing Configuration"
 msgstr "Initialiserer oppsett"
 
 #. Progress stage 1/2
-#: src/modules/Instserver.rb:1165
+#: src/modules/Instserver.rb:1166
 #, fuzzy
 msgid "Read configuration file"
 msgstr "Les oppsettfil"
 
 #. Progress stage 2/2
-#: src/modules/Instserver.rb:1167
+#: src/modules/Instserver.rb:1168
 #, fuzzy
 msgid "Search for a new repository"
 msgstr "Søk etter ny pakkebrønn"
 
 #. Progress step 1/2
-#: src/modules/Instserver.rb:1171
+#: src/modules/Instserver.rb:1172
 #, fuzzy
 msgid "Reading configuration file..."
 msgstr "Lesar oppsettfil …"
 
 #. Progress step 2/2
-#: src/modules/Instserver.rb:1173
+#: src/modules/Instserver.rb:1174
 #, fuzzy
 msgid "Searching for a new repository..."
 msgstr "Søkar etter ny pakkebrønn …"
 
 #. Progress finished
 #. Progress finished
-#: src/modules/Instserver.rb:1175 src/modules/Instserver.rb:1260
+#: src/modules/Instserver.rb:1176 src/modules/Instserver.rb:1278
 #, fuzzy
 msgid "Finished"
 msgstr "Fullført"
 
-#. TRANSLATORS: Error message
-#: src/modules/Instserver.rb:1188
+#. Error message
+#: src/modules/Instserver.rb:1224
 #, fuzzy
 msgid "Cannot read current settings."
 msgstr "Kan ikkje lesa gjeldande innstillingar."
 
 #. Instserver read dialog caption
-#: src/modules/Instserver.rb:1240
+#: src/modules/Instserver.rb:1254
 #, fuzzy
 msgid "Saving Installation Server Configuration"
 msgstr "Lagrar oppsett for installasjonsserver"
 
 #. Progress stage 1/2
-#: src/modules/Instserver.rb:1250
+#: src/modules/Instserver.rb:1268
 #, fuzzy
 msgid "Write the settings"
 msgstr "Lagre innstillingane"
 
 #. Progress stage 2/2
-#: src/modules/Instserver.rb:1252
+#: src/modules/Instserver.rb:1270
 #, fuzzy
 msgid "Run SuSEconfig"
 msgstr "Køyr SuSEconfig"
 
 #. Progress step 1/2
-#: src/modules/Instserver.rb:1256
+#: src/modules/Instserver.rb:1274
 #, fuzzy
 msgid "Writing the settings..."
 msgstr "Lagrar innstillingane …"
 
 #. Progress step 2/2
-#: src/modules/Instserver.rb:1258
+#: src/modules/Instserver.rb:1276
 #, fuzzy
 msgid "Running SuSEconfig..."
 msgstr "Køyrar SuSEconfig …"
 
 #. Error message
-#: src/modules/Instserver.rb:1274
+#: src/modules/Instserver.rb:1292
 #, fuzzy
 msgid "Cannot write settings."
 msgstr "Kan ikkje lagra innstillingane."
 
 #. Configuration summary text for autoyast
-#: src/modules/Instserver.rb:1441
+#: src/modules/Instserver.rb:1465
 #, fuzzy
 msgid "Configured Repositories"
 msgstr "Valde pakkebrønner"

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

Modified: branches/plus-SLE12-SP2/yast/nn/po/iscsi-client.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/iscsi-client.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/iscsi-client.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -134,8 +134,8 @@
 
 #: src/include/iscsi-client/dialogs.rb:161
 #, fuzzy
-msgid "Disconnect"
-msgstr "Koble til"
+msgid "Log Out"
+msgstr "Logg ut"
 
 #: src/include/iscsi-client/dialogs.rb:186
 #, fuzzy
@@ -148,6 +148,10 @@
 msgstr "Søk"
 
 #: src/include/iscsi-client/dialogs.rb:193
+#, fuzzy
+msgid "Log In"
+msgstr "Logg inn"
+
 #: src/include/iscsi-client/dialogs.rb:223
 #, fuzzy
 msgid "Connect"
@@ -244,8 +248,8 @@
 #. dialog for all targets from portal (connected/disconnected)
 #. authentification dialog for add/discovery target
 #: src/include/iscsi-client/dialogs.rb:404
-#: src/include/iscsi-client/helps.rb:110 src/include/iscsi-client/helps.rb:122
-#: src/include/iscsi-client/helps.rb:129
+#: src/include/iscsi-client/helps.rb:107 src/include/iscsi-client/helps.rb:119
+#: src/include/iscsi-client/helps.rb:126
 #, fuzzy
 msgid "<h1>iSCSI Initiator</h1>"
 msgstr "<h1>iSCSI-initiator</h1>"
@@ -264,192 +268,145 @@
 #: src/include/iscsi-client/helps.rb:38
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing iSCSI Initiator Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
-msgstr ""
-"<p><b><big>Konfigurasjonen til vent men av iSCSI-initiator initialiseres…</big></b></p>"
-"\n"
+"<p><b><big>Initializing iSCSI Initiator Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
+msgstr "<p><b><big>Konfigurasjonen til vent men av iSCSI-initiator initialiseres…</big></b></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/iscsi-client/helps.rb:42
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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>Avbryta initialisering:</big></b><br>"
-"\n"
-"Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryta initialisering:</big></b><br>\n"
+"Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/iscsi-client/helps.rb:46
 #, fuzzy
 msgid ""
-"<p><b><big>Saving iSCSI Initiator Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
-msgstr ""
-"<p><b><big>Vent medan konfigurasjon av iSCSI-initiator vert lagra…</big></b></p>"
-"\n"
+"<p><b><big>Saving iSCSI Initiator Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
+msgstr "<p><b><big>Vent medan konfigurasjon av iSCSI-initiator vert lagra…</big></b></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/iscsi-client/helps.rb:50
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryta lagring</big></b><br>"
-"\n"
+"<p><b><big>Avbryta lagring</big></b><br>\n"
 "Avbryt lagringsprosedyren ved å trykkja <b>Avbryt</b>.\n"
 " Ein ny dialogboks forteljar deg om det er trygt å gjera dette.\n"
-" </p>"
-"\n"
+" </p>\n"
 
 #. Summary dialog help 1/3
 #: src/include/iscsi-client/helps.rb:57
 #, fuzzy
 msgid ""
-"<p><b><big>iSCSI Initiator Configuration</big></b><br>"
-"\n"
-"Configure an iSCSI initiator here.<br>"
-"</p>"
-"\n"
+"<p><b><big>iSCSI Initiator Configuration</big></b><br>\n"
+"Configure an iSCSI initiator here.<br></p>\n"
 msgstr ""
-"<p><b><big>Konfigurasjon av iSCSI-initiator</big></b><br>"
-"\n"
-"Konfigurer ein iSCSI-initiator her.<br>"
-"</p>"
-"\n"
+"<p><b><big>Konfigurasjon av iSCSI-initiator</big></b><br>\n"
+"Konfigurer ein iSCSI-initiator her.<br></p>\n"
 
 #. Summary dialog help 2/3
 #: src/include/iscsi-client/helps.rb:61
 #, fuzzy
 msgid ""
-"<p><b><big>Adding an iSCSI Initiator</big></b><br>"
-"\n"
+"<p><b><big>Adding an iSCSI Initiator</big></b><br>\n"
 "Select an iSCSI initiator from the list of detected initiators.\n"
 "If your iSCSI initiator was not detected, use <b>Other (not detected)</b>.\n"
-"Then press <b>Configure</b>.</p>"
-"\n"
+"Then press <b>Configure</b>.</p>\n"
 msgstr ""
-"<p><b><big>Leggja til ein iSCSI-initiator</big></b><br>"
-"\n"
+"<p><b><big>Leggja til ein iSCSI-initiator</big></b><br>\n"
 "Vel ein iSCSI-initiator frå lista over oppdaga initiatorer.\n"
 " Viss iSCSI-initiatoren ikkje vart oppdaga, brukar du <b>Anna (ikkje funnet)</b>.\n"
-" Klikk deretter <b>Konfigurer</b>.</p>"
-"\n"
+" Klikk deretter <b>Konfigurer</b>.</p>\n"
 
 #. Summary dialog help 3/3
 #: src/include/iscsi-client/helps.rb:68
 #, fuzzy
 msgid ""
-"<p><b><big>Editing or Deleting</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting</big></b><br>\n"
 "If you press <b>Edit</b>, an additional dialog in which to change\n"
-"the configuration opens.</p>"
-"\n"
+"the configuration opens.</p>\n"
 msgstr ""
-"<p><b><big>Redigera eller slette</big></b><br>"
-"\n"
-"Viss du klikkar <b>Rediger</b>, vert vist ein ny dialogboks der du kan endra konfigurasjonen.</p>"
-"\n"
+"<p><b><big>Redigera eller slette</big></b><br>\n"
+"Viss du klikkar <b>Rediger</b>, vert vist ein ny dialogboks der du kan endra konfigurasjonen.</p>\n"
 
 #. Ovreview dialog help 1/3
 #: src/include/iscsi-client/helps.rb:74
 #, fuzzy
 msgid ""
-"<p><b><big>iSCSI Initiator Configuration Overview</big></b><br>"
-"\n"
+"<p><b><big>iSCSI Initiator Configuration Overview</big></b><br>\n"
 "Obtain an overview of installed iSCSI initiators. Additionally\n"
-"edit their configurations.<br>"
-"</p>"
-"\n"
+"edit their configurations.<br></p>\n"
 msgstr ""
-"<p><b><big>Oversyn over iSCSI-initiator</big></b><br>"
-"\n"
+"<p><b><big>Oversyn over iSCSI-initiator</big></b><br>\n"
 "Få eit oversyn over installerte iSCSI-initiatorer. Du kan òg\n"
-" redigera konfigurasjonen.<br>"
-"</p>"
-"\n"
+" redigera konfigurasjonen.<br></p>\n"
 
 #. Ovreview dialog help 2/3
 #: src/include/iscsi-client/helps.rb:80
 #, fuzzy
 msgid ""
-"<p><b><big>Adding an iSCSI Initiator</big></b><br>"
-"\n"
-"Press <b>Add</b> to configure an iSCSI initiator.</p>"
-"\n"
+"<p><b><big>Adding an iSCSI Initiator</big></b><br>\n"
+"Press <b>Add</b> to configure an iSCSI initiator.</p>\n"
 msgstr ""
-"<p><b><big>Leggja til ein iSCSI-initiator</big></b><br>"
-"\n"
-"Klikk <b>Legg til</b> for å konfigurera ein iSCSI-initiator.</p>"
-"\n"
+"<p><b><big>Leggja til ein iSCSI-initiator</big></b><br>\n"
+"Klikk <b>Legg til</b> for å konfigurera ein iSCSI-initiator.</p>\n"
 
 #. Ovreview dialog help 3/3
 #: src/include/iscsi-client/helps.rb:84
 #, fuzzy
 msgid ""
-"<p><b><big>Editing or Deleting</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting</big></b><br>\n"
 "Choose an iSCSI Initiator to change or remove.\n"
-"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>"
-"\n"
+"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
 msgstr ""
-"<p><b><big>Redigera eller slette</big></b><br>"
-"\n"
+"<p><b><big>Redigera eller slette</big></b><br>\n"
 "Vel ein iSCSI-initiator du vil endra eller sletta.\n"
-" Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter ønske.</p>"
-"\n"
+" Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter ønske.</p>\n"
 
 #. table of connected targets
 #: src/include/iscsi-client/helps.rb:90
+#, fuzzy
 msgid ""
-"<p>List of current sessions.</p>"
-"<p>Use the <b>Add</b> button to get additional targets. A discovery is started to detect new targets and the start-up mode of already connected targets keeps unchanged.<br>"
-"Use <b>Disconnect</b> to cancel the connection and with it remove the target from the list.<br>"
-"To change the start-up status, press <b>Edit</b>.</p>"
+"List of current sessions. To add a new target, select it and press <b>Add</b>.\n"
+"To remove it, press <b>Log Out</b>.\n"
+"To change the start-up status, press <b>Toggle</b>.\n"
 msgstr ""
+"Liste over gjeldande økter. Legg til eit mål ved å klikka <b>Legg til</b>.\n"
+"Fjern eit mål ved å velja det og klikka <b>Logg ut</b>.\n"
+"Klikk <b>Byt</b> for å endra oppstartsstatus.\n"
 
 #. Warning
 #. Warning
-#: src/include/iscsi-client/helps.rb:99 src/include/iscsi-client/helps.rb:117
+#: src/include/iscsi-client/helps.rb:96 src/include/iscsi-client/helps.rb:114
 #, fuzzy
 msgid "<h1>Warning</h1>"
 msgstr "<h1>Advarsel</h1>"
 
-#: src/include/iscsi-client/helps.rb:100 src/include/iscsi-client/helps.rb:118
+#: src/include/iscsi-client/helps.rb:97 src/include/iscsi-client/helps.rb:115
 #, fuzzy
-msgid ""
-"<p>When accessing an iSCSI device <b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive. Otherwise there is a potential risk of data corruption.</p>"
-"\n"
-msgstr ""
-"<p>Når du brukar ein iSCSI-eining med <b>LESA</b>/<b>SKRIVA</b>-rettar, må desse rettane vera eksklusive for å unngå risiko for øydelagte data.</p>"
-"\n"
+msgid "<p>When accessing an iSCSI device <b>READ</b>/<b>WRITE</b>, make sure that this access is exclusive. Otherwise there is a potential risk of data corruption.</p>\n"
+msgstr "<p>Når du brukar ein iSCSI-eining med <b>LESA</b>/<b>SKRIVA</b>-rettar, må desse rettane vera eksklusive for å unngå risiko for øydelagte data.</p>\n"
 
-#: src/include/iscsi-client/helps.rb:103
+#: src/include/iscsi-client/helps.rb:100
 #, fuzzy
 msgid ""
-"<p><b>Initiator Name</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n"
+"<p><b>InitiatorName</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n"
 "In case you have iBFT, this value will be added from there and you are only able to change it in the BIOS setup.</p>"
 msgstr ""
 "<p><b>Initiatornavn</b> er eit verd frå <tt>/etc/initiatorname.iscsi</tt>.\n"
 "Viss du har iBFT, vil dette verdet leggjast til derfrå, og du vil berre kunna endra han i BIOS-oppsettet.</p>"
 
-#: src/include/iscsi-client/helps.rb:106
+#: src/include/iscsi-client/helps.rb:103
 #, fuzzy
 msgid ""
 "If you want to use <b>iSNS</b> (Internet  Storage  Name Service) for discovering targets instead of the default SendTargets method,\n"
@@ -458,10 +415,10 @@
 "Viss du vil bruka <b>iSNS</b> (Internet  Storage  Name Service) for å finna mål i staden for vanlege SendTargets-metodar,\n"
 "angje IP-adressa for iSNS-serveren og porten. Standardporten skal vera 3205.\n"
 
-#: src/include/iscsi-client/helps.rb:111
+#: src/include/iscsi-client/helps.rb:108
 #, fuzzy
 msgid ""
-"Enter the <b>IP Address</b> of the iSCSI target server.\n"
+"Enter the <b>IP Address</b> of the discovered server.\n"
 "Only change <b>Port</b> if needed. For authentication, use <b>Username</b> and <b>Password</b>. If you do not need authentication,\n"
 "select <b>No Authentication</b>.\n"
 msgstr ""
@@ -469,11 +426,16 @@
 "<b>Port</b> bør berre endrast viss det er naudsynt. Bruk <b>Brukernavn</b> og <b>Passord</b> for autentisering. Viss du ikkje treng autentisering,\n"
 "vel <b>Ingen autentisering</b>.\n"
 
-#: src/include/iscsi-client/helps.rb:125
+#: src/include/iscsi-client/helps.rb:122
 #, fuzzy
 msgid "List of nodes offered by the iSCSI target. Select one item and click <b>Connect</b>.  "
 msgstr "Liste over tilgjengelege noder på iSCSI-målet. Vel eitt element, og klikk <b>Koble til</b>.  "
 
+#: src/include/iscsi-client/helps.rb:129
+#, fuzzy
+msgid "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>."
+msgstr "Vel autentiseringstypen og angje <b>Brukernavn</b>og<b>Passord</b>."
+
 #: src/include/iscsi-client/helps.rb:132
 #, fuzzy
 msgid "<h1>Startup</h1>"
@@ -483,47 +445,25 @@
 #, fuzzy
 msgid ""
 "<p><b>manual</b> is for iSCSI targets which are not to be connected by\n"
-"default, the user needs to connect them manually</p>"
-"\n"
+"default, the user needs to connect them manually</p>\n"
 "<p><b>onboot</b> is for iSCSI targets to be connected during boot, i.e. when\n"
-"root is on iSCSI. As such it will be evaluated by the initrd.</p>"
-"\n"
+"root is on iSCSI. As such it will be evaluated by the initrd.</p>\n"
 "<p><b>automatic</b> is for iSCSI targets to be connected when the iSCSI service\n"
-"starts up.</p>"
-"\n"
+"starts up.</p>\n"
 msgstr ""
-"<p><b>manual</b> inneber at iSCSI-mål ikkje kan tilkobles som standard. Brukaren må gjera det manuelt</p>"
-"\n"
+"<p><b>manual</b> inneber at iSCSI-mål ikkje kan tilkobles som standard. Brukaren må gjera det manuelt</p>\n"
 "<p><b>onboot</b> inneber at iSCSI-mål tilkobles ved oppstart, dvs. dersom root er på\n"
-"iSCSI. Dei vil då vurderast av initrd.</p>"
-"\n"
+"iSCSI. Dei vil då vurderast av initrd.</p>\n"
 "<p><b>automatic</b> inneber at iSCSI-mål tilkobles når sjølve iSCSI-tenesta\n"
 "startar.</p>"
 
-#: src/include/iscsi-client/helps.rb:141
+#. list of discovered targets
+#: src/include/iscsi-client/helps.rb:142
 #, fuzzy
-msgid "<h1>Authentication</h1>"
-msgstr "Ingen autentisering"
+msgid "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target."
+msgstr "Liste over mål som vart funnen. Start eit nytt <b>Søk</b> eller <b>Koble til</b> eit mål."
 
-#: src/include/iscsi-client/helps.rb:142
-msgid ""
-"<p>The default setting here is <i>No Authentication</i>. Uncheck the checkbox if authentication is needed for security reasons. Enter <b>Username</b> and <b>Password</b> for 'Incoming Authentication', 'Outgoing Authentication' or for both.</p>"
-"<p><b>Please note:</b><br>"
-"'Incoming Authentication' here correlates to 'Outgoing Authentication' on iSCSI target server side and the other way round.</p>"
-msgstr ""
-
-#. list of discovered targets
-#: src/include/iscsi-client/helps.rb:151
-msgid ""
-"<p>This screen shows the list of discovered targets.</p>"
-"<p>Use the <b>Discovery</b> button to get available iSCSI targets from a server specified by IP address.<br>"
-"<b>Connect</b> to a target to establih the connection. If login was successful the column <i>Connected</i> shows status 'True' and the target will appear on the <i>Connected Targets</i> screen.<br>"
-"To remove a target use the <b>Delete</b> button.<br>"
-" <b>Hint:</b> Removing of targets is only possible for not connected onces. If required, <b>Disconnect</b> at <i>Connected Targets</i> first.</p>"
-"<p><b>Please note:</b> Starting the <b>Discovery</b> again means doing a re-discovery of targets which possibly will change the start-up mode of already connected targets (to default 'manual'). Switch to <i>Connected Targets</i> screen and use the <b>Add</b> button if you want to add new targets without changing the start-up mode.</p>"
-msgstr ""
-
-#: src/include/iscsi-client/helps.rb:167
+#: src/include/iscsi-client/helps.rb:145
 #, fuzzy
 msgid "<h1>iBTF</h1>"
 msgstr "<h1>iBTF</h1>"
@@ -584,23 +524,16 @@
 msgstr "Port-feltet kan ikkje vera tomt"
 
 #. regexp for "cz.suse" or just "suse", "cz.su-se"
-#: src/include/iscsi-client/widgets.rb:428
+#: src/include/iscsi-client/widgets.rb:423
 #, fuzzy
-msgid "Incorrect Initiator Name"
-msgstr "Initiatornavn"
-
-#: src/include/iscsi-client/widgets.rb:429
-#, fuzzy
 msgid ""
-"\n"
+"Incorrect InitiatorName.\n"
 "The correct syntax is\n"
 "iqn.yyyy-mm.reversed.domain.name[:identifier]\n"
 "or eui.yyyy-mm.reversed.domain.name[:identifier]\n"
 "\n"
 "Example:\n"
 "iqn.2007-04.cz.server:storage.disk.sdb\n"
-"\n"
-"Do you want to use the name?\n"
 msgstr ""
 "Feil initiatornavn\n"
 "Riktigsyntaks er\n"
@@ -611,13 +544,13 @@
 "iqn.2007-04.no.servar:storage.disk.sdb\n"
 
 #. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:635
+#: src/include/iscsi-client/widgets.rb:625
 #, fuzzy
 msgid "Insert the IP address."
 msgstr "Angje IP-adressa."
 
 #. validate port number
-#: src/include/iscsi-client/widgets.rb:641
+#: src/include/iscsi-client/widgets.rb:631
 #, fuzzy
 msgid "Insert the port."
 msgstr "Angje porten."
@@ -626,41 +559,41 @@
 #. ******************* target table *************************
 #. initialize dialog for all targets from portal (connected/disconnected)
 #. enable/disable connect button according target is or not already connected
-#: src/include/iscsi-client/widgets.rb:754
-#: src/include/iscsi-client/widgets.rb:859
-#: src/include/iscsi-client/widgets.rb:887
+#: src/include/iscsi-client/widgets.rb:733
+#: src/include/iscsi-client/widgets.rb:838
+#: src/include/iscsi-client/widgets.rb:866
 #, fuzzy
 msgid "True"
 msgstr "Sann"
 
-#: src/include/iscsi-client/widgets.rb:754
-#: src/include/iscsi-client/widgets.rb:859
+#: src/include/iscsi-client/widgets.rb:733
+#: src/include/iscsi-client/widgets.rb:838
 #, fuzzy
 msgid "False"
 msgstr "Usann"
 
 #. check if not already connected
 #. check if not already connected
-#: src/include/iscsi-client/widgets.rb:792
-#: src/include/iscsi-client/widgets.rb:912
+#: src/include/iscsi-client/widgets.rb:771
+#: src/include/iscsi-client/widgets.rb:891
 #, fuzzy
 msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."
 msgstr "Målet med dette målnavnet er allereie tilkoblet. Passar på at Multipath er aktivert for å unngå øydelagte data."
 
-#: src/include/iscsi-client/widgets.rb:795
-#: src/include/iscsi-client/widgets.rb:915
+#: src/include/iscsi-client/widgets.rb:774
+#: src/include/iscsi-client/widgets.rb:894
 #, fuzzy
 msgid "Continue"
 msgstr "Hald fram"
 
-#: src/include/iscsi-client/widgets.rb:796
-#: src/include/iscsi-client/widgets.rb:916
+#: src/include/iscsi-client/widgets.rb:775
+#: src/include/iscsi-client/widgets.rb:895
 #, fuzzy
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:906
+#: src/include/iscsi-client/widgets.rb:885
 #, fuzzy
 msgid "The target is already connected."
 msgstr "Målet er allereie tilkoblet."
@@ -766,7 +699,7 @@
 msgstr ""
 
 #. }
-#: src/modules/IscsiClientLib.rb:698
+#: src/modules/IscsiClientLib.rb:694
 #, fuzzy
 msgid ""
 "InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n"
@@ -778,39 +711,20 @@
 "Gammalt initiatornavn vil erstattast med verdet frå iBFT, og det vil opprettast ein sikkerhetskopi.\n"
 "Viss du vil bruka eit anna initiatornavn, kan du endra det i BIOS."
 
-#. change startup status (manual/onboot) for target
-#: src/modules/IscsiClientLib.rb:1013
-msgid "Target connection failed.\n"
-msgstr ""
-
 #. do discovery first
-#: src/modules/IscsiClientLib.rb:1156
+#: src/modules/IscsiClientLib.rb:1147
 #, fuzzy
 msgid "Configuration summary..."
 msgstr "Konfigurasjonssammendrag …"
 
 #, fuzzy
-#~ msgid "Log Out"
-#~ msgstr "Logg ut"
+#~ msgid "Disconnect"
+#~ msgstr "Koble til"
 
 #, fuzzy
-#~ msgid "Log In"
-#~ msgstr "Logg inn"
+#~ msgid "<h1>Authentication</h1>"
+#~ msgstr "Ingen autentisering"
 
 #, fuzzy
-#~ msgid ""
-#~ "List of current sessions. To add a new target, select it and press <b>Add</b>.\n"
-#~ "To remove it, press <b>Log Out</b>.\n"
-#~ "To change the start-up status, press <b>Toggle</b>.\n"
-#~ msgstr ""
-#~ "Liste over gjeldande økter. Legg til eit mål ved å klikka <b>Legg til</b>.\n"
-#~ "Fjern eit mål ved å velja det og klikka <b>Logg ut</b>.\n"
-#~ "Klikk <b>Byt</b> for å endra oppstartsstatus.\n"
-
-#, fuzzy
-#~ msgid "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>."
-#~ msgstr "Vel autentiseringstypen og angje <b>Brukernavn</b>og<b>Passord</b>."
-
-#, fuzzy
-#~ msgid "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target."
-#~ msgstr "Liste over mål som vart funnen. Start eit nytt <b>Søk</b> eller <b>Koble til</b> eit mål."
+#~ msgid "Incorrect Initiator Name"
+#~ msgstr "Initiatornavn"

Modified: branches/plus-SLE12-SP2/yast/nn/po/iscsi-lio-server.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/iscsi-lio-server.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/iscsi-lio-server.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -40,14 +40,15 @@
 msgstr ""
 
 #. second tab - global authentication
-#: src/include/iscsi-lio-server/dialogs.rb:73 src/modules/IscsiLioServer.rb:427
+#: src/include/iscsi-lio-server/dialogs.rb:73
+#: src/modules/IscsiLioServer.rb:427
 msgid "Global"
 msgstr ""
 
 #. third tab - targets / luns
 #. targets dialog
 #: src/include/iscsi-lio-server/dialogs.rb:89
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
 #: src/modules/IscsiLioServer.rb:443
 msgid "Targets"
 msgstr ""
@@ -64,7 +65,7 @@
 
 #: src/include/iscsi-lio-server/dialogs.rb:128
 #: src/include/iscsi-lio-server/dialogs.rb:189
-#: src/include/iscsi-lio-server/dialogs.rb:320
+#: src/include/iscsi-lio-server/dialogs.rb:321
 msgid "Portal group"
 msgstr ""
 
@@ -98,194 +99,190 @@
 msgstr ""
 
 #: src/include/iscsi-lio-server/dialogs.rb:154
-#: src/include/iscsi-lio-server/dialogs.rb:198
-#: src/include/iscsi-lio-server/dialogs.rb:237
-#: src/include/iscsi-lio-server/dialogs.rb:325
-#: src/include/iscsi-lio-server/dialogs.rb:372
+#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:238
+#: src/include/iscsi-lio-server/dialogs.rb:326
+#: src/include/iscsi-lio-server/dialogs.rb:373
 #: src/include/iscsi-lio-server/widgets.rb:442
 msgid "Add"
 msgstr ""
 
 #: src/include/iscsi-lio-server/dialogs.rb:155
-#: src/include/iscsi-lio-server/dialogs.rb:238
-#: src/include/iscsi-lio-server/dialogs.rb:326
-#: src/include/iscsi-lio-server/dialogs.rb:373
+#: src/include/iscsi-lio-server/dialogs.rb:239
+#: src/include/iscsi-lio-server/dialogs.rb:327
+#: src/include/iscsi-lio-server/dialogs.rb:374
 msgid "Edit"
 msgstr ""
 
 #: src/include/iscsi-lio-server/dialogs.rb:156
-#: src/include/iscsi-lio-server/dialogs.rb:201
-#: src/include/iscsi-lio-server/dialogs.rb:239
-#: src/include/iscsi-lio-server/dialogs.rb:327
-#: src/include/iscsi-lio-server/dialogs.rb:374
+#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:240
+#: src/include/iscsi-lio-server/dialogs.rb:328
+#: src/include/iscsi-lio-server/dialogs.rb:375
 #: src/include/iscsi-lio-server/widgets.rb:443
 msgid "Delete"
 msgstr ""
 
-#: src/include/iscsi-lio-server/dialogs.rb:193
-msgid "Client"
+#. table header (Initiator: iSCSI client, LUN Mapping: logical unit client/target mapping, Auth: authorization)
+#: src/include/iscsi-lio-server/dialogs.rb:194
+msgid "Initiator"
 msgstr ""
 
-#: src/include/iscsi-lio-server/dialogs.rb:193
-msgid "Lun Mapping"
+#: src/include/iscsi-lio-server/dialogs.rb:194
+msgid "LUN Mapping"
 msgstr ""
 
-#: src/include/iscsi-lio-server/dialogs.rb:193
+#: src/include/iscsi-lio-server/dialogs.rb:194
 msgid "Auth"
 msgstr ""
 
-#: src/include/iscsi-lio-server/dialogs.rb:199
+#: src/include/iscsi-lio-server/dialogs.rb:200
 msgid "Edit LUN"
 msgstr ""
 
-#: src/include/iscsi-lio-server/dialogs.rb:200
+#: src/include/iscsi-lio-server/dialogs.rb:201
 msgid "Edit Auth"
 msgstr ""
 
-#: src/include/iscsi-lio-server/dialogs.rb:202
+#: src/include/iscsi-lio-server/dialogs.rb:203
 msgid "Copy"
 msgstr ""
 
 #. enable/disable none/incoming/outgoing authentication
-#: src/include/iscsi-lio-server/dialogs.rb:216
+#: src/include/iscsi-lio-server/dialogs.rb:217
 #: src/include/iscsi-lio-server/widgets.rb:207
 #: src/modules/IscsiLioServer.rb:434
 msgid "No Authentication"
 msgstr ""
 
-#: src/include/iscsi-lio-server/dialogs.rb:225
+#: src/include/iscsi-lio-server/dialogs.rb:226
 #: src/include/iscsi-lio-server/widgets.rb:218
 #: src/modules/IscsiLioServer.rb:437
 msgid "Incoming Authentication"
 msgstr ""
 
 #. dialog to add/modify user and password
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: src/include/iscsi-lio-server/dialogs.rb:253
+#: src/include/iscsi-lio-server/dialogs.rb:233
+#: src/include/iscsi-lio-server/dialogs.rb:254
 #: src/include/iscsi-lio-server/widgets.rb:223
 #: src/include/iscsi-lio-server/widgets.rb:236
 #: src/include/iscsi-lio-server/widgets.rb:721
 msgid "Username"
 msgstr ""
 
-#: src/include/iscsi-lio-server/dialogs.rb:232
-#: src/include/iscsi-lio-server/dialogs.rb:254
+#: src/include/iscsi-lio-server/dialogs.rb:233
+#: src/include/iscsi-lio-server/dialogs.rb:255
 #: src/include/iscsi-lio-server/widgets.rb:224
 #: src/include/iscsi-lio-server/widgets.rb:237
 #: src/include/iscsi-lio-server/widgets.rb:722
 msgid "Password"
 msgstr ""
 
-#: src/include/iscsi-lio-server/dialogs.rb:248
+#: src/include/iscsi-lio-server/dialogs.rb:249
 #: src/include/iscsi-lio-server/widgets.rb:231
 #: src/modules/IscsiLioServer.rb:440
 msgid "Outgoing Authentication"
 msgstr ""
 
 #. radio button (starting LIO target service - option 1)
-#: src/include/iscsi-lio-server/dialogs.rb:274
+#: src/include/iscsi-lio-server/dialogs.rb:275
 msgid "When &Booting"
 msgstr ""
 
 #. radio button (starting LIO target service - option 2)
-#: src/include/iscsi-lio-server/dialogs.rb:278
+#: src/include/iscsi-lio-server/dialogs.rb:279
 msgid "&Manually"
 msgstr ""
 
 #. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:284
+#: src/include/iscsi-lio-server/dialogs.rb:285
 #: src/modules/IscsiLioServer.rb:429
 msgid "When Booting"
 msgstr ""
 
 #. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:286
+#: src/include/iscsi-lio-server/dialogs.rb:287
 #: src/modules/IscsiLioServer.rb:431
 msgid "Manually"
 msgstr ""
 
+#: src/include/iscsi-lio-server/dialogs.rb:321
+msgid "TPG Status"
+msgstr ""
+
 #. dialog for expert settings
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
 msgid "Key"
 msgstr ""
 
-#: src/include/iscsi-lio-server/dialogs.rb:369
+#: src/include/iscsi-lio-server/dialogs.rb:370
 msgid "Value"
 msgstr ""
 
 #. Summary dialog
 #. @return dialog result
 #. Main dialog - tabbed
-#: src/include/iscsi-lio-server/dialogs.rb:430
+#: src/include/iscsi-lio-server/dialogs.rb:431
 msgid "iSCSI LIO Target Overview"
 msgstr ""
 
 #. expert dialog
 #. LUN details
-#: src/include/iscsi-lio-server/dialogs.rb:438
-#: src/include/iscsi-lio-server/helps.rb:178
-#: src/include/iscsi-lio-server/helps.rb:183
+#: src/include/iscsi-lio-server/dialogs.rb:439
+#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:184
 msgid "<h1>iSCSI Target</h1>"
 msgstr ""
 
 #. dialog for add target
-#: src/include/iscsi-lio-server/dialogs.rb:473
+#: src/include/iscsi-lio-server/dialogs.rb:474
 msgid "Add iSCSI Target"
 msgstr ""
 
-#. discovery authentication dialog
-#: src/include/iscsi-lio-server/dialogs.rb:507
-msgid "Modify iSCSI Target Client Setup"
+#. dialog for modifying initiator setup for a target
+#. (includes authentication)
+#: src/include/iscsi-lio-server/dialogs.rb:509
+msgid "Modify iSCSI Target Initiator Setup"
 msgstr ""
 
 #. edit target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:541
+#: src/include/iscsi-lio-server/dialogs.rb:543
 msgid "Modify iSCSI Target Lun Setup"
 msgstr ""
 
 #. expert target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:574
+#: src/include/iscsi-lio-server/dialogs.rb:576
 msgid "iSCSI Target Expert Settings"
 msgstr ""
 
 #. Read dialog help 1/2
 #: src/include/iscsi-lio-server/helps.rb:38
 msgid ""
-"<p><b><big>Initializing iSCSI LIO Target Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Initializing iSCSI LIO Target Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
 
 #. Read dialog help 2/2
 #: src/include/iscsi-lio-server/helps.rb:42
 msgid ""
-"<p><b><big>Aborting Initialization</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<p><b><big>Aborting Initialization</big></b><br>\n"
+"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n"
 msgstr ""
 
 #. Write dialog help 1/2
 #: src/include/iscsi-lio-server/helps.rb:47
 msgid ""
-"<p><b><big>Saving iSCSI Target Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Saving iSCSI Target Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
 
 #. Write dialog help 2/2
 #: src/include/iscsi-lio-server/helps.rb:51
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 
 #: src/include/iscsi-lio-server/helps.rb:57
@@ -297,71 +294,56 @@
 #. Summary dialog help 1/3
 #: src/include/iscsi-lio-server/helps.rb:61
 msgid ""
-"<p><b><big>iSCSI Target Configuration</big></b><br>"
-"\n"
-"Configure an iSCSI target here.<br>"
-"</p>"
-"\n"
+"<p><b><big>iSCSI Target Configuration</big></b><br>\n"
+"Configure an iSCSI target here.<br></p>\n"
 msgstr ""
 
 #. Summary dialog help 2/3
 #: src/include/iscsi-lio-server/helps.rb:65
 msgid ""
-"<p><b><big>Adding an iSCSI Target</big></b><br>"
-"\n"
+"<p><b><big>Adding an iSCSI Target</big></b><br>\n"
 "Choose an iSCSI target from the list of detected iSCSI targets.\n"
 "If your target was not detected, use <b>Other (not detected)</b>.\n"
-"Then press <b>Configure</b>.</p>"
-"\n"
+"Then press <b>Configure</b>.</p>\n"
 msgstr ""
 
 #. Summary dialog help 3/3
 #: src/include/iscsi-lio-server/helps.rb:72
 msgid ""
-"<p><b><big>Editing or Deleting</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting</big></b><br>\n"
 "If you press <b>Edit</b>, an additional dialog in which to change\n"
-"the configuration opens.</p>"
-"\n"
+"the configuration opens.</p>\n"
 msgstr ""
 
 #. Ovreview dialog help 1/3
 #: src/include/iscsi-lio-server/helps.rb:78
 msgid ""
-"<p><b><big>iSCSI Target Configuration Overview</big></b><br>"
-"\n"
+"<p><b><big>iSCSI Target Configuration Overview</big></b><br>\n"
 "Obtain an overview of installed iSCSI targets. Additionally\n"
-"edit their configurations.<br>"
-"</p>"
-"\n"
+"edit their configurations.<br></p>\n"
 msgstr ""
 
 #. Ovreview dialog help 2/3
 #: src/include/iscsi-lio-server/helps.rb:84
 msgid ""
-"<p><b><big>Adding an iSCSI Target</big></b><br>"
-"\n"
+"<p><b><big>Adding an iSCSI Target</big></b><br>\n"
 "Press <b>Add</b> to configure an iSCSI target.</p>"
 msgstr ""
 
 #. Ovreview dialog help 3/3
 #: src/include/iscsi-lio-server/helps.rb:89
 msgid ""
-"<p><b><big>Editing or Deleting</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting</big></b><br>\n"
 "Choose an iSCSI target to change or remove.\n"
-"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>"
-"\n"
+"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
 msgstr ""
 
 #. Configure1 dialog help 1/2
 #: src/include/iscsi-lio-server/helps.rb:95
 msgid ""
-"<p><b><big>Configuration Part One</big></b><br>"
-"\n"
+"<p><b><big>Configuration Part One</big></b><br>\n"
 "Press <b>Next</b> to continue.\n"
-"<br>"
-"</p>"
+"<br></p>"
 msgstr ""
 
 #. Configure1 dialog help 2/2
@@ -369,8 +351,7 @@
 #: src/include/iscsi-lio-server/helps.rb:101
 #: src/include/iscsi-lio-server/helps.rb:113
 msgid ""
-"<p><b><big>Selecting Something</big></b><br>"
-"\n"
+"<p><b><big>Selecting Something</big></b><br>\n"
 "It is not possible. You must code it first. :-)\n"
 "</p>"
 msgstr ""
@@ -378,12 +359,9 @@
 #. Configure2 dialog help 1/2
 #: src/include/iscsi-lio-server/helps.rb:107
 msgid ""
-"<p><b><big>Configuration Part Two</big></b><br>"
-"\n"
+"<p><b><big>Configuration Part Two</big></b><br>\n"
 "Press <b>Next</b> to continue.\n"
-"<br>"
-"</p>"
-"\n"
+"<br></p>\n"
 msgstr ""
 
 #. discovery authentication
@@ -393,21 +371,24 @@
 
 #. target client setup.
 #: src/include/iscsi-lio-server/helps.rb:124
-msgid "<p>Use <b>Add</b> to give a client access for a LUN imported from target portal group. Specify which client is allowed to access it (client name is <i>InitiatorName</i> in '/etc/iscsi/initiatorname.iscsi' on iscsi initiator). <b>Delete</b> will remove the client access to the LUN.</p>"
+msgid ""
+"<p>Use <b>Add</b> to give an initiator (iSCSI client) access to a LUN imported from\n"
+" target portal group. Specify which initiator is allowed to connect (use <i>InitiatorName</i>\n"
+" from '/etc/iscsi/initiatorname.iscsi' on iSCSI initiator). <b>Delete</b> will remove the initiator access to the LUN.</p>"
 msgstr ""
 
 #: src/include/iscsi-lio-server/helps.rb:130
 msgid ""
-"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>"
-"After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
+"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. Please make sure to set different values for incoming and outgoing authentication.\n"
+" If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here.</p>"
 msgstr ""
 
-#: src/include/iscsi-lio-server/helps.rb:136
-msgid "<p><b>Copy</b> offers the possibility to give an additional client access to the LUN.</p>"
+#: src/include/iscsi-lio-server/helps.rb:137
+msgid "<p><b>Copy</b> offers the possibility to give an additional initiator access to the LUN.</p>"
 msgstr ""
 
 #. target dialog
-#: src/include/iscsi-lio-server/helps.rb:138
+#: src/include/iscsi-lio-server/helps.rb:139
 msgid ""
 "List of offered targets and target portal groups. Create a new target by clicking <b>Add</b>.\n"
 "To delete or modify an item, select it and press <b>Edit</b> or <b>Delete</b>."
@@ -415,12 +396,12 @@
 
 #. edit target
 #. add target
-#: src/include/iscsi-lio-server/helps.rb:143
-#: src/include/iscsi-lio-server/helps.rb:159
+#: src/include/iscsi-lio-server/helps.rb:144
+#: src/include/iscsi-lio-server/helps.rb:160
 msgid "<h1>iSCSI Target IP/Port and LUN setup</h1>"
 msgstr ""
 
-#: src/include/iscsi-lio-server/helps.rb:146
+#: src/include/iscsi-lio-server/helps.rb:147
 msgid ""
 "It is possible to make arbitary block devices or files available under a <b>LUN</b>.\n"
 "You have to provide <b>path</b> to either block devices or file. \n"
@@ -429,19 +410,19 @@
 "does not provide a name for LUN, it is generated automatically."
 msgstr ""
 
-#: src/include/iscsi-lio-server/helps.rb:153
-#: src/include/iscsi-lio-server/helps.rb:172
+#: src/include/iscsi-lio-server/helps.rb:154
+#: src/include/iscsi-lio-server/helps.rb:173
 msgid ""
 "<p>Under <b>Ip Address</b> and <b>Port Number</b> you specify under which address\n"
 "and port the service will be available. Default for port number is 3260.\n"
 "Only ip addresses assigned to one of the network cards are possible."
 msgstr ""
 
-#: src/include/iscsi-lio-server/helps.rb:162
+#: src/include/iscsi-lio-server/helps.rb:163
 msgid "Create a new target. Replace template values with the correct values."
 msgstr ""
 
-#: src/include/iscsi-lio-server/helps.rb:165
+#: src/include/iscsi-lio-server/helps.rb:166
 msgid ""
 "It is possible to make arbitary block devices or files available under a lun.\n"
 "You have to provide <b>path</b> to either block devices or file. \n"
@@ -450,11 +431,11 @@
 "does not provide a name for LUN, it is generated automatically."
 msgstr ""
 
-#: src/include/iscsi-lio-server/helps.rb:179
+#: src/include/iscsi-lio-server/helps.rb:180
 msgid "It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional configuration options."
 msgstr ""
 
-#: src/include/iscsi-lio-server/helps.rb:184
+#: src/include/iscsi-lio-server/helps.rb:185
 msgid ""
 "Edit <b>LUN</b> number if needed, set <b>Type</b> (nullio is for testing purposes).\n"
 "If Type=fileio set <b>Path</b> to disk device or file.<b>SCSI ID</b> and <b>Sectors</b> are optional."
@@ -477,7 +458,7 @@
 msgstr ""
 
 #: src/include/iscsi-lio-server/widgets.rb:251
-msgid "Selected Lun is already in use!"
+msgid "Selected LUN is already in use!"
 msgstr ""
 
 #: src/include/iscsi-lio-server/widgets.rb:260
@@ -505,7 +486,7 @@
 msgstr ""
 
 #: src/include/iscsi-lio-server/widgets.rb:436
-msgid "Client Lun"
+msgid "Initiator LUN"
 msgstr ""
 
 #: src/include/iscsi-lio-server/widgets.rb:436
@@ -525,7 +506,7 @@
 msgstr ""
 
 #: src/include/iscsi-lio-server/widgets.rb:619
-msgid "Client name:"
+msgid "Initiator name:"
 msgstr ""
 
 #: src/include/iscsi-lio-server/widgets.rb:622
@@ -534,21 +515,21 @@
 
 #: src/include/iscsi-lio-server/widgets.rb:638
 #: src/include/iscsi-lio-server/widgets.rb:695
-msgid "Client name must not be empty!"
+msgid "Initiator name must not be empty!"
 msgstr ""
 
 #. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
-#. client name. It's allowed to have several LUNs accessable for same client.
+#. initiator name. It's allowed to have several LUNs accessable for same initiator.
 #. TODO: verify whether it's necessary to check @changed_lun here?
 #: src/include/iscsi-lio-server/widgets.rb:644
 #: src/include/iscsi-lio-server/widgets.rb:701
-msgid "Client name already exists!"
+msgid "Initiator name already exists!"
 msgstr ""
 
-#. Copy exisiting LUN, i.e. give additional client access to the LUN
+#. Copy exisiting LUN, i.e. give additional initiator access to the LUN
 #. (which is allowed, makes sense e.g. with multipath)
 #: src/include/iscsi-lio-server/widgets.rb:678
-msgid "New client name:"
+msgid "New initiator name:"
 msgstr ""
 
 #: src/include/iscsi-lio-server/widgets.rb:724
@@ -559,93 +540,99 @@
 msgid "Cancel"
 msgstr ""
 
+#. create items from targets
+#: src/include/iscsi-lio-server/widgets.rb:785
+msgid "Enabled"
+msgstr ""
+
+#: src/include/iscsi-lio-server/widgets.rb:785
+#: src/include/iscsi-lio-server/widgets.rb:1263
+#: src/include/iscsi-lio-server/widgets.rb:1366
+#: src/include/iscsi-lio-server/widgets.rb:1403
+msgid "Disabled"
+msgstr ""
+
 #. remove a item
 #. **************** Edit Dialog	*****************************
 #. init values for modifying target (read it from stored map)
-#: src/include/iscsi-lio-server/widgets.rb:820
-#: src/include/iscsi-lio-server/widgets.rb:934
-#: src/include/iscsi-lio-server/widgets.rb:1288
+#: src/include/iscsi-lio-server/widgets.rb:822
+#: src/include/iscsi-lio-server/widgets.rb:936
+#: src/include/iscsi-lio-server/widgets.rb:1290
 msgid "Really delete the selected item?"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1002
+#: src/include/iscsi-lio-server/widgets.rb:1004
 msgid "Problem creating target %1 with tpg %2"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1024
+#: src/include/iscsi-lio-server/widgets.rb:1026
 msgid "Problem setting network portal to %1"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1045
+#: src/include/iscsi-lio-server/widgets.rb:1047
 msgid "Problem removing lun %1"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1070
+#: src/include/iscsi-lio-server/widgets.rb:1072
 msgid "Problem setting lun %1 (name:%2) to path %3"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1084
+#: src/include/iscsi-lio-server/widgets.rb:1086
 msgid "Problem setting auth on %1:%2 to %3"
 msgstr ""
 
 #. validate function checks if target/tpg are unique and not empty
-#: src/include/iscsi-lio-server/widgets.rb:1198
+#: src/include/iscsi-lio-server/widgets.rb:1200
 msgid "The target cannot be empty."
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1202
+#: src/include/iscsi-lio-server/widgets.rb:1204
 msgid "The target portal group cannot be empty."
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1213
+#: src/include/iscsi-lio-server/widgets.rb:1215
 msgid "The target already exists."
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1233
+#: src/include/iscsi-lio-server/widgets.rb:1235
 msgid "Incoming"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1236
+#: src/include/iscsi-lio-server/widgets.rb:1238
 msgid "Outgoing"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1238
+#: src/include/iscsi-lio-server/widgets.rb:1240
 msgid "None"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1261
-#: src/include/iscsi-lio-server/widgets.rb:1364
-#: src/include/iscsi-lio-server/widgets.rb:1401
-msgid "Disabled"
-msgstr ""
-
-#: src/include/iscsi-lio-server/widgets.rb:1450
+#: src/include/iscsi-lio-server/widgets.rb:1452
 msgid ""
-"There isn't any client specified.\n"
-"To allow a client login to the target, please\n"
+"There isn't any initiator specified.\n"
+"To allow an initiator login to the target, please\n"
 "use the 'Add' button and enter the name\n"
 "(see /etc/iscsi/initiatorname.iscsi on initiator).\n"
-"Really want to continue without client access?"
+"Really want to continue without initiator access?"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1464
-msgid "Problem removing lun %4 for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1466
+msgid "Problem removing LUN %4 for initiator %3 in %1:%2"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1479
-msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1481
+msgid "Problem adding LUN %4:%5 for initiator %3 in %1:%2"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1500
-msgid "Problem removing client %3 from %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1502
+msgid "Problem removing initiator %3 from %1:%2"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1524
-msgid "Problem creating client %3 for %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1526
+msgid "Problem creating initiator %3 for %1:%2"
 msgstr ""
 
-#: src/include/iscsi-lio-server/widgets.rb:1559
-msgid "Problem changing auth for client %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1561
+msgid "Problem changing auth for initiator %3 in %1:%2"
 msgstr ""
 
 #. Initialization dialog caption
@@ -659,11 +646,11 @@
 msgstr ""
 
 #. scope link IPv6
-#: src/modules/IscsiLioData.rb:1424
+#: src/modules/IscsiLioData.rb:1428
 msgid "Cannot save lio setup"
 msgstr ""
 
-#: src/modules/IscsiLioData.rb:1428
+#: src/modules/IscsiLioData.rb:1432
 msgid "Cannot save tcm setup"
 msgstr ""
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/isns.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/isns.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/isns.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -146,135 +146,77 @@
 #: src/include/isns/helps.rb:17
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing iSNS daemon configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Initializing iSNS daemon configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Initialiserer oppsett av ISNS-nisse</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer oppsett av ISNS-nisse</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/isns/helps.rb:21
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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>Avbryta initialisering:</big></b><br>"
-"\n"
-"Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryta initialisering:</big></b><br>\n"
+"Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/isns/helps.rb:25
 #, fuzzy
 msgid ""
-"<p><b><big>Saving iSNS Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Saving iSNS Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Lagrar iSNS-oppsett</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar iSNS-oppsett</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/isns/helps.rb:29
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryt lagring:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Summary dialog help 1/3
 #: src/include/isns/helps.rb:36
 #, fuzzy
 msgid ""
-"<p><b><big>iSNS Configuration</big></b><br>"
-"\n"
-"Configure an iSNS server.<br>"
-"</p>"
-"\n"
+"<p><b><big>iSNS Configuration</big></b><br>\n"
+"Configure an iSNS server.<br></p>\n"
 msgstr ""
-"<p><b><big>iSNS-oppsett</big></b><br>"
-"\n"
-"Her kan du setja opp ein iSNS-servar.<br>"
-"</p>"
-"\n"
+"<p><b><big>iSNS-oppsett</big></b><br>\n"
+"Her kan du setja opp ein iSNS-servar.<br></p>\n"
 
 #: src/include/isns/helps.rb:39
 #, fuzzy
-msgid ""
-"<p>The list of all available iSCSI nodes registered with the iSNS service are displayed.</p>"
-" "
-"<p>Nodes are registered by iSCSI initiators and iSCSI targets.</p>"
-" "
-"<p> It is only possible to <b>delete</b> them.  Deleting a node removes it from the iSNS database.</p>"
-msgstr ""
-"<p>Lista over alle tilgjengelege iSCSI-noder som er registrerte med iSNS-tenesta, vert vist.</p>"
-" "
-"<p>Nodene vert med registrert iSCSI-initiatorer og iSCSI-mål.</p>"
-" "
-"<p> Det er berre mogleg å <b>sletta</b> dei. Å sletta ein node, fjernar han frå iSNS-databasen.</p>"
+msgid "<p>The list of all available iSCSI nodes registered with the iSNS service are displayed.</p> <p>Nodes are registered by iSCSI initiators and iSCSI targets.</p> <p> It is only possible to <b>delete</b> them.  Deleting a node removes it from the iSNS database.</p>"
+msgstr "<p>Lista over alle tilgjengelege iSCSI-noder som er registrerte med iSNS-tenesta, vert vist.</p> <p>Nodene vert med registrert iSCSI-initiatorer og iSCSI-mål.</p> <p> Det er berre mogleg å <b>sletta</b> dei. Å sletta ein node, fjernar han frå iSNS-databasen.</p>"
 
 #. discovery domains
 #: src/include/isns/helps.rb:43
 #, fuzzy
-msgid ""
-"A list of all discovery domains is displayed. It is possible to <b>Create</b> a discovery domain or <b>Delete</b> one. "
-"<p>Deleting a domain removes the members from the domain but does not delete the iSCSI node members.</p>"
-msgstr ""
-"Ei liste over alle søkedomener vert viste.  For søkedomener er det mogleg å <b>oppretta</b> eller <b>sletta</b> eit domane. "
-"<p>Å sletta eit domane, fjernar medlemmane frå domenet, men slettar ikkje iSCSI-nodemedlemmer. </p>"
+msgid "A list of all discovery domains is displayed. It is possible to <b>Create</b> a discovery domain or <b>Delete</b> one. <p>Deleting a domain removes the members from the domain but does not delete the iSCSI node members.</p>"
+msgstr "Ei liste over alle søkedomener vert viste.  For søkedomener er det mogleg å <b>oppretta</b> eller <b>sletta</b> eit domane. <p>Å sletta eit domane, fjernar medlemmane frå domenet, men slettar ikkje iSCSI-nodemedlemmer. </p>"
 
 #: src/include/isns/helps.rb:46
 #, fuzzy
-msgid ""
-"A list of all iSCSI nodes are displayed by discovery domain.  Selecting another discovery domain refreshes the list with members from that discovery domain.  It is possible to <b>Add</b> an iSCSI node to a discovery domain or <b>Delete</b> the node.  "
-"<p>Deleting a node removes it from the domain but does not delete the iSCSI node</p>"
-" "
-"<p>Creating an iSCSI node allows a not yet registered node to be added as a member of the discovery domain.  When the initiator or target registers this node then it becomes part of this domain</p>"
-"  "
-"<p>When an iSCSI initiator does a discovery request, the iSNS service returns all iSCSI node targets that are members of the same Discovery Domains.</p>"
-" "
-msgstr ""
-"Ei liste over alle iSCSI-noder vert med viste søkedomener. Å velja eit anna søkedomene oppdaterer lista med medlemmar frå det nye søkedomenet. Det er mogleg å <b>leggja til</b> ein iSCSI-node i eit søkedomene eller <b>slette</b> noden. "
-"<p>Å sletta ein node fjernar han frå domenet, men slettar ikkje iSCSI-noden</p>"
-" "
-"<p>Ved å oppretta ein iSCSI-node kan ein uregistrert node verta til lagd som medlem av søkedomenet. Når initiatoren eller målet registrerer denne noden, vert han ein del av dette domenet</p>"
-"  "
-"<p>Når ein iSCSI-initiator utfører ein søkeforespørsel, finn iSNS-tenesta alle iSCSI-nodemål som er medlemmar av same søkedomener.</p>"
-" "
+msgid "A list of all iSCSI nodes are displayed by discovery domain.  Selecting another discovery domain refreshes the list with members from that discovery domain.  It is possible to <b>Add</b> an iSCSI node to a discovery domain or <b>Delete</b> the node.  <p>Deleting a node removes it from the domain but does not delete the iSCSI node</p> <p>Creating an iSCSI node allows a not yet registered node to be added as a member of the discovery domain.  When the initiator or target registers this node then it becomes part of this domain</p>  <p>When an iSCSI initiator does a discovery request, the iSNS service returns all iSCSI node targets that are members of the same Discovery Domains.</p> "
+msgstr "Ei liste over alle iSCSI-noder vert med viste søkedomener. Å velja eit anna søkedomene oppdaterer lista med medlemmar frå det nye søkedomenet. Det er mogleg å <b>leggja til</b> ein iSCSI-node i eit søkedomene eller <b>slette</b> noden. <p>Å sletta ein node fjernar han frå domenet, men slettar ikkje iSCSI-noden</p> <p>Ved å oppretta ein iSCSI-node kan ein uregistrert node verta til lagd som medlem av søkedomenet. Når initiatoren eller målet registrerer denne noden, vert han ein del av dette domenet</p>  <p>Når ein iSCSI-initiator utfører ein søkeforespørsel, finn iSNS-tenesta alle iSCSI-nodemål som er medlemmar av same søkedomener.</p> "
 
 #. dds table dialog
 #: src/include/isns/helps.rb:50
 #, fuzzy
-msgid ""
-"At the top a list of all Discovery Domain Sets are displayed.  Discovery Domains belong to Discovery Domain Sets. "
-"<p>A Discovery Domain must be a member of a Discovery Domain Set in order to be active. </p>"
-"<p>In an iSNS database, a Discovery Domain Set contains Discovery Domains and Discovery Domains contain iSCSI Node members.</p>"
-msgstr ""
-"Øvst vert viste ei liste over alle søkedomenesett. Søkedomener tilhøyrer søkedomenesett. "
-"<p>Eit søkedomene må vera medlem i eit søkedomensett for å aktiverast. </p>"
-"<p>I ein iSNS-database inneheld eit søkedomenesett søkedomener, og søkedomener inneheld iSCSI-nodemedlemmer.</p>"
+msgid "At the top a list of all Discovery Domain Sets are displayed.  Discovery Domains belong to Discovery Domain Sets. <p>A Discovery Domain must be a member of a Discovery Domain Set in order to be active. </p><p>In an iSNS database, a Discovery Domain Set contains Discovery Domains and Discovery Domains contain iSCSI Node members.</p>"
+msgstr "Øvst vert viste ei liste over alle søkedomenesett. Søkedomener tilhøyrer søkedomenesett. <p>Eit søkedomene må vera medlem i eit søkedomensett for å aktiverast. </p><p>I ein iSNS-database inneheld eit søkedomenesett søkedomener, og søkedomener inneheld iSCSI-nodemedlemmer.</p>"
 
 #: src/include/isns/helps.rb:53
 #, fuzzy
@@ -394,12 +336,8 @@
 #~ msgstr "Legg til søkedomene"
 
 #, fuzzy
-#~ msgid ""
-#~ "<b><big>iSNS Server location</big></b><br>"
-#~ "The DNS name or the IP address of the iSNS service can be entered as the iSNS address.\n"
-#~ msgstr ""
-#~ "<b><big>Plassering av iSNS-servar</big></b><br>"
-#~ "DNS-namnet eller IP-adressa for iSNS-tenesta kan angjevast som iSNS-adresse.\n"
+#~ msgid "<b><big>iSNS Server location</big></b><br>The DNS name or the IP address of the iSNS service can be entered as the iSNS address.\n"
+#~ msgstr "<b><big>Plassering av iSNS-servar</big></b><br>DNS-namnet eller IP-adressa for iSNS-tenesta kan angjevast som iSNS-adresse.\n"
 
 #, fuzzy
 #~ msgid "Select discovery domain set to which discovery domain will be added."

Modified: branches/plus-SLE12-SP2/yast/nn/po/journal.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/journal.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/journal.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2015-08-26 20:35+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"

Modified: branches/plus-SLE12-SP2/yast/nn/po/kdump.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/kdump.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/kdump.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:16+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -428,10 +428,8 @@
 
 #. Force value to false, so it's actually rewritten
 #. TRANSLATORS: CommandLine printed text
-#. start kdump at boot
 #. delete crashkernel parameter from bootloader
-#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487
-#: src/modules/Kdump.rb:500
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:496
 #, fuzzy
 msgid "To apply changes a reboot is necessary."
 msgstr "Maskina må startast på nytt for å aktivare endringar."
@@ -870,42 +868,29 @@
 #: src/include/kdump/helps.rb:36
 #, fuzzy
 msgid ""
-"<p><b>Enable/Disable Kdump</b><br>"
-"\n"
+"<p><b>Enable/Disable Kdump</b><br>\n"
 "    Enable or disable kdump. The boot option crashkernel parameter is added/removed. \n"
-"    To apply changes, a reboot is necessary.<br>"
-"</p>"
-"\n"
+"    To apply changes, a reboot is necessary.<br></p>\n"
 msgstr ""
-"<p><b>Aktiver/deaktiver Kdump</b><br>"
-"\n"
+"<p><b>Aktiver/deaktiver Kdump</b><br>\n"
 "    Aktivar eller deaktiver kdump. Oppstartsvalget crashkernel er lagd til/fjerna.\n"
-"    Maskina må startast på nytt for å aktivare endringane.<br>"
-"</p>"
-"\n"
+"    Maskina må startast på nytt for å aktivare endringane.<br></p>\n"
 
 #. Kdump Memor&y [MB] - IntField 1/1
 #: src/include/kdump/helps.rb:42
 #, fuzzy
 msgid ""
-"<p><b>Kdump Memory</b><br>"
-"\n"
-"    Allocation of memory for kdump kernel. <br>"
-"</p>"
-"\n"
+"<p><b>Kdump Memory</b><br>\n"
+"    Allocation of memory for kdump kernel. <br></p>\n"
 msgstr ""
-"<p><b>Kdump-minne</b><br>"
-"\n"
-"    Tilordnet minne for kdump-kjerne.<br>"
-"</p>"
-"\n"
+"<p><b>Kdump-minne</b><br>\n"
+"    Tilordnet minne for kdump-kjerne.<br></p>\n"
 
 #. T: help text for a combo box
 #. description taken from http://lparbox.com/how-to/aix/19
 #: src/include/kdump/helps.rb:46
 msgid ""
-"<p><b>Firmware-Assisted Dump</b><br>"
-"\n"
+"<p><b>Firmware-Assisted Dump</b><br>\n"
 "    Dumps are not generated before the partition is reinitialized but take place     when the partition is restarting. When performing a firmware-assisted dump,     system memory is frozen and the partition rebooted, which allows a new instance     of the operating system to dump data from the previous kernel crash.    This feature is suitable only when the system has more than 1.5 GB of memory.</p>"
 msgstr ""
 
@@ -913,33 +898,24 @@
 #: src/include/kdump/helps.rb:57
 #, fuzzy
 msgid ""
-"<p><b>Dump Level</b><br>"
-"\n"
+"<p><b>Dump Level</b><br>\n"
 "    Specify the type of necessary page for analysis.\n"
 "    Pages of the specified type are copied to dumpfile. \n"
-"    The page type marked in the following table is included. <br>"
-"</p>"
+"    The page type marked in the following table is included. <br></p>"
 msgstr ""
-"<p><b>Dumpnivå</b><br>"
-"\n"
+"<p><b>Dumpnivå</b><br>\n"
 "    Angje type for påkrevet side som skal analyserast.\n"
 "    Sider av angjeven type vert kopierte til dumpfilen. \n"
-"    Sidetypen angjeven i den følgjande tabellen er inkludert. <br>"
-"</p>"
+"    Sidetypen angjeven i den følgjande tabellen er inkludert. <br></p>"
 
 #. Dump Format - RadioButtons  1/1
 #: src/include/kdump/helps.rb:64
 msgid ""
-"<p><b>Dump Format</b><br>"
-"\n"
-"    <i>No Dump</i> - Only save the kernel log.<br>"
-"\n"
-"    <i>ELF Format</i> - Create dump file in the ELF format.<br>"
-"\n"
-"    <i>Compressed Format</i> - Compress dump data by each page with gzip.<br>"
-"\n"
-"    <i>LZO Compressed Format</i> - Slightly bigger files but much faster.<br>"
-"\n"
+"<p><b>Dump Format</b><br>\n"
+"    <i>No Dump</i> - Only save the kernel log.<br>\n"
+"    <i>ELF Format</i> - Create dump file in the ELF format.<br>\n"
+"    <i>Compressed Format</i> - Compress dump data by each page with gzip.<br>\n"
+"    <i>LZO Compressed Format</i> - Slightly bigger files but much faster.<br>\n"
 "</p>"
 msgstr ""
 
@@ -947,16 +923,11 @@
 #: src/include/kdump/helps.rb:72
 #, fuzzy
 msgid ""
-"<p><b>Saving Target for Kdump Image</b><br>"
-"\n"
-"    The target for saving kdump images. Select type of target for saving dumps.<br>"
-"</p>"
+"<p><b>Saving Target for Kdump Image</b><br>\n"
+"    The target for saving kdump images. Select type of target for saving dumps.<br></p>"
 msgstr ""
-"<p><b>Lagringsmål for Kdump-diskbilde</b><br>"
-"\n"
-"    Målet der kdump-diskbilder skal lagrast. Vel måltypen der dumper skal mælast.<br>"
-"</p>"
-" "
+"<p><b>Lagringsmål for Kdump-diskbilde</b><br>\n"
+"    Målet der kdump-diskbilder skal lagrast. Vel måltypen der dumper skal mælast.<br></p> "
 
 #. Dump Format - RadioButtons  2/7
 #: src/include/kdump/helps.rb:76
@@ -965,15 +936,12 @@
 "<p><b>Local Filestem</b> - Save kdump image in the local filesystem.\n"
 "    <i>Directory for Saving Dumps</i> - The path for saving kdump images.\n"
 "    Selecting directory for saving kdump images via dialog by pressing <i>Browse</i>\n"
-"    <br>"
-"</p>"
+"    <br></p>"
 msgstr ""
 "<p><b>Lokalt filsystem</b> – Lager kdump-bilete på det lokalet filsystemet.\n"
 "    <i>Katalog for lagring av dumper</i> – Stigen der kdump-bilete skal lagrast.\n"
 "    Val av katalog for lagring av kdump-bilete vigde dialogvindu ved å trykkja <i>Bla gjennom</i>\n"
-"    <br>"
-"</p>"
-" "
+"    <br></p> "
 
 #. Dump Format - RadioButtons  3/7
 #: src/include/kdump/helps.rb:83
@@ -984,16 +952,14 @@
 "    <i>Port</i> - The port number for connection.\n"
 "    <i>Directory on Server</i> - The path for saving kdump images.\n"
 "    <i>Enable Anonymous FTP</i> enables anonymous connection to server.\n"
-"    <i>User Name</i> for ftp connection. <i>Password</i> for ftp connection.<br>"
-"</p>"
+"    <i>User Name</i> for ftp connection. <i>Password</i> for ftp connection.<br></p>"
 msgstr ""
 "<p><b>FTP</b> – Lager kdump-bilete vigde FTP.\n"
 "    <i>Servernavn</i> – Namnet til ftp-serveren.\n"
 "    <i>Port</i> – Portnummeret  for sambandet.\n"
 "    <i>Katalog på servar</i> – Stigen der kdump-bilete skal lagrast.\n"
 "    <i>Aktivar anonym tilkobling</i> Aktiverer anonym tilkobling til serveren.\n"
-"    <i>Brukernavn</i> for ftp-tilkoblingen. <i>Passord</i> for ftp-tilkoblingen.<br>"
-"</p>"
+"    <i>Brukernavn</i> for ftp-tilkoblingen. <i>Passord</i> for ftp-tilkoblingen.<br></p>"
 
 #. Dump Format - RadioButtons  4/7
 #: src/include/kdump/helps.rb:92
@@ -1004,16 +970,13 @@
 "    <i>Port</i> - The port number for connection.\n"
 "    <i>Directory on Server</i> - The path for saving kdump images.\n"
 "    <i>User Name</i> for SSH connection.  \n"
-"    <i>Password</i> for SSH connection.<br>"
-"</p>"
-"\n"
+"    <i>Password</i> for SSH connection.<br></p>\n"
 msgstr ""
 "<p><b>SSH</b> – Lager kdump-diskbilde vigde SSH.\n"
 "    <i>Servernavn</i> – Namnet til serveren.\n"
 "    <i>Port</i> – Portnummeret for sambandet.\n"
 "    <i>Katalog på servar</i> – Filstien der kdump-diskbilder skal lagrast.\n"
-"    <i>Brukernavn</i> for ssh-sambandet.  <i>Passord</i> for ssh-sambandet.<br>"
-"</p>"
+"    <i>Brukernavn</i> for ssh-sambandet.  <i>Passord</i> for ssh-sambandet.<br></p>"
 
 #. Dump Format - RadioButtons  5/7
 #: src/include/kdump/helps.rb:101
@@ -1024,16 +987,13 @@
 "    <i>Port</i> - The port number for connection.\n"
 "    <i>Directory on Server</i> - The path for saving kdump images.\n"
 "    <i>User Name</i> for SSH connection.  \n"
-"    <i>Password</i> for SSH connection.<br>"
-"</p>"
-"\n"
+"    <i>Password</i> for SSH connection.<br></p>\n"
 msgstr ""
 "<p><b>SSH</b> – Lager kdump-diskbilde vigde SSH.\n"
 "    <i>Servernavn</i> – Namnet til serveren.\n"
 "    <i>Port</i> – Portnummeret for sambandet.\n"
 "    <i>Katalog på servar</i> – Filstien der kdump-diskbilder skal lagrast.\n"
-"    <i>Brukernavn</i> for ssh-sambandet.  <i>Passord</i> for ssh-sambandet.<br>"
-"</p>"
+"    <i>Brukernavn</i> for ssh-sambandet.  <i>Passord</i> for ssh-sambandet.<br></p>"
 
 #: src/include/kdump/helps.rb:109
 msgid ""
@@ -1048,13 +1008,11 @@
 msgid ""
 "<p><b>NFS</b> - Save kdump image on NFS.\n"
 "    <i>Server Name</i> - The name of nfs server.\n"
-"    <i>Directory on Server</i> - The path for saving kdump images.<br>"
-"</p>"
+"    <i>Directory on Server</i> - The path for saving kdump images.<br></p>"
 msgstr ""
 "<p><b>NFS</b> – Lager kdump-bilete på NFS.\n"
 "    <i>Servernavn</i> – Namnet til NFS-serveren.\n"
-"    <i>Katalog på servar</i> – Stigen der kdump-bilete skal lagrast.<br>"
-"</p>"
+"    <i>Katalog på servar</i> – Stigen der kdump-bilete skal lagrast.<br></p>"
 
 #. Dump Format - RadioButtons  7/7
 #: src/include/kdump/helps.rb:121
@@ -1065,16 +1023,14 @@
 "    <i>Exported Share</i> - The windows share name.\n"
 "    <i>Directory on Server</i> - The path for saving kdump images.\n"
 "    <i>Use Authentication</i> enables authenticated connection to server.\n"
-"    <i>User Name</i> for connection. <i>Password</i> for connection.<br>"
-"</p>"
+"    <i>User Name</i> for connection. <i>Password</i> for connection.<br></p>"
 msgstr ""
 "<p><b>CIFS</b> – Lager kdump-bilete vigde CIFS.\n"
 "    <i>Servernavn</b> – Namnet til serveren.\n"
 "    <i>Delt ressurs</i> – Namnet til windows-ressursen.\n"
 "    <i>Katalog på servar</i> – Stigen der kdump-bilete skal lagrast.\n"
 "    <i>Nytte autentisering</i> aktiverer brukerautentisering mot servar.\n"
-"    <i>Brukernavn</i> for sambandet. <i>Passord</i> for sambandet<br>"
-"</p>"
+"    <i>Brukernavn</i> for sambandet. <i>Passord</i> for sambandet<br></p>"
 
 #. Custom Kdump Kernel - TextEntry 1/1
 #: src/include/kdump/helps.rb:130
@@ -1082,25 +1038,21 @@
 msgid ""
 "<p><b>Custom Kdump Kernel</b> The user can enter the custom kernel.\n"
 "    The naming scheme is:<i>/boot/vmlinu[zx]-[.gz]</i>\n"
-"    Please enter only <i>kernel_string</i>.<br>"
-"</p>"
+"    Please enter only <i>kernel_string</i>.<br></p>"
 msgstr ""
 "<p><b>Tilpassa Kdump-kinna</b> Brukaren kan angje ein tilpassa kjerne.\n"
 "    Navnemønsteret er: <i>/boot/vmlinu[zx]-[.gz]</i>\n"
-"   Angje berre <i>kernel_string</i>.<br>"
-"</p>"
+"   Angje berre <i>kernel_string</i>.<br></p>"
 
 #. Kdump Command Line - TextEntry 1/1
 #: src/include/kdump/helps.rb:136
 #, fuzzy
 msgid ""
 "<p><b>Kdump Command Line</b>\n"
-"    Additional arguments passed to kexec. <br>"
-"</p>"
+"    Additional arguments passed to kexec. <br></p>"
 msgstr ""
 "<p><b>Kdump kommandolinje</b>\n"
-"    Tilleggsargumenter til kexec. <br>"
-"</p>"
+"    Tilleggsargumenter til kexec. <br></p>"
 
 #. Kdump Command Line Append - TextEntry 1/1
 #: src/include/kdump/helps.rb:140
@@ -1109,29 +1061,22 @@
 "<p><b>Kdump Command Line Append</b>\n"
 "    Set this option to _append_ values to the default command line string. \n"
 "    The string will be appended if the <i>Kdump Command Line</i>\n"
-"    is set. <br>"
-"</p>"
-"\n"
+"    is set. <br></p>\n"
 msgstr ""
-"<p><br>"
-"Kdump-kommandolinjetillegg</b>\n"
+"<p><br>Kdump-kommandolinjetillegg</b>\n"
 "    Dette tyder at verd vert _lagt til_ standardstrengen for kommandolinjen.\n"
 "    Strengen vert òg lagd til viss <i>Kdump-kommandolinje</i>\n"
-"    er definert. <br>"
-"</p>"
-"\n"
+"    er definert. <br></p>\n"
 
 #. Enable Immediate Reboot After Saving the Core - CheckBox 1/1
 #: src/include/kdump/helps.rb:147
 #, fuzzy
 msgid ""
 "<p><b>Enable Immediate Reboot After Saving the Core</b> - \n"
-"    Enable immediately reboot after saving the core in the kdump.<br>"
-"</p>"
+"    Enable immediately reboot after saving the core in the kdump.<br></p>"
 msgstr ""
 "<p><b>Aktivar umiddelbar omstart etter at kjernen er lagra</b> – \n"
-"    Aktivum umiddelbar omstart etter at kjernen er lagra i kdump.<br>"
-"</p>"
+"    Aktivum umiddelbar omstart etter at kjernen er lagra i kdump.<br></p>"
 
 #. Enable Delete Old Dump Images - CheckBox 1/1
 #: src/include/kdump/helps.rb:151
@@ -1139,13 +1084,11 @@
 msgid ""
 "<p><b>Enable Delete Old Dump Images</b> - \n"
 "    Enable Delete Old Dump Images. If the number of dump files in \n"
-"    <i>Number of Old Dumps</i> exceeds this number, older dumps are removed.<br>"
-"</p>"
+"    <i>Number of Old Dumps</i> exceeds this number, older dumps are removed.<br></p>"
 msgstr ""
 "<p><b>Aktiver sletting av gamle dumper</b> – \n"
 "    Aktivum sletting av gamle dumper. Viss mengda dumpfiler i \n"
-"    <i>Mengd gamle dumpfiler</i> overskrid dette talet, skal eldre dumpfiler fjernast.<br>"
-"</p>"
+"    <i>Mengd gamle dumpfiler</i> overskrid dette talet, skal eldre dumpfiler fjernast.<br></p>"
 
 #. Enable Copy Ke&rnel into the Dump Directory - CheckBox 1/1
 #: src/include/kdump/helps.rb:157
@@ -1155,16 +1098,13 @@
 "    If this option is selected, the kernel and the\n"
 "      debugging information (if installed) are copied into the dump\n"
 "      directory. The default is \"off\". It is useful to have\n"
-"      everything in place for debugging.<br>"
-"</p>"
-"\n"
+"      everything in place for debugging.<br></p>\n"
 msgstr ""
 "<p><b>Aktivar kopiering av kjerne til dump-katalog</b> – \n"
 "    Viss dette er val vil sleva kjernen samg\n"
 "      feilsøkingsinformasjon (viss installert) vert kopiert til dump-\n"
 "      katalogen.  Standardverdien er «av». Det er nyttig å aktivera\n"
-"      alle feilsøkingsfunksjoner.<br>"
-"</p>"
+"      alle feilsøkingsfunksjoner.<br></p>"
 
 #. SMTP Server
 #: src/include/kdump/helps.rb:165
@@ -1177,8 +1117,7 @@
 #, fuzzy
 msgid ""
 "<p><b>User Name</b> for SMTP authetication when <i>SMTP Server</i> is\n"
-"  set. This is optional. If you do not specifiy a username and password, plain SMTP will be used.</p>"
-"\n"
+"  set. This is optional. If you do not specifiy a username and password, plain SMTP will be used.</p>\n"
 msgstr ""
 "<p><b>Brukernavn</b> for SMTP-autentisering viss <i>SMTP-servar</i> er vald. Dette er valfritt,\n"
 "  og utan brukernavn/passord vil enkel SMTP brukast.</p>"
@@ -1188,8 +1127,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Password</b> for SMTP authetication when <i>SMTP Server</i> is set. This\n"
-"  is optional. If you do not specify a username and password, plain SMTP will be used.</p>"
-"\n"
+"  is optional. If you do not specify a username and password, plain SMTP will be used.</p>\n"
 msgstr ""
 "<p><b>Passord</b> for SMTP-autentisering viss <i>SMTP-servar</i> er valt. Dette er valfritt,\n"
 "  og utan brukernavn/passord vil enkel SMTP brukast.</p>"
@@ -1197,9 +1135,7 @@
 #. Notification To (email addresses)
 #: src/include/kdump/helps.rb:177
 #, fuzzy
-msgid ""
-"<p><b>Notification To</b> Specify the email address to which a notification email will be sent when a dump has been saved.</p>"
-"\n"
+msgid "<p><b>Notification To</b> Specify the email address to which a notification email will be sent when a dump has been saved.</p>\n"
 msgstr ""
 "<p><b>Varsling til</b> e-postadressen til han som skal varslast når ei dump er\n"
 "  lagra.</p>"
@@ -1209,8 +1145,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Notification CC</b> Specify a list of space-separated email addresses to\n"
-" which a notification email will be sent via cc if a dump has been saved.</p>"
-"\n"
+" which a notification email will be sent via cc if a dump has been saved.</p>\n"
 msgstr ""
 "<p><b>Varslingskopi</b> er ei liste over e-postadresser, adskilt av mellomrom, dit kopiar av varslingen\n"
 " skal sendast via e-post når ei dump er lagra.</p>"
@@ -1227,161 +1162,115 @@
 #: src/include/kdump/helps.rb:189
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing Kdump Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Initializing Kdump Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Initialiserer oppsett av Kdump</big></b><br>"
-"\n"
-"Vennligst vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer oppsett av Kdump</big></b><br>\n"
+"Vennligst vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/kdump/helps.rb:193
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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 avbryta oppsettsverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
+"Du kan trygt avbryta oppsettsverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/kdump/helps.rb:197
 #, fuzzy
 msgid ""
-"<p><b><big>Saving Kdump Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Saving Kdump Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Lagrar oppsett av Kdump</big></b><br>"
-"\n"
-"Vennligst vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar oppsett av Kdump</big></b><br>\n"
+"Vennligst vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/kdump/helps.rb:201
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryt lagring:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Summary dialog help 1/3
 #: src/include/kdump/helps.rb:208
 #, fuzzy
 msgid ""
-"<p><b><big>Kdump Configuration</big></b><br>"
-"\n"
-"Configure kdump here.<br>"
-"</p>"
-"\n"
+"<p><b><big>Kdump Configuration</big></b><br>\n"
+"Configure kdump here.<br></p>\n"
 msgstr ""
-"<p><b><big>Oppset av Kdump</big></b><br>"
-"\n"
-"Sett opp kdump her.<br>"
-"</p>"
-"\n"
+"<p><b><big>Oppset av Kdump</big></b><br>\n"
+"Sett opp kdump her.<br></p>\n"
 
 #. Summary dialog help 2/3
 #: src/include/kdump/helps.rb:212
 #, fuzzy
 msgid ""
-"<p><b><big>Adding a Kdump:</big></b><br>"
-"\n"
+"<p><b><big>Adding a Kdump:</big></b><br>\n"
 "Choose an kdump from the list of detected kdumps.\n"
 "If your kdump was not detected, select <b>Other (not detected)</b>.\n"
-"Then press <b>Configure</b>.</p>"
-"\n"
+"Then press <b>Configure</b>.</p>\n"
 msgstr ""
-"<p><b><big>Legg til Kdump:</big></b><br>"
-"\n"
+"<p><b><big>Legg til Kdump:</big></b><br>\n"
 "Vel ein kdump frå lista over registrerte kdump.\n"
 "Viss ein kdump ikkje er registrert, nytte <b>Andre (ikkje registrerte)</b>.\n"
-"Klikk deretter <b>Sett opp</b>.</p>"
-"\n"
+"Klikk deretter <b>Sett opp</b>.</p>\n"
 
 #. Summary dialog help 3/3
 #: src/include/kdump/helps.rb:219
 #, fuzzy
 msgid ""
-"<p><b><big>Editing or Deleting:</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting:</big></b><br>\n"
 "If you press <b>Edit</b>, an additional dialog in which to change\n"
-"the configuration opens.</p>"
-"\n"
+"the configuration opens.</p>\n"
 msgstr ""
-"<p><b><big>Redigera eller slette:</big></b><br>"
-"\n"
+"<p><b><big>Redigera eller slette:</big></b><br>\n"
 "Viss du klikkar <b>Rediger</b>, får du opp ein ny dialog der\n"
-"du kan endra oppsettet.</p>"
-"\n"
+"du kan endra oppsettet.</p>\n"
 
 #. Ovreview dialog help 1/3
 #: src/include/kdump/helps.rb:225
 #, fuzzy
 msgid ""
-"<p><b><big>Kdump Configuration Overview</big></b><br>"
-"\n"
+"<p><b><big>Kdump Configuration Overview</big></b><br>\n"
 "Obtain an overview of installed kdumps. Additionally\n"
-"edit their configurations.<br>"
-"</p>"
-"\n"
+"edit their configurations.<br></p>\n"
 msgstr ""
-"<p><b><big>Oversyn over Kdump-oppsett</big></b><br>"
-"\n"
+"<p><b><big>Oversyn over Kdump-oppsett</big></b><br>\n"
 "Her finn du eit oversyn over installerte dumper. Du kan òg\n"
-"redigera oppsetta.<br>"
-"</p>"
-"\n"
+"redigera oppsetta.<br></p>\n"
 
 #. Ovreview dialog help 2/3
 #: src/include/kdump/helps.rb:231
 #, fuzzy
 msgid ""
-"<p><b><big>Adding a Kdump:</big></b><br>"
-"\n"
+"<p><b><big>Adding a Kdump:</big></b><br>\n"
 "Press <b>Add</b> to configure a kdump.</p>"
 msgstr ""
-"<p><b><big>Leggja til ein Kdump:</big></b><br>"
-"\n"
+"<p><b><big>Leggja til ein Kdump:</big></b><br>\n"
 "Trykk på <b>Legg til</b> for å setja opp ein kdump.</p>"
 
 #. Ovreview dialog help 3/3
 #: src/include/kdump/helps.rb:235
 #, fuzzy
 msgid ""
-"<p><b><big>Editing or Deleting:</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting:</big></b><br>\n"
 "Choose a kdump to change or remove.\n"
-"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>"
-"\n"
+"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
 msgstr ""
-"<p><b><big>Rediger eller slett:</big></b><br>"
-"\n"
+"<p><b><big>Rediger eller slett:</big></b><br>\n"
 "Vel ein kdump du vil endra eller sletta.\n"
-"Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter ønske.</p>"
-"\n"
+"Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter ønske.</p>\n"
 
 #. definition UI terms for saveing dump target
 #.
@@ -1481,172 +1370,187 @@
 #. several ranges and ask user about rewritting
 #.
 #. "KdumpMemory"
-#: src/include/kdump/uifunctions.rb:1449
+#: src/include/kdump/uifunctions.rb:1454
 #, fuzzy
 msgid "Kernel option includes several ranges or redundant values. Rewrite it?"
 msgstr "Kjernevalget inkluderer fleire område. Vil du lagra på nytt?"
 
 #. T: Checkbox label
-#: src/include/kdump/uifunctions.rb:1482
+#: src/include/kdump/uifunctions.rb:1487
 msgid "Use &Firmware-Assisted Dump"
 msgstr ""
 
+#. Function validates options in
+#. "Dump Format"
+#. install makedumpfile if KDUMP_DUMPFORMAT == "compressed"
+#: src/include/kdump/uifunctions.rb:1849
+msgid ""
+"Kdump is not supported on this system.\n"
+"If you continue now, the module may not function properly.\n"
+"For example, some settings will not be correctly read\n"
+"and the resulting configuration will probably be useless.\n"
+msgstr ""
+
+#: src/include/kdump/uifunctions.rb:1855
+msgid "Kdump not supported"
+msgstr ""
+
 #. See FATE#315780
 #. See https://www.suse.com/support/kb/doc.php?id=7012786
 #. FIXME what about dracut?
-#: src/modules/Kdump.rb:412
+#: src/modules/Kdump.rb:398
 msgid ""
 "Error updating initrd while calling '%{cmd}'.\n"
 "See %{log} for details."
 msgstr ""
 
 #. Kdump read dialog caption
-#: src/modules/Kdump.rb:514
+#: src/modules/Kdump.rb:506
 #, fuzzy
 msgid "Initializing kdump Configuration"
 msgstr "Initialiserer kdump-oppsett"
 
 #. Progress stage 1/4
 #. Progress step 1/4
-#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531
+#: src/modules/Kdump.rb:515 src/modules/Kdump.rb:523
 #, fuzzy
 msgid "Reading the config file..."
 msgstr "Lesar oppsettsfil …"
 
 #. Progress stage 3/4
-#: src/modules/Kdump.rb:525
+#: src/modules/Kdump.rb:517
 #, fuzzy
 msgid "Reading kernel boot options..."
 msgstr "Les oppstartsvalg for kjernen …"
 
 #. Progress stage 4/4
-#: src/modules/Kdump.rb:527
+#: src/modules/Kdump.rb:519
 msgid "Calculating memory limits..."
 msgstr ""
 
 #. Progress step 2/4
-#: src/modules/Kdump.rb:533
+#: src/modules/Kdump.rb:525
 #, fuzzy
 msgid "Reading partitions of disks..."
 msgstr "Les diskane sine partisjoner …"
 
 #. Progress finished 3/4
-#: src/modules/Kdump.rb:535
+#: src/modules/Kdump.rb:527
 #, fuzzy
 msgid "Reading available memory and calibrating usage..."
 msgstr "Les tilgjengeleg minne …"
 
 #. Error message
-#: src/modules/Kdump.rb:547
+#: src/modules/Kdump.rb:539
 #, fuzzy
 msgid "Cannot read config file /etc/sysconfig/kdump"
 msgstr "Kan ikkje lesa oppsettsfilen /etc/sysconfig/kdump"
 
 #. Error message
-#: src/modules/Kdump.rb:555
+#: src/modules/Kdump.rb:547
 #, fuzzy
 msgid "Cannot read kernel boot options."
 msgstr "Kan ikkje lesa oppstartsvalg for kjerne."
 
 #. Error message
-#: src/modules/Kdump.rb:563
+#: src/modules/Kdump.rb:555
 #, fuzzy
 msgid "Cannot read available memory."
 msgstr "Kan ikkje lesa tilgjengeleg minne."
 
 #. Kdump read dialog caption
-#: src/modules/Kdump.rb:589
+#: src/modules/Kdump.rb:581
 #, fuzzy
 msgid "Saving kdump Configuration"
 msgstr "Lagrar kdump-oppsett"
 
 #. Progress stage 1/2
-#: src/modules/Kdump.rb:618
+#: src/modules/Kdump.rb:610
 #, fuzzy
 msgid "Write the settings"
 msgstr "Lagre innstillingane"
 
 #. Progress stage 2/2
-#: src/modules/Kdump.rb:620
+#: src/modules/Kdump.rb:612
 #, fuzzy
 msgid "Update boot options"
 msgstr "Oppdater oppstartsvalg"
 
 #. Progress step 1/2
-#: src/modules/Kdump.rb:624
+#: src/modules/Kdump.rb:616
 #, fuzzy
 msgid "Writing the settings..."
 msgstr "Lagrar innstillingane …"
 
 #. Progress step 2/2
-#: src/modules/Kdump.rb:626
+#: src/modules/Kdump.rb:618
 #, fuzzy
 msgid "Updating boot options..."
 msgstr "Oppdaterer oppstartsvalg …"
 
 #. Progress finished
-#: src/modules/Kdump.rb:628
+#: src/modules/Kdump.rb:620
 #, fuzzy
 msgid "Finished"
 msgstr "Fullført"
 
 #. Error message
-#: src/modules/Kdump.rb:638
+#: src/modules/Kdump.rb:630
 #, fuzzy
 msgid "Cannot write settings."
 msgstr "Kan ikkje lagra innstillingane."
 
 #. Error message
-#: src/modules/Kdump.rb:647
+#: src/modules/Kdump.rb:639
 #, fuzzy
 msgid "Adding crashkernel parameter to bootloader fault."
 msgstr "Legger til crashkernel-parameter for oppstartslasterfeil."
 
 #. Create a textual summary
 #. @return summary of the current configuration
-#: src/modules/Kdump.rb:758
+#: src/modules/Kdump.rb:750
 #, fuzzy
 msgid "Kdump status: %1"
 msgstr "Kdump-status: %1"
 
-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:751
 #, fuzzy
 msgid "enabled"
 msgstr "aktivert"
 
-#: src/modules/Kdump.rb:759
+#: src/modules/Kdump.rb:751
 #, fuzzy
 msgid "disabled"
 msgstr "deaktivert"
 
-#: src/modules/Kdump.rb:766
+#: src/modules/Kdump.rb:758
 #, fuzzy
 msgid "Value(s) of crashkernel option: %1"
 msgstr "Verd for crashkernel-val: %1"
 
-#: src/modules/Kdump.rb:773
+#: src/modules/Kdump.rb:765
 #, fuzzy
 msgid "Dump format: %1"
 msgstr "Dump-format: %1"
 
-#: src/modules/Kdump.rb:780
+#: src/modules/Kdump.rb:772
 #, fuzzy
 msgid "Target of dumps: %1"
 msgstr "Dump-mål: %1"
 
-#: src/modules/Kdump.rb:787
+#: src/modules/Kdump.rb:779
 #, fuzzy
 msgid "Number of dumps: %1"
 msgstr "Mengd dumpar: %1"
 
 #. TRANSLATORS: warning message in installation proposal,
 #. do not translate %{requested} and %{available} - they are replaced with actual sizes later
-#: src/modules/Kdump.rb:879
+#: src/modules/Kdump.rb:871
 msgid "Warning! There might not be enough free space. %{required} required, but only %{available} are available."
 msgstr ""
 
 #. Trying to use fadump on unsupported hardware
-#: src/modules/Kdump.rb:974
+#: src/modules/Kdump.rb:958
 msgid ""
 "Cannot use Firmware-assisted dump.\n"
 "It is not supported on this hardware."
@@ -1674,18 +1578,13 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b>Dump Format</b><br>"
-#~ "\n"
+#~ "<p><b>Dump Format</b><br>\n"
 #~ "    <i>Compressed Format</i> - Compress dump data by each page.\n"
-#~ "    <i>ELF Format</i> - Create dumpfile in the ELF format<br>"
-#~ "</p>"
+#~ "    <i>ELF Format</i> - Create dumpfile in the ELF format<br></p>"
 #~ msgstr ""
-#~ "<p><b>Dumpformat</b><br>"
-#~ "\n"
+#~ "<p><b>Dumpformat</b><br>\n"
 #~ "    <i>Komprimert format</i> – Komprimer dumpdata etter kvar side.\n"
-#~ "    <i>ELF-format</i> – Opprett dumpfil i ELF-format<br>"
-#~ "</p>"
-#~ " "
+#~ "    <i>ELF-format</i> – Opprett dumpfil i ELF-format<br></p> "
 
 #, fuzzy
 #~ msgid "Unsupported architecture, \"crashkernel\" was not added"

Modified: branches/plus-SLE12-SP2/yast/nn/po/languages_db.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/languages_db.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/languages_db.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2011-06-05 00:27+0200\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: Norwegian Nynorsk \n"

Modified: branches/plus-SLE12-SP2/yast/nn/po/ldap-client.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/ldap-client.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/ldap-client.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -46,24 +46,20 @@
 #, fuzzy
 msgid ""
 "<p>Configure the template used for creating \n"
-"new objects (like users or groups).</p>"
-"\n"
+"new objects (like users or groups).</p>\n"
 msgstr ""
 "<p>Her konfigurerer du malen som skal brukast ved\n"
-"oppretting av nye objekt (som brukarar eller grupper).</p>"
-"\n"
+"oppretting av nye objekt (som brukarar eller grupper).</p>\n"
 
 #. help text 2/3
 #: src/ui.rb:172
 #, fuzzy
 msgid ""
 "<p>Edit the template attribute values with <b>Edit</b>.\n"
-"Changing the <b>cn</b> value renames the template.</p>"
-"\n"
+"Changing the <b>cn</b> value renames the template.</p>\n"
 msgstr ""
 "<p>Nytte <b>Rediger</b> for å redigera malen sin attributtverdier.\n"
-"Malen får nytt namn når <b>cn</b>-verdet vert endra.</p>"
-"\n"
+"Malen får nytt namn når <b>cn</b>-verdet vert endra.</p>\n"
 
 #. help text 3/3
 #: src/ui.rb:176
@@ -71,13 +67,11 @@
 msgid ""
 "<p>The second table contains a list of <b>default values</b> used\n"
 "for new objects. Modify the list by adding new values, editing or\n"
-"removing current ones.</p>"
-"\n"
+"removing current ones.</p>\n"
 msgstr ""
 "<p>Den andre tabellen inneheld ei liste over <b>standardverdier</b> som vert nytta\n"
 "for nye objekt. Du kan endra lista ved å leggja til nye verd og redigera eller\n"
-"sletta eksisterande.</p>"
-"\n"
+"sletta eksisterande.</p>\n"
 
 #. table header 1/2
 #. table header 1/2
@@ -159,14 +153,12 @@
 "<p>Each configuration set is called a \"configuration module.\" If there\n"
 "is no configuration module in the provided location (base configuration),\n"
 "create one with <b>New</b>. Delete the current module\n"
-"using <b>Delete</b>.</p>"
-"\n"
+"using <b>Delete</b>.</p>\n"
 msgstr ""
 "<p>Kvart konfigurasjonssett vert kalla ein konfigurasjonsmodul. Viss det ikkje\n"
 "er nokon konfigurasjonsmodul i angjeven plassering (basekonfigurasjon),\n"
 " opprettar du ein med <b>Ny</b>. Gjeldande modul vert sletta\n"
-" med <b>Slett</b>.</p>"
-"\n"
+" med <b>Slett</b>.</p>\n"
 
 #. helptext 3/4
 #: src/ui.rb:449
@@ -174,13 +166,11 @@
 msgid ""
 "<p>Edit the values of attributes in the table with <b>Edit</b>.\n"
 "Some values have special meanings, for example, changing the <b>cn</b> value renames the\n"
-"current module.</p>"
-"\n"
+"current module.</p>\n"
 msgstr ""
 "<p>Rediger attributtverdiene i tabellen med <b>Rediger</b>.\n"
 "Nokre verd har spesielle tydingar. Ved å endra <b>cn</b>-verdet endrar du til dømes namn på\n"
-"gjeldande modul.</p>"
-"\n"
+"gjeldande modul.</p>\n"
 
 #. helptext 4/4
 #: src/ui.rb:455
@@ -188,13 +178,11 @@
 msgid ""
 "<p>To configure the default template of the current module,\n"
 "click <b>Configure Template</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>For å konfigurera standardmalen for gjeldande modul,\n"
 "klikk <b>Konfigurer mal</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. combobox label
 #: src/ui.rb:535
@@ -357,13 +345,10 @@
 #~ "er kopiert til katalogen '%2'"
 
 #, fuzzy
-#~ msgid ""
-#~ "<p>Set up your machine as an LDAP client.</p>"
-#~ "\n"
+#~ msgid "<p>Set up your machine as an LDAP client.</p>\n"
 #~ msgstr ""
 #~ "<p>Her kan datamaskina konfigurerast som ein \n"
-#~ "LDAP-klient.</p>"
-#~ "\n"
+#~ "LDAP-klient.</p>\n"
 
 #, fuzzy
 #~ msgid "<p>To authenticate your users with an OpenLDAP server, select <b>Use LDAP</b>. NSS and PAM will be configured accordingly.</p>"
@@ -394,14 +379,12 @@
 #~ "<p>Enter the LDAP server's address (such as ldap.example.com or 10.20.0.2) in <b>Addresses</b> and the distinguished name of the search base (<b>Base DN</b>, such as dc=example,dc=com). Specify multiple servers\n"
 #~ "by separating their addresses with spaces. It must be possible to resolve the\n"
 #~ "addresses without using LDAP. You can also specify the port on which the server is running using the syntax \"server:port\", for example, <tt>ldap.example.com:379</tt>.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
 #~ "<p>Angje LDAP-serverens adresse (t.d. ldap.døme.com eller 10.20.0.2) i <b>Adresser</b> og det unike namnet på søkebasen (<b>DN for base</b>, t.d. dc=døme,dc=com). Angje fleire servera ved å\n"
 #~ "skilja adressene med mellomrom. Det må vera mogleg å løysa\n"
 #~ " adressene utan å bruka LDAP. Du kan òg angje porten serveren køyrar på med syntaksen <b>servar:port</b>, til dømes <tt>ldap.døme.com:379</tt>.\n"
-#~ " </p>"
-#~ "\n"
+#~ " </p>\n"
 
 #, fuzzy
 #~ msgid "<p>With <b>Find</b>, select the LDAP server from the list provided by the service location protocol (SLP). Using <b>Fetch DN</b>, read the base DN from server.</p>"
@@ -412,42 +395,35 @@
 #~ "<p>Some LDAP servers support StartTLS (RFC2830).\n"
 #~ "If your server supports it and it is configured, activate <b>LDAP TLS/SSL</b>\n"
 #~ "to encrypt your communication with the LDAP server. You may download a CA\n"
-#~ "certificate file in PEM format from a given URL.</p>"
-#~ "\n"
+#~ "certificate file in PEM format from a given URL.</p>\n"
 #~ msgstr ""
 #~ "<p>Nokre LDAP-servera støttar StartTLS (RFC2830).\n"
 #~ "Viss serveren støttar dette og er sett opp, aktivum <b>LDAP TLS/SSL</b>\n"
-#~ "for å kryptera kommunikasjonen med LDAP-serveren. Du kan lasta ned CA-sertifikatsfilen i PEM-format frå den angjevne nettadressen.</p>"
-#~ "\n"
+#~ "for å kryptera kommunikasjonen med LDAP-serveren. Du kan lasta ned CA-sertifikatsfilen i PEM-format frå den angjevne nettadressen.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>To configure advanced LDAP settings, click\n"
-#~ "<b>Advanced Configuration</b>.</p>"
-#~ "\n"
+#~ "<b>Advanced Configuration</b>.</p>\n"
 #~ "<p>To configure security settings, click\n"
-#~ "<b>SSL/TLS Configuration</b>.</p>"
-#~ "\n"
+#~ "<b>SSL/TLS Configuration</b>.</p>\n"
 #~ msgstr ""
 #~ "<p>Klikk\n"
-#~ "<b>Avansert konfigurasjon</b> for å konfigurera avanserte LDAP-innstillingar.</p>"
-#~ "\n"
+#~ "<b>Avansert konfigurasjon</b> for å konfigurera avanserte LDAP-innstillingar.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p><b>Automounter</b> is a daemon that automatically mounts directories, such\n"
 #~ "as users' home directories. Its configuration files (auto.*) should already\n"
 #~ "exist locally or over LDAP. If the automounter is not installed yet but you\n"
-#~ "want to use it, it will be installed automatically.</p>"
-#~ "\n"
+#~ "want to use it, it will be installed automatically.</p>\n"
 #~ msgstr ""
 #~ "<p>Automounter er ein nisse som automatisk monterer katalogar,\n"
 #~ "til dømes brukaren sin hjemmekataloger.\n"
 #~ "Det vert at føresett nissen sin konfigurasjonsfiler (auto.*) allereie finst,\n"
 #~ "anten lokalt eller vigt LDAP.\n"
 #~ "Viss han er ikkje installert og du ynskjer å bruka henne, vert han installert\n"
-#~ "automatisk.</p>"
-#~ "\n"
+#~ "automatisk.</p>\n"
 
 #, fuzzy
 #~ msgid "Start Auto&mounter"
@@ -579,13 +555,11 @@
 #~ msgid ""
 #~ "<p>If Kerberos authentication should be used, specify the <b>realm</b> and <b>KDC Address</b>.\n"
 #~ "Determine if user credentials should be cached locally by checking <b>SSSD Offline Authentication</b>.\n"
-#~ "For more info about SSSD settings, check the man page of <tt>sssd.conf</tt>.</p>"
-#~ "\n"
+#~ "For more info about SSSD settings, check the man page of <tt>sssd.conf</tt>.</p>\n"
 #~ msgstr ""
 #~ "<p>Viss Kerberos-autentisering skal nyttast, angje ein <b>region</b> og ein <b>KDC-adresse</b>.\n"
 #~ "Vel at brukerrettigheter skal mellomlagres lokalt ved å kryssa av for <b> Lokal SSSD-autentisering</b>.\n"
-#~ "Du finn meir informasjon om SSSD-innstillingar, på manualsiden <tt>sssd.conf</tt>.</p>"
-#~ "\n"
+#~ "Du finn meir informasjon om SSSD-innstillingar, på manualsiden <tt>sssd.conf</tt>.</p>\n"
 
 #, fuzzy
 #~ msgid ""
@@ -596,12 +570,10 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>Set the type of LDAP groups to use.\n"
-#~ "The default value for <b>Group Member Attribute</b> is <i>%1</i>.</p>"
-#~ "\n"
+#~ "The default value for <b>Group Member Attribute</b> is <i>%1</i>.</p>\n"
 #~ msgstr ""
 #~ "<p>Angje typen LDAP-grupper som skal brukast.\n"
-#~ "Standardverdien for <b>Gruppemedlemattributt</b> er <i>%1</i>.</p>"
-#~ "\n"
+#~ "Standardverdien for <b>Gruppemedlemattributt</b> er <i>%1</i>.</p>\n"
 
 #, fuzzy
 #~ msgid ""
@@ -618,59 +590,49 @@
 #~ msgid ""
 #~ "<p>First, set <b>Configuration Base DN</b>.\n"
 #~ "This is the base for storing your configuration data on the LDAP\n"
-#~ "server.</p>"
-#~ "\n"
+#~ "server.</p>\n"
 #~ msgstr ""
 #~ "<p>Gå først til <b>Konfigurasjon av hoved-DN</b>.\n"
 #~ "Dette er ein database for lagring av konfigurasjonsinformasjonen på LDAP-\n"
-#~ "serveren.</p>"
-#~ "\n"
+#~ "serveren.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>To access the data stored on the server, enter the\n"
 #~ "<b>Administrator DN</b>.\n"
 #~ "You can enter the full DN (for example, cn=Administrator,dc=mydomain,dc=com) or \n"
-#~ "the relative DN (for example, cn=Administrator). The LDAP base DN is appended automatically if the appropriate option is checked.</p>"
-#~ "\n"
+#~ "the relative DN (for example, cn=Administrator). The LDAP base DN is appended automatically if the appropriate option is checked.</p>\n"
 #~ msgstr ""
 #~ "<p>Angje <b>DN for Administrator</b> for å få tilgjenge til dataa som er lagra på serveren.\n"
 #~ " Du kan bruka det fullstendige unike namnet (til dømes cn=Administrator,dc=mittdomene,dc=com)\n"
-#~ " eller bara det lokale unike namnet (til dømes cn=Administrator). DN for LDAP-basen vert til lagd automatisk viss det er merkt av for det aktuelle alternativet.</p>"
-#~ "\n"
+#~ " eller bara det lokale unike namnet (til dømes cn=Administrator). DN for LDAP-basen vert til lagd automatisk viss det er merkt av for det aktuelle alternativet.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>To create the default configuration objects for LDAP users and groups,\n"
-#~ "check <b>Create Default Configuration Objects</b>. The objects are only created when they do not already exist.</p>"
-#~ "\n"
+#~ "check <b>Create Default Configuration Objects</b>. The objects are only created when they do not already exist.</p>\n"
 #~ msgstr ""
 #~ "<p>For å oppretta standard konfigurasjonsobjekter for for LDAP-brukarar og -grupper,\n"
-#~ "kryss av for <b>Opprett standard konfigurasjonsobjekter</b>. Objekta må eksistera for å kunne opprettast.</p>"
-#~ "\n"
+#~ "kryss av for <b>Opprett standard konfigurasjonsobjekter</b>. Objekta må eksistera for å kunne opprettast.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>Press <b>Configure</b> to configure settings stored on the\n"
 #~ "LDAP server. You will be asked for the password if you are not connected yet or\n"
-#~ "have changed your configuration.</p>"
-#~ "\n"
+#~ "have changed your configuration.</p>\n"
 #~ msgstr ""
 #~ "<p>Klikk <b>Konfigurer</b> for å konfigurera innstillingar som er lagra på\n"
 #~ "LDAP-serveren. Du vil vart beden om passord viss du ikkje er tilkoplet enno,\n"
-#~ "eller viss konfigurasjonen din er endra.</p>"
-#~ "\n"
+#~ "eller viss konfigurasjonen din er endra.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>Specify the search bases to use for specific maps (users or groups) if they are different from the base DN. These values are\n"
-#~ "set to the ldap_user_search_base, ldap_group_search_base and ldap_autofs_search_base attributes in /etc/sssd/sssd.conf file.</p>"
-#~ "\n"
+#~ "set to the ldap_user_search_base, ldap_group_search_base and ldap_autofs_search_base attributes in /etc/sssd/sssd.conf file.</p>\n"
 #~ msgstr ""
 #~ "<p>Spesifiser søkebasene som skal brukast for spesifikke kart (brukarar, passord og grupper) viss dei avvik frå basis-DN. Desse verda\n"
 #~ "vert nytta for attributta nss_basa_passwd, nss_basa_shadow og nss_basa_group attributes\n"
-#~ "i fila /etc/ldap.conf.</p>"
-#~ "\n"
+#~ "i fila /etc/ldap.conf.</p>\n"
 
 #, fuzzy
 #~ msgid "C&lient Settings"
@@ -1081,24 +1043,18 @@
 #~ "possible values to use for the current attribute.\n"
 #~ "If the value of the edited attribute should be a distinguished name (DN),\n"
 #~ "it is possible to choose it from the LDAP tree using <b>Browse</b>.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
 #~ "<p>Viss attributtet kan ha fleire verd, legg du til nye oppføringer\n"
 #~ " med <b>Legg til verd</b>. Iblant inneheld knappen lista over\n"
 #~ " moglege verd som kan brukast for gjeldande attributt.\n"
 #~ " Viss verdet av det redigerte attributtet skulle vera eit unikt namn (DN),\n"
 #~ " er det mogleg å velja det frå LDAP-treet ved hjelp av <b>Bla gjennom</b>.\n"
-#~ " </p>"
-#~ "\n"
+#~ " </p>\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "<p>The description of attribute \"%1\":<br>"
-#~ "</p>"
-#~ msgstr ""
-#~ "<p>Skildring av attributtet \"%1\":<br>"
-#~ "</p>"
+#~ msgid "<p>The description of attribute \"%1\":<br></p>"
+#~ msgstr "<p>Skildring av attributtet \"%1\":<br></p>"
 
 #, fuzzy
 #~ msgid "&Value of \"%1\" Attribute"
@@ -1156,27 +1112,23 @@
 #~ 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"
+#~ "the new object is created.</p>\n"
 #~ msgstr ""
 #~ "<p>Her kan du definera verd for attributt for\n"
 #~ "eit objekt som brukar gjeldande mal. Slike verd vert brukte som standardinnstillinger når\n"
-#~ "det nye objektet vert oppretta.</p>"
-#~ "\n"
+#~ "det nye objektet vert oppretta.</p>\n"
 
 #, fuzzy
 #~ 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"
+#~ "as a value of \"homeDirectory\").</p>\n"
 #~ msgstr ""
 #~ "<p>Du kan bruka ein spesiell syntaks for å oppretta\n"
 #~ "attributtverdier frå eksisterande verd. Uttrykt <i>%attr_name</i> vil erstattast\n"
 #~ "av verdet for attributtet \"attr_name\" (bruk til dømes \"/home/%uid\"\n"
-#~ "som verd for \"homeDirectory\").</p>"
-#~ "\n"
+#~ "som verd for \"homeDirectory\").</p>\n"
 
 #, fuzzy
 #~ msgid "Attribute &Name"
@@ -1224,9 +1176,7 @@
 
 #, fuzzy
 #~ msgid "<p>Select whether the password quality should be verified while passwords are modified or added. Select <b>No Checking</b> if passwords should not be checked at all. With <b>Accept Uncheckable Passwords</b>, passwords are accepted even if the check cannot be performed, for example, if the user has provided an encrypted password. With <b>Only Accept Checked Passwords</b> passwords are refused if the quality test fails or the password cannot be checked.</p>"
-#~ msgstr ""
-#~ "<p>Vel om passordkvaliteten skal kontrollerast når passord vert endra eller vert oppretta. Vel <b>Ingen kontroll</b> viss det ikkje skal gjerast kontroll av passord. Med <b>Godta passord som ikkje kan kontrollerast</b> godtakast passord sjølv om kontrollen ikkje kan utførast, til dømes viss brukaren har angjeve eit kryptert passord. Med <b>Godta berre kontrollerte passord</b> avvisast passord viss kvalitetskontrollen mislukkast eller passordet ikkje kan kontrollerast."
-#~ "<p>"
+#~ msgstr "<p>Vel om passordkvaliteten skal kontrollerast når passord vert endra eller vert oppretta. Vel <b>Ingen kontroll</b> viss det ikkje skal gjerast kontroll av passord. Med <b>Godta passord som ikkje kan kontrollerast</b> godtakast passord sjølv om kontrollen ikkje kan utførast, til dømes viss brukaren har angjeve eit kryptert passord. Med <b>Godta berre kontrollerte passord</b> avvisast passord viss kvalitetskontrollen mislukkast eller passordet ikkje kan kontrollerast.<p>"
 
 #, fuzzy
 #~ msgid "Set the minimum number of characters that must be used in a password in <b>Minimum Password Length</b>.</p>"
@@ -1367,34 +1317,28 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>Here, your machine can be set up as an\n"
-#~ "LDAP client.</p>"
-#~ "\n"
+#~ "LDAP client.</p>\n"
 #~ msgstr ""
 #~ "<p>Her kan datamaskina konfigurerast som ein \n"
-#~ "LDAP-klient.</p>"
-#~ "\n"
+#~ "LDAP-klient.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>Some LDAP servers support StartTLS (RFC2830).\n"
 #~ "If your server supports it and it is configured, activate <b>LDAP TLS/SSL</b>\n"
-#~ "to encrypt your communication with the LDAP server. You may download CA certificate file in PEM format from given URL.</p>"
-#~ "\n"
+#~ "to encrypt your communication with the LDAP server. You may download CA certificate file in PEM format from given URL.</p>\n"
 #~ msgstr ""
 #~ "<p>Nokre LDAP-servera støttar StartTLS (RFC2830).\n"
 #~ "Viss serveren støttar dette og er sett opp, aktivum <b>LDAP TLS/SSL</b>\n"
-#~ "for å kryptera kommunikasjonen med LDAP-serveren. Du kan lasta ned CA-sertifikatsfilen i PEM-format frå den angjevne nettadressen.</p>"
-#~ "\n"
+#~ "for å kryptera kommunikasjonen med LDAP-serveren. Du kan lasta ned CA-sertifikatsfilen i PEM-format frå den angjevne nettadressen.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>For configuration of advanced LDAP settings, click\n"
-#~ "<b>Advanced Configuration</b>.</p>"
-#~ "\n"
+#~ "<b>Advanced Configuration</b>.</p>\n"
 #~ msgstr ""
 #~ "<p>Klikk\n"
-#~ "<b>Avansert konfigurasjon</b> for å konfigurera avanserte LDAP-innstillingar.</p>"
-#~ "\n"
+#~ "<b>Avansert konfigurasjon</b> for å konfigurera avanserte LDAP-innstillingar.</p>\n"
 
 #, fuzzy
 #~ msgid ""
@@ -1403,16 +1347,14 @@
 #~ "It is assumed that its configuration files (auto.*) already exist\n"
 #~ "locally or over LDAP.\n"
 #~ "If it is not installed and you want to use it, it is installed\n"
-#~ "automatically.</p>"
-#~ "\n"
+#~ "automatically.</p>\n"
 #~ msgstr ""
 #~ "<p>Automounter er ein nisse som automatisk monterer katalogar,\n"
 #~ "til dømes brukaren sin hjemmekataloger.\n"
 #~ "Det vert at føresett nissen sin konfigurasjonsfiler (auto.*) allereie finst,\n"
 #~ "anten lokalt eller vigt LDAP.\n"
 #~ "Viss han er ikkje installert og du ynskjer å bruka henne, vert han installert\n"
-#~ "automatisk.</p>"
-#~ "\n"
+#~ "automatisk.</p>\n"
 
 #, fuzzy
 #~ msgid "Do N&ot Use LDAP"
@@ -1460,38 +1402,32 @@
 #~ msgid ""
 #~ "<p>Normally, the LDAP version 3 protocol is used. If you have\n"
 #~ "an LDAP server using protocol 2 (for example, OpenLDAP v1), activate\n"
-#~ "<b>LDAP Version 2</b>.</p>"
-#~ "\n"
+#~ "<b>LDAP Version 2</b>.</p>\n"
 #~ msgstr ""
 #~ "<p>Vanlegvis vert brukt versjon 3 av LDAP-protokollen. Viss du har\n"
 #~ "ein LDAP-servar som brukar protokoll 2 (til dømes OpenLDAP v1), aktiverer du\n"
-#~ " <b>LDAP versjon 2</b>.</p>"
-#~ "\n"
+#~ " <b>LDAP versjon 2</b>.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>First, set <b>Configuration Base DN</b>.\n"
 #~ "It is the base for storing your configuration data, which is saved on the LDAP\n"
-#~ "server.</p>"
-#~ "\n"
+#~ "server.</p>\n"
 #~ msgstr ""
 #~ "<p>Gå først til <b>Konfigurasjon av hoved-DN</b>.\n"
 #~ "Dette er ein database for lagring av konfigurasjonsinformasjonen på LDAP-\n"
-#~ "serveren.</p>"
-#~ "\n"
+#~ "serveren.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>To access the data stored on the server, enter the\n"
 #~ "<b>Administrator DN</b>.\n"
 #~ "You can enter the full DN (for example, cn=Administrator,dc=mydomain,dc=com) or just\n"
-#~ "the relative DN (for example, cn=Administrator). The LDAP base DN is appended automatically if the appropriate option is checked.</p>"
-#~ "\n"
+#~ "the relative DN (for example, cn=Administrator). The LDAP base DN is appended automatically if the appropriate option is checked.</p>\n"
 #~ msgstr ""
 #~ "<p>Angje <b>DN for Administrator</b> for å få tilgjenge til dataa som er lagra på serveren.\n"
 #~ " Du kan bruka det fullstendige unike namnet (til dømes cn=Administrator,dc=mittdomene,dc=com)\n"
-#~ " eller bara det lokale unike namnet (til dømes cn=Administrator). DN for LDAP-basen vert til lagd automatisk viss det er merkt av for det aktuelle alternativet.</p>"
-#~ "\n"
+#~ " eller bara det lokale unike namnet (til dømes cn=Administrator). DN for LDAP-basen vert til lagd automatisk viss det er merkt av for det aktuelle alternativet.</p>\n"
 
 #, fuzzy
 #~ msgid "<p><b>Home Directories</b></p>"
@@ -1502,14 +1438,12 @@
 #~ "<p>If home directories of users should be stored on this machine,\n"
 #~ "check the appropriate option. Changing this value does not cause any direct\n"
 #~ "action.  It is only information for the YaST users module, which can manage\n"
-#~ "user home directories.</p>"
-#~ "\n"
+#~ "user home directories.</p>\n"
 #~ msgstr ""
 #~ "<p>Kryss av for aktuelt val viss brukarane sine hjemmekataloger skal lagrast\n"
 #~ "på denne maskina. Det har ingen direkte konsekvensar å endra dette verdet.\n"
 #~ "Han servar berre som informasjon for brukermodulen i YaST, der brukarane sine hjemmekataloger\n"
-#~ "kan administrerast.</p>"
-#~ "\n"
+#~ "kan administrerast.</p>\n"
 
 #, fuzzy
 #~ msgid "<p><b>Password Policy</b></p>"
@@ -1570,24 +1504,20 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>Here, configure the template used for\n"
-#~ "creating new objects (like users or groups).</p>"
-#~ "\n"
+#~ "creating new objects (like users or groups).</p>\n"
 #~ msgstr ""
 #~ "<p>Her konfigurerer du malen som skal brukast ved\n"
-#~ "oppretting av nye objekt (som brukarar eller grupper).</p>"
-#~ "\n"
+#~ "oppretting av nye objekt (som brukarar eller grupper).</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>The second table contains a list of <b>default values</b>, used\n"
 #~ "for new objects. Modify the list by adding new values and editing or\n"
-#~ "removing current ones.</p>"
-#~ "\n"
+#~ "removing current ones.</p>\n"
 #~ msgstr ""
 #~ "<p>Den andre tabellen inneheld ei liste over <b>standardverdier</b> som vert nytta\n"
 #~ "for nye objekt. Du kan endra lista ved å leggja til nye verd og redigera eller\n"
-#~ "sletta eksisterande.</p>"
-#~ "\n"
+#~ "sletta eksisterande.</p>\n"
 
 #, fuzzy
 #~ msgid "<p>Here, manage the configuration stored in LDAP directory.</p>"

Modified: branches/plus-SLE12-SP2/yast/nn/po/ldap.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/ldap.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/ldap.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2014-05-19 09:34+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -199,8 +199,7 @@
 "possible values to use for the current attribute.\n"
 "If the value of the edited attribute should be a distinguished name (DN),\n"
 "it is possible to choose it from the LDAP tree using <b>Browse</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 
 #. help text 3/3, %1 is attribute name, description follows.
@@ -211,9 +210,7 @@
 #. or:
 #. "<p>The description (only in english) of attribute \"%1\":<br></p>"
 #: src/LdapPopup.rb:287
-msgid ""
-"<p>The description of attribute \"%1\":<br>"
-"</p>"
+msgid "<p>The description of attribute \"%1\":<br></p>"
 msgstr ""
 
 #. textentry label
@@ -285,8 +282,7 @@
 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"
+"the new object is created.</p>\n"
 msgstr ""
 
 #. // help text 2/3 do not translate "defaultObjectClass"
@@ -300,8 +296,7 @@
 "<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"
+"as a value of \"homeDirectory\").</p>\n"
 msgstr ""
 
 #. combobox label

Modified: branches/plus-SLE12-SP2/yast/nn/po/live-installer.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/live-installer.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/live-installer.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2013-02-18 20:58+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: Norwegian Nynorsk \n"
@@ -35,27 +35,27 @@
 #.
 #. Progress::NextStage ();
 #. Progress::Title (_("Evaluating filesystems to copy..."));
-#: src/clients/inst_live_doit.rb:57 src/clients/inst_live_doit.rb:58
+#: src/clients/inst_live_doit.rb:58 src/clients/inst_live_doit.rb:59
 msgid "Evaluating filesystems to copy..."
 msgstr "Undersøkjer filsystem som skal kopierast …"
 
-#: src/clients/inst_live_doit.rb:60 src/clients/inst_live_doit.rb:61
+#: src/clients/inst_live_doit.rb:61 src/clients/inst_live_doit.rb:62
 msgid "Copying root filesystem..."
 msgstr "Kopierer rotfilsystem …"
 
-#: src/clients/inst_live_doit.rb:62
+#: src/clients/inst_live_doit.rb:63
 msgid "Copying live image..."
 msgstr "Kopierer live-diskbilete …"
 
 #. Copy all the symlinks as needed
 #. @param [Hash{String => String}] symlinks a map of resolved symlinks
 #. @return [Boolean] true on success
-#: src/clients/inst_live_doit.rb:152 src/clients/inst_live_doit.rb:154
+#: src/clients/inst_live_doit.rb:149 src/clients/inst_live_doit.rb:151
 msgid "Copying %1..."
 msgstr "Kopierer %1 …"
 
 #. need to set some lower limit - roughly estimated maximum size of the last file which could have failed
-#: src/clients/inst_live_doit.rb:222
+#: src/clients/inst_live_doit.rb:226
 msgid ""
 "Copying the live image to hard disk failed.\n"
 "\n"
@@ -69,71 +69,53 @@
 "diskpartisjon for installering av live-systemet."
 
 #. generic error report
-#: src/clients/inst_live_doit.rb:250
+#: src/clients/inst_live_doit.rb:254
 msgid "Copying the live image to hard disk failed."
 msgstr "Feil ved kopiering live-diskbilete til harddisken."
 
 #. dialog caption
-#: src/clients/inst_live_simple_proposal.rb:45
-#: src/clients/inst_live_simple_proposal.rb:211
+#: src/clients/inst_live_simple_proposal.rb:44
+#: src/clients/inst_live_simple_proposal.rb:179
 msgid "Installation Settings"
 msgstr "Installasjonsinnstillingar"
 
 #. label
-#: src/clients/inst_live_simple_proposal.rb:47
+#: src/clients/inst_live_simple_proposal.rb:46
 msgid "Analyzing the system..."
 msgstr "Analyserer systemet …"
 
 #. partitioning summary
-#: src/clients/inst_live_simple_proposal.rb:111
+#: src/clients/inst_live_simple_proposal.rb:110
 msgid "Use %1%% of disk %2 for Linux"
 msgstr "Bruk %1 %% av disken %2 til Linux"
 
-#: src/clients/inst_live_simple_proposal.rb:120
+#: src/clients/inst_live_simple_proposal.rb:119
 msgid "Do not use disk %1"
 msgstr "Ikkje bruk disken %1"
 
-#: src/clients/inst_live_simple_proposal.rb:127
+#: src/clients/inst_live_simple_proposal.rb:126
 msgid "Partitioning"
 msgstr "Partisjonering"
 
 #. end of partitioning summary
-#. bootloader summary
-#: src/clients/inst_live_simple_proposal.rb:143
-msgid "System start-up"
-msgstr "Oppstart av systemet"
-
-#: src/clients/inst_live_simple_proposal.rb:149
-msgid "Ask whether to boot Linux or existing system"
-msgstr "Spør om Linux eller det eksisterande systemet skal startast"
-
-#: src/clients/inst_live_simple_proposal.rb:150
-msgid "Boot only Linux"
-msgstr "Start berre Linux"
-
-#: src/clients/inst_live_simple_proposal.rb:158
-msgid "System start time-out: %1 seconds"
-msgstr "Ventetid før systemstart: %1 sekund"
-
-#. end of bootloader summary
 #. keyboard entry
-#: src/clients/inst_live_simple_proposal.rb:167
+#: src/clients/inst_live_simple_proposal.rb:135
 msgid "Keyboard"
 msgstr "Tastatur"
 
 #. end of keyboard entry
 #. timezone entry
-#: src/clients/inst_live_simple_proposal.rb:177
+#: src/clients/inst_live_simple_proposal.rb:145
 msgid "Time Zone"
 msgstr "Tidssone"
 
 #. end of timezone entry
-#: src/clients/inst_live_simple_proposal.rb:187
+#: src/clients/inst_live_simple_proposal.rb:155
 msgid "Change Installation Settings"
 msgstr "Endra installasjonsinnstillingar"
 
 #. help text 1/3
-#: src/clients/inst_live_simple_proposal.rb:192
+#: src/clients/inst_live_simple_proposal.rb:160
 msgid ""
 "<p>\n"
 "Use <b>Accept</b> to perform a new installation with the values displayed.</p>"
@@ -142,20 +124,18 @@
 "Vel <b>Stadfest</b> for å starta ei ny installasjon med desse verdiane.</p>"
 
 #. help text 2/3
-#: src/clients/inst_live_simple_proposal.rb:196
+#: src/clients/inst_live_simple_proposal.rb:164
 msgid ""
 "<p>\n"
 "To change the values, click the respective headline\n"
-"or select <b>Change Installation Settings</b>.</p>"
-"\n"
+"or select <b>Change Installation Settings</b>.</p>\n"
 msgstr ""
 "<p>\n"
 "Du kan endra verdiane ved å trykkja på overskrifta\n"
-"eller på <b>Endra installasjonsinnstillingar</b>.</p>"
-"\n"
+"eller på <b>Endra installasjonsinnstillingar</b>.</p>\n"
 
 #. help text 3/3
-#: src/clients/inst_live_simple_proposal.rb:202
+#: src/clients/inst_live_simple_proposal.rb:170
 msgid ""
 "<p>\n"
 "Your hard disk has not been modified, you can still safely abort.\n"
@@ -169,12 +149,10 @@
 #: src/clients/inst_live_welcome.rb:37
 msgid ""
 "<p>Welcome to the &product; installation.\n"
-"Press <b>Next</p>"
-" to run the installation wizard.</p>"
+"Press <b>Next</p> to run the installation wizard.</p>"
 msgstr ""
 "<p>Velkomen til installeringa av &product;.\n"
-"Trykk <b>Neste</p>"
-" for å starta installasjonsvegvisaren.</p>"
+"Trykk <b>Neste</p> for å starta installasjonsvegvisaren.</p>"
 
 #. dialog caption, %1 is product name (typically openSUSE)
 #: src/clients/inst_live_welcome.rb:43
@@ -272,7 +250,7 @@
 "du må bruka «Reset»-knappen til dette."
 
 #. progress step title
-#: src/clients/live_copy_files_finish.rb:76
+#: src/clients/live_copy_files_finish.rb:75
 msgid "Copying files to installed system..."
 msgstr "Kopierer filer til installert system …"
 
@@ -295,3 +273,15 @@
 #: src/clients/live_save_config_finish.rb:80
 msgid "Saving time zone..."
 msgstr "Lagrar tidssone …"
+
+#~ msgid "System start-up"
+#~ msgstr "Oppstart av systemet"
+
+#~ msgid "Ask whether to boot Linux or existing system"
+#~ msgstr "Spør om Linux eller det eksisterande systemet skal startast"
+
+#~ msgid "Boot only Linux"
+#~ msgstr "Start berre Linux"
+
+#~ msgid "System start time-out: %1 seconds"
+#~ msgstr "Ventetid før systemstart: %1 sekund"

Modified: branches/plus-SLE12-SP2/yast/nn/po/mail.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/mail.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/mail.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -103,37 +103,31 @@
 "\n"
 "<p>How are you connected to the Internet? With a dial-up connection,\n"
 "mails will not be sent immediately but rather after invoking\n"
-"<b>sendmail -q</b>.</p>"
-"\n"
+"<b>sendmail -q</b>.</p>\n"
 msgstr ""
 "\n"
 "<p>Kva slags internettforbindelse har du? Dersom du har eit oppringt samband,\n"
 "vil ikkje e-post sendast med ein gong, men etter aktivering av\n"
-"<b>sendmail -q</b>.</p>"
-"\n"
+"<b>sendmail -q</b>.</p>\n"
 
 #: src/include/mail/helps.rb:79
 #, fuzzy
 msgid ""
 "<p>If choosing <b>No Connection</b>, the mail server will be started.\n"
-"However, only local mail transport is possible. The MTA listens to the localhost.</p>"
-"\n"
+"However, only local mail transport is possible. The MTA listens to the localhost.</p>\n"
 msgstr ""
 "<p>E-postserveren vil startast sjølv om du vel <b>Ingen forbindels</b>.\n"
-"Men berre lokal e-postoverføring vil vera mogleg. E-postsystemet lyttar på localhost.</p>"
-"\n"
+"Men berre lokal e-postoverføring vil vera mogleg. E-postsystemet lyttar på localhost.</p>\n"
 
 #. Translators: masquerading dialog help, part 1 of 1
 #: src/include/mail/helps.rb:88
 #, fuzzy
 msgid ""
 "\n"
-"<p>Specify the rewriting of the sender's address here for each user.</p>"
-"\n"
+"<p>Specify the rewriting of the sender's address here for each user.</p>\n"
 msgstr ""
 "\n"
-"<p>Her definerer du omskrivingen av avsenderadressen for kvar enkelt brukar.</p>"
-"\n"
+"<p>Her definerer du omskrivingen av avsenderadressen for kvar enkelt brukar.</p>\n"
 
 #. Translators: authentication dialog help 1/4
 #: src/include/mail/helps.rb:96
@@ -142,14 +136,12 @@
 "\n"
 "<p>Some servers require authentication for sending mails. Here you can\n"
 "enter information for this option. If you do not want to use authentication,\n"
-"simply leave these fields empty.</p>"
-"\n"
+"simply leave these fields empty.</p>\n"
 msgstr ""
 "\n"
 "<p>Nokre servera krev autentisering for utgående e-post. Her kan du\n"
 "leggja inn informasjon for dette alternativet. Viss du du ikkje ynskjer å bruka autentisering,\n"
-"kan du la desse felta vera tomme.</p>"
-"\n"
+"kan du la desse felta vera tomme.</p>\n"
 
 #. Translators: authentication dialog help 2/4
 #: src/include/mail/helps.rb:103
@@ -157,38 +149,32 @@
 msgid ""
 "\n"
 "<p>The outgoing mail server is generally intended for dial-up connections.\n"
-"Enter the Internet service provider's SMTP server, such as <b>smtp.provider.com</b>.</p>"
-"\n"
+"Enter the Internet service provider's SMTP server, such as <b>smtp.provider.com</b>.</p>\n"
 msgstr ""
 "\n"
 "<p>Utgående e-postservere er vanlegvis berekna på oppringte samband.\n"
 "Legg inn internettleverandørens SMTP-servar, t.d.\n"
-"<b>smtp.leverandor.com</b>.</p>"
-"\n"
+"<b>smtp.leverandor.com</b>.</p>\n"
 
 #. Translators: authentication dialog help 3/4
 #: src/include/mail/helps.rb:109
 #, fuzzy
 msgid ""
 "\n"
-"<p>In the <b>User Name</b> field, enter the user name assigned by from your provider.</p>"
-"\n"
+"<p>In the <b>User Name</b> field, enter the user name assigned by from your provider.</p>\n"
 msgstr ""
 "\n"
-"<p>Legg inn brukernavnet du har fått av leverandøren i <b>Brukernavn</b>-feltet.</p>"
-"\n"
+"<p>Legg inn brukernavnet du har fått av leverandøren i <b>Brukernavn</b>-feltet.</p>\n"
 
 #. Translators: authentication dialog help 4/4
 #: src/include/mail/helps.rb:113
 #, fuzzy
 msgid ""
 "\n"
-"<p>Enter your password in the <b>Password</b> field.</p>"
-"\n"
+"<p>Enter your password in the <b>Password</b> field.</p>\n"
 msgstr ""
 "\n"
-"<p>Angje passordet ditt i <b>Passord</b>-feltet.</p>"
-"\n"
+"<p>Angje passordet ditt i <b>Passord</b>-feltet.</p>\n"
 
 #. Translators: authentication dialog help, 5/4
 #: src/include/mail/helps.rb:115
@@ -197,14 +183,12 @@
 "\n"
 "<p>Note: For simplicity, only one server is displayed in this dialog,\n"
 "although there may be more of them in your configuration file.\n"
-"They will not be lost.</p>"
-"\n"
+"They will not be lost.</p>\n"
 msgstr ""
 "\n"
 "<p>Merk: For å gjera det enkelt verta berre vist éin servar i denne dialogen\n"
 "sjølv om det kan finnast fleire i konfigurasjonsfilen.\n"
-"Øvrige servera vil ikkje fjernast.</p>"
-"\n"
+"Øvrige servera vil ikkje fjernast.</p>\n"
 
 #. Translators: downloading dialog help, part 1 of 1
 #: src/include/mail/helps.rb:126
@@ -212,13 +196,11 @@
 msgid ""
 "\n"
 "<p>These are parameters for downloading mail from\n"
-"a POP or an IMAP server using <b>fetchmail</b>.</p>"
-"\n"
+"a POP or an IMAP server using <b>fetchmail</b>.</p>\n"
 msgstr ""
 "\n"
 "<p>Dette er parametrar for nedlasting av e-post frå ein \n"
-"POP- eller ein IMAP-servar vigd <b>fetchmail</b>.</p>"
-"\n"
+"POP- eller ein IMAP-servar vigd <b>fetchmail</b>.</p>\n"
 
 #. Translators: aliases dialog help, part 1 of 2
 #: src/include/mail/helps.rb:136
@@ -227,14 +209,12 @@
 "\n"
 "<p>This table redirects mail delivered locally.\n"
 "Redirect it to another local user (useful for system accounts,\n"
-"especially for <b>root</b>), to a remote address, or to a list of addresses.</p>"
-"\n"
+"especially for <b>root</b>), to a remote address, or to a list of addresses.</p>\n"
 msgstr ""
 "\n"
 "<p>Denne tabellen omadresserer e-post som leverast lokalt.\n"
 "Omadresser henne til ein annan lokal brukar (nyttig for systemkontoer, \n"
-"spesielt for <b>rotbrukeren</b>), til ei ekstern adresse eller til ein adresseliste.</p>"
-"\n"
+"spesielt for <b>rotbrukeren</b>), til ei ekstern adresse eller til ein adresseliste.</p>\n"
 
 #. Translators: aliases dialog help, part 2 of 2
 #: src/include/mail/helps.rb:143
@@ -242,13 +222,11 @@
 msgid ""
 "\n"
 "<p>See the aliases(5) manual page\n"
-"for a description of advanced features.</p>"
-"\n"
+"for a description of advanced features.</p>\n"
 msgstr ""
 "\n"
 "<p>Meir avanserte funksjonar er\n"
-"skildra på manualsiden aliases(5).</p>"
-"\n"
+"skildra på manualsiden aliases(5).</p>\n"
 
 #. Translators: virtual domains dialog help, part 1 of 2
 #: src/include/mail/helps.rb:153
@@ -257,14 +235,12 @@
 "\n"
 "<p>This table redirects incoming mail. Unlike the alias table,\n"
 "it also considers the domain\n"
-"part of the address.</p>"
-"\n"
+"part of the address.</p>\n"
 msgstr ""
 "\n"
 "<p>Denne tabellen omadresserer innkommende post. I motsetnad til aliastabellen \n"
 "vurderer han òg domenet som \n"
-"ein del av adressa.</p>"
-"\n"
+"ein del av adressa.</p>\n"
 
 #. Translators: virtual domains dialog help, part 2 of 2
 #: src/include/mail/helps.rb:160
@@ -272,13 +248,11 @@
 msgid ""
 "\n"
 "<p>It allows hosting multiple \"virtual domains\"\n"
-"on a single machine.</p>"
-"\n"
+"on a single machine.</p>\n"
 msgstr ""
 "\n"
 "<p>Han tillèt vertskap for fleire \"virtuelle domener\"\n"
-"på same maskin.</p>"
-"\n"
+"på same maskin.</p>\n"
 
 #. Translators: continue/cancel dialog
 #. %1 is a sysconfig variable name
@@ -725,14 +699,12 @@
 "\n"
 "<p>The outgoing mail server is generally intended for dial-up connections.\n"
 "Enter the Internet service provider's SMTP server, such as\n"
-"<b>smtp.provider.com</b>.</p>"
-"\n"
+"<b>smtp.provider.com</b>.</p>\n"
 msgstr ""
 "\n"
 "<p>Ein utgående e-postserver er vanlegvis berekna på oppringte samband.\n"
 "Legg inn internettleverandørens SMTP-servar, t.d.\n"
-"<b>smtp.leverandor.com</b>.</p>"
-"\n"
+"<b>smtp.leverandor.com</b>.</p>\n"
 
 #. Translators: text entry label
 #: src/include/mail/widgets.rb:102
@@ -747,14 +719,12 @@
 "\n"
 "<p>You may want the mail you sent to appear as if it originated from\n"
 "<b>company.com</b> instead of <b>pc-042.company.com</b>.\n"
-"Use the text box provided or a more detailed dialog.</p>"
-"\n"
+"Use the text box provided or a more detailed dialog.</p>\n"
 msgstr ""
 "\n"
 "<p>Det kan hende du ynskjer at e-posten du sender skal sjå ut som han kjem frå\n"
 "<b>selskap.com</b> i staden for <b>PC-042.selskap.com</b>.\n"
-"Bruk tekstboksen eller ein meir detaljert dialog.</p>"
-"\n"
+"Bruk tekstboksen eller ein meir detaljert dialog.</p>\n"
 
 #. Translators: text entry label
 #: src/include/mail/widgets.rb:122
@@ -769,14 +739,12 @@
 "\n"
 "<p>Here, specify the domains for which the mail\n"
 "will be delivered locally. If you enter nothing,\n"
-"the local host name is assumed.</p>"
-"\n"
+"the local host name is assumed.</p>\n"
 msgstr ""
 "\n"
 "<p>Her angjev du domener for lokal levering\n"
 "av e-post. Dersom du ikkje skriv noko, vil \n"
-"localhost veljast automatisk.</p>"
-"\n"
+"localhost veljast automatisk.</p>\n"
 
 #. check box label
 #: src/include/mail/widgets.rb:142
@@ -810,32 +778,24 @@
 msgid ""
 "\n"
 "<p><b>Enabling virus scanning (AMaViS)</b> checks incoming and outgoing mail\n"
-"with AMaViS.</p>"
-"\n"
+"with AMaViS.</p>\n"
 msgstr ""
 "\n"
 "<p>Viss du aktiverer virusskanning, vil innkommende og utgående e-post kontrollerast\n"
-"av AMaViS.</p>"
-"\n"
+"av AMaViS.</p>\n"
 
 #. help text
 #: src/include/mail/widgets.rb:168
 #, fuzzy
 msgid ""
-"<p>Enabling AMaViS will also enable the following modules: </p>"
-"\n"
-"<p><b>Spamassassin</b> SPAM scanner</p>"
-"\n"
-"<p><b>DKIM</b> checks Domain Key signed incomming mails</p>"
-"\n"
+"<p>Enabling AMaViS will also enable the following modules: </p>\n"
+"<p><b>Spamassassin</b> SPAM scanner</p>\n"
+"<p><b>DKIM</b> checks Domain Key signed incomming mails</p>\n"
 "<p><b>Clamav</b> open source virus scanner engine</p>"
 msgstr ""
-"<p>Aktivering av AMaViS vil òg aktivera følgjande modular: </p>"
-"\n"
-"<p><b>Spamassassin</b>, ein spamskanner</p>"
-"\n"
-"<p><b>DKIM</b>, som kontrollerer domennøkkelsignerte innkommnede mldinger</p>"
-"\n"
+"<p>Aktivering av AMaViS vil òg aktivera følgjande modular: </p>\n"
+"<p><b>Spamassassin</b>, ein spamskanner</p>\n"
+"<p><b>DKIM</b>, som kontrollerer domennøkkelsignerte innkommnede mldinger</p>\n"
 "<p><b>Clamav</b>, ein virusskanner med opi kjeldekode</p>"
 
 #. help text
@@ -844,13 +804,11 @@
 msgid ""
 "\n"
 "<p>If AMaViS is not installed and you want to use it, it will be installed\n"
-"automatically.</p>"
-"\n"
+"automatically.</p>\n"
 msgstr ""
 "\n"
 "<p>Dersom AMaViS ikkje er installert og du vil bruka programmet, vil pakka installerast\n"
-"automatisk.</p>"
-"\n"
+"automatisk.</p>\n"
 
 #. checkbox label
 #: src/include/mail/widgets.rb:186
@@ -863,13 +821,11 @@
 #, fuzzy
 msgid ""
 "\n"
-"<p><b>Enabling DKIM signig for outgoing mails.</b></p>"
-"\n"
+"<p><b>Enabling DKIM signig for outgoing mails.</b></p>\n"
 msgstr ""
 "\n"
 "<p>Viss du aktiverer virusskanning, vil innkommende og utgående e-post kontrollerast\n"
-"av AMaViS.</p>"
-"\n"
+"av AMaViS.</p>\n"
 
 #. help text
 #: src/include/mail/widgets.rb:194
@@ -881,8 +837,7 @@
 "'submission' will be configured in Postfix. After this is set up you can send\n"
 "email with this service 'submission' from 'mynetworks' with enabled SASL\n"
 "authentication. Only the emails sent by this new service will be signed with\n"
-"the domain key.</p>"
-"\n"
+"the domain key.</p>\n"
 msgstr ""
 "\n"
 "<p>Å aktivera DKIM for utgående meldingar krev fleire handlingar. Ein SSL-nøkkel\n"
@@ -890,8 +845,7 @@
 "'submersion'-teneste vil setjast opp i Postfix. Etter at dette er sett opp, kan du senda\n"
 "e-post med tenesta 'submersion' frå 'mynetworks' med aktivert SASL-\n"
 "autorisasjon. Bara meldingar som vert send med denne nye tenesta, vil signerast med\n"
-"domenenøkkelen.</p>"
-"\n"
+"domenenøkkelen.</p>\n"
 
 #. help text
 #: src/include/mail/widgets.rb:204
@@ -904,8 +858,7 @@
 "according Domain Name Service. If there is a name service\n"
 "running on this server, which is the authoritative server for that domain, the\n"
 "public key will be added as a TXT record to that domain zone\n"
-"automatically.</p>"
-"\n"
+"automatically.</p>\n"
 msgstr ""
 "\n"
 "<p>Den offentlege nøkkelen i domenenøkkelen må tilbydast av ein\n"
@@ -914,8 +867,7 @@
 "samsvarande domenenavntjeneste. Viss det køyrer ein navnetjeneste\n"
 "på den serveren som er autorisasjonsserver for det aktuelle domenet, vil\n"
 "den offentlege nøkkelen automatisk leggjast til som ein TXT-oppføring\n"
-"for dette domenet.</p>"
-"\n"
+"for dette domenet.</p>\n"
 
 #. help text
 #: src/include/mail/widgets.rb:215
@@ -1364,15 +1316,11 @@
 
 #, fuzzy
 #~ msgid "<P><B>Mail Server Configuration</B><BR>"
-#~ msgstr ""
-#~ "<p><b>Oppset av E-postserver</b></p>"
-#~ "<BR>"
+#~ msgstr "<p><b>Oppset av E-postserver</b></p><BR>"
 
 #, fuzzy
 #~ msgid "<P>This module will configure and start Postfix and, if necessary, the Cyrus IMAP server.</P>"
-#~ msgstr ""
-#~ "<p>Denne modulen set opp og aktiverer Postfix og viss naudsynt, Cyrus IMAP-serveren."
-#~ "<p>"
+#~ msgstr "<p>Denne modulen set opp og aktiverer Postfix og viss naudsynt, Cyrus IMAP-serveren.<p>"
 
 #, fuzzy
 #~ msgid ""
@@ -1381,12 +1329,10 @@
 #~ "features of their email application to send and\n"
 #~ "receive email. They do not need this module.</P>\n"
 #~ msgstr ""
-#~ "<p><b>Merk:</b><br>"
-#~ "\n"
+#~ "<p><b>Merk:</b><br>\n"
 #~ "Dei fleste hjemmebrukere kan nytta dei innebygde\n"
 #~ "funksjonane i e-postklienten for å senda og\n"
-#~ "motta e-post. Dei treng ikkje å bruka denne modulen.</p>"
-#~ "\n"
+#~ "motta e-post. Dei treng ikkje å bruka denne modulen.</p>\n"
 
 #, fuzzy
 #~ msgid ""
@@ -1394,8 +1340,7 @@
 #~ "email on your local system or for some special cases.</P>\n"
 #~ msgstr ""
 #~ "<p>Du treng Postfix berre viss du vil lagra\n"
-#~ "e-posten lokalt eller i andre spesielle tilfelle.</p>"
-#~ "\n"
+#~ "e-posten lokalt eller i andre spesielle tilfelle.</p>\n"
 
 #, fuzzy
 #~ msgid "Skip this page in the future"
@@ -2005,382 +1950,267 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Administrator Authorization</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Administrator Authorization</big></b><br>\n"
 #~ "To use the YaST mail server component, your system must use LDAP\n"
-#~ "as a repository for the user and group accounts and for the DNS services.<br>"
-#~ "\n"
-#~ "Some of the mail server settings will be stored in the LDAP repository, too.<br>"
-#~ "</p>"
-#~ "\n"
+#~ "as a repository for the user and group accounts and for the DNS services.<br>\n"
+#~ "Some of the mail server settings will be stored in the LDAP repository, too.<br></p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Administratorautorisasjon</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Administratorautorisasjon</big></b><br>\n"
 #~ "For å bruk e-postserverkomponenten i YaST, må systemet bruka LDAP\n"
-#~ "til lagring av brukar- og gruppekontoer og til DNS-tenester.<br>"
-#~ "\n"
-#~ "Nokre av innstillingane for e-postserveren vil òg lagrast i LDAP.<br>"
-#~ "</p>"
-#~ "\n"
+#~ "til lagring av brukar- og gruppekontoer og til DNS-tenester.<br>\n"
+#~ "Nokre av innstillingane for e-postserveren vil òg lagrast i LDAP.<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Set Up Mail Server Configuration</big></b><br>"
-#~ "\n"
-#~ "</p>"
-#~ "\n"
+#~ "<p><b><big>Set Up Mail Server Configuration</big></b><br>\n"
+#~ "</p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Sett opp e-postserver </big></b><br>"
-#~ "\n"
-#~ "Vent…<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<p><b><big>Sett opp e-postserver </big></b><br>\n"
+#~ "Vent…<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Initializing Mail Server Configuration</big></b><br>"
-#~ "\n"
-#~ "Please wait...<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<p><b><big>Initializing Mail Server Configuration</big></b><br>\n"
+#~ "Please wait...<br></p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Initialiserer konfigurasjon av e-postserver </big></b><br>"
-#~ "\n"
-#~ "Vent…<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<p><b><big>Initialiserer konfigurasjon av e-postserver </big></b><br>\n"
+#~ "Vent…<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Aborting Initialization:</big></b><br>"
-#~ "\n"
-#~ "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-#~ "\n"
+#~ "<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 avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-#~ "\n"
+#~ "<p><b><big>Avbryt initialisering:</big></b><br>\n"
+#~ "Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Saving Mail Server Configuration</big></b><br>"
-#~ "\n"
-#~ "Please wait...<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<p><b><big>Saving Mail Server Configuration</big></b><br>\n"
+#~ "Please wait...<br></p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Lagrar konfigurasjon for e-postserver </big></b><br>"
-#~ "\n"
-#~ "Vent…<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<p><b><big>Lagrar konfigurasjon for e-postserver </big></b><br>\n"
+#~ "Vent…<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Aborting Saving:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Aborting Saving:</big></b><br>\n"
 #~ "Abort the save procedure by pressing <b>Abort</b>.\n"
 #~ "An additional dialog informs whether it is safe to do so.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Avbryt lagring:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Avbryt lagring:</big></b><br>\n"
 #~ "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 #~ "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Server Identification:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Server Identification:</big></b><br>\n"
 #~ "This is the SMTP server's greeting banner.</b>.\n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<br></p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Serveridentifikasjon:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Serveridentifikasjon:</big></b><br>\n"
 #~ "Dette er velkomstbildet for SMTP-serveren.</b>.\n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Mail Size:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Mail Size:</big></b><br>\n"
 #~ "This parameter limits the total size in bytes of a mail (sending and getting),\n"
 #~ "including envelope information.\n"
 #~ "</p>"
 #~ msgstr ""
-#~ "<p><b><big>Meldingsstørrelse:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Meldingsstørrelse:</big></b><br>\n"
 #~ "Denne parameteren avgrensar den totale storleiken på ei melding i byte (sending og mottak),\n"
 #~ "inkludert metainformasjon.\n"
 #~ "</p>"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Outgoing Mails:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Outgoing Mails:</big></b><br>\n"
 #~ "Set the transport type for outgoing mails.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Ugående meldingar:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Ugående meldingar:</big></b><br>\n"
 #~ "vel transporttype for utgående meldingar.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Manage Mail Routing</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Manage Mail Routing</big></b><br>\n"
 #~ "Add or modify mail transport routes.\n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<br></p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Administrer meldingsruting</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Administrer meldingsruting</big></b><br>\n"
 #~ "Legg til eller endre rutingen for meldingstransport.\n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Defined Mail Transport Routes</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Defined Mail Transport Routes</big></b><br>\n"
 #~ "This is the list of the defined mail transports.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Definerte meldingstransportruter</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Definerte meldingstransportruter</big></b><br>\n"
 #~ "Dette er ei liste over definerte meldingstransportmetoder.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>SPAM Prevention</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>SPAM Prevention</big></b><br>\n"
 #~ "Postfix offers a variety of parameters that limit the delivery of unsolicited commercial e-mail (UCE).\n"
 #~ "In this dialog, configure this settings.  For example, set access lists or RBL\n"
 #~ "(real-time blackhole list) name servers. \n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<br></p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Søppelpostblokkering</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Søppelpostblokkering</big></b><br>\n"
 #~ "Postfix har ei rekkje parametrar som avgrensar levering av uønska kommersiell e-post (UCE).\n"
 #~ "I denne dialogen kan du konfigurera desse innstillingane, til dømes definera tilgangslister eller RBL-\n"
 #~ "navneservere (liste over svarte hol i sanntid). \n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Start Virus Scanner AMAVIS:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Start Virus Scanner AMAVIS:</big></b><br>\n"
 #~ "If you start the virus scanner AMAVIS, your emails will be scanned for viruses and and for spam.\n"
 #~ "The virus scanner engine <b>Clamavd</b> and the spam finder <b>SpamAssassin</b> will be installed \n"
 #~ "and configured as well. You can also install other (commercial) virus scanner engines.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Start antivirusprogrammet AMAVIS:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Start antivirusprogrammet AMAVIS:</big></b><br>\n"
 #~ "Viss du startar antivirusprogrammet AMAVIS, vil e-postmeldingene dine skannast for virus og søppelpost.\n"
 #~ "Virusskannermotoren <b>Clamavd</b> og søppelpostrenseren <b>SpamAssassin</b> vil òg installerast \n"
 #~ "og sett opp. Du kan òg installera andre (kommersialle) antivirussystemer.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Configure Spam Learning Extension:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Configure Spam Learning Extension:</big></b><br>\n"
 #~ "The spam learning extension can only be configured if the local delivery method is <b>cyrus imapd</b>.\n"
 #~ "In this case the shared folders <b>NewSpam</b> and <b>NoSpam</b> will be created. Spam email \n"
 #~ "which was not detected by <b>SpamAssassin</b> should be put into the folder <b>NewSpam</b>.\n"
 #~ "If you want your spam finder to be most effective you should also put non-spam email into\n"
 #~ "the folder <b>NoSpam</b>. The emails in this folder cannot be read by anyone.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Sett opp innlæringstillegg for søppelpost:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Sett opp innlæringstillegg for søppelpost:</big></b><br>\n"
 #~ "Innlæringstillegget for søppelpost kan berre verta opp sette dersom den lokale leveringsmetoden er <b>cyrus imapd</b>.\n"
 #~ "I så fall vil dei delte mappene <b>NewSpam</b> og <b>NoSpam</b> opprettast. Søppelpost \n"
-#~ "som ikkje vart oppdaga av <b>SpamAssassin</b>, bør plasserast i mappen "
-#~ "<p>NewSpam</p>"
-#~ ".\n"
+#~ "som ikkje vart oppdaga av <b>SpamAssassin</b>, bør plasserast i mappen <p>NewSpam</p>.\n"
 #~ "Viss du vil at søppelpostprogrammet skal fungera mest mogleg effektivt, bør du òg plassera meldingar som ikkje er søppelpost, i\n"
-#~ "mappen "
-#~ "<p>NoSpam</p>"
-#~ ". Meldingane i denne mappen kan ikkje lesast av nokon.\n"
-#~ "</p>"
-#~ "\n"
+#~ "mappen <p>NoSpam</p>. Meldingane i denne mappen kan ikkje lesast av nokon.\n"
+#~ "</p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Trusted Local Networks:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Trusted Local Networks:</big></b><br>\n"
 #~ "Clients from these networks can use your mail server for mail relaying.\n"
 #~ "(Sending non-local mails)\n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<br></p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Pålitelege lokalnettverk:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Pålitelege lokalnettverk:</big></b><br>\n"
 #~ "Klientar frå desse nettverka kan bruka e-postserveren til overføring av meldingar. \n"
 #~ "(senda meldingar til eksterne adresser)\n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Require SASL Authentication:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Require SASL Authentication:</big></b><br>\n"
 #~ "If set to true, clients must authenticate to use\n"
 #~ "the mail server for mail relaying. \n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<br></p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Krev SASL-autentisering:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Krev SASL-autentisering:</big></b><br>\n"
 #~ "Viss 'Ja', må klientane autentisere seg for å bruka\n"
 #~ "e-postserveren til overføring av meldingar. \n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Local Delivery Type</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Local Delivery Type</big></b><br>\n"
 #~ "In this frame, choose the local mail delivery method. \n"
 #~ "For clients to be able to connect to your mail server via the POP or IMAP\n"
-#~ "protocol, choose <b>Cyrus IMAP</p>"
-#~ ". \n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "protocol, choose <b>Cyrus IMAP</p>. \n"
+#~ "<br></p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Lokal leveringstype</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Lokal leveringstype</big></b><br>\n"
 #~ "Her kan du velja ein metode for lokal meldingslevering. \n"
 #~ "For at klientar skal kunna koble til e-postserveren via POP- eller IMAP-\n"
-#~ "protokollen, må du velja <b>Cyrus IMAP</p>"
-#~ ". \n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "protokollen, må du velja <b>Cyrus IMAP</p>. \n"
+#~ "<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>Depending on the local delivery method, you have\n"
 #~ "different possibilities of settings.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
 #~ "<p>Avhengig av lokal leveringsmetode, kan\n"
 #~ "ulike innstillingar vera tilgjengelege.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Mail Fetching Scheduler</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Mail Fetching Scheduler</big></b><br>\n"
 #~ "If you have mail boxes on an Internet provider, you can fetch this regularly\n"
 #~ "at defined time intervals and by connecting to the Internet.\n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<br></p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Planlegg meldingshenting</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Planlegg meldingshenting</big></b><br>\n"
 #~ "Viss du har postboksar hos ein internettleverandør, kan du henta meldingar regelmessig\n"
 #~ "ved å koble til Internett med definerte intervall.\n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>Note: If you have not defined any local delivery type, you cannot\n"
 #~ "define mail fetching jobs.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
 #~ "<p>Merk: Viss du ikkje har definert nokon lokal leveringstype, Kan du ikkje\n"
 #~ "definera hentejobber for meldingar.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Mail Server Domains</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Mail Server Domains</big></b><br>\n"
 #~ "Here, define the domains for which your mail server considers itself \n"
 #~ "the final destination.\n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<br></p>\n"
 #~ msgstr ""
-#~ "<p><b><big>E-postserverdomener</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>E-postserverdomener</big></b><br>\n"
 #~ "Her definerer du kva for domener e-postserveren skal definera seg sjølv \n"
 #~ "som sluttdestinasjon for.\n"
-#~ "<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>Note: You can create and set up the domains with the YaST \n"
 #~ "DNS server module. In the current module, you only can set the properties\n"
 #~ "concerning the mail server.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
 #~ "<p>Merk: Du kan oppretta og konfigurera domener i modulen \n"
 #~ "DNS-servar i YaST. I denne modulen kan du berre definera innstillingane\n"
 #~ "for e-postserveren.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Type:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Type:</big></b><br>\n"
 #~ "You can define virtual and local domains. In virtual domains, only users\n"
 #~ "assigned an email address in the domain can receive emails.\n"
 #~ "In local domains, all users can get emails. Assign virtual email \n"
 #~ "addresses in the YaST user module.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Type:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Type:</big></b><br>\n"
 #~ "Du kan definera virtuelle og lokale domener. I virtuelle domener kan bara brukarar\n"
 #~ "som er tilordnet ei e-postadresse i domenet, motta meldingar.\n"
 #~ "I lokale domener kan alle brukarar motta meldingar. Du kan tilordne virtuelle \n"
 #~ "e-postadresser i brukermodulen i YaST.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #, fuzzy
 #~ msgid "The server uses &TLS."

Modified: branches/plus-SLE12-SP2/yast/nn/po/multipath.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/multipath.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/multipath.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -231,251 +231,143 @@
 #: src/include/multipath/helps.rb:36
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing Multipath Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Initializing Multipath Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Initialiserer oppsett av multipath</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer oppsett av multipath</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 1/2
 #: src/include/multipath/helps.rb:40
 #, fuzzy
 msgid ""
-"<p><b><big>Saving Multipath Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Saving Multipath Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Lagrar multipath-oppsett</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar multipath-oppsett</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. dialog help for Status help
 #: src/include/multipath/helps.rb:44
 #, fuzzy
 msgid ""
-"<p><b><big>Multipath Status</big></b><br>"
+"<p><b><big>Multipath Status</big></b><br>\n"
+"\t\t\tStart or stop multipathd, check the multipath information.<br><br>\n"
 "\n"
-"\t\t\tStart or stop multipathd, check the multipath information.<br>"
-"<br>"
+"\t\t\t<b><big>Stop/Start Multipathd</big></b><br>\n"
+"\t\t\tClick <b>\"Use Multipath\"</b> to start multipathd. Click <b>\"Do not use Multipath\"</b> to stop multipathd.<br>\n"
+"\t\t\tMultipath status information can still be displayed when multipathd stopped.<br><br>\n"
 "\n"
-"\n"
-"\t\t\t<b><big>Stop/Start Multipathd</big></b><br>"
-"\n"
-"\t\t\tClick <b>\"Use Multipath\"</b> to start multipathd. Click <b>\"Do not use Multipath\"</b> to stop multipathd.<br>"
-"\n"
-"\t\t\tMultipath status information can still be displayed when multipathd stopped.<br>"
-"<br>"
-"\n"
-"\n"
-"\t\t\t<b><big>Configure Multipath</big></b><br>"
-"\n"
-"\t\t\tClick <b>Configure</b> Tab to make the multipath configurations.<br>"
-"</p>"
-"\n"
+"\t\t\t<b><big>Configure Multipath</big></b><br>\n"
+"\t\t\tClick <b>Configure</b> Tab to make the multipath configurations.<br></p>\n"
 msgstr ""
-"<p><b><big>Multipath-status</big></b><br>"
+"<p><b><big>Multipath-status</big></b><br>\n"
+"\t\t\tStart eller stopp multipathd, kontrollar multipath-informasjonen.<br><br>\n"
 "\n"
-"\t\t\tStart eller stopp multipathd, kontrollar multipath-informasjonen.<br>"
-"<br>"
+"\t\t\t<b><big>Stopp/start Multipathd</big></b><br>\n"
+"\t\t\tKlikk <b>\"Bruk Multipath\"</b> for å starta multipathd. Klikk <b>\"Ikkje nytte Multipath\"</b> for å stoppa multipathd.<br>\n"
+"\t\t\tStatusinformasjon om multipath kan visast sjølv om multipathd er stoppet.<br><br>\n"
 "\n"
-"\n"
-"\t\t\t<b><big>Stopp/start Multipathd</big></b><br>"
-"\n"
-"\t\t\tKlikk <b>\"Bruk Multipath\"</b> for å starta multipathd. Klikk <b>\"Ikkje nytte Multipath\"</b> for å stoppa multipathd.<br>"
-"\n"
-"\t\t\tStatusinformasjon om multipath kan visast sjølv om multipathd er stoppet.<br>"
-"<br>"
-"\n"
-"\n"
-"\t\t\t<b><big>Sett opp Multipath</big></b><br>"
-"\n"
-"\t\t\tKlikk på <b>Sett opp</b> for å setja opp multipath.<br>"
-"</p>"
-"\n"
+"\t\t\t<b><big>Sett opp Multipath</big></b><br>\n"
+"\t\t\tKlikk på <b>Sett opp</b> for å setja opp multipath.<br></p>\n"
 
 #. dialog help for Configure tab
 #: src/include/multipath/helps.rb:56
 #, fuzzy
 msgid ""
-"<p><b><big>Configuration</big></b><br>"
-"\n"
+"<p><b><big>Configuration</big></b><br>\n"
 "\t\t\tAll the content of /etc/multipath.conf can be configured here. There are four sections in the configuration file:\n"
-"\t\t\t<b>multipaths</b>, <b>defaults</b>, <b>blacklist</b>, <b>blacklist_exception</b>, <b>devices.</b><br>"
-"<br>"
-"\n"
-"\t\t\t<b>Multipaths:</b> list of multipaths finest-grained settings.<br>"
-"\n"
-"\t\t\t<b>Defaults:</b> multipath-tools default settings.<br>"
-"\n"
-"\t\t\tClick <b>\"Configure Defaults\"</b> button to configure defaults settings.<br>"
-"\n"
-"\t\t\t<b>Blacklist:</b> list of device names to be discard as not multipath candidates.<br>"
-"\n"
-"\t\t\tClick <b>\"Configure Blacklist\"</b> button to configure blacklist settings.<br>"
-"\n"
-"\t\t\t<b>Blacklist Exceptions:</b> list of device names to be excluded from blacklist.<br>"
-"\n"
-"\t\t\tClick <b>\"Configure Blacklist Exceptions\"</b> button to configure blacklist_exceptions settings.<br>"
-"\n"
-"\t\t\t<b>Devices:</b> list of per storage controller settings. Overrides default settings, overridden by per multipath settings.<br>"
-"\n"
-"\t\t\tClick <b>\"Configure devices\"</b> button to configure devices settings.<br>"
-"<br>"
-"\n"
-"\t\t\tClick <b>\"Finish\"</b> button to save and update the configurations.<br>"
-"<br>"
-"</p>"
-"\n"
+"\t\t\t<b>multipaths</b>, <b>defaults</b>, <b>blacklist</b>, <b>blacklist_exception</b>, <b>devices.</b><br><br>\n"
+"\t\t\t<b>Multipaths:</b> list of multipaths finest-grained settings.<br>\n"
+"\t\t\t<b>Defaults:</b> multipath-tools default settings.<br>\n"
+"\t\t\tClick <b>\"Configure Defaults\"</b> button to configure defaults settings.<br>\n"
+"\t\t\t<b>Blacklist:</b> list of device names to be discard as not multipath candidates.<br>\n"
+"\t\t\tClick <b>\"Configure Blacklist\"</b> button to configure blacklist settings.<br>\n"
+"\t\t\t<b>Blacklist Exceptions:</b> list of device names to be excluded from blacklist.<br>\n"
+"\t\t\tClick <b>\"Configure Blacklist Exceptions\"</b> button to configure blacklist_exceptions settings.<br>\n"
+"\t\t\t<b>Devices:</b> list of per storage controller settings. Overrides default settings, overridden by per multipath settings.<br>\n"
+"\t\t\tClick <b>\"Configure devices\"</b> button to configure devices settings.<br><br>\n"
+"\t\t\tClick <b>\"Finish\"</b> button to save and update the configurations.<br><br></p>\n"
 msgstr ""
-"<p><b><big>Oppset</big></b><br>"
-"\n"
+"<p><b><big>Oppset</big></b><br>\n"
 "\t\t\tAlt innhald i /etc/multipath.conf kan vert opp her sett. Oppsettfilen inneheld fire seksjonar:\n"
-"\t\t\t<b>multipaths</b>, <b>defaults</b>, <b>blacklist</b>, <b>blacklist_exception</b>, <b>devices.</b><br>"
-"<br>"
-"\n"
-"\t\t\t<b>Multipath:</b>Liste over fininnstillinger for multipath.<br>"
-"\n"
-"\t\t\t<b>Standardverdier:</b> Standardinnstillinger for multipath-verktøy.<br>"
-"\n"
-"\t\t\tKlikk <b>\"Sett opp standardverdier\"</b> for å setja opp standardinnstillingene.<br>"
-"\n"
-"\t\t\t<b>Svartelista:</b> Liste over enhetsnavn som skal forkastast som multipath-kandidatar.<br>"
-"\n"
-"\t\t\tKlikk<b>\"Sett opp svartelista\"</b> for å endra svartelisteinnstillinger.<br>"
-"\n"
-"\t\t\t<b>Svartelisteunntak:</b> Liste over enhetsnavn som ikkje skal vera med på svartelisten.<br>"
-"\n"
-"\t\t\tKlikk på <b>\"Sett opp svartelisteunntak\"</b> for å endra blacklist_exceptions-innstillingane.<br>"
-"\n"
-"\t\t\t<b>Einingar:</b> Liste over kontrollar-innstillingar per lagringsenhet. Overstyrer standardinnstillingene og vert overstyrde per multipath.<br>"
-"\n"
-"\t\t\tKlikk på <b>\"Sett opp einingar\"</b> for å endra enhetsinnstillinger.<br>"
-"<br>"
-"\n"
-"\t\t\tKlikk <b>\"Fullfør\"</b> for å lager og oppdatera oppsetta.<br>"
-"<br>"
-"</p>"
-"\n"
+"\t\t\t<b>multipaths</b>, <b>defaults</b>, <b>blacklist</b>, <b>blacklist_exception</b>, <b>devices.</b><br><br>\n"
+"\t\t\t<b>Multipath:</b>Liste over fininnstillinger for multipath.<br>\n"
+"\t\t\t<b>Standardverdier:</b> Standardinnstillinger for multipath-verktøy.<br>\n"
+"\t\t\tKlikk <b>\"Sett opp standardverdier\"</b> for å setja opp standardinnstillingene.<br>\n"
+"\t\t\t<b>Svartelista:</b> Liste over enhetsnavn som skal forkastast som multipath-kandidatar.<br>\n"
+"\t\t\tKlikk<b>\"Sett opp svartelista\"</b> for å endra svartelisteinnstillinger.<br>\n"
+"\t\t\t<b>Svartelisteunntak:</b> Liste over enhetsnavn som ikkje skal vera med på svartelisten.<br>\n"
+"\t\t\tKlikk på <b>\"Sett opp svartelisteunntak\"</b> for å endra blacklist_exceptions-innstillingane.<br>\n"
+"\t\t\t<b>Einingar:</b> Liste over kontrollar-innstillingar per lagringsenhet. Overstyrer standardinnstillingene og vert overstyrde per multipath.<br>\n"
+"\t\t\tKlikk på <b>\"Sett opp einingar\"</b> for å endra enhetsinnstillinger.<br><br>\n"
+"\t\t\tKlikk <b>\"Fullfør\"</b> for å lager og oppdatera oppsetta.<br><br></p>\n"
 
 #. dialog help for defaults section configure tab 1/3
 #: src/include/multipath/helps.rb:72
 #, fuzzy
 msgid ""
-"<p><b><big>Defaults Configuration</big></b><br>"
-"\n"
-"\t\t\tGlobal default settings can be configured and cleared here.<br>"
-"\n"
-"\t\t\tAny default setting here will take effect in all multipath configurations, unless a corresponding local setting overwrites it.<br>"
-"\n"
-"\t\t\tIf a default setting here is cleared, multipath will take its own value as default setting.<br>"
-"</p>"
-"\n"
+"<p><b><big>Defaults Configuration</big></b><br>\n"
+"\t\t\tGlobal default settings can be configured and cleared here.<br>\n"
+"\t\t\tAny default setting here will take effect in all multipath configurations, unless a corresponding local setting overwrites it.<br>\n"
+"\t\t\tIf a default setting here is cleared, multipath will take its own value as default setting.<br></p>\n"
 msgstr ""
-"<p><b><big>Oppset av standardverdier</big></b><br>"
-"\n"
-"\t\t\tGlobale standardinnstillinger kan vert opp sette og vert her fjerna.<br>"
-"\n"
-"\t\t\tAlle standardinnstillinger her vil brukast i alle multipath-oppsett viss ikkje ei samsvarande lokal innstilling overstyrer han.<br>"
-"\n"
-"\t\t\tViss ein standardinnstilling vert her fjerna, vil multipath bruka sin eige verd som standard.<br>"
-"</p>"
-"\n"
+"<p><b><big>Oppset av standardverdier</big></b><br>\n"
+"\t\t\tGlobale standardinnstillinger kan vert opp sette og vert her fjerna.<br>\n"
+"\t\t\tAlle standardinnstillinger her vil brukast i alle multipath-oppsett viss ikkje ei samsvarande lokal innstilling overstyrer han.<br>\n"
+"\t\t\tViss ein standardinnstilling vert her fjerna, vil multipath bruka sin eige verd som standard.<br></p>\n"
 
 #. dialog help for blacklist section configure tab 1/3
 #: src/include/multipath/helps.rb:79
 #, fuzzy
 msgid ""
-"<p><b><big>Blacklist Configuration</big></b><br>"
-"\n"
-"\t\t\tDevice names listed here can be discarded as not multipath candidates.<br>"
-"\n"
-"\t\t\tThere are three methods to identify a device name: <b>wwid</b>, <b>devnode</b>, <b>device</b>.<br>"
-"<br>"
-"\n"
-"\t\t\t<b>wwid</b>: The world wide ID identifying the device in blacklist.<br>"
-"\n"
-"\t\t\t<b>devnode</b>: Regular expression can be used here to identify device names in udev_dir (default in directory /dev). Common device names are cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop.<br>"
-"\n"
-"\t\t\t<b>device</b>: Used to identify a specific storage controller in blacklist. A device can be specified by vendor and product name.<br>"
-"\n"
+"<p><b><big>Blacklist Configuration</big></b><br>\n"
+"\t\t\tDevice names listed here can be discarded as not multipath candidates.<br>\n"
+"\t\t\tThere are three methods to identify a device name: <b>wwid</b>, <b>devnode</b>, <b>device</b>.<br><br>\n"
+"\t\t\t<b>wwid</b>: The world wide ID identifying the device in blacklist.<br>\n"
+"\t\t\t<b>devnode</b>: Regular expression can be used here to identify device names in udev_dir (default in directory /dev). Common device names are cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop.<br>\n"
+"\t\t\t<b>device</b>: Used to identify a specific storage controller in blacklist. A device can be specified by vendor and product name.<br>\n"
 "</p>"
 msgstr ""
-"<p><b><big>Svartelisteoppsett</big></b><br>"
-"\n"
-"\t\t\tEnhetsnavn som er angjeve her, kan forkastast som multipath-kandidatar.<br>"
-"\n"
-"\t\t\tEit enhetsnavn kan identifiserast på tre måtar: <b>wwid</b>, <b>devnode</b>, <b>device</b>.<br>"
-"<br>"
-"\n"
-"\t\t\t<b>wwid</b>: World wide ID som enhetsidentifikasjon i svartelisten.<br>"
-"\n"
-"\t\t\t<b>devnode</b>: Regulære uttrykk kan verta her brukte for å identifisera enhetsnavn i udev_dir (katalogen /dev er standard). Vanlege enhetsnavn er cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop.<br>"
-"\n"
-"\t\t\t<b>device</b>: Brukast for å identifisera ein spesifikk lagrings-kontrollar i svartelisten. Ei eining kan òg angjevast med produsent- og produktnavn.<br>"
-"\n"
+"<p><b><big>Svartelisteoppsett</big></b><br>\n"
+"\t\t\tEnhetsnavn som er angjeve her, kan forkastast som multipath-kandidatar.<br>\n"
+"\t\t\tEit enhetsnavn kan identifiserast på tre måtar: <b>wwid</b>, <b>devnode</b>, <b>device</b>.<br><br>\n"
+"\t\t\t<b>wwid</b>: World wide ID som enhetsidentifikasjon i svartelisten.<br>\n"
+"\t\t\t<b>devnode</b>: Regulære uttrykk kan verta her brukte for å identifisera enhetsnavn i udev_dir (katalogen /dev er standard). Vanlege enhetsnavn er cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop.<br>\n"
+"\t\t\t<b>device</b>: Brukast for å identifisera ein spesifikk lagrings-kontrollar i svartelisten. Ei eining kan òg angjevast med produsent- og produktnavn.<br>\n"
 "</p>"
 
 #. dialog help for blacklist_exception section configure tab 1/3
 #: src/include/multipath/helps.rb:89
 #, fuzzy
 msgid ""
-"<p><b><big>Blacklist Exceptions Configuration</big></b><br>"
-"\n"
-"\t\t\tDevice names listed here are excluded from blacklist.<br>"
-"\n"
-"\t\t\tThere are three methods to identify a device name: <b>wwid</b>, <b>devnode</b>, <b>device</b>.<br>"
-"<br>"
-"\n"
-"\t\t\t<b>wwid</b>: The world wide ID identifying the device excepted from blacklist.<br>"
-"\n"
-"\t\t\t<b>devnode</b>: Regular expression can be used here to identify device names in udev_dir (default in directory /dev). Common device names are cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop.<br>"
-"\n"
-"\t\t\t<b>device</b>: Used to identify a specific storage controller excepted from blacklist. A device can be specified by vendor and product name.<br>"
-"\n"
+"<p><b><big>Blacklist Exceptions Configuration</big></b><br>\n"
+"\t\t\tDevice names listed here are excluded from blacklist.<br>\n"
+"\t\t\tThere are three methods to identify a device name: <b>wwid</b>, <b>devnode</b>, <b>device</b>.<br><br>\n"
+"\t\t\t<b>wwid</b>: The world wide ID identifying the device excepted from blacklist.<br>\n"
+"\t\t\t<b>devnode</b>: Regular expression can be used here to identify device names in udev_dir (default in directory /dev). Common device names are cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop.<br>\n"
+"\t\t\t<b>device</b>: Used to identify a specific storage controller excepted from blacklist. A device can be specified by vendor and product name.<br>\n"
 "</p>"
 msgstr ""
-"<p><b><big>Oppset av svartelisteunntak</big></b><br>"
-"\n"
-"\t\t\tEnhetsnavn som er angjeven her, er ikkje med på svartelisten.<br>"
-"\n"
-"\t\t\tEit enhetsnavn kan angjevast på tre måtar: <b>wwid</b>, <b>devnode</b>, <b>device</b>.<br>"
-"<br>"
-"\n"
-"\t\t\t<b>wwid</b>: World wide ID angjev eininga som ikkje er med på svartelisten.<br>"
-"\n"
-"\t\t\t<b>devnode</b>: Regulære uttrykk kan verta her brukt for å angje enhetsnavn i udev_dir (standard er katalogen /dev). Vanlege enhetsnavn er cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop.<br>"
-"\n"
-"\t\t\t<b>device</b>: Brukast for å angje ein spesifikk lagrings-kontrollar som ikkje er med på svartelisten. Ei eining kan angjevast med produsent- og produktnavn.<br>"
-"\n"
+"<p><b><big>Oppset av svartelisteunntak</big></b><br>\n"
+"\t\t\tEnhetsnavn som er angjeven her, er ikkje med på svartelisten.<br>\n"
+"\t\t\tEit enhetsnavn kan angjevast på tre måtar: <b>wwid</b>, <b>devnode</b>, <b>device</b>.<br><br>\n"
+"\t\t\t<b>wwid</b>: World wide ID angjev eininga som ikkje er med på svartelisten.<br>\n"
+"\t\t\t<b>devnode</b>: Regulære uttrykk kan verta her brukt for å angje enhetsnavn i udev_dir (standard er katalogen /dev). Vanlege enhetsnavn er cciss, fd, hd, md, dm, sr, scd, st, ram, raw, loop.<br>\n"
+"\t\t\t<b>device</b>: Brukast for å angje ein spesifikk lagrings-kontrollar som ikkje er med på svartelisten. Ei eining kan angjevast med produsent- og produktnavn.<br>\n"
 "</p>"
 
 #. dialog help for devcies section configure tab 1/3
 #: src/include/multipath/helps.rb:99
 #, fuzzy
 msgid ""
-"<p><b><big>Devices Configuration</big></b><br>"
-"\n"
-"\t\t\tPer storage controller settings are listed here, they override the default settings and are overridden by per multipath settings.<br>"
-"\n"
-"\t\t\tEach device is identified by <b>vendor</b> and <b>product</b> name.<br>"
-"</p>"
-"\n"
+"<p><b><big>Devices Configuration</big></b><br>\n"
+"\t\t\tPer storage controller settings are listed here, they override the default settings and are overridden by per multipath settings.<br>\n"
+"\t\t\tEach device is identified by <b>vendor</b> and <b>product</b> name.<br></p>\n"
 msgstr ""
-"<p><b><big>Oppset av einingar</big></b><br>"
-"\n"
-"\t\t\tKontrollar-innstillingar per lagringsenhet er angjeven her. Dei overstyrer standardinnstillinger, og vert overstyrde per multipath-innstilling.<br>"
-"\n"
-"\t\t\tKvar eining vert angjeven med <b>produsent</b>- og <b>produkt</b>-namn.<br>"
-"</p>"
-"\n"
+"<p><b><big>Oppset av einingar</big></b><br>\n"
+"\t\t\tKontrollar-innstillingar per lagringsenhet er angjeven her. Dei overstyrer standardinnstillinger, og vert overstyrde per multipath-innstilling.<br>\n"
+"\t\t\tKvar eining vert angjeven med <b>produsent</b>- og <b>produkt</b>-namn.<br></p>\n"
 
 #. add quotes to configuration value, no matter how many words.
 #. if the value has quotes pair, do not touch it.

Modified: branches/plus-SLE12-SP2/yast/nn/po/ncurses-pkg.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/ncurses-pkg.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/ncurses-pkg.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -784,12 +784,8 @@
 #. part1 of help text package installation
 #: src/NCPkgStrings.cc:121
 #, fuzzy
-msgid ""
-"<p><b>Welcome to the package selector</b></p>"
-"<p>This tool will help you to manage the software on your system. You can install, update or remove single packages, as well as patterns (sets of packages serving certain purpose) or languages. Usually, you do not need to care about package dependencies when installing or removing anything, the solver will do it for you. The package selector consists of three main parts: <b>filters</b>, <b>package table</b> and <b>menu</b>.</p>"
-msgstr ""
-"<h3>Velkomen til pakkehandsamaren</h3>"
-"<p>Med dette verktøyet kan du administrera programvara som er installert på systemet. Du kan installera, oppdatera eller fjerne enkeltpakker, mønstra (pakkesett for spesielle føremål) or språk. Du treng vanlegvis ikkje å bry deg om avhengigheter når du installerer eller fjernar program – pakkehandsamaren ordnar dette for deg. Pakkehandsamaren består av tre deler: <b>filter, pakketabell<b> og <b>menylinje</b>.</p>"
+msgid "<p><b>Welcome to the package selector</b></p><p>This tool will help you to manage the software on your system. You can install, update or remove single packages, as well as patterns (sets of packages serving certain purpose) or languages. Usually, you do not need to care about package dependencies when installing or removing anything, the solver will do it for you. The package selector consists of three main parts: <b>filters</b>, <b>package table</b> and <b>menu</b>.</p>"
+msgstr "<h3>Velkomen til pakkehandsamaren</h3><p>Med dette verktøyet kan du administrera programvara som er installert på systemet. Du kan installera, oppdatera eller fjerne enkeltpakker, mønstra (pakkesett for spesielle føremål) or språk. Du treng vanlegvis ikkje å bry deg om avhengigheter når du installerer eller fjernar program – pakkehandsamaren ordnar dette for deg. Pakkehandsamaren består av tre deler: <b>filter, pakketabell<b> og <b>menylinje</b>.</p>"
 
 #. part of help text package installation
 #: src/NCPkgStrings.cc:129
@@ -806,27 +802,8 @@
 #. part2 of help text package installation
 #: src/NCPkgStrings.cc:143
 #, fuzzy
-msgid ""
-"<ol>"
-"<li>Package status (for more information see <i>Package Status and Symbols</i>)</li>"
-" "
-"<li>Package name</li>"
-"<li>Package summary</li>"
-"<li>Available version (in some of the configured repositories)</li>"
-" "
-"<li>Installed version(empty for not yet installed packages)</li>"
-" "
-"<li>Package size</li>"
-"</ol>"
-msgstr ""
-"<ol>"
-"<li>Pakkestatus (du finn meir informasjon under <i>Pakkestatus og symbol</i> )</li>"
-"<li>Pakkenavn</li>"
-"<li>Pakkesammendrag</li>"
-"<li>Tilgjengeleg versjon (frå dei valde pakkebrønnene)</li>"
-"<li>Installert versjon (berre for installerte pakker)</li>"
-"<li>Pakkestørrelse</li>"
-"</ol>"
+msgid "<ol><li>Package status (for more information see <i>Package Status and Symbols</i>)</li> <li>Package name</li><li>Package summary</li><li>Available version (in some of the configured repositories)</li> <li>Installed version(empty for not yet installed packages)</li> <li>Package size</li></ol>"
+msgstr "<ol><li>Pakkestatus (du finn meir informasjon under <i>Pakkestatus og symbol</i> )</li><li>Pakkenavn</li><li>Pakkesammendrag</li><li>Tilgjengeleg versjon (frå dei valde pakkebrønnene)</li><li>Installert versjon (berre for installerte pakker)</li><li>Pakkestørrelse</li></ol>"
 
 #. part3 of help text package installation
 #: src/NCPkgStrings.cc:151
@@ -849,12 +826,8 @@
 #. part 1 of help text package status
 #: src/NCPkgStrings.cc:172
 #, fuzzy
-msgid ""
-"<p>The package status can be changed using the <i>Actions</i> menu or the keys specified in the menu items. For example, use '+' to install an additional package.</p>"
-"<p>The \"Taboo\" status means the package should never be installed. On the contrary, the \"Locked\" status means that the installed version of a package should always be kept.</p>"
-msgstr ""
-"<p>Pakkestatus kan endrast ved hjelp av <i>Handlingar</i>-menyen eller med tastane som er spesifiserte i menypunktene. Bruk til dømes '+' for å installera ein tilleggspakke.</p>"
-"<p> Statusen \"Tabu\" tyder at pakka aldri skal installerast. Statusen \"Låst\" tyder at den installerte versjonen av pakka alltid skal haldast på.</p>"
+msgid "<p>The package status can be changed using the <i>Actions</i> menu or the keys specified in the menu items. For example, use '+' to install an additional package.</p><p>The \"Taboo\" status means the package should never be installed. On the contrary, the \"Locked\" status means that the installed version of a package should always be kept.</p>"
+msgstr "<p>Pakkestatus kan endrast ved hjelp av <i>Handlingar</i>-menyen eller med tastane som er spesifiserte i menypunktene. Bruk til dømes '+' for å installera ein tilleggspakke.</p><p> Statusen \"Tabu\" tyder at pakka aldri skal installerast. Statusen \"Låst\" tyder at den installerte versjonen av pakka alltid skal haldast på.</p>"
 
 #. part 2 of help text package status
 #: src/NCPkgStrings.cc:179
@@ -871,34 +844,14 @@
 #. help text package status
 #: src/NCPkgStrings.cc:192
 #, fuzzy
-msgid ""
-"<p><b> + </b>:  package will be installed</p>"
-"<p><b>a+ </b>: package will be installed automatically</p>"
-"<p><b> > </b>: package will be updated</p>"
-"<p><b>a> </b>: package will be automatically updated</p>"
-"<p><b> i </b>: package is installed</p>"
-"<p><b> - </b>:  package will be deleted</p>"
-"<p><b>---</b>: never install this package (taboo)</p>"
-msgstr ""
-"<p><b> + </b>: Pakka vil installerast</p>"
-"<p><b>a+ </b>: Pakka vil installerast automatisk</p>"
-"<p><b> > </b>: Pakka vil oppgraderast</p>"
-"<p><b>a> </b>: Pakka vil oppgraderast automatisk</p>"
-"<p><b> i </b>: Pakka er installert</p>"
-"<p><b> – </b>: Pakka vil fjernast</p>"
-"<p><b>---</b>: Installer aldri denne pakka (tabu)</p>"
+msgid "<p><b> + </b>:  package will be installed</p><p><b>a+ </b>: package will be installed automatically</p><p><b> > </b>: package will be updated</p><p><b>a> </b>: package will be automatically updated</p><p><b> i </b>: package is installed</p><p><b> - </b>:  package will be deleted</p><p><b>---</b>: never install this package (taboo)</p>"
+msgstr "<p><b> + </b>: Pakka vil installerast</p><p><b>a+ </b>: Pakka vil installerast automatisk</p><p><b> > </b>: Pakka vil oppgraderast</p><p><b>a> </b>: Pakka vil oppgraderast automatisk</p><p><b> i </b>: Pakka er installert</p><p><b> – </b>: Pakka vil fjernast</p><p><b>---</b>: Installer aldri denne pakka (tabu)</p>"
 
 #. help text package status
 #: src/NCPkgStrings.cc:199
 #, fuzzy
-msgid ""
-"<p><b>-i-</b>: keep the installed version and never update or delete it ( package locked )</p>"
-"<p>Status information for pattern and languages:</p>"
-"<p><b> i </b>: All requirements of this pattern/language are satisfied</p>"
-msgstr ""
-"<p><b>-i-</b>: Hald på den installerte versjonen. Han skal aldri oppgraderast eller vert fjerna (låst pakke)</p>"
-"<p>Statusinformasjon for mønster og språk</p>"
-"<p><b></b>: Alle avhengigheter for dette mønstret/språket er oppfylt</p>"
+msgid "<p><b>-i-</b>: keep the installed version and never update or delete it ( package locked )</p><p>Status information for pattern and languages:</p><p><b> i </b>: All requirements of this pattern/language are satisfied</p>"
+msgstr "<p><b>-i-</b>: Hald på den installerte versjonen. Han skal aldri oppgraderast eller vert fjerna (låst pakke)</p><p>Statusinformasjon for mønster og språk</p><p><b></b>: Alle avhengigheter for dette mønstret/språket er oppfylt</p>"
 
 #. label for an error popup
 #: src/NCPkgStrings.cc:206
@@ -944,9 +897,7 @@
 
 #: src/NCPkgStrings.cc:254
 #, fuzzy
-msgid ""
-"<p><b>Dependencies:</b><br>"
-" This menu offers various actions related to the handling of package dependencies. By default, package dependencies are checked with every status change. You will be informed about package conflicts in a dialog proposing possible conflict resolutions. To resolve the conflict, select one of the offered solutions and press 'OK -- Try Again'.</p>"
+msgid "<p><b>Dependencies:</b><br> This menu offers various actions related to the handling of package dependencies. By default, package dependencies are checked with every status change. You will be informed about package conflicts in a dialog proposing possible conflict resolutions. To resolve the conflict, select one of the offered solutions and press 'OK -- Try Again'.</p>"
 msgstr "<p><b>Avhengigheter:</b> Denne menyen tilbyr ulike handlingar for å lause pakkekonflikter. Som standard vert kontrollert avhengighetene kvar gong du endrar pakkestatus (<i>Automatisk konfliktkontroll</i> er avkrysset). Du får informasjon om pakkekonflikter og forslag til å løysa dei. Vel ein av dei foreslegne løysingane for å lause ein konflikt, og prøv på nytt.</p>"
 
 #: src/NCPkgStrings.cc:260
@@ -956,36 +907,26 @@
 
 #: src/NCPkgStrings.cc:267
 #, fuzzy
-msgid ""
-"<p>Available options for dependency checking are:<br>"
-"<i>Automatic Dependency Check</i> (see above), <i>Install Recommended Packages</i>: if ON, weak dependencies will be honored, <i>System Verification Mode</i>: repair dependencies of installed packages and solve immediately. Please note: after checking the system with <i>Verify System Now</i> the option <i>System Verification Mode</i> is ON (uncheck the option, if desired). These options are saved in the YaST configuration file <tt>/etc/sysconfig/yast2</tt>.</p>"
+msgid "<p>Available options for dependency checking are:<br><i>Automatic Dependency Check</i> (see above), <i>Install Recommended Packages</i>: if ON, weak dependencies will be honored, <i>System Verification Mode</i>: repair dependencies of installed packages and solve immediately. Please note: after checking the system with <i>Verify System Now</i> the option <i>System Verification Mode</i> is ON (uncheck the option, if desired). These options are saved in the YaST configuration file <tt>/etc/sysconfig/yast2</tt>.</p>"
 msgstr "<p>Tilgjengelege val for avhengighetskontroll er: <i>Systemverifiseringsmodus</i> (overvak og reparer avhengigheter for allereie installerte pakker og lòs konfliktar umiddelbart), <i>Rydd opp når pakker vert fjerna</i> (fjern pakkar som ikkje lenger krevjast av andre pakker) og <i>Tillat byte av leverandør</i> (pakka kan ha ein annan leverandør enn den installerte pakka). Hugs: Etter at systemet er kontrollert med <i>Verifiser systemet no</i>, vil <i>Systemverifiseringsmodus</i> aktiverast (fjern eventuelt dette valet).</p>"
 
 #: src/NCPkgStrings.cc:279
-msgid ""
-"<p>Advanced options:<br>"
-" <i>Cleanup when deleting packages</i>: remove dependent unused packages. <i>Allow vendor change</i>: package vendor may differ from vendor of installed package. These options will not be saved, they can only be set in the configuration file of the package library <tt>/etc/zypp/zypp.conf</tt>.</p>"
+msgid "<p>Advanced options:<br> <i>Cleanup when deleting packages</i>: remove dependent unused packages. <i>Allow vendor change</i>: package vendor may differ from vendor of installed package. These options will not be saved, they can only be set in the configuration file of the package library <tt>/etc/zypp/zypp.conf</tt>.</p>"
 msgstr ""
 
 #: src/NCPkgStrings.cc:285
 #, fuzzy
-msgid ""
-"<p><b>View:</b><br>"
-"Choose which information about the selected package will be displayed in the window below the package table. Available options are: package description, technical data (version, size, license etc.) package versions (all available), file list (all files included in the package) and dependencies (provides, requires etc.).</p>"
+msgid "<p><b>View:</b><br>Choose which information about the selected package will be displayed in the window below the package table. Available options are: package description, technical data (version, size, license etc.) package versions (all available), file list (all files included in the package) and dependencies (provides, requires etc.).</p>"
 msgstr "<p><b>Vis:</b> Her kan du velja kva for ein informasjon som skal visast om den valde pakka i vindauget under pakketabellen. Tilgjengelege val er: pakkebeskrivelse, teknisk informasjon (versjon, storleik, lisens osb.), pakkeversjoner (alle tigjengelige), filliste (alle filene som pakka består av) og avhengigheter (gir, krev osb.).</p>"
 
 #: src/NCPkgStrings.cc:291
 #, fuzzy
-msgid ""
-"<p><b>Configuration:</b><br>"
-"This menu integrates package selector with the rest of package management utils. From here, you can <b>Launch Repository Manager</b> and edit configured repositories or register to update repository and configure periodic download of available updates (<b>Launch Online Update Configuration</b>). Also, you can pick one of the three possible behaviours of package selector at exit - in <b>Action after Package Installation</b> menu.</p>"
+msgid "<p><b>Configuration:</b><br>This menu integrates package selector with the rest of package management utils. From here, you can <b>Launch Repository Manager</b> and edit configured repositories or register to update repository and configure periodic download of available updates (<b>Launch Online Update Configuration</b>). Also, you can pick one of the three possible behaviours of package selector at exit - in <b>Action after Package Installation</b> menu.</p>"
 msgstr "<p><b>Oppset:</b> I denne menyen er pakkevelgeren integrert med resten av pakkehandsamarverktøyene. Her kan du velja <b>Start pakkebrønnhandsamar</b> for å redigera pakkebrønner, velja å oppdatera pakkebrønner og setja opp periodisk nedlasting av tilgjengelege oppdateringar (<b>Start oppsett av online-oppdatering</b>). Du kan òg velja ein av dei tre måtane pakkevelgeren skal avsluttast på i menyen <b>Handlng etter pakkeinstallasjon</b>.</p>"
 
 #: src/NCPkgStrings.cc:296
 #, fuzzy
-msgid ""
-"<p><b>Extras:</b><br>"
-"Miscellaneous functions reside here. <i>Export Package List to File</i> will dump data on installed packages, patterns and languages into specified XML file. This file can be later read by <i>Import Package List from File</i> option e.g. on different computer. It will bring the set of packages on the target computer into the same state as described in provided XML file. <i>Show Available Disk Space</i> will show a popup table displaying disk usage and free disk space on currently mounted partition.</p>"
+msgid "<p><b>Extras:</b><br>Miscellaneous functions reside here. <i>Export Package List to File</i> will dump data on installed packages, patterns and languages into specified XML file. This file can be later read by <i>Import Package List from File</i> option e.g. on different computer. It will bring the set of packages on the target computer into the same state as described in provided XML file. <i>Show Available Disk Space</i> will show a popup table displaying disk usage and free disk space on currently mounted partition.</p>"
 msgstr "<p>Under <b>Tillegg:</b> finn du diverse funksjonar. <i>Eksportar pakkeliste til fil</i> lagrar rådata om installerte pakker, mønster og språk i ein spesifisert XML-fil. Denne fila kan seinare brukast av funksjonen <i>Importar pakkeliste frå fil</i>, t.d. på ein anna datamaskin. Dette vil gje pakkene på måldatamaskinen same status som XML-fila skildrar. <i>Vis ledig diskplass</i> vil visa brukt og ledig plass på den monterte partisjonen i eit oppsprettvindu.</p>"
 
 #. label of a frame with search settings
@@ -1222,9 +1163,7 @@
 #. help text online udpate
 #. Do NOT translate 'recommended' and 'security'! because the patch kind is always shown as english text.
 #: src/NCPkgStrings.cc:618
-msgid ""
-"<p>General information about patches:</p>"
-"<p>The patches of kind <b>security</b> are solving security issues and we highly recommend to install it. You should also install <b>recommended</b> patches, they usually contain important bug-fixes. Install <b>feature</b> patches if you are interested in the feature.</p>"
+msgid "<p>General information about patches:</p><p>The patches of kind <b>security</b> are solving security issues and we highly recommend to install it. You should also install <b>recommended</b> patches, they usually contain important bug-fixes. Install <b>feature</b> patches if you are interested in the feature.</p>"
 msgstr ""
 
 #. help text online udpate continue
@@ -1236,32 +1175,17 @@
 #. help text online udpate continue
 #: src/NCPkgStrings.cc:632
 #, fuzzy
-msgid ""
-"<p>Meaning of the status flags:</p>"
-"<p><b>a+ </b>: Patches concerning your installation are preselected. They will be downloaded and installed on your system. If you do not want a certain patch, deselect it with '-'.</p>"
-"<p><b> i </b>: All requirements of this patch are satisfied.</p>"
-"<p><b> + </b>: You have selected this patch for installation.</p>"
-msgstr ""
-"<p>Statusindikatorenes tyding:</p>"
-"<p><b>a+ </b>: Pakkeoppdateringer for installasjonen er forhåndsvalgt. Dei vil lastast ned og installert. Viss du ikkje ynskjer ei spesiell oppdatering, kan du velja han bort med '-'.</p>"
-"<p><b> i</b>: Alle avhengigheter for denne pakkeoppdateringen er oppfylt.</p>"
-"<p><b>+ </b>: Du har valt å installera denne pakkeoppdateringen.</p>"
+msgid "<p>Meaning of the status flags:</p><p><b>a+ </b>: Patches concerning your installation are preselected. They will be downloaded and installed on your system. If you do not want a certain patch, deselect it with '-'.</p><p><b> i </b>: All requirements of this patch are satisfied.</p><p><b> + </b>: You have selected this patch for installation.</p>"
+msgstr "<p>Statusindikatorenes tyding:</p><p><b>a+ </b>: Pakkeoppdateringer for installasjonen er forhåndsvalgt. Dei vil lastast ned og installert. Viss du ikkje ynskjer ei spesiell oppdatering, kan du velja han bort med '-'.</p><p><b> i</b>: Alle avhengigheter for denne pakkeoppdateringen er oppfylt.</p><p><b>+ </b>: Du har valt å installera denne pakkeoppdateringen.</p>"
 
 #. help text online udpate continue
 #: src/NCPkgStrings.cc:639
-msgid ""
-"<p>More details about the status:<br>"
-"If there are several patches for a package (or a set of packages) which aren't yet applied to the system all got preselected and have status <b>a+</b>. If one of these patches is deselected with '-' it might show the status <b>i</b> afterwards. This is because any of the other patches concerning the same package(s) is still selected. The newer version(s) of the package(s) will be installed and with it this patch is satisfied. Deselecting of all patches is required if the patches are not wanted.</p>"
+msgid "<p>More details about the status:<br>If there are several patches for a package (or a set of packages) which aren't yet applied to the system all got preselected and have status <b>a+</b>. If one of these patches is deselected with '-' it might show the status <b>i</b> afterwards. This is because any of the other patches concerning the same package(s) is still selected. The newer version(s) of the package(s) will be installed and with it this patch is satisfied. Deselecting of all patches is required if the patches are not wanted.</p>"
 msgstr ""
 
 #. help text online udpate continue
 #: src/NCPkgStrings.cc:646
-msgid ""
-"<p>The menus:</p>"
-"<p>The <b>Filter</b> menu allows to filter the patches, e.g. show the 'Installed' ones or list 'Security' patches. It also provides to search for patches.<br>"
-"Use the <b>Actions</b> menu to change the status of a patch.<br>"
-"The <b>View</b> menu offers the possibility to see which packages are concerned by the patch. Please note: If the filter is 'All Patches' the package list for some patches might be empty. This means no packages are concerned because none of the patch packages is installed on the system.<br>"
-"The <b>Dependencies</b> menu contains dependencies checks and the 'Generate Solver Testcase' entry.</p>"
+msgid "<p>The menus:</p><p>The <b>Filter</b> menu allows to filter the patches, e.g. show the 'Installed' ones or list 'Security' patches. It also provides to search for patches.<br>Use the <b>Actions</b> menu to change the status of a patch.<br>The <b>View</b> menu offers the possibility to see which packages are concerned by the patch. Please note: If the filter is 'All Patches' the package list for some patches might be empty. This means no packages are concerned because none of the patch packages is installed on the system.<br>The <b>Dependencies</b> menu contains dependencies checks and the 'Generate Solver Testcase' entry.</p>"
 msgstr ""
 
 #. label for a warning popup
@@ -1316,12 +1240,8 @@
 #. text for a Notify popup
 #: src/NCPkgStrings.cc:728
 #, fuzzy
-msgid ""
-"<p>All changes in the package, patch or pattern selection will be lost.<br>"
-"Really exit?</p>"
-msgstr ""
-"<p>Alle vala dine vil gå tapt når du avsluttar med Avbryt.<br>"
-"Vil du verkeleg avslutta?</p>"
+msgid "<p>All changes in the package, patch or pattern selection will be lost.<br>Really exit?</p>"
+msgstr "<p>Alle vala dine vil gå tapt når du avsluttar med Avbryt.<br>Vil du verkeleg avslutta?</p>"
 
 #. the label of language table
 #: src/NCPkgStrings.cc:736
@@ -1378,22 +1298,8 @@
 #. help text package status
 #: src/NCPkgStrings.cc:797
 #, fuzzy
-msgid ""
-"<b>Update Problem List</b><br>"
-"<p>The packages in the list cannot be updated automatically.</p>"
-"<p>Possible reasons:</p>"
-"<p>They are obsoleted by other packages.</p>"
-"<p>There is no newer version to which to update on any installation media.</p>"
-"<p>They are third-party packages</p>"
-"<p>Manually select what to do with them. The safest course of action is to delete them.</p>"
-msgstr ""
-"<b>Oppgraderingsfeil</b><br>"
-"<p>Pakkene i lista kan ikkje oppgraderast automatisk.</p>"
-"<p>Moglege årsaker:</p>"
-"<p>Dei er inkompatible pga. installasjon av andre pakker.</p>"
-"<p>Det finst ingen nyare versjon å oppgradera til på installasjonsmediene.</p>"
-"<p>Det er pakker frå tredjepart</p>"
-"<p>Vel kva du vil gjera med dei manuelt. Det sikraste alternativet er å fjerna pakka.</p>"
+msgid "<b>Update Problem List</b><br><p>The packages in the list cannot be updated automatically.</p><p>Possible reasons:</p><p>They are obsoleted by other packages.</p><p>There is no newer version to which to update on any installation media.</p><p>They are third-party packages</p><p>Manually select what to do with them. The safest course of action is to delete them.</p>"
+msgstr "<b>Oppgraderingsfeil</b><br><p>Pakkene i lista kan ikkje oppgraderast automatisk.</p><p>Moglege årsaker:</p><p>Dei er inkompatible pga. installasjon av andre pakker.</p><p>Det finst ingen nyare versjon å oppgradera til på installasjonsmediene.</p><p>Det er pakker frå tredjepart</p><p>Vel kva du vil gjera med dei manuelt. Det sikraste alternativet er å fjerna pakka.</p>"
 
 #. column header source RPM installation (keep it short!)
 #: src/NCPkgStrings.cc:804
@@ -1434,16 +1340,11 @@
 msgstr ""
 
 #: src/NCPkgStrings.cc:854
-msgid ""
-"<p>This version is multiversion-capable.</p>"
-"<p>Press \"Continue\" to install this version and unselect the non-multiversion-capable version, \"Cancel\" to unselect this version and keep the other one.</p>"
+msgid "<p>This version is multiversion-capable.</p><p>Press \"Continue\" to install this version and unselect the non-multiversion-capable version, \"Cancel\" to unselect this version and keep the other one.</p>"
 msgstr ""
 
 #: src/NCPkgStrings.cc:864
-msgid ""
-"<p>This version is not multiversion-capable.</p>"
-"<p>Press \"Continue\" to install only this version and unselect all other versions, \"Cancel\" to unselect this version and keep the other ones."
-"<p>"
+msgid "<p>This version is not multiversion-capable.</p><p>Press \"Continue\" to install only this version and unselect all other versions, \"Cancel\" to unselect this version and keep the other ones.<p>"
 msgstr ""
 
 #, fuzzy

Modified: branches/plus-SLE12-SP2/yast/nn/po/network.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/network.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/network.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -142,14 +142,12 @@
 #: src/clients/firewall_stage1_proposal.rb:195
 #, fuzzy
 msgid ""
-"<p><b><big>Firewall and SSH</big></b><br>"
-"\n"
+"<p><b><big>Firewall and SSH</big></b><br>\n"
 "Firewall is a defensive mechanism that protects your computer from network attacks.\n"
 "SSH is a service that allows logging into this computer remotely via dedicated\n"
 "SSH client</p>"
 msgstr ""
-"<p><b><big>Brannmur og SSH</big></b><br />"
-"\n"
+"<p><b><big>Brannmur og SSH</big></b><br />\n"
 "Ein brannmur er ein forsvarsmekanisme som vernar maskina mot angrep via nettverket.\n"
 "SSH er ei teneste som tillèt innlogging på denne datamaskina via ein spesiell\n"
 "SSH-klient</p>"
@@ -248,7 +246,7 @@
 
 #. Command line output Headline
 #. configuration of hosts
-#: src/clients/host.rb:123
+#: src/clients/host.rb:114
 #, fuzzy
 msgid "Host Configuration Summary:"
 msgstr "Vertsmaskiner, oppsettssammendrag:"
@@ -282,36 +280,30 @@
 #, fuzzy
 msgid ""
 "<p>Here, view the progress of the\n"
-"Internet connection test.</p>"
-"\n"
+"Internet connection test.</p>\n"
 msgstr ""
 "<p>Her vert vist fremdriften for\n"
-"kontrollen av internettforbindelsen.</p>"
-"\n"
+"kontrollen av internettforbindelsen.</p>\n"
 
 #. help for dialog "Running Internet Connection Test"
 #: src/clients/inst_do_net_test.rb:246
 #, fuzzy
 msgid ""
 "<p>The test can be aborted by pressing\n"
-"<b>Abort Test</b>.</p>"
-"\n"
+"<b>Abort Test</b>.</p>\n"
 msgstr ""
 "<p>Du kan avbryta testen ved å klikka på\n"
-"<b>Avbryt test</b>.</p>"
-"\n"
+"<b>Avbryt test</b>.</p>\n"
 
 #. help for dialog "Running Internet Connection Test"
 #: src/clients/inst_do_net_test.rb:254
 #, fuzzy
 msgid ""
 "<p>If the test fails, return to the network configuration\n"
-"and correct the settings.</p>"
-"\n"
+"and correct the settings.</p>\n"
 msgstr ""
 "<p>Gå tilbake til nettverksoppsett og korriger\n"
-"innstillingane viss testen mislukkast.</p>"
-"\n"
+"innstillingane viss testen mislukkast.</p>\n"
 
 #. Label for result of internet test
 #: src/clients/inst_do_net_test.rb:288
@@ -571,7 +563,7 @@
 #. in case keep_install_network is set to true (in AY)
 #. we'll keep values from installation
 #. and merge with XML data (bnc#712864)
-#: src/clients/lan_auto.rb:136
+#: src/clients/lan_auto.rb:108
 #, fuzzy
 msgid "Configuration Error: uninitialized interface."
 msgstr "Oppsettfeil: Grensesnitt er ikkje initialisert!"
@@ -674,7 +666,7 @@
 #. Commandline help title
 #. Main routing dialog
 #. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:468
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:480
 #, fuzzy
 msgid "Routing Configuration"
 msgstr "Rutingoppsett"
@@ -878,14 +870,14 @@
 
 #. interface summary: WiFi without encryption
 #. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1363
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1367
 #, fuzzy
 msgid "Warning: no encryption is used."
 msgstr "Advarsel: ingen kryptering vert nytta."
 
 #. Hyperlink: Change the configuration of an interface
 #. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1365
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1369
 #, fuzzy
 msgid "Change."
 msgstr "Endre."
@@ -1256,7 +1248,7 @@
 #. Table header label
 #. Table header label
 #: src/include/network/lan/address.rb:97 src/include/network/lan/complex.rb:75
-#: src/include/network/services/host.rb:128
+#: src/include/network/services/host.rb:129
 #, fuzzy
 msgid "IP Address"
 msgstr "IP-adresse"
@@ -1265,7 +1257,7 @@
 #. PushButton label
 #. PushButton label
 #: src/include/network/lan/address.rb:106
-#: src/include/network/services/host.rb:139
+#: src/include/network/services/host.rb:140
 #: src/include/network/services/routing.rb:100
 #, fuzzy
 msgid "Ad&d"
@@ -1276,7 +1268,7 @@
 #. PushButton label
 #. Pushbutton label
 #: src/include/network/lan/address.rb:108
-#: src/include/network/services/host.rb:141
+#: src/include/network/services/host.rb:142
 #: src/include/network/services/routing.rb:102
 #: src/include/network/summary.rb:69
 #, fuzzy
@@ -1288,7 +1280,7 @@
 #. PushButton label
 #. Pushbutton label
 #: src/include/network/lan/address.rb:110
-#: src/include/network/services/host.rb:143
+#: src/include/network/services/host.rb:144
 #: src/include/network/services/routing.rb:104
 #: src/include/network/summary.rb:71
 #, fuzzy
@@ -1344,7 +1336,7 @@
 msgstr "Tunnelgruppe"
 
 #: src/include/network/lan/address.rb:191
-#: src/include/network/lan/address.rb:1297
+#: src/include/network/lan/address.rb:1315
 #, fuzzy
 msgid "Bridged Devices"
 msgstr "Bru-einingar"
@@ -1393,7 +1385,7 @@
 #. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty());
 #. else
 #: src/include/network/lan/address.rb:283
-#: src/include/network/lan/address.rb:798
+#: src/include/network/lan/address.rb:816
 #, fuzzy
 msgid "No Link and IP Setup (Bonding Slaves)"
 msgstr "Tilkoblings- og IP-oppsett manglar (bonding-slavar)"
@@ -1433,7 +1425,7 @@
 #. TextEntry label
 #: src/include/network/lan/address.rb:325
 #: src/include/network/lan/virtual.rb:213
-#: src/include/network/services/host.rb:341
+#: src/include/network/services/host.rb:334
 #, fuzzy
 msgid "&IP Address"
 msgstr "&IP-Adresse"
@@ -1467,7 +1459,7 @@
 msgstr "&S/390"
 
 #. validate device type, misdetection
-#: src/include/network/lan/address.rb:1018
+#: src/include/network/lan/address.rb:1036
 #, fuzzy
 msgid ""
 "You have changed the interface type from the one\n"
@@ -1479,14 +1471,14 @@
 "du er sikker på at feil grensesnittype vart funnen."
 
 #. Popup text
-#: src/include/network/lan/address.rb:1038
+#: src/include/network/lan/address.rb:1056
 #, fuzzy
 msgid "Configuration %1 already present."
 msgstr "Oppsettet %1 finst allereie."
 
 #. If firewall is active and interface in no zone, nothing
 #. gets through (#62309) so warn and redirect to details
-#: src/include/network/lan/address.rb:1062
+#: src/include/network/lan/address.rb:1080
 #, fuzzy
 msgid ""
 "The firewall is active, but this interface is not\n"
@@ -1501,23 +1493,23 @@
 #. @param [String] key	the widget being validated
 #. @param [Hash] event	the event being handled
 #. @return whether valid
-#: src/include/network/lan/address.rb:1082
+#: src/include/network/lan/address.rb:1100
 #, fuzzy
 msgid "No valid IP address."
 msgstr "Ugyldig IP-adresse."
 
-#: src/include/network/lan/address.rb:1089
+#: src/include/network/lan/address.rb:1107
 #, fuzzy
 msgid "No valid netmask or prefix length."
 msgstr "Ugyldig nettverksmaske eller prefikslengde."
 
-#: src/include/network/lan/address.rb:1097
+#: src/include/network/lan/address.rb:1115
 #, fuzzy
 msgid "Invalid hostname."
 msgstr "Ugyldig vertsnavn."
 
 #. There'll be no 127.0.0.2 -> remind user to define some hostname
-#: src/include/network/lan/address.rb:1105
+#: src/include/network/lan/address.rb:1123
 #, fuzzy
 msgid ""
 "No hostname has been specified. We recommend to associate \n"
@@ -1533,7 +1525,7 @@
 "Vil du likevel ikkje angje noko vertsnavn?"
 
 #. Popup text
-#: src/include/network/lan/address.rb:1124
+#: src/include/network/lan/address.rb:1142
 #, fuzzy
 msgid ""
 "Duplicate IP address detected.\n"
@@ -1544,96 +1536,92 @@
 
 #. @param [Array<String>] types network card types
 #. @return their descriptions for CWM
-#: src/include/network/lan/address.rb:1177
+#: src/include/network/lan/address.rb:1195
 #, fuzzy
 msgid "&General"
 msgstr "&Generelt"
 
 #. TODO: "MANDATORY",
-#: src/include/network/lan/address.rb:1188
+#: src/include/network/lan/address.rb:1206
 #, fuzzy
 msgid "Device Activation"
 msgstr "Enhetsaktivering"
 
-#: src/include/network/lan/address.rb:1192
+#: src/include/network/lan/address.rb:1210
 #, fuzzy
 msgid "Firewall Zone"
 msgstr "Brannmursone"
 
-#: src/include/network/lan/address.rb:1197
+#: src/include/network/lan/address.rb:1215
 #, fuzzy
 msgid "Maximum Transfer Unit (MTU)"
 msgstr "Største overføringsenhet (MTU)"
 
 #. FIXME: we have helps per widget and for the whole
 #. tab set but not for one tab
-#: src/include/network/lan/address.rb:1207
+#: src/include/network/lan/address.rb:1225
 #, fuzzy
 msgid "<p>Configure the detailed network card settings here.</p>"
 msgstr "<p>Vel detaljerte innstillingar for nettverkskort her.</p>"
 
 #. FIXME: here it does not complain about missing
 #. shortcuts
-#: src/include/network/lan/address.rb:1274
+#: src/include/network/lan/address.rb:1292
 #, fuzzy
 msgid "&Address"
 msgstr "&Adresse"
 
 #. Address tab help
-#: src/include/network/lan/address.rb:1277
+#: src/include/network/lan/address.rb:1295
 #, fuzzy
 msgid "<p>Configure your IP address.</p>"
 msgstr "<p>Sett opp IP-adressa di.</p>"
 
-#: src/include/network/lan/address.rb:1283
+#: src/include/network/lan/address.rb:1301
 #, fuzzy
 msgid "&Hardware"
 msgstr "&Maskinvare"
 
-#: src/include/network/lan/address.rb:1290
+#: src/include/network/lan/address.rb:1308
 #, fuzzy
 msgid "&Bond Slaves"
 msgstr "&Bond-slavar"
 
-#: src/include/network/lan/address.rb:1304
+#: src/include/network/lan/address.rb:1322
 #, fuzzy
 msgid "&Wireless"
 msgstr "&Trådlaust"
 
 #. Combo box label - when to activate device (e.g. on boot, manually, never,..)
-#: src/include/network/lan/address.rb:1388
+#: src/include/network/lan/address.rb:1406
 #, fuzzy
 msgid "Ifplugd Priority"
 msgstr "Ifplugd-prioritet"
 
 #. Device activation main help. The individual parts will be
 #. substituted as %1
-#: src/include/network/lan/address.rb:1394
+#: src/include/network/lan/address.rb:1412
 #, fuzzy
 msgid ""
-"<p><b><big>IFPLUGD PRIORITY</big></b></p>"
-" \n"
+"<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"
 " used mutually exclusive. If more then one of these interfaces is <b>On Cable Connection</b>\n"
 " then we need a way to decide which interface to take up. Therefore we have to\n"
-" set the priority of each interface.  </p>"
-"\n"
+" set the priority of each interface.  </p>\n"
 msgstr ""
-"<p><b><big>IFPLUGD PRIORITY</big></b></p>"
-" \n"
+"<p><b><big>IFPLUGD PRIORITY</big></b></p> \n"
 "<p> Alle grensesnitt sat opp med <b>Kabelforbindelse</b> og med IFPLUGD_pRIORITY != 0 vil brukast uavhengig av kvarandre. Viss fleire enn eitt av desse grensesnitta er <b>Kabelforbindelse</b>,\n"
 " må det kjennast kva for eit grensesnitt som skal nyttast. Difor må\n"
-" det angjevast ein prioritet for kvart grensesnitt.  </p>"
-"\n"
+" det angjevast ein prioritet for kvart grensesnitt.  </p>\n"
 
 #. Address dialog caption
-#: src/include/network/lan/address.rb:1476
+#: src/include/network/lan/address.rb:1494
 #, fuzzy
 msgid "Network Card Setup"
 msgstr "Nettverkskortoppsett"
 
 #. remove all aliases (bnc#590167)
-#: src/include/network/lan/bridge.rb:103
+#: src/include/network/lan/bridge.rb:86
 #, fuzzy
 msgid ""
 "At least one selected device is already configured.\n"
@@ -2016,13 +2004,13 @@
 "vil det ikkje lengjer kunna styrast via NetworkManager.\n"
 
 #. warn user when device to delete has STARTMODE=nfsroot (bnc#433867)
-#: src/include/network/lan/complex.rb:456
+#: src/include/network/lan/complex.rb:454
 #, fuzzy
 msgid "Device you select has STARTMODE=nfsroot. Really delete?"
 msgstr "Den valde eininga har STARTMODE=nfsroot. Vil du verkeleg slette henne?"
 
 #. Network setup method dialog caption
-#: src/include/network/lan/complex.rb:487 src/include/network/widgets.rb:363
+#: src/include/network/lan/complex.rb:485 src/include/network/widgets.rb:363
 #, fuzzy
 msgid "Network Setup Method"
 msgstr "Oppsettsmetode for nettverk"
@@ -2032,7 +2020,7 @@
 #. it is basically useful if user aborts dialog and he has done some
 #. changes already. Calling this function may results in confirmation
 #. popup.
-#: src/include/network/lan/complex.rb:519
+#: src/include/network/lan/complex.rb:517
 #, fuzzy
 msgid "Network Settings"
 msgstr "Nettverksinnstillinger"
@@ -2068,12 +2056,10 @@
 #, fuzzy
 msgid ""
 "<p>Set up hardware-specific options for \n"
-"your network device here.</p>"
-"\n"
+"your network device here.</p>\n"
 msgstr ""
 "<p>Angje maskinvarespesifikke val for \n"
-"nettverksenheten her.</p>"
-"\n"
+"nettverksenheten her.</p>\n"
 
 #. Manual network card setup help 2/4
 #. translators: do not translated udev, MAC, BusID
@@ -2111,13 +2097,11 @@
 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"
-"your device in the drop-down list. If necessary, choose a driver from the list, but usually the default value works.</p>"
-"\n"
+"your device in the drop-down list. If necessary, choose a driver from the list, but usually the default value works.</p>\n"
 msgstr ""
 "<p><b>Kjernemodul</b>. Angje kjernemodulnavnet (driv) \n"
 "for nettverksenheten her. Viss eininga allereie er sett opp, kontrollar om det er meir enn éin drivar tilgjengeleg for\n"
-"eininga i nedtrekkslisten. Du kan om naudsynt velja ein driv frå lista, men normalt fungerer standardverdien bra.</p>"
-"\n"
+"eininga i nedtrekkslisten. Du kan om naudsynt velja ein driv frå lista, men normalt fungerer standardverdien bra.</p>\n"
 
 #. Manual networ card setup help 3/4
 #: src/include/network/lan/hardware.rb:125
@@ -2125,34 +2109,26 @@
 msgid ""
 "<p>Additionally, specify <b>Options</b> for the kernel module. Use this\n"
 "format: <i>option</i>=<i>value</i>. Each entry should be space-separated, for example: <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are \n"
-"configured with the same module name, the options will be merged while saving.</p>"
-"\n"
+"configured with the same module name, the options will be merged while saving.</p>\n"
 msgstr ""
 "<p>Du kan òg angje <b>Val</b> for kjernemodulen i følgjande format: <i>val</i>=<i>verd</i>. Kvar oppføring skal vera adskilt\n"
 "av mellomrom, til dømes, <i>io=0x300 irq=5</i>. <b>Merk:</b> Viss  to kort er sette opp\n"
-"med same modulnavn, vil vala slåast saman ved lagring.</p>"
-"\n"
+"med same modulnavn, vil vala slåast saman ved lagring.</p>\n"
 
 #: src/include/network/lan/hardware.rb:131
 #, fuzzy
-msgid ""
-"<p>If you specify options via <b>Ethtool options</b>, ifup will call ethtool with these options.</p>"
-"\n"
-msgstr ""
-"<p>Viss du skriv inn noko under <b>Ethtool.val</b>, vil ifup senda ein kommando med desse vala til ethtool.</p>"
-"\n"
+msgid "<p>If you specify options via <b>Ethtool options</b>, ifup will call ethtool with these options.</p>\n"
+msgstr "<p>Viss du skriv inn noko under <b>Ethtool.val</b>, vil ifup senda ein kommando med desse vala til ethtool.</p>\n"
 
 #. Manual dialog help 4/4
 #: src/include/network/lan/hardware.rb:140
 #, fuzzy
 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"
+"If you have a <b>USB</b> network card, select USB.</p>\n"
 msgstr ""
 "<p>Viss du har eit <b>PCMCIA</b>-nettverkskort, vel PCMCIA.\n"
-"Viss du har eit <b>USB</b>-nettverkskort, vel USB.</p>"
-"\n"
+"Viss du har eit <b>USB</b>-nettverkskort, vel USB.</p>\n"
 
 #. overwrite help
 #. Manual dialog help 5/4
@@ -2160,12 +2136,10 @@
 #, fuzzy
 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"
+"written to <i>/etc/modprobe.conf</i> or <i>/etc/chandev.conf</i>.</p>\n"
 msgstr ""
 "<p>Her kan du setja opp nettverksenheten. Verda vert\n"
-"lagra i <i>/etc/modprobe.conf</i> eller <i>/etc/chandev.conf</i>.</p>"
-"\n"
+"lagra 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
@@ -2441,12 +2415,10 @@
 #, fuzzy
 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"
+"for example, the z/VM user name with which to connect (case-sensitive).</p>\n"
 msgstr ""
 "<p>Angje namnet til ein annan IUCV-maskin,\n"
-"til dømes z/VM-brukernavnet som skal brukast ved tilkobling (det skilst mellom små og store bokstavar).</p>"
-"\n"
+"til dømes z/VM-brukernavnet som skal brukast ved tilkobling (det skilst mellom små og store bokstavar).</p>\n"
 
 #. #176330, must be static
 #: src/include/network/lan/hardware.rb:1220
@@ -2470,91 +2442,65 @@
 #, fuzzy
 msgid ""
 "<p><b><big>Initializing Network Card\n"
-"Configuration</big></b><br>"
-"Please wait...<br>"
-"</p>"
-"\n"
+"Configuration</big></b><br>Please wait...<br></p>\n"
 msgstr ""
 "<p><b><big>Initialiserer oppsett for\n"
-"nettverkskort</big></b><br>"
-"Vent…<br>"
-"</p>"
-"\n"
+"nettverkskort</big></b><br>Vent…<br></p>\n"
 
 #. Network cards read dialog help 2/2
 #: src/include/network/lan/help.rb:35
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting the Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <B>Abort</B> now.</p>"
-"\n"
+"<p><b><big>Aborting the Initialization:</big></b><br>\n"
+"Safely abort the configuration utility by pressing <B>Abort</B> now.</p>\n"
 msgstr ""
-"<p><b><big>Avbryt initialiseringen:</big></b><br>"
-"\n"
-"Du kan trygt avslutta oppsettsverktøyet ved å klikka <B>Avbryt</B> no.</p>"
-"\n"
+"<p><b><big>Avbryt initialiseringen:</big></b><br>\n"
+"Du kan trygt avslutta oppsettsverktøyet ved å klikka <B>Avbryt</B> no.</p>\n"
 
 #. Network cards write dialog help 1/2
 #: src/include/network/lan/help.rb:39
 #, fuzzy
 msgid ""
 "<p><b><big>Saving Network Card\n"
-"Configuration</big></b><br>"
-"Please wait...<br>"
-"</p>"
-"\n"
+"Configuration</big></b><br>Please wait...<br></p>\n"
 msgstr ""
 "<p><b><big>Lagrar oppsett for\n"
-"nettverkskort</big></b><br>"
-"Vent…<br>"
-"</p>"
-"\n"
+"nettverkskort</big></b><br>Vent…<br></p>\n"
 
 #. Network cards write dialog help 2/2
 #: src/include/network/lan/help.rb:43
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
-"Abort saving by pressing <b>Abort</b>.</p>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
+"Abort saving by pressing <b>Abort</b>.</p>\n"
 msgstr ""
-"<p><b><big>Avbryt lagring:</big></b><br>"
-"\n"
-"Avbryt lagringen ved å klikka <b>Avbryt</b>.</p>"
-"\n"
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
+"Avbryt lagringen ved å klikka <b>Avbryt</b>.</p>\n"
 
 #. Network setup method help
 #. NetworkManager and wicked are programs
 #: src/include/network/lan/help.rb:48
 #, fuzzy
 msgid ""
-"<p><b><big>Network Setup Method</big></b></p>"
-"\n"
+"<p><b><big>Network Setup Method</big></b></p>\n"
 "<p>Use the <b>NetworkManager</b> as a desktop applet\n"
 "managing connections for all interfaces. It is well suited\n"
-"for switching among wired and wireless networks.</p>"
-"\n"
+"for switching among wired and wireless networks.</p>\n"
 msgstr ""
-"<p><b><big>Oppsettmetode for nettverk</big></b></p>"
-"\n"
+"<p><b><big>Oppsettmetode for nettverk</big></b></p>\n"
 "<p>Vel <b>NetworkManager</b> for bruka eit skrivebordsprogram\n"
 "til å kontrollera tilkoblingene for alle grensesnitt. Dette er praktisk\n"
-"for å byte mellom kabelnettverk og ulike trådlause nettverk.</p>"
-"\n"
+"for å byte mellom kabelnettverk og ulike trådlause nettverk.</p>\n"
 
 #: src/include/network/lan/help.rb:54
 #, fuzzy
 msgid ""
 "<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"
+"or need to use multiple interfaces at the same time.</p>\n"
 msgstr ""
 "<p>Bruk <b>Tradisjonell metode med <tt>ifup</tt></b>\n"
 "viss du ikkje køyrer eit grafisk skrivebordsmiljø (GNOME eller KDE),\n"
-"eller viss du har behov for å bruka fleire grensesnitt samstundes.</p>"
-"\n"
+"eller viss du har behov for å bruka fleire grensesnitt samstundes.</p>\n"
 
 #. For systems not including NetworkManager by default (bnc#892678)
 #: src/include/network/lan/help.rb:59
@@ -2562,70 +2508,52 @@
 "<p><b>NetworkManager</b> is not part of every base\n"
 "installation repository. For example, to enable it on SUSE\n"
 "Linux Enterprise Server add the Workstation Extension\n"
-"repository and install the 'NetworkManager' package.</p>"
-"\n"
+"repository and install the 'NetworkManager' package.</p>\n"
 msgstr ""
 
 #: src/include/network/lan/help.rb:66
 #, fuzzy
 msgid ""
-"<p><b><big>Network Card Overview</big></b><br>"
-"\n"
+"<p><b><big>Network Card Overview</big></b><br>\n"
 "Obtain an overview of installed network cards. Additionally,\n"
-"edit their configuration.<br>"
-"</p>"
-"\n"
+"edit their configuration.<br></p>\n"
 msgstr ""
-"<p><b><big>Oversyn over nettverkskort</big></b><br>"
-"\n"
+"<p><b><big>Oversyn over nettverkskort</big></b><br>\n"
 "Her finn du eit oversyn over installerte nettverkskort. Du kan òg\n"
-"redigera oppsettet.<br>"
-"</p>"
-"\n"
+"redigera oppsettet.<br></p>\n"
 
 #: src/include/network/lan/help.rb:71
 #, fuzzy
 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"
+"<p><b><big>Adding a Network Card:</big></b><br>\n"
+"Press <b>Add</b> to configure a new network card manually.</p>\n"
 msgstr ""
-"<p><b><big>Legg til eit nettverkskort:</big></b><br>"
-"\n"
-"Klikk <b>Legg til</b> for å setja opp eit nytt nettverkskort manuelt.</p>"
-"\n"
+"<p><b><big>Legg til eit nettverkskort:</big></b><br>\n"
+"Klikk <b>Legg til</b> for å setja opp eit nytt nettverkskort manuelt.</p>\n"
 
 #: src/include/network/lan/help.rb:74
 #, fuzzy
 msgid ""
-"<p><b><big>Configuring or Deleting:</big></b><br>"
-"\n"
+"<p><b><big>Configuring or Deleting:</big></b><br>\n"
 "Choose a network card to change or remove.\n"
-"Then press <b>Edit</b> or <b>Delete</b> respectively.</p>"
-"\n"
+"Then press <b>Edit</b> or <b>Delete</b> respectively.</p>\n"
 msgstr ""
-"<p><b><big>Redigera eller slette:</big></b><br>"
-"\n"
+"<p><b><big>Redigera eller slette:</big></b><br>\n"
 "Vel eit nettverkskort som skal endrast eller vert sletta.\n"
-"Klikk deretter <b>Rediger</b> eller <b>Slett</b>.</p>"
-"\n"
+"Klikk deretter <b>Rediger</b> eller <b>Slett</b>.</p>\n"
 
 #. IPv6 help
 #: src/include/network/lan/help.rb:81
 #, fuzzy
 msgid ""
-"<p><b><big>IPv6 Protocol Settings</big></b></p>"
-"\n"
+"<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"
 "It is possible to use IPv6 together with IPv4. This is the default option.\n"
 "To disable IPv6, uncheck this option. This will blacklist the kernel \n"
 "module for ipv6. If the IPv6 protocol is not used on your network, the response \n"
-"time can be faster.</p>"
-"\n"
+"time can be faster.</p>\n"
 msgstr ""
-"<p><b><big>Innstillingar for IPv6-protokollen</big></b></p>"
-"\n"
+"<p><b><big>Innstillingar for IPv6-protokollen</big></b></p>\n"
 "<p>Kryss av for <b>Aktivum IPv6</b> for å aktivare IPv6-modulen i kjernen.\n"
 "Det er mogleg å bruka IPv6 saman med IPv4, og dette er standarvalget.\n"
 "For å deaktivere IPv6, fjern avkryssingen (dette vil svartelista kjernemodulen\n"
@@ -2645,27 +2573,23 @@
 "The <b>Default Gateway</b> matches every possible destination, but poorly. \n"
 "If any other entry exists that matches the required address, it is\n"
 "used instead of the default route. The idea of the default route is simply\n"
-"to enable you to say \"and everything else should go here.\"</p>"
-"\n"
+"to enable you to say \"and everything else should go here.\"</p>\n"
 msgstr ""
 "<p>Rutingen kan verta opp sette i denne dialogen.\n"
 "<b>Standard systemport</b> samsvarer med alle moglege bestemmelsessteder, men ikkje særleg presist. \n"
 "Viss det finst andre verd som samsvarer med adressa, vil desse brukast i staden for standardruten. Prinsippet bak standardruten er ganske enkelt\n"
-"å gje melding om at \"alt anna skal verta hit sendt\".</p>"
-"\n"
+"å gje melding om at \"alt anna skal verta hit sendt\".</p>\n"
 
 #: src/include/network/lan/help.rb:99
 #, fuzzy
 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"
-"the device through which the traffic to the defined network will be routed.\"-\" is an alias for any interface.</p>"
-"\n"
+"the device through which the traffic to the defined network will be routed.\"-\" is an alias for any interface.</p>\n"
 msgstr ""
 "<p>For kvar rute angjev du destinasjonsnettverkets IP-adresse, systemportens adresse\n"
 "og nettverksmasken. Nytte bindestrek «-» for å kanne over nokon av desse verda. Vel\n"
-"òg eininga som trafikken til det angjevne nettverket skal rutast gjennom. Nytte «-» som alias for kva for eit som helst nettverk.</p>"
-"\n"
+"òg eininga som trafikken til det angjevne nettverket skal rutast gjennom. Nytte «-» som alias for kva for eit som helst nettverk.</p>\n"
 
 #. Routing dialog help 2/2
 #: src/include/network/lan/help.rb:105
@@ -2687,8 +2611,7 @@
 msgid ""
 "<p><b>Important:</b> if the firewall is enabled, allowing forwarding alone is not enough. \n"
 "You should enable masquerading and/or set at least one redirect rule in the\n"
-"firewall configuration. Use the YaST firewall module.</p>"
-"\n"
+"firewall configuration. Use the YaST firewall module.</p>\n"
 msgstr ""
 "<p>Aktivar <b>IP-vidaresending</b> (vidaresending av pakker frå eksterne nettverk\n"
 "til det interne) viss dette systemet er ein ruter. Både IPv4- og IPv6-samband \n"
@@ -2704,15 +2627,13 @@
 "also a hostname via DHCP.  The hostname will be set automatically by the DHCP client.\n"
 "However, changing the hostname at runtime may confuse the graphical desktop. \n"
 "Therefore, disable this option if you connect to different networks that assign \n"
-"different hostnames.</p>"
-" "
+"different hostnames.</p> "
 msgstr ""
 "<p>Viss du brukar DHCP for å få ein IP-adresse, vel om du òg vil motta\n"
 "eit vertsnavn vigd DHCP. Vertsnavnet vil veljast automatisk av DHCP-klienten.\n"
 "Det kan likevel forvirra det grafiske skrivebordsmiljøet å endra vertsnavn under køyring. \n"
 "Difor bør du fjerne denne avkryssingen viss du kobler til ulike nettverk sine som tilordner \n"
-"ulike vertsnavn.</p>"
-" "
+"ulike vertsnavn.</p> "
 
 #: src/include/network/lan/help.rb:129
 #, fuzzy
@@ -2721,8 +2642,7 @@
 "the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is a \n"
 "useful option if you want to have the hostname resolvable at all times, even \n"
 "without an active network. In all other cases, use it carefully, especially \n"
-"if this computer provides some network services.</p>"
-"\n"
+"if this computer provides some network services.</p>\n"
 msgstr ""
 "<p><b>Tilordne vertsnavn til Loopback-IP</b> knyter ditt vertsnavn til IP-adressa \n"
 "<tt>127.0.0.2</tt> (loopback) i <tt>/etc/hosts</tt>. Dette er eit \n"
@@ -2734,12 +2654,10 @@
 #, fuzzy
 msgid ""
 "<p>Enter the name servers and domain search list for resolving \n"
-"hostnames. Usually they can be obtained by DHCP.</p>"
-"\n"
+"hostnames. Usually they can be obtained by DHCP.</p>\n"
 msgstr ""
 "<p>Angje navneserverne og domenesøkelisten for \n"
-"vertsnavn. Desse kan vanlegvis hentast via DHCP.</p>"
-"\n"
+"vertsnavn. Desse kan vanlegvis hentast via DHCP.</p>\n"
 
 #. resolver dialog help
 #: src/include/network/lan/help.rb:141
@@ -2747,13 +2665,11 @@
 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"
-"(for example, 192.168.0.42), not as a hostname.</p>"
-"\n"
+"(for example, 192.168.0.42), not as a hostname.</p>\n"
 msgstr ""
 "<p>Ein navneserver er ei datamaskin som omset vertsnavn til\n"
 "IP-adresser. Dette verdet må skrivast inn som ein <b>IP-adresse</b>\n"
-"(t.d. 192.168.0.42), ikkje som eit vertsnavn.</p>"
-"\n"
+"(t.d. 192.168.0.42), ikkje som eit vertsnavn.</p>\n"
 
 #. resolver dialog help
 #: src/include/network/lan/help.rb:147
@@ -2762,14 +2678,12 @@
 "<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"
 "your computer (for example, suse.de). There may be additional search domains\n"
-"(such as suse.com). Separate the domains with commas or white space.</p>"
-"\n"
+"(such as suse.com). Separate the domains with commas or white space.</p>\n"
 msgstr ""
 "<p>Søkedomenet er domenenavnet der søking etter vertsnavn startar.\n"
 "Primært søkedomene er vanlegvis det same som domenenavnet for\n"
 "datamaskina di (t.d. susa.dei). Det kan vera fleire søkedomener\n"
-"(t.d. susa.com). Domener skal vera adskilt av komma eller mellomrom.</p>"
-"\n"
+"(t.d. susa.com). Domener skal vera adskilt av komma eller mellomrom.</p>\n"
 
 #: src/include/network/lan/help.rb:154
 #, fuzzy
@@ -2793,8 +2707,7 @@
 "by the <i>netconfig</i> script, which merges statically defined data with\n"
 "dynamically obtained data (e.g. from the DHCP client, NetworkManager,\n"
 "etc.). This is the default. <b>Use Default Policy</b> is sufficient for most\n"
-"configurations.</p>"
-"\n"
+"configurations.</p>\n"
 msgstr ""
 "<p>Vel korleis DNS-oppsettet (navneservere, søkeliste, innhaldet i \n"
 "fila <i>/etc/resolv.conf</i>) skal endrast. Normalt vert handtert dette av skriptet <i>netconfig</i>,\n"
@@ -2812,8 +2725,7 @@
 "including wildcards, with STATIC and STATIC_FALLBACK as predefined special\n"
 "values. For more information, see the <i>netconfig</i> manual page. Note:\n"
 "Leaving the field blank is the same as using the <b> Only Manually</b>\n"
-"policy.</p>"
-"\n"
+"policy.</p>\n"
 msgstr ""
 "<p>Vel<b>Berre manuelt</b> viss du ikkje vil at<i>netconfig</i> lengjer skal kunna endra \n"
 "<i>/etc/resolv.conf</i>. Du kan redigera fila manuelt i staden. vel <b>Bruk egendefinert praksis</b> \n"
@@ -2827,38 +2739,28 @@
 #: src/include/network/lan/help.rb:181
 #, fuzzy
 msgid ""
-"<p><b><big>Address Setup</big></b></p>"
-"\n"
+"<p><b><big>Address Setup</big></b></p>\n"
 "<p>Select <b>No Address Setup</b> if you do not want to assign an IP address to this device.\n"
-"This is particularly useful for bonding ethernet devices.</p>"
-"\n"
+"This is particularly useful for bonding ethernet devices.</p>\n"
 msgstr ""
-"<p><b><big>Adresseoppsett</big></b></p>"
-"\n"
+"<p><b><big>Adresseoppsett</big></b></p>\n"
 "<p>Vel <b>Ikkje adresseoppsett</b> viss du ikkje ynskjer nokon IP-adresse for denne eininga.\n"
-"Dette er spesielt nyttig for bond-nettverkskort.</p>"
-"\n"
+"Dette er spesielt nyttig for bond-nettverkskort.</p>\n"
 
 #: src/include/network/lan/help.rb:186
 #, fuzzy
-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> viss du vil at nettverket skal setjast opp i BIOS.</p>"
-"\n"
+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> viss du vil at nettverket skal setjast opp i BIOS.</p>\n"
 
 #. Address dialog help 2/8
 #: src/include/network/lan/help.rb:190
 #, fuzzy
 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"
+"assigned by the system administrator or your Internet provider.</p>\n"
 msgstr ""
 "<p>Vel <b>Dynamisk adresse</b> viss du ikkje har fått tildelt ein statisk IP-adresse \n"
-"frå systemadministroren eller internettleverandøren.</p>"
-"\n"
+"frå systemadministroren eller internettleverandøren.</p>\n"
 
 #. Address dialog help 3/8
 #: src/include/network/lan/help.rb:194
@@ -2866,13 +2768,11 @@
 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"
-"are then automatically obtained from the server.</p>"
-"\n"
+"are then automatically obtained from the server.</p>\n"
 msgstr ""
 "<p>Du kan velja ein av metodane for dynamisk adressetildeling. Vel <b>DHCP</b>\n"
 "viss du har ein <b>DHCP-servar</b> som køyrer på lokalnettverket. Nettverksadresser vert då \n"
-"henta automatisk frå han serveren.</p>"
-"\n"
+"henta automatisk frå han serveren.</p>\n"
 
 #. Address dialog help 4/8
 #: src/include/network/lan/help.rb:200
@@ -2880,13 +2780,11 @@
 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"
-"</b>. Otherwise, the network addresses must be assigned <b>Statically</b>.</p>"
-"\n"
+"</b>. Otherwise, the network addresses must be assigned <b>Statically</b>.</p>\n"
 msgstr ""
 "<p>For å søkja etter ein IP-adresse for statisk tildeling, vel \n"
 " <b>Zeroconf</b>. For å bruka DHCP, men ha zeroconf som reserveløsning, vel <b>DHCP + Zeroconf</b>.\n"
-"Viss ikkje, må adressa tildelast <b>statisk</b>.</p>"
-"\n"
+"Viss ikkje, må adressa tildelast <b>statisk</b>.</p>\n"
 
 #. Address dialog help 5/8
 #: src/include/network/lan/help.rb:207
@@ -2894,12 +2792,10 @@
 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"
-"for your peer.</p>"
-"\n"
+"for your peer.</p>\n"
 msgstr ""
 "<p>Angje ein <b>IP-adresse</b> (t.d. <tt>192.168.100.99</tt>) for datamaskina di og ein <b>Ekstern IP-adresse</b> (t.d. <tt>192.168.100.254</tt>4)\n"
-"for ein anna maskin.</p>"
-"\n"
+"for ein anna maskin.</p>\n"
 
 #. Address dialog help 6/8
 #: src/include/network/lan/help.rb:214
@@ -2907,13 +2803,11 @@
 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"
-"a fully qualified hostname for this IP address. The hostname will be written to <tt>/etc/hosts</tt>.</p>"
-"\n"
+"a fully qualified hostname for this IP address. The hostname will be written to <tt>/etc/hosts</tt>.</p>\n"
 msgstr ""
 "<p>For <b>Statisk adresseoppsett</b>, angje den statiske IP-adressa for datamaskina (til dømes: <tt>192.168.100.99</tt>) og\n"
 "nettverksmasken (vanlegvis <tt>255.255.255.0</tt>, eller berre lengda på prefikset<tt>/24</tt>). Du kan òg angje\n"
-"eit vertsnavn for denne IP-adressa. Vertsnavnet vil lagrast i <tt>/etc/hosts</tt>.</p>"
-"\n"
+"eit vertsnavn for denne IP-adressa. Vertsnavnet vil lagrast i <tt>/etc/hosts</tt>.</p>\n"
 
 #. Address dialog help 8/8
 #: src/include/network/lan/help.rb:220
@@ -2937,8 +2831,7 @@
 #: src/include/network/lan/help.rb:228
 #, fuzzy
 msgid ""
-"<p><b><big>Firewall Zone</big></b></p>"
-"\n"
+"<p><b><big>Firewall Zone</big></b></p>\n"
 "<p>Select the firewall zone to put the interface into. If you\n"
 "select a zone, the firewall will be enabled. If you do not and other \n"
 "firewalled interfaces exist, the firewall\n"
@@ -2946,8 +2839,7 @@
 "interface. If you do not select a zone and no others exist, \n"
 "the firewall will be disabled.</p>"
 msgstr ""
-"<p><b><big>Brannmursone</big></b></p>"
-"\n"
+"<p><b><big>Brannmursone</big></b></p>\n"
 "<p>Vel ein brannmursone å plassera grensesnittet i. Viss du\n"
 "vel ei sone, vil brannmuren aktiverast. Viss ikkje, avheng dette av\n"
 "om det finst andre brannmurbeskyttede grensesnitt. I så fall vil brannmuren\n"
@@ -2963,23 +2855,19 @@
 #: src/include/network/lan/help.rb:242
 #, fuzzy
 msgid ""
-"<p><b><big>Maximum Transfer Unit</big></b></p>"
-"\n"
+"<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"
 "transferred over the network in one frame. Usually, you do not need to\n"
 "set a MTU, but using lower MTU values may improve the network performance,\n"
 "especially on slow dial-up connections. Either select one of the recommended\n"
-"values or define another one.</p>"
-"\n"
+"values or define another one.</p>\n"
 msgstr ""
-"<p><b><big>Største overføringsenhet</big></b></p>"
-"\n"
+"<p><b><big>Største overføringsenhet</big></b></p>\n"
 "<p>Største overføringsenhet (<b>MTU</b>) angjev kor stor pakke som\n"
 "vert overført via nettverket per overføringsvindu. Det er normalt ikkje naudsynt å\n"
 "angje MTU, men ein redusert MTU-verd, kan forbetra nettverksytelsen,\n"
 "spesielt ved treige oppringte samband. Vel ein av dei  tilrådde verda, eller\n"
-"angje ein egendefinert verd.</p>"
-"\n"
+"angje ein egendefinert verd.</p>\n"
 
 #: src/include/network/lan/help.rb:251
 #, fuzzy
@@ -3019,13 +2907,11 @@
 "<p>The <b>Hostname to Send</b> specifies a string used for the\n"
 "hostname option field when the DHCP client sends messages to the DHCP server. Some \n"
 "DHCP servers update name server zones (forward and reverse records) \n"
-"according to this hostname (dynamic DNS).</p>"
-"\n"
+"according to this hostname (dynamic DNS).</p>\n"
 "Some DHCP servers require the <b>Hostname to Send</b> option field to\n"
 "contain a specific string in the DHCP messages from clients. Leave <b>AUTO</b>\n"
 "to send the current hostname (for example, the one defined in <tt>/etc/HOSTNAME</tt>). \n"
-"If you do not want to send a hostname, leave the field empty.</p>"
-"\n"
+"If you do not want to send a hostname, leave the field empty.</p>\n"
 msgstr ""
 "<p><b>Overført vertsnavn</b> angjev strengen som vert brukt for valgfeltet for \n"
 "vertsnavn når dhcpcd sender meldingar til ein DHCP-servar. Einskilde \n"
@@ -3034,22 +2920,17 @@
 "Einskilde DHCP-servera krev òg at alternativfeltet <b>Overførd vertsnavn</b>\n"
 "inneheld ein bestemd streng i DHCP-meldingar frå klientar. La verdet vera <i>AUTO</i>\n"
 "for å senda gjeldande vertsnavn (dvs. namnet som er definert i <tt>/etc/HOSTNAME</tt>). \n"
-"La feltet stå tomt viss vertsnavn ikkje skal sendast.</p>"
-"\n"
+"La feltet stå tomt viss vertsnavn ikkje skal sendast.</p>\n"
 
 #. Aliases dialog help 1/4
 #: src/include/network/lan/help.rb:276
 #, fuzzy
 msgid ""
-"<p><b><big>Additional Addresses</big></b></p>"
-"\n"
-"<p>Configure additional addresses of an interface in this table.</p>"
-"\n"
+"<p><b><big>Additional Addresses</big></b></p>\n"
+"<p>Configure additional addresses of an interface in this table.</p>\n"
 msgstr ""
-"<p><b><big>Tilleggsadresser</big></b></p>"
-"\n"
-"<p>Sett opp tilleggsadresser for eit grensesnitt (aliaser) i denne tabellen.</p>"
-"\n"
+"<p><b><big>Tilleggsadresser</big></b></p>\n"
+"<p>Sett opp tilleggsadresser for eit grensesnitt (aliaser) i denne tabellen.</p>\n"
 
 #. Aliases dialog help 2/4
 #: src/include/network/lan/help.rb:280
@@ -3086,37 +2967,29 @@
 #, fuzzy
 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"
-"<br>"
-"<b>ASCII</b>: The ASCII values of the characters entered constitute the\n"
+"<br><b>Passphrase</b>: The key is generated from the phrase entered.\n"
+"<br><b>ASCII</b>: The ASCII values of the characters entered constitute the\n"
 "key. Enter 5 characters for 64-bit keys, up to 13\n"
 "characters for 128-bit keys, up to 16 characters for 156-bit keys, and\n"
 "up to 29 characters for 256-bit keys.\n"
-"<br>"
-"<b>Hexadecimal</b>: Enter the hex codes of the key directly. Enter\n"
+"<br><b>Hexadecimal</b>: Enter the hex codes of the key directly. Enter\n"
 "10 hex digits for 64-bit keys, 26 digits for 128-bit keys, 32 digits\n"
 "for 156-bit keys, and 58 digits for 256-bit keys. You can\n"
 "use hyphens <tt>-</tt> to separate pairs or groups of digits, for example,\n"
 "<tt>0a5f-41e6-48</tt>.\n"
-"</p>"
-" \n"
+"</p> \n"
 msgstr ""
 "<p>Vel blant tre <b>Nøkkelangivelsestyper</b> for nøkkelen\n"
-"<br>"
-"<b>Passfrase</b>: Nøkkelen vert generert ut frå frasen som vert angjeven.\n"
-"<br>"
-"<b>ASCII</b>: ASCII verdet for teikna som vert angjevne, dannar\n"
+"<br><b>Passfrase</b>: Nøkkelen vert generert ut frå frasen som vert angjeven.\n"
+"<br><b>ASCII</b>: ASCII verdet for teikna som vert angjevne, dannar\n"
 "nøkkelen Angje fem teikn for 64-bitsnøkler, inntil 13\n"
 "teikn for128-bitsnøkler, inntil 16 teikn for 156-bitsnøkler og.\n"
 "inntil 29 teikn for 256-bitsnøkler.\n"
-"<br>"
-"<b>Heksadesimal</b>: Angje nøkkelen sin hekskoder direkte. Angje\n"
+"<br><b>Heksadesimal</b>: Angje nøkkelen sin hekskoder direkte. Angje\n"
 "10 hekssiffer for 64-bitsnøkler, 26 siffer for 128-bitsnøkler, 32 siffer for 156-bitsnøkler og 58 siffer for 256-bitsnøkler. Du kan\n"
 "bruka bindestreker <tt>-</tt> mellom sifferpar eller siffergrupper, til dømes\n"
 "<tt>0a5f-41e6-48</tt>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Wireless dialog help
 #: src/include/network/lan/help.rb:312
@@ -3135,15 +3008,13 @@
 "can be <b>Ad-Hoc</b> (peer-to-peer network without an access point),\n"
 "<b>Managed</b> (network managed by an access point, sometimes also\n"
 "called <i>Infrastructure Mode</i>), or <b>Master</b> (the network card\n"
-"acts as an access point).</p>"
-"\n"
+"acts as an access point).</p>\n"
 msgstr ""
 "<p><b>Driftsmodus</b> avheng av nettverket sitt topologi. Modusen\n"
 "kan vera <b>Ad-hoc</b> (direkte samband utan aksesspunkt),\n"
 "<b>Styrt</b> (nettverk som vert styrd av eit aksesspunkt, iblant òg\n"
 "kalla <i>Infrastrukturmodmodus</i>) eller <b>Master</b> (nettverkskortet\n"
-"fungerer som aksesspunkt).</p>"
-"\n"
+"fungerer som aksesspunkt).</p>\n"
 
 #: src/include/network/lan/help.rb:322
 #, fuzzy
@@ -3154,8 +3025,7 @@
 "you choose the operation mode <b>Managed</b> and no <b>WPA</b> authentication mode,\n"
 "you can leave this field empty or set it to <tt>any</tt>. In this\n"
 "case, your WLAN card associates with the access point with the best\n"
-"signal strength.</p>"
-"\n"
+"signal strength.</p>\n"
 msgstr ""
 "<p>Spesifiser eit <b>Nettverksnavn (ESSID)</b> som skal brukast for å identifisera\n"
 "celler som tilhøyrar same virtuelle nettverk. Alle stasjonar i eit\n"
@@ -3163,8 +3033,7 @@
 "du vel driftsmodusen <b>Styrt</b> og ingen <b>WPA</b>-autentiseringsmodus,\n"
 "kan du la dette feltet vera tomt eller bruka verdet <tt>any</tt>. I så\n"
 "fall vil WLAN-korta koble seg til det aksesspunktet som har dei\n"
-"sterkaste signala.</p>"
-"\n"
+"sterkaste signala.</p>\n"
 
 #: src/include/network/lan/help.rb:331
 #, fuzzy
@@ -3184,8 +3053,7 @@
 "was defined to close its security holes, but not all hardware supports\n"
 "WPA. If you want to use WPA, select <b>WPA-PSK</b> or <b>WPA-EAP</b> as the\n"
 "authentication mode. This is only possible in the operation mode\n"
-"<b>Managed</b>.</p>"
-"\n"
+"<b>Managed</b>.</p>\n"
 msgstr ""
 "<p>I nokre nettverk må du angje ein <b>Autentiseringsmodus</b>.\n"
 "Denne avheng av sikkerhetsteknologien som vert brukt, WEP eller WPA. <b>WEP</b>\n"
@@ -3201,8 +3069,7 @@
 "innført for å tette sikkerhetshullene, men ikkje all maskinvare støttar\n"
 "WPA. Viss du vil bruka WPA, vel <b>WPA-PSK</b> eller <b>WPA-EAP</b>som\n"
 "autentiseringsmodus. Dette er berre mogleg i driftsmodusen\n"
-"<b>Styrt</b>.</p>"
-"\n"
+"<b>Styrt</b>.</p>\n"
 
 #: src/include/network/lan/help.rb:349
 #, fuzzy
@@ -3211,14 +3078,12 @@
 "WEP encryption key to use. It can have a key\n"
 "length of 64, 128, 156, or 256 bits, but not all sizes are\n"
 "supported by all devices. Of these keys, 24 bits\n"
-"are dynamically generated, so you only need to enter 40 to 232 bits.</p>"
-"\n"
+"are dynamically generated, so you only need to enter 40 to 232 bits.</p>\n"
 msgstr ""
 "<p>For å bruka WEP, angje\n"
 "WEP-krypteringsnøkkelen som skal brukast. Han kan ha ein nøkkellengde\n"
 "på 64, 128, 156 eller 256 bitar sine (24 bitar genererast dynamisk,\n"
-"så du treng berre å angje 40 til 232 bitar).</p>"
-"\n"
+"så du treng berre å angje 40 til 232 bitar).</p>\n"
 
 #. Wireless dialog help
 #: src/include/network/lan/help.rb:357
@@ -3229,27 +3094,23 @@
 "key is used for authentication and encryption keys are generated from\n"
 "it. These are not vulnerable to known attacks against WEP keys, but\n"
 "dictionary attacks are still possible. Do not use a word that is\n"
-"easy to guess as the passphrase.</p>"
-"\n"
+"easy to guess as the passphrase.</p>\n"
 msgstr ""
 "<p>For å bruka WPA-PSK (iblant kalla WPA Home),\n"
 "angje den forhåndsdelte nøkkelen. Denne\n"
 "nøkkelen vert til brukt autentisering, og han genererer krypteringsnøkler.\n"
 "Desse er ikkje sårbare overfor kjende angrep mot WEP-nøklar, men\n"
 "ordbokangrep er framleis mogleg. Ikkje bruk ord som er \n"
-"enkle å gjetta som passfrase.</p>"
-"\n"
+"enkle å gjetta som passfrase.</p>\n"
 
 #: src/include/network/lan/help.rb:365
 #, fuzzy
 msgid ""
 "<p>To use WPA-EAP (sometimes referred to as WPA Enterprise),\n"
-"enter some additional parameters in the next dialog.</p>"
-"\n"
+"enter some additional parameters in the next dialog.</p>\n"
 msgstr ""
 "<p>For å bruka WPA-EAP (iblant kalla WPA Enterprise)\n"
-"må du angje nokon tilleggsparametere i neste dialog.</p>"
-"\n"
+"må du angje nokon tilleggsparametere i neste dialog.</p>\n"
 
 #: src/include/network/lan/help.rb:368
 #, fuzzy
@@ -3285,7 +3146,7 @@
 #. Popup::Error text
 #. Popup::Error text
 #: src/include/network/lan/virtual.rb:257
-#: src/include/network/services/host.rb:386
+#: src/include/network/services/host.rb:379
 #, fuzzy
 msgid "The IP address is invalid."
 msgstr "IP-adressa er ugyldig."
@@ -3351,13 +3212,11 @@
 msgid ""
 "<p>WPA-EAP uses a RADIUS server to authenticate users. There\n"
 "are different methods in EAP to connect to the server and\n"
-"perform the authentication, namely TLS, TTLS, and PEAP.</p>"
-"\n"
+"perform the authentication, namely TLS, TTLS, and PEAP.</p>\n"
 msgstr ""
 "<p>WPA-EAP nytter ein RADIUS-servar for å autentisere brukarar. Det\n"
 "er ulike metodar i EAP for å koble til serveren og\n"
-"utføra autentiseringen, TLS, TTLS og PEAP.</p>"
-"\n"
+"utføra autentiseringen, TLS, TTLS og PEAP.</p>\n"
 
 #. text entry label
 #: src/include/network/lan/wireless.rb:98
@@ -3371,14 +3230,12 @@
 "<p>For TTLS and PEAP, enter your <b>Identity</b>\n"
 "and <b>Password</b> as configured on the server.\n"
 "If you have special requirements to set the username used as\n"
-"<b>Anonymous Identity</b>, you may set it here. This is usually not needed.</p>"
-"\n"
+"<b>Anonymous Identity</b>, you may set it here. This is usually not needed.</p>\n"
 msgstr ""
 "<p>For TTLS og PEAP, angje <b>Identitet</b>\n"
 "og <b>Passord</b> slik dei er sette opp på serveren.\n"
 "Viss du har spesielle krav med omsyn til brukernavn brukt som\n"
-"<b>Anonym identitet</b>, kan du angje dette her. Dette er normalt ikkje naudsynt.</p>"
-"\n"
+"<b>Anonym identitet</b>, kan du angje dette her. Dette er normalt ikkje naudsynt.</p>\n"
 
 #. text entry label
 #: src/include/network/lan/wireless.rb:110
@@ -3406,15 +3263,13 @@
 "password combination for authentication. It uses a public and private key pair\n"
 "to encrypt negotiation communication, therefore you will additionally need\n"
 "a <b>Client Key</b> file that contains your private key and\n"
-"the appropriate <b>Client Key Password</b> for that file.</p>"
-"\n"
+"the appropriate <b>Client Key Password</b> for that file.</p>\n"
 msgstr ""
 "<p>TLS brukar eit <b>Klientsertifikat</b> i staden for ein brukernavn- og\n"
 "passordkombinasjon for autentisering. Eit offentleg og privat nøkkelpar vert nytta\n"
 "for å kryptera tilkoblingen, og difor treng du i tillegg\n"
 "ein <b>Klientnøkkel</b>-fil som inneheld den private nøkkelen din og dessutan\n"
-"eit <b>Klientnøkkelpassord</b> for denne fila.</p>"
-"\n"
+"eit <b>Klientnøkkelpassord</b> for denne fila.</p>\n"
 
 #. text entry label
 #: src/include/network/lan/wireless.rb:143
@@ -3441,13 +3296,11 @@
 msgid ""
 "<p>To increase security, it is recommended to configure\n"
 "a <b>Server Certificate</b>. It is used\n"
-"to validate the server's authenticity.</p>"
-"\n"
+"to validate the server's authenticity.</p>\n"
 msgstr ""
 "<p>For å auka tryggleiken vert rådd til det å setja opp eit\n"
 "a <b>Serversertifikat</b>. Det vert nytta\n"
-"for å stadfesta serverens identitet.</p>"
-"\n"
+"for å stadfesta serverens identitet.</p>\n"
 
 #. push button label
 #: src/include/network/lan/wireless.rb:211
@@ -3476,14 +3329,12 @@
 "<p>Here you can configure the inner authentication (also known as phase 2)\n"
 "method. By default, all methods are allowed. If you want to restrict the\n"
 "allowed methods or in case you have encountered difficulties regarding\n"
-"authentication, choose your inner authentication method.</p>"
-"\n"
+"authentication, choose your inner authentication method.</p>\n"
 msgstr ""
 "<p>Her kan du setja opp den interne autentiseringensmetoden (òg kalla fase 2).\n"
 "Som standard er alle metodar tillate. Viss du vil avgrensa\n"
 "metodane som skal tillatast eller viss du har problem med\n"
-"autentiseringen, kan du velja ein intern autentiseringsmetode.</p>"
-"\n"
+"autentiseringen, kan du velja ein intern autentiseringsmetode.</p>\n"
 
 #. radio button group label
 #: src/include/network/lan/wireless.rb:249
@@ -3495,12 +3346,10 @@
 #, fuzzy
 msgid ""
 "<p>If you are using PEAP, you can also force the use of a specific PEAP\n"
-"implementation (version 0 or 1). Normally this should not be necessary.</p>"
-"\n"
+"implementation (version 0 or 1). Normally this should not be necessary.</p>\n"
 msgstr ""
 "<p>Viss du brukar PEAP, kan du òg velja at ein spesifikk PEAP skal nyttast\n"
-"(versjon 0 eller 1). Dette bør normalt ikkje vera naudsynt.</p>"
-"\n"
+"(versjon 0 eller 1). Dette bør normalt ikkje vera naudsynt.</p>\n"
 
 #. radio button: any version of PEAP
 #: src/include/network/lan/wireless.rb:255
@@ -3606,54 +3455,54 @@
 msgstr "&WEP-nøklar"
 
 #. Popup text
-#: src/include/network/lan/wireless.rb:560
+#: src/include/network/lan/wireless.rb:561
 #, fuzzy
 msgid "WPA authentication mode is only possible in managed operating mode."
 msgstr "WPA-autentiseringsmodus er berre mogleg i styrt driftsmodus."
 
 #. Popup text
 #. modes: combination of operation and authentication
-#: src/include/network/lan/wireless.rb:571
+#: src/include/network/lan/wireless.rb:572
 #, fuzzy
 msgid "Specify the network name for this mode."
 msgstr "Angje nettverksnavnet for denne modusen."
 
 #. Popup text
-#: src/include/network/lan/wireless.rb:578
+#: src/include/network/lan/wireless.rb:579
 #, fuzzy
 msgid "The network name must be shorter than 32 characters."
 msgstr "Nettverksnavnet må ikkje innehalda meir enn 32 teikn."
 
 #. Error popup
-#: src/include/network/lan/wireless.rb:598
+#: src/include/network/lan/wireless.rb:599
 #, fuzzy
 msgid "The passphrase must have between 8 and 63 characters (inclusively)."
 msgstr "Passfrasen må innehalda mellom 8 og 63 teikn (totalt)."
 
 #. Error popup
-#: src/include/network/lan/wireless.rb:609
+#: src/include/network/lan/wireless.rb:610
 #, fuzzy
 msgid "The key must have %1 hexadecimal digits."
 msgstr "Nøkkelen må ha %1 heksadesimalsiffer."
 
 #. Popup text
 #. Popup text
-#: src/include/network/lan/wireless.rb:621
-#: src/include/network/lan/wireless.rb:939
+#: src/include/network/lan/wireless.rb:622
+#: src/include/network/lan/wireless.rb:941
 #, fuzzy
 msgid "The encryption key is invalid."
 msgstr "Krypteringsnøkkelen er ugyldig."
 
 #. error
 #. Popup text
-#: src/include/network/lan/wireless.rb:629
+#: src/include/network/lan/wireless.rb:630
 #, fuzzy
 msgid "The encryption key must be specified for this authentication mode."
 msgstr "Krypteringsnøkkelen må angjevast for denne autentiseringsmodusen."
 
 #. warning only
 #. Popup text
-#: src/include/network/lan/wireless.rb:636
+#: src/include/network/lan/wireless.rb:637
 #, fuzzy
 msgid ""
 "Using no encryption is a security risk.\n"
@@ -3664,14 +3513,14 @@
 
 #. Wireless expert dialog caption
 #. Frame label
-#: src/include/network/lan/wireless.rb:694
-#: src/include/network/lan/wireless.rb:775
+#: src/include/network/lan/wireless.rb:695
+#: src/include/network/lan/wireless.rb:776
 #, fuzzy
 msgid "Wireless Expert Settings"
 msgstr "Avanserte innstillingar for trådlaust nettverk"
 
 #. Wireless expert dialog help 1/5
-#: src/include/network/lan/wireless.rb:697
+#: src/include/network/lan/wireless.rb:698
 #, fuzzy
 msgid ""
 "<p>Here, set additional configuration parameters\n"
@@ -3681,23 +3530,21 @@
 "(sjeldan naudsynt).</p>"
 
 #. Wireless expert dialog help 2/5
-#: src/include/network/lan/wireless.rb:701
+#: src/include/network/lan/wireless.rb:702
 #, fuzzy
 msgid ""
 "<p>To use your wireless LAN card in master or ad-hoc mode,\n"
 "set the <b>Channel</b> the card should use here. This is not needed\n"
 "for managed mode--the card will hop through the channels searching for access\n"
-"points in that case.</p>"
-"\n"
+"points in that case.</p>\n"
 msgstr ""
 "<p>Viss du vil bruka eit trådlaust nettverkskort i master- eller Ad-hoc-modus,\n"
 "kan du definera ein <b>Kanal</b> som korta skal bruka her. Dette er ikkje naudsynt\n"
 "for styrt modus. Korta vil søkja gjennom kanalane etter aksesspunkter\n"
-"i denne modusen.</p>"
-"\n"
+"i denne modusen.</p>\n"
 
 #. Wireless expert dialog help 3/5
-#: src/include/network/lan/wireless.rb:708
+#: src/include/network/lan/wireless.rb:709
 #, fuzzy
 msgid ""
 "<p>In some rare cases, you may want to set a transmission\n"
@@ -3707,7 +3554,7 @@
 "<b>overføringshastighet</b>. Standardinnstillingen er å bruka så høg fart som mogleg.</p>"
 
 #. Wireless expert dialog help 4/5
-#: src/include/network/lan/wireless.rb:712
+#: src/include/network/lan/wireless.rb:713
 #, fuzzy
 msgid ""
 "<p>In an environment with multiple <b>Access Points</b>, you may want to\n"
@@ -3717,82 +3564,80 @@
 "definera kva for eit punkt du vil kopla deg til ved å leggja inn  aksesspunktets MAC-adresse.</p>"
 
 #. Wireless expert dialog help 5/5
-#: src/include/network/lan/wireless.rb:716
+#: src/include/network/lan/wireless.rb:717
 #, fuzzy
 msgid ""
 "<p><b>Use Power Management</b> enables power saving mechanisms.\n"
 "This is generally a good idea, especially if you are a laptop user and may\n"
-"be disconnected from AC power.</p>"
-"\n"
+"be disconnected from AC power.</p>\n"
 msgstr ""
 "<p>Vel <b>Bruk strømstyring</b> for å aktivare strømsparefunksjoner.\n"
 "Dette er vanlegvis ein fordel, spesielt viss du brukar ein berbar PC\n"
-"som iblant ikkje er kopla til strømnettet.</p>"
-"\n"
+"som iblant ikkje er kopla til strømnettet.</p>\n"
 
 #. Combobox item
 #. Combobox item
-#: src/include/network/lan/wireless.rb:744
-#: src/include/network/lan/wireless.rb:766
+#: src/include/network/lan/wireless.rb:745
+#: src/include/network/lan/wireless.rb:767
 #, fuzzy
 msgid "Automatic"
 msgstr "Automatisk"
 
 #. Combobox label
-#: src/include/network/lan/wireless.rb:781
+#: src/include/network/lan/wireless.rb:782
 #, fuzzy
 msgid "&Channel"
 msgstr "&Kanal"
 
 #. Combobox label
-#: src/include/network/lan/wireless.rb:784
+#: src/include/network/lan/wireless.rb:785
 #, fuzzy
 msgid "B&it Rate"
 msgstr "O&verføringshastighet"
 
 #. Text entry label
-#: src/include/network/lan/wireless.rb:790
+#: src/include/network/lan/wireless.rb:791
 #, fuzzy
 msgid "&Access Point"
 msgstr "&Aksesspunkt"
 
 #. CheckBox label
-#: src/include/network/lan/wireless.rb:798
+#: src/include/network/lan/wireless.rb:799
 #, fuzzy
 msgid "Use &Power Management"
 msgstr "Nytte &strømsparing"
 
-#: src/include/network/lan/wireless.rb:807
+#: src/include/network/lan/wireless.rb:808
 #, fuzzy
 msgid "AP ScanMode"
 msgstr "AP ScanMode"
 
 #. Translators: popup dialog heading
-#: src/include/network/lan/wireless.rb:897
+#: src/include/network/lan/wireless.rb:899
 #, fuzzy
 msgid "Enter Encryption Key"
 msgstr "Angje krypteringsnøkkel"
 
 #. Translators: text entry label
-#: src/include/network/lan/wireless.rb:901
+#: src/include/network/lan/wireless.rb:903
 #, fuzzy
 msgid "&Key"
 msgstr "&Nøkkel"
 
 #. Translators: popup title
-#: src/include/network/lan/wireless.rb:925
+#: src/include/network/lan/wireless.rb:927
 #, fuzzy
 msgid "Help"
 msgstr "Hjelp"
 
 #. Wireless keys dialog caption
-#: src/include/network/lan/wireless.rb:974
+#: src/include/network/lan/wireless.rb:976
 #, fuzzy
 msgid "Wireless Keys"
 msgstr "Trådløsnøkler"
 
 #. Wireless keys dialog help 1/3
-#: src/include/network/lan/wireless.rb:977
+#: src/include/network/lan/wireless.rb:979
 #, fuzzy
 msgid ""
 "<p>In this dialog, define your WEP keys used\n"
@@ -3808,7 +3653,7 @@
 "éin nøkkel.</p>"
 
 #. Wireless keys dialog help 2/3
-#: src/include/network/lan/wireless.rb:985
+#: src/include/network/lan/wireless.rb:987
 #, fuzzy
 msgid ""
 "<p><b>Key Length</b> defines the bit length of your WEP keys.\n"
@@ -3824,50 +3669,50 @@
 "verdet til 64.</p>"
 
 #. Frame label
-#: src/include/network/lan/wireless.rb:1010
+#: src/include/network/lan/wireless.rb:1012
 #, fuzzy
 msgid "WEP Keys"
 msgstr "WEP-nøklar"
 
 #. ComboBox label
-#: src/include/network/lan/wireless.rb:1016
+#: src/include/network/lan/wireless.rb:1018
 #, fuzzy
 msgid "&Key Length"
 msgstr "&Nøkkellengde"
 
 #. Table header label
 #. Abbreviation of Number
-#: src/include/network/lan/wireless.rb:1024
+#: src/include/network/lan/wireless.rb:1026
 #, fuzzy
 msgid "No."
 msgstr "Nr."
 
 #. Table header label
-#: src/include/network/lan/wireless.rb:1026
+#: src/include/network/lan/wireless.rb:1028
 #, fuzzy
 msgid "Key"
 msgstr "Nøkkel"
 
 #. Table header label
-#: src/include/network/lan/wireless.rb:1028
+#: src/include/network/lan/wireless.rb:1030
 #, fuzzy
 msgid "Default"
 msgstr "Standard"
 
 #. PushButton label
-#: src/include/network/lan/wireless.rb:1038
+#: src/include/network/lan/wireless.rb:1040
 #, fuzzy
 msgid "&Set as Default"
 msgstr "Definer som st&andard"
 
 #. file browser dialog headline
-#: src/include/network/lan/wireless.rb:1210
+#: src/include/network/lan/wireless.rb:1213
 #, fuzzy
 msgid "Choose a Certificate"
 msgstr "Vel eit sertifikat"
 
 #. validated in ValidateWpaEap
-#: src/include/network/lan/wireless.rb:1255
+#: src/include/network/lan/wireless.rb:1258
 #, fuzzy
 msgid ""
 "Not using a Certificate Authority (CA) certificate can result in connections\n"
@@ -3877,7 +3722,7 @@
 "som er usikkert og sårbart. Vil du halda fram utan CA ?"
 
 #. error popup text
-#: src/include/network/lan/wireless.rb:1283
+#: src/include/network/lan/wireless.rb:1286
 #, fuzzy
 msgid ""
 "Enter either the identity and password\n"
@@ -3887,55 +3732,55 @@
 "eller klientsertifikatet."
 
 #. dialog caption
-#: src/include/network/lan/wireless.rb:1329
+#: src/include/network/lan/wireless.rb:1332
 #, fuzzy
 msgid "WPA-EAP"
 msgstr "WPA-EAP"
 
 #. combo box item, any of EAP authentication methods
-#: src/include/network/lan/wireless.rb:1351
+#: src/include/network/lan/wireless.rb:1354
 #, fuzzy
 msgid "Any"
 msgstr "Udefinert"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1355
+#: src/include/network/lan/wireless.rb:1358
 #, fuzzy
 msgid "MD5"
 msgstr "MD5"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1357
+#: src/include/network/lan/wireless.rb:1360
 #, fuzzy
 msgid "GTC"
 msgstr "GTC"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1359
+#: src/include/network/lan/wireless.rb:1362
 #, fuzzy
 msgid "CHAP"
 msgstr "CHAP"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1361
+#: src/include/network/lan/wireless.rb:1364
 #, fuzzy
 msgid "PAP"
 msgstr "PAP"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1363
+#: src/include/network/lan/wireless.rb:1366
 #, fuzzy
 msgid "MSCHAPv1"
 msgstr "MSCHAPv1"
 
 #. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1367
+#: src/include/network/lan/wireless.rb:1370
 #, fuzzy
 msgid "MSCHAPv2"
 msgstr "MSCHAPv2"
 
 #. dialog caption
-#: src/include/network/lan/wireless.rb:1390
+#: src/include/network/lan/wireless.rb:1393
 #, fuzzy
 msgid "WPA-EAP Details"
 msgstr "WPA-EAP-informasjon"
@@ -3968,23 +3813,19 @@
 #: src/include/network/remote/dialogs.rb:89
 #, fuzzy
 msgid ""
-"<p><b><big>Remote Administration Settings</big></b></p>"
-"\n"
+"<p><b><big>Remote Administration Settings</big></b></p>\n"
 "<p>If this feature is enabled, you can\n"
 "administer this machine remotely from another machine. Use a VNC\n"
 "client, such as krdc (connect to <tt><hostname>:%1</tt>), or\n"
 "a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</tt>).\n"
-"This form of remote administration is less secure than using SSH.</p>"
-"\n"
+"This form of remote administration is less secure than using SSH.</p>\n"
 msgstr ""
-"<p><b><big>Innstillingar for ekstern administrasjon</big></b></p>"
-"\n"
+"<p><b><big>Innstillingar for ekstern administrasjon</big></b></p>\n"
 "<p>Viss denne funksjonen er aktivert, kan du\n"
 "administrera denne maskina frå ein anna maskin. Du kan bruka ein VNC-\n"
 "klient, til dømes krdc (koble til <tt><hostname>:%1</tt>) eller\n"
 "ein javakompatibel nettleser (koble til <tt>http://<hostname>:%2/</tt>).\n"
-"Denne typen ekstern administrasjon er mindre sikker enn SSH.</p>"
-"\n"
+"Denne typen ekstern administrasjon er mindre sikker enn SSH.</p>\n"
 
 #. Dialog frame title
 #: src/include/network/remote/dialogs.rb:109
@@ -3993,13 +3834,13 @@
 msgstr "Innstillingar for ekstern administrasjon"
 
 #. Popup text
-#: src/include/network/routines.rb:144
+#: src/include/network/routines.rb:129
 #, fuzzy
 msgid "These packages need to be installed:"
 msgstr "Følgjande pakker må installerast:"
 
 #. Popup text
-#: src/include/network/routines.rb:162
+#: src/include/network/routines.rb:147
 #, fuzzy
 msgid ""
 "The required packages are not installed.\n"
@@ -4012,121 +3853,59 @@
 "\n"
 "Vil du freista igjen?\n"
 
-#. Table field (Unknown device)
-#: src/include/network/routines.rb:255
+#. Create a list of items for UI from the given hardware list.
+#.
+#. This list is used when selecting <ol>
+#. <li> detected unconfigured cards,
+#. there we want to see the link status </li>
+#. <li> undetected cards manually. there is no link status there
+#. and it won't be displayed. all is ok. </li>
+#. </ol>
+#. @param [Array<Hash>] l given list for conversion
+#. @param [Fixnum] selected selected item (0 for the first)
+#. @return a list of items
+#: src/include/network/routines.rb:195
 #, fuzzy
 msgid "Unknown"
 msgstr "Ukjent"
 
-#. Popup headline
-#: src/include/network/routines.rb:279
-#, fuzzy
-msgid "Configuration Successfully Saved"
-msgstr "Oppsettet er lagra"
-
-#. Popup headline
-#: src/include/network/routines.rb:284
-#, fuzzy
-msgid "DNS Configuration Successfully Saved"
-msgstr "DNS-oppsettet er lagra"
-
-#. Popup headline
-#: src/include/network/routines.rb:286
-#, fuzzy
-msgid "DSL Configuration Successfully Saved"
-msgstr "DSL-oppsettet er lagra"
-
-#. Popup headline
-#: src/include/network/routines.rb:288
-#, fuzzy
-msgid "Hosts Configuration Successfully Saved"
-msgstr "Vertsmaskinoppsettet er lagra"
-
-#. Popup headline
-#: src/include/network/routines.rb:292
-#, fuzzy
-msgid "ISDN Configuration Successfully Saved"
-msgstr "ISDN-oppsettet er lagra"
-
-#. Popup headline
-#: src/include/network/routines.rb:296
-#, fuzzy
-msgid "Network Card Configuration Successfully Saved"
-msgstr "Oppsettet for nettverkskort er lagra"
-
-#. Popup headline
-#: src/include/network/routines.rb:300
-#, fuzzy
-msgid "Modem Configuration Successfully Saved"
-msgstr "Modemoppsettet er lagra"
-
-#. Popup headline
-#: src/include/network/routines.rb:304
-#, fuzzy
-msgid "Proxy Configuration Successfully Saved"
-msgstr "Mellomserveroppsettet er lagra"
-
-#. Popup headline
-#: src/include/network/routines.rb:308
-#, fuzzy
-msgid "Provider Configuration Successfully Saved"
-msgstr "Leverandøroppsettet er lagra"
-
-#. Popup headline
-#: src/include/network/routines.rb:312
-#, fuzzy
-msgid "Routing Configuration Successfully Saved"
-msgstr "Rutingoppsettet er lagra"
-
-#. Popup text
-#: src/include/network/routines.rb:321
-#, fuzzy
-msgid "Configure mail now?"
-msgstr "Vil du setja opp e-postsystemet no?"
-
-#. Popup text
-#: src/include/network/routines.rb:326
-#, fuzzy
-msgid "Run configuration of %1?"
-msgstr "Vil du setja opp %1?"
-
 #. Disables all widgets which cannot be configured with current network service
 #.
 #. see bnc#433084
 #. if listed any items, disable them, if show_popup, show warning popup
 #.
 #. returns true if items were disabled
-#: src/include/network/routines.rb:1004
+#: src/include/network/routines.rb:807
 msgid ""
 "Network is currently handled by NetworkManager\n"
 "or completely disabled. YaST is unable to configure some options."
 msgstr ""
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1064
+#: src/include/network/routines.rb:867
 #, fuzzy
 msgid "Network Cards"
 msgstr "Nettverkskort"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1068
+#: src/include/network/routines.rb:871
 #, fuzzy
 msgid "Modems"
 msgstr "Modem"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1072
+#: src/include/network/routines.rb:875
 #, fuzzy
 msgid "ISDN Cards"
 msgstr "ISDN-kort"
 
 #. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:1076
+#: src/include/network/routines.rb:879
 #, fuzzy
 msgid "DSL Devices"
 msgstr "DSL-einingar"
 
-#: src/include/network/routines.rb:1081
+#: src/include/network/routines.rb:884
 #, fuzzy
 msgid "All Network Devices"
 msgstr "Alle nettverksenheter"
@@ -4134,7 +3913,7 @@
 #. validation error popup
 #. Popup::Error text
 #: src/include/network/services/dns.rb:92
-#: src/include/network/services/host.rb:398
+#: src/include/network/services/host.rb:391
 #, fuzzy
 msgid "The hostname is invalid."
 msgstr "Vertsnavnet er ugyldig."
@@ -4221,8 +4000,8 @@
 #. Frame label
 #. dialog caption
 #: src/include/network/services/dns.rb:234
-#: src/include/network/services/dns.rb:684
-#: src/include/network/services/dns.rb:697
+#: src/include/network/services/dns.rb:677
+#: src/include/network/services/dns.rb:690
 #, fuzzy
 msgid "Hostname and Domain Name"
 msgstr "Vertsmaskin- og domenenavn"
@@ -4252,32 +4031,32 @@
 #. @param [String] key	the widget being validated
 #. @param [Hash] event	the event being handled
 #. @return whether valid
-#: src/include/network/services/dns.rb:496
+#: src/include/network/services/dns.rb:495
 #, fuzzy
 msgid "It's not recommended to use .local as domainname due to Multicast DNS. Use it at your own risk?"
 msgstr "På grunn av multikast-DNS vert rådde til det ikkje å bruka .local som domenenavn. Vil du bruka det likevel?"
 
 #. Popup::Error text
-#: src/include/network/services/dns.rb:520
+#: src/include/network/services/dns.rb:513
 #, fuzzy
 msgid "The search list can have at most %1 domains."
 msgstr "Søkelisten kan ha maksimalt %1 domener."
 
 #. Popup::Error text
-#: src/include/network/services/dns.rb:526
+#: src/include/network/services/dns.rb:519
 #, fuzzy
 msgid "The search list can have at most %1 characters."
 msgstr "Søkelisten kan ha maksimalt %1 teikn."
 
 #. Popup::Error text
-#: src/include/network/services/dns.rb:535
+#: src/include/network/services/dns.rb:528
 #, fuzzy
 msgid "The search domain '%1' is invalid."
 msgstr "Søkedomenet '%1' er ugyldig."
 
 #. Standalone dialog only - embedded one is handled separately
 #. via CWMTab
-#: src/include/network/services/dns.rb:725
+#: src/include/network/services/dns.rb:718
 #, fuzzy
 msgid "Hostname and Name Server Configuration"
 msgstr "Vertsnavn- og navneserveroppsett"
@@ -4311,39 +4090,37 @@
 #, fuzzy
 msgid ""
 "<p>Enter a host <b>IP Address</b>, a <b>Hostname</b>, and optional\n"
-"<b>Host Aliases</b>, separated by spaces.</p>"
-"\n"
+"<b>Host Aliases</b>, separated by spaces.</p>\n"
 msgstr ""
 "<p>Angje ein <b>IP-adresse</b> for vertsmaskinen, eit <b>vertsnavn</b> og\n"
-"<b>vertsmaskinaliaser</b> (valfritt) adskilt av mellomrom.</p>"
-"\n"
+"<b>vertsmaskinaliaser</b> (valfritt) adskilt av mellomrom.</p>\n"
 
 #. Frame label
-#: src/include/network/services/host.rb:118
+#: src/include/network/services/host.rb:119
 #, fuzzy
 msgid "Current Hosts"
 msgstr "Gjeldande vertsmaskiner"
 
 #. Table header label
-#: src/include/network/services/host.rb:130
+#: src/include/network/services/host.rb:131
 #, fuzzy
 msgid "Hostnames"
 msgstr "Vertsnavn"
 
 #. Table header label
-#: src/include/network/services/host.rb:132
+#: src/include/network/services/host.rb:133
 #, fuzzy
 msgid "Host Aliases"
 msgstr "Vertsmaskinaliaser"
 
 #. TextEntry label
-#: src/include/network/services/host.rb:351
+#: src/include/network/services/host.rb:344
 #, fuzzy
 msgid "Hos&t Aliases"
 msgstr "Ver&tsmaskinaliaser"
 
 #. Popup::Error text
-#: src/include/network/services/host.rb:414
+#: src/include/network/services/host.rb:407
 #, fuzzy
 msgid "Alias name \"%1\" is invalid."
 msgstr "Aliasnavnet \"%1\" er ugyldig."
@@ -4386,47 +4163,47 @@
 #. @param [Yast::Term] entry edited entry
 #. @param [Array] devs available devices
 #. @return route or nil, if canceled
-#: src/include/network/services/routing.rb:161
+#: src/include/network/services/routing.rb:163
 #, fuzzy
 msgid "&Destination"
 msgstr "&Bestemmelsessted"
 
-#: src/include/network/services/routing.rb:167
+#: src/include/network/services/routing.rb:172
 #, fuzzy
 msgid "Ge&nmask"
 msgstr "Ge&nmaske"
 
-#: src/include/network/services/routing.rb:175
+#: src/include/network/services/routing.rb:182
 #, fuzzy
 msgid "&Gateway"
 msgstr "&Systemport"
 
-#: src/include/network/services/routing.rb:181
+#: src/include/network/services/routing.rb:191
 #, fuzzy
 msgid "De&vice"
 msgstr "Ein&heitte"
 
 #. Popup::Error text
-#: src/include/network/services/routing.rb:240
+#: src/include/network/services/routing.rb:252
 #, fuzzy
 msgid "Destination is invalid."
 msgstr "Destinasjonen er ugyldig."
 
 #. Popup::Error text
-#: src/include/network/services/routing.rb:248
+#: src/include/network/services/routing.rb:260
 #, fuzzy
 msgid "Gateway IP address is invalid."
 msgstr "Systemportens IP-adresse er ugyldig."
 
 #. Popup::Error text
-#: src/include/network/services/routing.rb:256
+#: src/include/network/services/routing.rb:268
 #, fuzzy
 msgid "Subnetmask is invalid."
 msgstr "Nettverksmasken er ugyldig."
 
 #. #178538 - disable routing dialog when NetworkManager is used
 #. but instead of default route (#299448) - NM reads it
-#: src/include/network/services/routing.rb:414
+#: src/include/network/services/routing.rb:426
 #, fuzzy
 msgid "The default gateway is invalid."
 msgstr "Standard systemport er ugyldig."
@@ -4469,15 +4246,13 @@
 "change the dial prefix in KInternet provided that it matches the expression.\n"
 "A recommended value is <tt>[09]?</tt>, allowing <tt>0</tt>, <tt>9</tt>,\n"
 "and the empty prefix. If the expression is empty, users are not allowed\n"
-"to change the prefix.</p>"
-"\n"
+"to change the prefix.</p>\n"
 msgstr ""
 "<p>Viss <b>Linje ut, regulært uttrykk</b> er valt, kan brukarane\n"
 "endra linje ut-verdet i KInternet dersom han samsvarer med uttrykket.\n"
 "Verdet <tt>[09]?</tt> rådast til. Han tillèt <tt>0</tt>, <tt>9</tt>\n"
 "og dessutan inga linje ut. Viss uttrykket er tomt, kan ikkje brukarane\n"
-"endra linje ut-verdet.</p>"
-"\n"
+"endra linje ut-verdet.</p>\n"
 
 #. radio button group label,method of setup
 #: src/include/network/widgets.rb:69
@@ -4543,12 +4318,10 @@
 #, fuzzy
 msgid ""
 "<p><b>Manually</b>: You control the interface manually\n"
-"via 'ifup' or 'qinternet' (see 'User Controlled' below).</p>"
-"\n"
+"via 'ifup' or 'qinternet' (see 'User Controlled' below).</p>\n"
 msgstr ""
 "<p><b>Manuelt</b>: Du kontrollerer grensesnittet manuelt\n"
-"via 'ifup' eller 'qinternet' (sjå 'Brukerstyrt' nedanfor).</p>"
-".\n"
+"via 'ifup' eller 'qinternet' (sjå 'Brukerstyrt' nedanfor).</p>.\n"
 
 #. Combo box option for Device Activation
 #: src/include/network/widgets.rb:125
@@ -4619,19 +4392,15 @@
 #: src/include/network/widgets.rb:190
 #, fuzzy
 msgid ""
-"<p><b><big>Device Activation</big></b></p>"
-" \n"
+"<p><b><big>Device Activation</big></b></p> \n"
 "<p>Choose when to bring up the network interface. <b>At Boot Time</b> activates it during system boot, \n"
 "<b>Never</b> does not start the device.\n"
-"%1</p>"
-"\n"
+"%1</p>\n"
 msgstr ""
-"<p><b><big>Enhetsaktivering</big></b></p>"
-" \n"
+"<p><b><big>Enhetsaktivering</big></b></p> \n"
 "<p>Vel når nettverksgrensesnittet skal aktiverast. Vel <b>Ved oppstart av maskina</b> viss grensesnittet skal aktiverast når maskina startar.\n"
 "Vel <b>Aldri</b> viss eininga ikkje skal aktiverast.\n"
-"%1</p>"
-"\n"
+"%1</p>\n"
 
 #: src/include/network/widgets.rb:235
 msgid "IPoIB Device Mode"
@@ -4724,7 +4493,7 @@
 msgstr "IPv6-protokollinnstillinger"
 
 #. enable ipv6 support
-#: src/include/network/widgets.rb:403 src/modules/Lan.rb:810
+#: src/include/network/widgets.rb:403 src/modules/Lan.rb:783
 #, fuzzy
 msgid "Enable IPv6"
 msgstr "Aktivar IPv6"
@@ -4830,7 +4599,7 @@
 
 #. Progress stage 2
 #. Progress stage 10
-#: src/modules/DNS.rb:379 src/modules/Lan.rb:534
+#: src/modules/DNS.rb:379 src/modules/Lan.rb:533
 #, fuzzy
 msgid "Update configuration"
 msgstr "Oppdater mellomserveroppsett"
@@ -4857,7 +4626,7 @@
 
 #. Progress step 2/3
 #. Progress step 10
-#: src/modules/DNS.rb:411 src/modules/Lan.rb:622
+#: src/modules/DNS.rb:411 src/modules/Lan.rb:621
 #, fuzzy
 msgid "Updating configuration..."
 msgstr "Oppdaterer mellomserveroppsett …"
@@ -4871,119 +4640,119 @@
 msgstr "Oppdaterer /etc/resolve.conf …"
 
 #. Summary text
-#: src/modules/DNS.rb:538
+#: src/modules/DNS.rb:543
 #, fuzzy
 msgid "Hostname: Set by DHCP"
 msgstr "Vertsnavn: Definert av DHCP"
 
 #. Summary text
-#: src/modules/DNS.rb:544
+#: src/modules/DNS.rb:549
 #, fuzzy
 msgid "Hostname: %1"
 msgstr "Vertsnavn: %1"
 
-#: src/modules/DNS.rb:552
+#: src/modules/DNS.rb:557
 #, fuzzy
 msgid "Hostname will not be written to /etc/hosts"
 msgstr "Vertsnavnet vil ikkje lagrast i /etc/hosts"
 
 #. Summary text
-#: src/modules/DNS.rb:573
+#: src/modules/DNS.rb:578
 #, fuzzy
 msgid "Name Servers: %1"
 msgstr "Navneservere: %1"
 
 #. Summary text
-#: src/modules/DNS.rb:583
+#: src/modules/DNS.rb:588
 #, fuzzy
 msgid "Search List: %1"
 msgstr "Søkeliste: %1"
 
 #. Check if there is anything to do
-#: src/modules/Host.rb:138
+#: src/modules/Host.rb:165
 #, fuzzy
 msgid "Update /etc/hosts"
 msgstr "Oppdater /etc/hosts"
 
-#: src/modules/Host.rb:140
+#: src/modules/Host.rb:167
 #, fuzzy
 msgid "Saving Hostname Configuration"
 msgstr "Lagrar vertsnavnoppsett"
 
 #. sleep for longer time, so that progress does not disappear right afterwards
-#: src/modules/Host.rb:145
+#: src/modules/Host.rb:172
 #, fuzzy
 msgid "Updating /etc/hosts ..."
 msgstr "Oppdaterer /etc/hosts …"
 
 #. Read dialog caption
-#: src/modules/Lan.rb:272
+#: src/modules/Lan.rb:271
 #, fuzzy
 msgid "Initializing Network Configuration"
 msgstr "Initialiserer nettverksoppsett"
 
 #. Progress stage 1/9
-#: src/modules/Lan.rb:285
+#: src/modules/Lan.rb:284
 #, fuzzy
 msgid "Detect network devices"
 msgstr "Søk etter nettverksenheter"
 
 #. Progress stage 2/9
-#: src/modules/Lan.rb:287
+#: src/modules/Lan.rb:286
 #, fuzzy
 msgid "Read driver information"
 msgstr "Les driverinformasjon"
 
 #. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:289
+#: src/modules/Lan.rb:288
 #, fuzzy
 msgid "Read device configuration"
 msgstr "Les enhetsoppsett"
 
 #. Progress stage 4/9
-#: src/modules/Lan.rb:291
+#: src/modules/Lan.rb:290
 #, fuzzy
 msgid "Read network configuration"
 msgstr "Les nettverksoppsett"
 
 #. Progress stage 5/9
-#: src/modules/Lan.rb:293
+#: src/modules/Lan.rb:292
 #, fuzzy
 msgid "Read firewall settings"
 msgstr "Les brannmurinnstillinger"
 
 #. Progress stage 6/9
-#: src/modules/Lan.rb:295
+#: src/modules/Lan.rb:294
 #, fuzzy
 msgid "Read hostname and DNS configuration"
 msgstr "Les vertsnavn og DNS-oppsett"
 
 #. Progress stage 7/9
-#: src/modules/Lan.rb:297
+#: src/modules/Lan.rb:296
 #, fuzzy
 msgid "Read installation information"
 msgstr "Les installasjonsinformasjon"
 
 #. Progress stage 8/9
-#: src/modules/Lan.rb:299
+#: src/modules/Lan.rb:298
 #, fuzzy
 msgid "Read routing configuration"
 msgstr "Les rutingoppsett"
 
 #. Progress stage 9/9
-#: src/modules/Lan.rb:301
+#: src/modules/Lan.rb:300
 #, fuzzy
 msgid "Detect current status"
 msgstr "Søk etter gjeldande status"
 
 #. Progress step 1/9
-#: src/modules/Lan.rb:315
+#: src/modules/Lan.rb:314
 #, fuzzy
 msgid "Detecting ndiswrapper..."
 msgstr "Søkjer for ndiswrapper …"
 
 #. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:334
+#: src/modules/Lan.rb:333
 #, fuzzy
 msgid ""
 "Detected a ndiswrapper configuration,\n"
@@ -4994,7 +4763,7 @@
 "men det vart ikkje køyrt modprobe for kjernemodulen.\n"
 "Vil du køyra modprobe for ndiswrapper?\n"
 
-#: src/modules/Lan.rb:342
+#: src/modules/Lan.rb:341
 #, fuzzy
 msgid ""
 "ndiswrapper kernel module has not been loaded.\n"
@@ -5004,395 +4773,387 @@
 "Kontroller oppsettet manuelt."
 
 #. Progress step 2/9
-#: src/modules/Lan.rb:356
+#: src/modules/Lan.rb:355
 #, fuzzy
 msgid "Detecting network devices..."
 msgstr "Søkar etter nettverksenheter …"
 
 #. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:364
+#: src/modules/Lan.rb:363
 #, fuzzy
 msgid "Reading device configuration..."
 msgstr "Lesar enhetsoppsett …"
 
 #. Progress step 4/9
-#: src/modules/Lan.rb:370
+#: src/modules/Lan.rb:369
 #, fuzzy
 msgid "Reading network configuration..."
 msgstr "Lesar nettverksoppsett …"
 
 #. Progress step 5/9
-#: src/modules/Lan.rb:379
+#: src/modules/Lan.rb:378
 #, fuzzy
 msgid "Reading firewall settings..."
 msgstr "Lesar brannmurinnstillinger …"
 
 #. Progress step 6/9
-#: src/modules/Lan.rb:387
+#: src/modules/Lan.rb:386
 #, fuzzy
 msgid "Reading hostname and DNS configuration..."
 msgstr "Lesar vertsnavn og DNS-oppsett …"
 
 #. Progress step 7/9
-#: src/modules/Lan.rb:394
+#: src/modules/Lan.rb:393
 #, fuzzy
 msgid "Reading installation information..."
 msgstr "Lesar installasjonsinformasjon …"
 
 #. Progress step 8/9
-#: src/modules/Lan.rb:400
+#: src/modules/Lan.rb:399
 #, fuzzy
 msgid "Reading routing configuration..."
 msgstr "Lesar rutinginformasjon …"
 
 #. Progress step 9/9
-#: src/modules/Lan.rb:406
+#: src/modules/Lan.rb:405
 #, fuzzy
 msgid "Detecting current status..."
 msgstr "Søkar etter gjeldande status …"
 
 #. Final progress step
 #. Final progress step
-#: src/modules/Lan.rb:412 src/modules/Lan.rb:643
+#: src/modules/Lan.rb:411 src/modules/Lan.rb:642
 #, fuzzy
 msgid "Finished"
 msgstr "Fullført"
 
 #. (a specialization used when a parameterless function is needed)
 #. @return Read(`cache)
-#: src/modules/Lan.rb:438
+#: src/modules/Lan.rb:437
 #, fuzzy
 msgid "To apply this change, a reboot is needed."
 msgstr "Start maskina på nytt for å aktivare denne endringa."
 
 #. Write dialog caption
-#: src/modules/Lan.rb:506
+#: src/modules/Lan.rb:505
 #, fuzzy
 msgid "Saving Network Configuration"
 msgstr "Lagrar nettverksoppsett"
 
 #. Progress stage 2
-#: src/modules/Lan.rb:513
+#: src/modules/Lan.rb:512
 #, fuzzy
 msgid "Write drivers information"
 msgstr "Lagre driverinformasjon"
 
 #. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:515
+#: src/modules/Lan.rb:514
 #, fuzzy
 msgid "Write device configuration"
 msgstr "Lagre enhetsoppsett"
 
 #. Progress stage 4
-#: src/modules/Lan.rb:517
+#: src/modules/Lan.rb:516
 #, fuzzy
 msgid "Write network configuration"
 msgstr "Lagre nettverksoppsett"
 
 #. Progress stage 5
-#: src/modules/Lan.rb:519
+#: src/modules/Lan.rb:518
 #, fuzzy
 msgid "Write routing configuration"
 msgstr "Lagre rutingoppsett"
 
 #. Progress stage 6
-#: src/modules/Lan.rb:521
+#: src/modules/Lan.rb:520
 #, fuzzy
 msgid "Write hostname and DNS configuration"
 msgstr "Lagre vertsnavn og DNS-oppsett"
 
 #. Progress stage 7
-#: src/modules/Lan.rb:523
+#: src/modules/Lan.rb:522
 #, fuzzy
 msgid "Set up network services"
 msgstr "Sett opp nettverkstjenester"
 
 #. Progress stage 8
 #. Progress stage 1
-#: src/modules/Lan.rb:527 src/modules/Remote.rb:293
+#: src/modules/Lan.rb:526 src/modules/Remote.rb:197
 #, fuzzy
 msgid "Write firewall settings"
 msgstr "Lagre brannmurinnstillinger"
 
 #. Progress stage 9
-#: src/modules/Lan.rb:531
+#: src/modules/Lan.rb:530
 #, fuzzy
 msgid "Activate network services"
 msgstr "Aktivar nettverkstjenester"
 
 #. Progress step 2
-#: src/modules/Lan.rb:547
+#: src/modules/Lan.rb:546
 #, fuzzy
 msgid "Writing /etc/modprobe.conf..."
 msgstr "Lagrar /etc/modprobe.conf …"
 
 #. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:552
+#: src/modules/Lan.rb:551
 #, fuzzy
 msgid "Writing device configuration..."
 msgstr "Lagrar enhetsoppsett …"
 
 #. Progress step 4
-#: src/modules/Lan.rb:558
+#: src/modules/Lan.rb:557
 #, fuzzy
 msgid "Writing network configuration..."
 msgstr "Lagrar nettverksoppsett …"
 
 #. Progress step 5
-#: src/modules/Lan.rb:564
+#: src/modules/Lan.rb:563
 #, fuzzy
 msgid "Writing routing configuration..."
 msgstr "Lagrar rutinginformasjon …"
 
 #. Progress step 6
-#: src/modules/Lan.rb:572
+#: src/modules/Lan.rb:571
 #, fuzzy
 msgid "Writing hostname and DNS configuration..."
 msgstr "Lagrar vertsnavn og DNS-oppsett …"
 
 #. Progress step 7
-#: src/modules/Lan.rb:585
+#: src/modules/Lan.rb:584
 #, fuzzy
 msgid "Setting up network services..."
 msgstr "Set opp nettverkstjenester …"
 
 #. Progress step 8
-#: src/modules/Lan.rb:593 src/modules/Remote.rb:307
+#: src/modules/Lan.rb:592 src/modules/Remote.rb:211
 #, fuzzy
 msgid "Writing firewall settings..."
 msgstr "Lagrar brannmurinnstillinger …"
 
 #. Progress step 9
-#: src/modules/Lan.rb:603
+#: src/modules/Lan.rb:602
 #, fuzzy
 msgid "Activating network services..."
 msgstr "Aktiverer nettverkstjenester …"
 
-#: src/modules/Lan.rb:639
+#: src/modules/Lan.rb:638
 #, fuzzy
 msgid "No network running"
 msgstr "Ingen nettverk er aktiverte"
 
-#. Import data
-#. @param [Hash] settings settings to be imported
-#. @return true on success
-#: src/modules/Lan.rb:698
-msgid "AutoYaST setting networking/managed: NetworkManager is not available, Wicked will be used."
-msgstr ""
-
 #. Create a textual summary for the general network settings
 #. proposal (NetworkManager + ipv6)
 #. @return [rich text, links]
-#: src/modules/Lan.rb:782
+#: src/modules/Lan.rb:755
 #, fuzzy
 msgid "Network Mode"
 msgstr "Nettverksmodus"
 
 #. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:787
+#: src/modules/Lan.rb:760
 #, fuzzy
 msgid "Interfaces controlled by NetworkManager"
 msgstr "Grensesnitt som vert kontrollerte av NetworkManager"
 
 #. disable NetworkManager applet
-#: src/modules/Lan.rb:789
+#: src/modules/Lan.rb:762
 #, fuzzy
 msgid "Disable NetworkManager"
 msgstr "Deaktiver NetworkManager"
 
 #. network mode
-#: src/modules/Lan.rb:793
+#: src/modules/Lan.rb:766
 #, fuzzy
 msgid "Traditional network setup with NetControl - ifup"
 msgstr "Tradisjonelt nettveksoppsett med NetControl – ifup"
 
 #. enable NetworkManager applet
 #. for virtual network proposal (bridged) don't show hyperlink to enable networkmanager
-#: src/modules/Lan.rb:796
+#: src/modules/Lan.rb:769
 #, fuzzy
 msgid "Enable NetworkManager"
 msgstr "Aktivar NetworkManager"
 
 #. ipv6 support is enabled
-#: src/modules/Lan.rb:802
+#: src/modules/Lan.rb:775
 #, fuzzy
 msgid "Support for IPv6 protocol is enabled"
 msgstr "Støtte for IPv6-protokollen er aktivert"
 
 #. disable ipv6 support
-#: src/modules/Lan.rb:804
+#: src/modules/Lan.rb:777
 #, fuzzy
 msgid "Disable IPv6"
 msgstr "Deaktiver IPv6"
 
 #. ipv6 support is disabled
-#: src/modules/Lan.rb:808
+#: src/modules/Lan.rb:781
 #, fuzzy
 msgid "Support for IPv6 protocol is disabled"
 msgstr "Støtte for IPv6-protokollen er deaktivert"
 
 #. translators: a possible value for: IPoIB device mode
-#: src/modules/LanItems.rb:193
+#: src/modules/LanItems.rb:199
 #, fuzzy
 msgid "connected"
 msgstr "Ikkje tilkoblet"
 
-#: src/modules/LanItems.rb:194
+#: src/modules/LanItems.rb:200
 msgid "datagram"
 msgstr ""
 
 #. summary description of STARTMODE=auto
 #. summary description of STARTMODE=auto
 #. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1260 src/modules/LanItems.rb:1264
-#: src/modules/LanItems.rb:1268
+#: src/modules/LanItems.rb:1264 src/modules/LanItems.rb:1268
+#: src/modules/LanItems.rb:1272
 #, fuzzy
 msgid "Started automatically at boot"
 msgstr "Starta automatisk ved oppstart"
 
 #. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1276
 #, fuzzy
 msgid "Started automatically on cable connection"
 msgstr "Starta automatisk vigde kabelforbindelse"
 
 #. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1276
+#: src/modules/LanItems.rb:1280
 #, fuzzy
 msgid "Managed by NetworkManager"
 msgstr "Nytte NetworkManager"
 
 #. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1280
+#: src/modules/LanItems.rb:1284
 #, fuzzy
 msgid "Will not be started at all"
 msgstr "Vil ikkje startast i det heile"
 
-#: src/modules/LanItems.rb:1286
+#: src/modules/LanItems.rb:1290
 #, fuzzy
 msgid "Started manually"
 msgstr "Starta manuelt"
 
 #. do nothing
-#: src/modules/LanItems.rb:1298
+#: src/modules/LanItems.rb:1302
 #, fuzzy
 msgid "IP address assigned using"
 msgstr "IP-adresse tildelt vigde"
 
-#: src/modules/LanItems.rb:1302
+#: src/modules/LanItems.rb:1306
 #, fuzzy
 msgid "IP address: %s/%s"
 msgstr "IP-adresse: %1/%2"
 
-#: src/modules/LanItems.rb:1305
+#: src/modules/LanItems.rb:1309
 #, fuzzy
 msgid "IP address: %s, subnet mask %s"
 msgstr "IP-adresse %1, nettverksmaske %2"
 
 #. FIXME: side effect: sets @type. No reason for that. It should only build item
 #. overview. Check and remove.
-#: src/modules/LanItems.rb:1329
+#: src/modules/LanItems.rb:1333
 #, fuzzy
 msgid "Not configured"
 msgstr "Ikkje sat opp"
 
 #. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1351 src/modules/LanItems.rb:1411
+#: src/modules/LanItems.rb:1355 src/modules/LanItems.rb:1415
 #, fuzzy
 msgid "Device Name: %s"
 msgstr "Enhetsnavn: %1"
 
-#: src/modules/LanItems.rb:1372
+#: src/modules/LanItems.rb:1376
 #, fuzzy
 msgid "Bonding slaves"
 msgstr "Bond Vert slava"
 
-#: src/modules/LanItems.rb:1386
+#: src/modules/LanItems.rb:1390
 msgid "enslaved in %s"
 msgstr ""
 
-#: src/modules/LanItems.rb:1387
+#: src/modules/LanItems.rb:1391
 msgid "Bonding master"
 msgstr ""
 
-#: src/modules/LanItems.rb:1401
+#: src/modules/LanItems.rb:1405
 #, fuzzy
 msgid "Not connected"
 msgstr "Ikkje tilkoblet"
 
-#: src/modules/LanItems.rb:1402
+#: src/modules/LanItems.rb:1406
 #, fuzzy
 msgid "No hwinfo"
 msgstr "Ingen maskinvareinfo"
 
-#: src/modules/LanItems.rb:1417
+#: src/modules/LanItems.rb:1421
 #, fuzzy
 msgid "Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details."
 msgstr "<p>Kunne ikkje setja opp nettverkskortet fordi kjerneenheten (eth0, wlan0) ikkje finst. Dette vert vanlegvis skulda manglande fastvare (for wlan-einingar). Sjå resultatet av dmesg-kommandoen.</p>"
 
-#: src/modules/LanItems.rb:1423
+#: src/modules/LanItems.rb:1427
 #, fuzzy
 msgid ""
 "The device is not configured. Press <b>Edit</b>\n"
 "to configure.\n"
 msgstr ""
 "<p>Eininga er ikkje sett opp. Klikk <b>Rediger</b>\n"
-"for å gå til oppsett.</p>"
-"\n"
+"for å gå til oppsett.</p>\n"
 
-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1434
 #, fuzzy
 msgid "Needed firmware"
 msgstr "Naudsynt fastvare"
 
-#: src/modules/LanItems.rb:1430
+#: src/modules/LanItems.rb:1434
 #, fuzzy
 msgid "unknown"
 msgstr "ukjent"
 
 #. Package containing SuSEfirewall2 services has to be installed before
 #. reading SuSEFirewall, otherwise exception is thrown by firewall
-#: src/modules/Remote.rb:243
+#: src/modules/Remote.rb:159
 msgid ""
 "Package %{package} is not installed\n"
 "firewall settings will be disabled."
 msgstr ""
 
 #. Progress stage 2
-#: src/modules/Remote.rb:295
+#: src/modules/Remote.rb:199
 #, fuzzy
 msgid "Configure display manager"
 msgstr "Sett opp vindushandsamar"
 
 #. Progress stage 3
-#: src/modules/Remote.rb:300
+#: src/modules/Remote.rb:204
 #, fuzzy
 msgid "Restart the services"
 msgstr "Start tenesta på nytt"
 
-#: src/modules/Remote.rb:303
+#: src/modules/Remote.rb:207
 #, fuzzy
 msgid "Saving Remote Administration Configuration"
 msgstr "Lagrar oppsett av ekstern administrasjon"
 
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:216
 #, fuzzy
 msgid "Configuring display manager..."
 msgstr "Set opp vindushandsamar …"
 
-#: src/modules/Remote.rb:316
+#: src/modules/Remote.rb:220
 #, fuzzy
 msgid "Restarting the service..."
 msgstr "Startar tenesta på nytt …"
 
 #. Enable xinetd
 #. Enable XDM
-#: src/modules/Remote.rb:342 src/modules/Remote.rb:350
+#: src/modules/Remote.rb:246 src/modules/Remote.rb:254
 msgid "Enabling service %{service} has failed"
 msgstr ""
 
 #. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:377
+#: src/modules/Remote.rb:281
 msgid ""
 "Your display manager must be restarted.\n"
 "To take the changes in remote administration into account, \n"
@@ -5400,35 +5161,35 @@
 msgstr ""
 
 #. description in proposal
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:312
 #, fuzzy
 msgid "Remote administration is enabled."
 msgstr "Ekstern administrasjon er aktivert."
 
-#: src/modules/Remote.rb:408
+#: src/modules/Remote.rb:312
 #, fuzzy
 msgid "Remote administration is disabled."
 msgstr "Ekstern administrasjon is deaktivert."
 
 #. Progress stage 1
-#: src/modules/Routing.rb:261
+#: src/modules/Routing.rb:264
 #, fuzzy
 msgid "Write IP forwarding settings"
 msgstr "Lagre oppsett for IP-overføring"
 
 #. Progress stage 2
-#: src/modules/Routing.rb:263
+#: src/modules/Routing.rb:266
 #, fuzzy
 msgid "Write routing settings"
 msgstr "Lagre oppsett for ruter"
 
-#: src/modules/Routing.rb:266
+#: src/modules/Routing.rb:269
 #, fuzzy
 msgid "Saving Routing Configuration"
 msgstr "Lagrar oppsett for ruter"
 
 #. Progress stage 1/2
-#: src/modules/Routing.rb:271
+#: src/modules/Routing.rb:274
 #, fuzzy
 msgid "Writing IP forwarding settings..."
 msgstr "Lagrar oppsett for IP-overføring …"
@@ -5438,25 +5199,25 @@
 #. sysconfig does not support restarting routes only,
 #. so we let our caller do it together with other things
 #. Progress stage 2/2
-#: src/modules/Routing.rb:281
+#: src/modules/Routing.rb:284
 #, fuzzy
 msgid "Writing routing settings..."
 msgstr "Lagrar oppsett for ruter …"
 
 #. Summary text
-#: src/modules/Routing.rb:434
+#: src/modules/Routing.rb:454
 #, fuzzy
 msgid "Gateway: %s"
 msgstr "Systemport: %1"
 
 #. Summary text
-#: src/modules/Routing.rb:438
+#: src/modules/Routing.rb:458
 #, fuzzy
 msgid "IP Forwarding for IPv4: %s"
 msgstr "IP-overføring:"
 
 #. Summary text
-#: src/modules/Routing.rb:442
+#: src/modules/Routing.rb:462
 #, fuzzy
 msgid "IP Forwarding for IPv6: %s"
 msgstr "IP-overføring:"
@@ -5480,6 +5241,54 @@
 msgstr "(ubeskyttet"
 
 #, fuzzy
+#~ msgid "Configuration Successfully Saved"
+#~ msgstr "Oppsettet er lagra"
+
+#, fuzzy
+#~ msgid "DNS Configuration Successfully Saved"
+#~ msgstr "DNS-oppsettet er lagra"
+
+#, fuzzy
+#~ msgid "DSL Configuration Successfully Saved"
+#~ msgstr "DSL-oppsettet er lagra"
+
+#, fuzzy
+#~ msgid "Hosts Configuration Successfully Saved"
+#~ msgstr "Vertsmaskinoppsettet er lagra"
+
+#, fuzzy
+#~ msgid "ISDN Configuration Successfully Saved"
+#~ msgstr "ISDN-oppsettet er lagra"
+
+#, fuzzy
+#~ msgid "Network Card Configuration Successfully Saved"
+#~ msgstr "Oppsettet for nettverkskort er lagra"
+
+#, fuzzy
+#~ msgid "Modem Configuration Successfully Saved"
+#~ msgstr "Modemoppsettet er lagra"
+
+#, fuzzy
+#~ msgid "Proxy Configuration Successfully Saved"
+#~ msgstr "Mellomserveroppsettet er lagra"
+
+#, fuzzy
+#~ msgid "Provider Configuration Successfully Saved"
+#~ msgstr "Leverandøroppsettet er lagra"
+
+#, fuzzy
+#~ msgid "Routing Configuration Successfully Saved"
+#~ msgstr "Rutingoppsettet er lagra"
+
+#, fuzzy
+#~ msgid "Configure mail now?"
+#~ msgstr "Vil du setja opp e-postsystemet no?"
+
+#, fuzzy
+#~ msgid "Run configuration of %1?"
+#~ msgstr "Vil du setja opp %1?"
+
+#, fuzzy
 #~ msgid "Device boot protocol"
 #~ msgstr "Enhetsoppstartsprotokoll"
 
@@ -5498,12 +5307,10 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>To specify the <b>Frequency</b> instead of\n"
-#~ "the channel, select the desired value.</p>"
-#~ "\n"
+#~ "the channel, select the desired value.</p>\n"
 #~ msgstr ""
 #~ "<p>For å spesifisera <b>frekvensen</b> i staden for\n"
-#~ "kanalen, kan du velja eit verd.</p>"
-#~ "\n"
+#~ "kanalen, kan du velja eit verd.</p>\n"
 
 #, fuzzy
 #~ msgid "&Frequency"
@@ -5701,11 +5508,9 @@
 #~ "You can abort the save process by pressing <B>Abort</B>. An additional\n"
 #~ "dialog may inform you whether it is safe to do so.</P>\n"
 #~ msgstr ""
-#~ "<p><b><big>Avbryt lagring</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Avbryt lagring</big></b><br>\n"
 #~ "Avbryt lagringen ved å klikka <b>Avbryt</b>. Ein annan\n"
-#~ "dialog vil gje deg melding om det er trygt å gjera dette.</p>"
-#~ "\n"
+#~ "dialog vil gje deg melding om det er trygt å gjera dette.</p>\n"
 
 #, fuzzy
 #~ msgid "The provider %1 is in use."
@@ -5766,12 +5571,10 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>Here, set the most important settings\n"
-#~ "for the DSL connection.</p>"
-#~ "\n"
+#~ "for the DSL connection.</p>\n"
 #~ msgstr ""
 #~ "<p>Her gjer du dei viktigaste innstillingane\n"
-#~ "for DSL-tilkoblingen.</p>"
-#~ "\n"
+#~ "for DSL-tilkoblingen.</p>\n"
 
 #, fuzzy
 #~ msgid ""
@@ -5802,14 +5605,12 @@
 #~ "<p>The <b>PPP Mode-Dependent Settings</b> are settings required to set up\n"
 #~ "your DSL connection. <b>VPI/VCI</b> makes sense only for <i>PPP over ATM</i>\n"
 #~ "connections, <b>Ethernet Card</b> is needed for <i>PPP over Ethernet</i>\n"
-#~ "connections.</p>"
-#~ "\n"
+#~ "connections.</p>\n"
 #~ msgstr ""
 #~ "<p><b>Innstillingane for PPP-modus</b> er obligatoriske for\n"
 #~ "DSL-sambandet. <b>VPI/VCI</b> er berre aktuelt for <i>PPP vigd ATM</i>-\n"
 #~ "tilkoblinger. Eit <b>Ethernet-kort</b> må installerast for <i>PPP vigd Ethernet</i>-\n"
-#~ "tilkoblinger.</p>"
-#~ "\n"
+#~ "tilkoblinger.</p>\n"
 
 #, fuzzy
 #~ msgid ""
@@ -5919,11 +5720,9 @@
 #~ "You can abort the save procedure by pressing <B>Abort</B>.\n"
 #~ "An additional dialog informs you whether it is safe to do so.</P>\n"
 #~ msgstr ""
-#~ "<p><b><big>Avbryt lagring</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Avbryt lagring</big></b><br>\n"
 #~ "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
-#~ "Ein annan dialog vil gje deg melding om det er trygt å gjera dette.</p>"
-#~ "\n"
+#~ "Ein annan dialog vil gje deg melding om det er trygt å gjera dette.</p>\n"
 
 #, fuzzy
 #~ msgid "Select the item to edit."
@@ -6024,74 +5823,60 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>The <b>Remote Phone Number List</b> controls which remote machines are\n"
-#~ "allowed to connect to this interface.</p>"
-#~ "\n"
+#~ "allowed to connect to this interface.</p>\n"
 #~ msgstr ""
 #~ "<p><b>Ekstern telefonnummerliste</b> kontrollerer kva for eksterne maskiner som\n"
-#~ "kan kopla til dette grensesnittet.</p>"
-#~ "\n"
+#~ "kan kopla til dette grensesnittet.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>Deselect <b>Only Listed Numbers Allowed</b> \n"
-#~ "to allow all caller IDs.</p>"
-#~ "\n"
+#~ "to allow all caller IDs.</p>\n"
 #~ msgstr ""
 #~ "<p>Fjern markeringa i <b>Berre angjevne nummer tillate</b>-ruta\n"
-#~ "for gje alle oppringings-Ider tilgjenge.</p>"
-#~ "\n"
+#~ "for gje alle oppringings-Ider tilgjenge.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>If the callback mode is <b>off</b>,  calls  are handled normally without special \n"
-#~ "processing.</p>"
-#~ "\n"
+#~ "processing.</p>\n"
 #~ msgstr ""
 #~ "<p>Viss <b>tilbakeringingsmodus</b> er <b>deaktivert</b>, vert handterte oppringningene utan spesielle \n"
-#~ "prosedyrar.</p>"
-#~ "\n"
+#~ "prosedyrar.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>If the callback mode is <b>server</b>, after getting an incoming call, a callback \n"
-#~ "is triggered.</p>"
-#~ "\n"
+#~ "is triggered.</p>\n"
 #~ msgstr ""
 #~ "<p>Viss tilbakeringingsmodus er sette til <b>servar</b>, vil ein tilbakeringing utløysast ved \n"
-#~ "innkommende samtalar.</p>"
-#~ "\n"
+#~ "innkommende samtalar.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>If the callback mode is <b>client</b>, the local system does the initial call then \n"
-#~ "waits for callback from the remote machine.</p>"
-#~ "\n"
+#~ "waits for callback from the remote machine.</p>\n"
 #~ msgstr ""
 #~ "<p>Viss tilbakeringingsmodus er sette til <b>klient</b>, ringar først det lokale systemet opp, \n"
-#~ "og ventar deretter på at den eksterne maskina skal ringa tilbake.</p>"
-#~ "\n"
+#~ "og ventar deretter på at den eksterne maskina skal ringa tilbake.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p><b>Callback Delay</b> is the number of seconds between the initial call and the\n"
 #~ "callback (server) or the hang-up (client). It should be greater on the server than on\n"
-#~ "the client.</p>"
-#~ "\n"
+#~ "the client.</p>\n"
 #~ msgstr ""
 #~ "<p><b>Tilbakeringingsforsinkelse</b> er mengd sekund mellom først oppringing og\n"
 #~ "tilbakeringing (servar) eller \"legg på\" (klient). Dette verdet bør vera større for serveren enn for\n"
-#~ "klienten.</p>"
-#~ "\n"
+#~ "klienten.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>In <b>Additional ipppd Options</b>, add extra options for ipppd,\n"
-#~ "for example, +pap +chap for the dial-in server authentication.</p>"
-#~ "\n"
+#~ "for example, +pap +chap for the dial-in server authentication.</p>\n"
 #~ msgstr ""
 #~ "<p><b>Fleire ipppd-alternativ:</b> Vel fleire alternativ for ipppd,\n"
-#~ "til dømes +pap +chap for serverautentisering ved innkommende anrop.</p>"
-#~ "\n"
+#~ "til dømes +pap +chap for serverautentisering ved innkommende anrop.</p>\n"
 
 #, fuzzy
 #~ msgid "&Additional ipppd Options"
@@ -6133,37 +5918,31 @@
 #~ msgid ""
 #~ "<p>If you have a combined ISDN and DSL CAPI controller, configure your DSL\n"
 #~ "connection via <b>Add DSL CAPI Interface</b>. You can also do this later\n"
-#~ "in the DSL configuration dialog.</p>"
-#~ "\n"
+#~ "in the DSL configuration dialog.</p>\n"
 #~ msgstr ""
 #~ "<p>Viss du har ein kombinert CAPI-kontrollar for ISDN/DSL, set du opp DSL-\n"
 #~ "sambandet med <b>Legg til CAPI-grensesnitt for DSL</b>. Dette kan du òg gjera seinare\n"
-#~ "i oppsettsdialogen for DSL.</p>"
-#~ "\n"
+#~ "i oppsettsdialogen for DSL.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>For networking over ISDN, there are two types of interfaces:\n"
 #~ "<b>RawIP</b> and <b>SyncPPP</b>. In most cases, use SyncPPP. It is\n"
-#~ "the default for all common Internet providers.</p>"
-#~ "\n"
+#~ "the default for all common Internet providers.</p>\n"
 #~ msgstr ""
 #~ "<p>For ISDN-samband er det to typar grensesnitt:\n"
 #~ "<b>RawIP</b> og <b>SyncPPP</b>. Du bør sannsynlegvis velja SyncPPP. Dette er\n"
-#~ "standard for dei fleste internettleverandører.</p>"
-#~ "\n"
+#~ "standard for dei fleste internettleverandører.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>To switch between various Internet providers, an\n"
 #~ "interface for each provider is not required. Simply add multiple providers to the\n"
-#~ "same interface.</p>"
-#~ "\n"
+#~ "same interface.</p>\n"
 #~ msgstr ""
 #~ "<p>Du treng ikkje eit grensesnitt for kvar leverandør for\n"
 #~ "for å skifte mellom ulike tjenesteleverandører. Du kan leggja til fleire tjenesteleverandører for\n"
-#~ "same grensesnitt.</p>"
-#~ "\n"
+#~ "same grensesnitt.</p>\n"
 
 #, fuzzy
 #~ msgid ""
@@ -6231,24 +6010,18 @@
 #~ "<p>If you select manual, start and stop the service manually by\n"
 #~ "issuing the following commands (while logged in as 'root'):\n"
 #~ "<tt>\n"
-#~ " <br>"
-#~ " <b>start: </b>ifup ippp0\n"
-#~ " <br>"
-#~ " <b>stop : </b>ifdown ippp0\n"
-#~ " <br>"
-#~ "\n"
+#~ " <br> <b>start: </b>ifup ippp0\n"
+#~ " <br> <b>stop : </b>ifdown ippp0\n"
+#~ " <br>\n"
 #~ "</tt>\n"
 #~ "Note: ippp0 is an example</p>"
 #~ msgstr ""
 #~ "<p>Viss du vel manuelt, må du starta/stoppa tenesta manuelt ved\n"
 #~ "hjelp av følgjande kommandoar (du må vera innlogget som rot):\n"
 #~ "<tt>\n"
-#~ "<br>"
-#~ " <b>Start: </b>ifup ippp0\n"
-#~ "<br>"
-#~ " <b>Stopp : </b>ifdown ippp0\n"
-#~ "<br>"
-#~ "\n"
+#~ "<br> <b>Start: </b>ifup ippp0\n"
+#~ "<br> <b>Stopp : </b>ifdown ippp0\n"
+#~ "<br>\n"
 #~ "</tt>\n"
 #~ "Merk: ippp0 er eit døme</p>"
 
@@ -6258,35 +6031,27 @@
 #~ "also known as Multilink PPP. To activate or deactivate the second channel,\n"
 #~ "use the following commands:\n"
 #~ "<tt>\n"
-#~ " <br>"
-#~ " isdnctrl addlink ippp0\n"
-#~ " <br>"
-#~ " isdnctrl removelink ippp0\n"
-#~ " <br>"
-#~ "\n"
+#~ " <br> isdnctrl addlink ippp0\n"
+#~ " <br> isdnctrl removelink ippp0\n"
+#~ " <br>\n"
 #~ "</tt>\n"
 #~ "You can also install the package <b>xibod</b> to have this happen automatically. If\n"
 #~ "there is a demand for more bandwidth, it adds a channel. If the traffic goes down, it \n"
 #~ "removes a channel.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
 #~ "<p>Ved å velja <b>kanalsamling</b> set du opp ein 128 kBit-samband,\n"
 #~ "òg kalla Multilink PPP. For å opne eller lukka den andre kanalen\n"
 #~ "brukar du følgjande kommandoar:\n"
 #~ "<tt>\n"
-#~ "<br>"
-#~ " isdnctrl addlink ippp0\n"
-#~ "<br>"
-#~ " isdnctrl removelink ippp0\n"
-#~ "<br>"
-#~ "\n"
+#~ "<br> isdnctrl addlink ippp0\n"
+#~ "<br> isdnctrl removelink ippp0\n"
+#~ "<br>\n"
 #~ "</tt>\n"
 #~ "Du kan òg installera pakka <b>xibod</b> for å utføra dette automatisk. Når\n"
 #~ "meir båndbredde vert kravt, vert lagt ein ekstra kanal til. Når trafikken vert mindre, vert lukka\n"
 #~ "ein av kanalane.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #, fuzzy
 #~ msgid ""
@@ -6341,12 +6106,10 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>Enter the IP addresses if you received a fixed IP address\n"
-#~ "from your provider for syncppp or you use raw IP.</p>"
-#~ "\n"
+#~ "from your provider for syncppp or you use raw IP.</p>\n"
 #~ msgstr ""
 #~ "<p>Angje IP-addressene viss har fått fasta adresser\n"
-#~ "frå tjenesteleverandøren for syncppp, eller viss du brukar rå IP.</p>"
-#~ "\n"
+#~ "frå tjenesteleverandøren for syncppp, eller viss du brukar rå IP.</p>\n"
 
 #, fuzzy
 #~ msgid ""
@@ -6354,27 +6117,23 @@
 #~ "assigns you one temporary address per connection. In this case, the\n"
 #~ "outgoing address is unknown until the moment the link is established.\n"
 #~ "This is the default with most providers.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
 #~ "<p>Kryss av for <b>Dynamisk IP-adresse</b>\n"
 #~ "viss tjenesteleverandøren tildeler ei mellombels adresse for kvar tilkobling. I så fall er\n"
 #~ "den utgående adressa ukjent inntil sambandet er etablert.\n"
 #~ "Dette er standard for dei fleste tjenesteleverandører.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>Check <b>Default Route</b> to use this interface as the\n"
 #~ "default route. Only one interface can be the default\n"
-#~ "route.</p>"
-#~ "\n"
+#~ "route.</p>\n"
 #~ msgstr ""
 #~ "<p>Kryss av for <b>Standardrute</b> for å bruka dette grensesnittet som\n"
 #~ "standardrute. Berre eitt grensesnitt kan vera\n"
-#~ "standardrute.</p>"
-#~ "\n"
+#~ "standardrute.</p>\n"
 
 #, fuzzy
 #~ msgid "IP Address Settings"
@@ -6456,37 +6215,31 @@
 #~ msgid ""
 #~ "<p>If you have an old legacy ISA card, you can enter values for\n"
 #~ "IO port or memory addresses and the used interrupt.\n"
-#~ "For the correct values, check with your technical manual or contact your salesman.</p>"
-#~ "\n"
+#~ "For the correct values, check with your technical manual or contact your salesman.</p>\n"
 #~ msgstr ""
 #~ "<p>Viss du eit IST-KORT av eldre modell, kan du leggja inn verd for\n"
 #~ "inn/ut-port, minneadresser og avbruddslinjer.\n"
-#~ "Sjå brukerveiledningen eller kontakt forhandleren der du kjøpte korta for å finna riktige verd.</p>"
-#~ "\n"
+#~ "Sjå brukerveiledningen eller kontakt forhandleren der du kjøpte korta for å finna riktige verd.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p><b>Start Mode: </b>  With <b>OnBoot</b>, the driver is loaded during\n"
 #~ "system boot. For <b>Manual</b>, the driver must be started with the\n"
 #~ "<b>rcisdn start</b> command. Only the user root can do this.\n"
-#~ "<b>HotPlug</b> is a special case for PCMCIA and USB devices.</p>"
-#~ "\n"
+#~ "<b>HotPlug</b> is a special case for PCMCIA and USB devices.</p>\n"
 #~ msgstr ""
 #~ "<p><b>Oppstartsmodus: </b> Vel <b>Ved oppstart</b> for å lasta drivaren når\n"
 #~ "systemet startar opp. Viss du vel <b>Manuelt</b>, må drivaren startast med kommandoen\n"
 #~ "<b>rcisdn start</b>. Du må vera rot for å gjera dette.\n"
-#~ "<b>Hotplug </b> er berre aktuelt for PCMCIA- og USB-einingar.</p>"
-#~ "\n"
+#~ "<b>Hotplug </b> er berre aktuelt for PCMCIA- og USB-einingar.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>Multiple drivers exist for your ISDN card.\n"
-#~ "Select one from the list.</p>"
-#~ "\n"
+#~ "Select one from the list.</p>\n"
 #~ msgstr ""
 #~ "<p>For nokon ISDN-kort finst det fleire drivarar.\n"
-#~ "Vel ein driv frå lista.</p>"
-#~ "\n"
+#~ "Vel ein driv frå lista.</p>\n"
 
 #, fuzzy
 #~ msgid "<p><b>ISDN Protocol: </b>In most cases, the protocol is Euro-ISDN.</p>"
@@ -6495,22 +6248,18 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p><b>Area Code: </b> Enter your local area code for the ISDN\n"
-#~ "line here, without a leading zero and without a country prefix.</p>"
-#~ "\n"
+#~ "line here, without a leading zero and without a country prefix.</p>\n"
 #~ msgstr ""
 #~ "<p><b>Retningsnummer: </b> Angje retningsnummeret for ISDN-\n"
-#~ "linja her, utan innledende null og utan landskode.</p>"
-#~ "\n"
+#~ "linja her, utan innledende null og utan landskode.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p><b>Dial Prefix: </b> If you need a prefix to get an public line, \n"
-#~ "enter it here. This is only used on a internal S0 bus and the most common one is \"0\".</p>"
-#~ "\n"
+#~ "enter it here. This is only used on a internal S0 bus and the most common one is \"0\".</p>\n"
 #~ msgstr ""
 #~ "<p><b>Linje ut: </b> Viss du må slå eit nummer for å kome ut på det offentlege telenettet, \n"
-#~ "skriv du inn dette her. Nummeret vert berre brukt i ein intern S0-buss, og vanlegvis vert brukt \"0\".</p>"
-#~ "\n"
+#~ "skriv du inn dette her. Nummeret vert berre brukt i ein intern S0-buss, og vanlegvis vert brukt \"0\".</p>\n"
 
 #, fuzzy
 #~ msgid "<p>If you do not want to log all your ISDN traffic, uncheck <b>Start ISDN Log</b>.</p>"
@@ -6771,26 +6520,22 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>If you are on a PBX, you probably need to enter a <b>Dial Prefix</b>.\n"
-#~ "Often, this is <i>9</i> or <i>0</i>.</p>"
-#~ "\n"
+#~ "Often, this is <i>9</i> or <i>0</i>.</p>\n"
 #~ msgstr ""
 #~ "<p>Viss du er koblet til ein hussentral (PBX), må du sannsynlegvis angje ei<b>linje ut</b>.\n"
-#~ "Dette er ofte <i>9</i> eller <i>0</i>.</p>"
-#~ "\n"
+#~ "Dette er ofte <i>9</i> eller <i>0</i>.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>Choose <b>Dial Mode</b> according to your phone link. Most telephone\n"
 #~ "companies use <i>Tone Dial</i> as the <b>Dial Mode</b>. Check the additional\n"
 #~ "check boxes to turn on your modem speaker (<i>Speaker On</i>) or for your\n"
-#~ "modem to wait until it detects a dial tone (<i>Detect Dial Tone</i>).</p>"
-#~ "\n"
+#~ "modem to wait until it detects a dial tone (<i>Detect Dial Tone</i>).</p>\n"
 #~ msgstr ""
 #~ "<p>Vel <b>ringemodus</b> for telefonsystemet. Dei fleste teleselskaper\n"
 #~ "brukar <I>tonesignal</I> som <B>ringemodus</B>. Kryss av i andre\n"
 #~ "boksar for å slå på modemhøyttaleren (<i>Høyttaler på</i>)\n"
-#~ "eller for at modemet skal venta på summetone (<i>Vent på summetone</i>).</p>"
-#~ "\n"
+#~ "eller for at modemet skal venta på summetone (<i>Vent på summetone</i>).</p>\n"
 
 #, fuzzy
 #~ msgid ""
@@ -6843,22 +6588,18 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p><b>Baud Rate</b> is a transmission speed that tells\n"
-#~ "how many bits per second your computer communicates with your modem.</p>"
-#~ "\n"
+#~ "how many bits per second your computer communicates with your modem.</p>\n"
 #~ msgstr ""
 #~ "<p><b>Overføringshastighet</b> definerer\n"
-#~ "kor mange bitar per sekund som vert overførde mellom datamaskina og modemet.</p>"
-#~ "\n"
+#~ "kor mange bitar per sekund som vert overførde mellom datamaskina og modemet.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>All the relevant information about <b>Init Strings</b>\n"
-#~ "should be in your modem manual.</p>"
-#~ "\n"
+#~ "should be in your modem manual.</p>\n"
 #~ msgstr ""
 #~ "<p>All relevant informasjon om <b>Init-strengar</b>\n"
-#~ "byrd finnast i modemet sitt brukerveiledning.</p>"
-#~ "\n"
+#~ "byrd finnast i modemet sitt brukerveiledning.</p>\n"
 
 #, fuzzy
 #~ msgid "B&aud Rate"
@@ -6949,26 +6690,22 @@
 #~ "<p><b>Name Servers</b> are required to convert hostnames\n"
 #~ "(such as www.suse.com) to IP addresses (for example, 213.95.15.200). You only\n"
 #~ "need to specify the name servers if you enable dial on demand or\n"
-#~ "disable <b>DNS Modification</b> when connected.</p>"
-#~ "\n"
+#~ "disable <b>DNS Modification</b> when connected.</p>\n"
 #~ msgstr ""
 #~ "<p><b>Navneservere</b> vert kravd for å konverterar vertsnavn\n"
 #~ "(t.d. www.susa.com) til IP-adresser (t.d. 213.95.15.200). Du treng\n"
 #~ "berre å spesifisera navneservere viss du aktiverer automatisk oppringning eller\n"
-#~ "deaktiverer <b>Endring av DNS</b> ved tilkobling.</p>"
-#~ "\n"
+#~ "deaktiverer <b>Endring av DNS</b> ved tilkobling.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p><b>Ignore Prompts</b> disables the detection of any prompts from the dial-up\n"
 #~ "server. If the connection build-up is slow or does not work at all, try this\n"
-#~ "option.</p>"
-#~ "\n"
+#~ "option.</p>\n"
 #~ msgstr ""
 #~ "<p><b>Ignorer spurnad</b> hindrar at førespurnader frå oppringingsserveren\n"
 #~ "registrerast. Viss det tek lang tid å etablera sambandet eller viss tilkoblingen mislukkast, kan du prøva dette\n"
-#~ "alternativet.</p>"
-#~ "\n"
+#~ "alternativet.</p>\n"
 
 #, fuzzy
 #~ msgid ""
@@ -6985,12 +6722,10 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>The <b>Idle Time-Out</b> specifies the time after which an idle\n"
-#~ "connection will be shut down (0 means the connection will not time-out).</p>"
-#~ "\n"
+#~ "connection will be shut down (0 means the connection will not time-out).</p>\n"
 #~ msgstr ""
 #~ "<p><b>Tidsavbrudd ved inaktivitet</b> spesifiserer kor lang tid det skal\n"
-#~ "gå før ein inaktiv samband frakobles (0 tyder at sambandet aldri frakobles).</p>"
-#~ "\n"
+#~ "gå før ein inaktiv samband frakobles (0 tyder at sambandet aldri frakobles).</p>\n"
 
 #, fuzzy
 #~ msgid "min"
@@ -7089,14 +6824,12 @@
 #~ "<p>Check <b>Use Peer DNS</b> to change\n"
 #~ "your domain name servers after the connection is made. This replaces your static\n"
 #~ "DNS configuration with the obtained DNS server IP addresses. Today, almost all\n"
-#~ "providers support <b>Use Peer DNS</b>.</p>"
-#~ "\n"
+#~ "providers support <b>Use Peer DNS</b>.</p>\n"
 #~ msgstr ""
 #~ "<p>Kryss av for <b>Bruk DNS frå anna maskin</b> viss du vil endra \n"
 #~ "domenenavneservere etter at sambandet er etablert. Dette erstattar den\n"
 #~ "statiske DNS-oppsettet med IP-adresser for DNS-serveren. I dag tilbyr nesten\n"
-#~ "alle tjenesteleverandører <b>Bruk DNS frå anna maskin</b>.</p>"
-#~ "\n"
+#~ "alle tjenesteleverandører <b>Bruk DNS frå anna maskin</b>.</p>\n"
 
 #, fuzzy
 #~ msgid ""
@@ -7167,81 +6900,52 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p><b><big>Initializing Provider\n"
-#~ "Configuration</big></b><br>"
-#~ "Please wait...<br>"
-#~ "</p>"
-#~ "\n"
+#~ "Configuration</big></b><br>Please wait...<br></p>\n"
 #~ msgstr ""
 #~ "<p><b><big>Initialiserer oppsett\n"
-#~ "for tjenesteleverandør</big></b><br>"
-#~ "Vent…<br>"
-#~ "</p>"
-#~ "\n"
+#~ "for tjenesteleverandør</big></b><br>Vent…<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p><b><big>Saving Provider\n"
-#~ "Configuration</big></b><br>"
-#~ "Please wait...<br>"
-#~ "</p>"
-#~ "\n"
+#~ "Configuration</big></b><br>Please wait...<br></p>\n"
 #~ msgstr ""
 #~ "<p><b><big>Lagrar oppsett\n"
-#~ "for tjenesteleverandør</big></b><br>"
-#~ "Vent…<br>"
-#~ "</p>"
-#~ "\n"
+#~ "for tjenesteleverandør</big></b><br>Vent…<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Provider Setup</big></b><br>"
-#~ "\n"
-#~ "Configure your provider here.<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<p><b><big>Provider Setup</big></b><br>\n"
+#~ "Configure your provider here.<br></p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Tjenesteleverandøroppsett</big></b><br>"
-#~ "\n"
-#~ "Sett opp tjenesteleverandøren her.<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<p><b><big>Tjenesteleverandøroppsett</big></b><br>\n"
+#~ "Sett opp tjenesteleverandøren her.<br></p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Adding a Provider:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Adding a Provider:</big></b><br>\n"
 #~ "Choose a provider from the list of available providers\n"
-#~ "then press <b>Edit</b>.</p>"
-#~ "\n"
+#~ "then press <b>Edit</b>.</p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Legg til ein tjenesteleverandør:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Legg til ein tjenesteleverandør:</big></b><br>\n"
 #~ "Vel ein leverandør frå lista over tilgjengelege leverandørar\n"
-#~ "og klikk deretter <b>Rediger</b>.</p>"
-#~ "\n"
+#~ "og klikk deretter <b>Rediger</b>.</p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Editing or Deleting:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Editing or Deleting:</big></b><br>\n"
 #~ "If you press <b>Edit</b>, an additional dialog in which\n"
-#~ "to change the configuration opens.</p>"
-#~ "\n"
+#~ "to change the configuration opens.</p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Redigera eller slette:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Redigera eller slette:</big></b><br>\n"
 #~ "Viss du klikkar <b>Rediger</b>, får du opp ein ny dialog der\n"
-#~ "du kan endra oppsettet.</p>"
-#~ "\n"
+#~ "du kan endra oppsettet.</p>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Provider Overview</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Provider Overview</big></b><br>\n"
 #~ "Obtain an overview of installed providers. Additionally,\n"
-#~ "edit their configurations.<br>"
-#~ "</p>"
-#~ "\n"
+#~ "edit their configurations.<br></p>\n"
 #~ msgstr ""
 #~ "<P><B><BIG>Oversyn over tjenesteleverandører</BIG></B><BR>\n"
 #~ "Hent eit oversyn over installerte tjenesteleverandører. Du kan\n"
@@ -7249,27 +6953,21 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Adding a Provider:</big></b><br>"
-#~ "\n"
-#~ "Press <b>Add</b> to configure a new provider manually.</p>"
-#~ "\n"
+#~ "<p><b><big>Adding a Provider:</big></b><br>\n"
+#~ "Press <b>Add</b> to configure a new provider manually.</p>\n"
 #~ msgstr ""
 #~ "<P><B><BIG>Legg til ein leverandør:</BIG></B><BR>\n"
 #~ "Klikk <B>Legg til</B> for å setja opp ein ny leverandør manuelt.</P>\n"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Editing or Deleting:</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Editing or Deleting:</big></b><br>\n"
 #~ "Choose a provider to change or remove.\n"
-#~ "Then press <b>Edit</b> or <b>Delete</b> as desired.</p>"
-#~ "\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"
+#~ "<p><b><big>Rediger eller slett:</big></b><br>\n"
 #~ "Vel ein leverandør du vil endra eller sletta.\n"
-#~ "Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter behov.</p>"
-#~ "\n"
+#~ "Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter behov.</p>\n"
 
 #, fuzzy
 #~ msgid "<p>Select the appropriate <b>provider</b>.</p>"
@@ -7303,13 +7001,11 @@
 #~ msgid ""
 #~ "<p>To register for <b>%1</b> and find the best\n"
 #~ "dialing number, connect to the home page <b>%2</b> or call the hot line\n"
-#~ "<b>%3</b>.</p>"
-#~ "\n"
+#~ "<b>%3</b>.</p>\n"
 #~ msgstr ""
 #~ "<p>For å registrera deg for <b>%1</b> og finne riktig\n"
 #~ "oppringingsnummer, besøk nettsiden <b>%2</b> eller ring brukerstøttenummeret\n"
-#~ "<b>%3</b>.</p>"
-#~ "\n"
+#~ "<b>%3</b>.</p>\n"
 
 #, fuzzy
 #~ msgid ""
@@ -7322,12 +7018,10 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>To register for <b>%1</b> and find the best\n"
-#~ "dialing number, call the hot line <b>%2</b>.</p>"
-#~ "\n"
+#~ "dialing number, call the hot line <b>%2</b>.</p>\n"
 #~ msgstr ""
 #~ "<p>For å registrera deg for <b>%1</b> og finne riktig\n"
-#~ "oppringingsnummer, ring brukerstøttenummeret <b>%2</b>.</p>"
-#~ "\n"
+#~ "oppringingsnummer, ring brukerstøttenummeret <b>%2</b>.</p>\n"
 
 #, fuzzy
 #~ msgid "Provider Parameters"
@@ -7336,12 +7030,10 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>Configure access to your Internet provider. If you have\n"
-#~ "selected your provider from the  list, these values are provided.</p>"
-#~ "\n"
+#~ "selected your provider from the  list, these values are provided.</p>\n"
 #~ msgstr ""
 #~ "<p>Tilgjenge til internettleverandør: Viss du har\n"
-#~ "valt ein leverandør frå lista, er følgjande verd tilgjengelege.</p>"
-#~ "\n"
+#~ "valt ein leverandør frå lista, er følgjande verd tilgjengelege.</p>\n"
 
 #, fuzzy
 #~ msgid "<p>Enter a <b>Provider Name</b> for the provider.</p>"
@@ -7404,16 +7096,14 @@
 #~ "Internet service provider might not allow passwords to be saved on\n"
 #~ "disk. If you enter the password here, it is saved in clear text on disk\n"
 #~ "(readable by root only).\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
 #~ "<p>Kryss av for <b>Spør alltid etter passord</b> for å bedast om passord kvar gong.\n"
 #~ "Din\n"
 #~ "internettleverandør tillèt kanskje ikkje at passord vert lagra på\n"
 #~ "disken. Viss du angjev passordet her, vert det lagra på disken i klartekst\n"
 #~ "(berre lesbart av rot).\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #, fuzzy
 #~ msgid "Authorization"
@@ -7525,13 +7215,11 @@
 #~ msgid ""
 #~ "<p>In the <b>User Name</b> field, replace the blank space\n"
 #~ "(after the <b>/</b>) with your Kamp login. Then enter your password\n"
-#~ "and click <b>Next</b>. Contact your provider if you have difficulties.</p>"
-#~ "\n"
+#~ "and click <b>Next</b>. Contact your provider if you have difficulties.</p>\n"
 #~ msgstr ""
 #~ "<p>I <b>Brukernavn</b>-feltet, erstatt den tomme plassen\n"
 #~ "(etter <b>/</b>) med Kamp-brukernavnet ditt. Skriv deretter inn passord\n"
-#~ "og klikk <b>Neste</b> (spør tjenesteleverandøren viss får problem).</p>"
-#~ "\n"
+#~ "og klikk <b>Neste</b> (spør tjenesteleverandøren viss får problem).</p>\n"
 
 #, fuzzy
 #~ msgid "<p>Access AOL-DSL.</p>"
@@ -7544,16 +7232,14 @@
 #~ "If you are a new AOL customer and want to dial up for the first time, you need\n"
 #~ "to enter your AOL PIN number once. If you have a Windows system, you can enter\n"
 #~ "the PIN in the AOL dial-up software. If not, call the AOL hot line and request\n"
-#~ "the AOL staff to enter the PIN number for you.</p>"
-#~ "\n"
+#~ "the AOL staff to enter the PIN number for you.</p>\n"
 #~ msgstr ""
 #~ "<p>I <b>Brukernavn</b>-feltet, erstatt den tomme plassen (før\n"
 #~ "<b>@</b>) med AOL-brukernavnet ditt. Skriv deretter inn passord og klikk <b>Neste</b>.\n"
 #~ "Viss du er ein ny AOL-kunde og ynskjer å ringa opp for første gong, må du\n"
 #~ "du skriva inn AOL PIN-koda éin gong. Viss du har eit Windows-system, finn du\n"
 #~ "PIN-koda i AOLs tilkoblingsprogram. Viss ikkje, må du ringa AOLs brukerstøttetelefon og be\n"
-#~ "dei leggja inn PIN-koda for deg.</p>"
-#~ "\n"
+#~ "dei leggja inn PIN-koda for deg.</p>\n"
 
 #, fuzzy
 #~ msgid "<p>Access to Kamp 1&1 DSL.</p>"
@@ -7563,13 +7249,11 @@
 #~ msgid ""
 #~ "<p>In the <b>User Name</b> field, replace the blank space (after\n"
 #~ "the <b>/</b>) with your 1&1 login. Then enter your password and click <b>Next</b>.\n"
-#~ "Contact your provider if you have difficulties.</p>"
-#~ "\n"
+#~ "Contact your provider if you have difficulties.</p>\n"
 #~ msgstr ""
 #~ "<p>I <b>Brukernavn</b>-feltet, erstatt den tomme plassen (etter\n"
 #~ "<b>/</b>) med 1&1-brukernavnet ditt. Skriv deretter inn passord og klikk <b>Neste</b>\n"
-#~ "{(spør tjenesteleverandøren viss får problem).</p>"
-#~ "\n"
+#~ "{(spør tjenesteleverandøren viss får problem).</p>\n"
 
 #, fuzzy
 #~ msgid "<p>Access to Kamp Eggenet DSL.</p>"
@@ -7578,12 +7262,10 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>Enter your password and click <b>Next</b>.\n"
-#~ "Contact your provider if you have difficulties.</p>"
-#~ "\n"
+#~ "Contact your provider if you have difficulties.</p>\n"
 #~ msgstr ""
 #~ "<p>Skriv inn passord og klikk <b>Neste</b>\n"
-#~ "(spør tjenesteleverandøren viss får problem).</p>"
-#~ "\n"
+#~ "(spør tjenesteleverandøren viss får problem).</p>\n"
 
 #, fuzzy
 #~ msgid "<p>Access to Kamp T-Online Business DSL.</p>"
@@ -7593,13 +7275,11 @@
 #~ msgid ""
 #~ "<p>In the <b>User Name</b> field, replace the blank space (after\n"
 #~ "the <b>/</b>) with your T-Online Business login. Then enter your password and\n"
-#~ "click <b>Next</b>. Contact your provider if you have difficulties.</p>"
-#~ "\n"
+#~ "click <b>Next</b>. Contact your provider if you have difficulties.</p>\n"
 #~ msgstr ""
 #~ "<p>I <b>Brukernavn</b>-feltet, erstatt den tomme plassen (etter\n"
 #~ "<b>/</b>) med T-Online Business-brukernavnet ditt. Skriv deretter inn passord og\n"
-#~ " klikk <b>Neste</b> (spør tjenesteleverandøren viss får problem).</p>"
-#~ "\n"
+#~ " klikk <b>Neste</b> (spør tjenesteleverandøren viss får problem).</p>\n"
 
 #, fuzzy
 #~ msgid "Provider Configuration"
@@ -7611,21 +7291,17 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Device Control</big></b></p>"
-#~ "\n"
+#~ "<p><b><big>Device Control</big></b></p>\n"
 #~ "<p>Usually, only the system administrator is allowed to activate and\n"
 #~ "deactivate a network interface. With <b>Enable Device Control for Non-root User\n"
 #~ "Via QInternet</b>, any user may control the interface via QInternet.This will require\n"
-#~ "<b>smpppd</b> installed and running.</p>"
-#~ "\n"
+#~ "<b>smpppd</b> installed and running.</p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Enhetskontroll</big></b></p>"
-#~ "\n"
+#~ "<p><b><big>Enhetskontroll</big></b></p>\n"
 #~ "<p>Normalt har berre systemadministratoren tilgjenge til å aktivera og \n"
 #~ "deaktivere nettverksgrensesnitt. Med <b>Aktivum enhetskontroll for ikkje-rot-brukarar\n"
 #~ "vigd QInternet kan alle brukarar styra grensesnittet vigd QInternet. Dette krev at\n"
-#~ "<b>smpppd</b> er installert og køyrer.</p>"
-#~ "\n"
+#~ "<b>smpppd</b> er installert og køyrer.</p>\n"
 
 #, fuzzy
 #~ msgid "Initializing DSL Configuration"
@@ -8069,14 +7745,12 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p>Configure your Internet proxy (caching) settings here.</p>"
-#~ "\n"
+#~ "<p>Configure your Internet proxy (caching) settings here.</p>\n"
 #~ "<p><b>Note:</b> It is generally recommended to relogin for the settings to take effect, \n"
 #~ "however in some cases the application may pick up new settings immediately. Please check \n"
 #~ "what your application (web browser, ftp client,...) supports. </p>"
 #~ msgstr ""
-#~ "<p>Sett opp ein mellomtjener for Internett  her (mellomlagring).</p>"
-#~ "\n"
+#~ "<p>Sett opp ein mellomtjener for Internett  her (mellomlagring).</p>\n"
 #~ "<p><b>Merk:</b> Du må normalt logga inn på nytt for å aktivare innstillingane, \n"
 #~ "men i nokre tilfelle kan det hende at programmet tek i bruk innstillingane umiddelbart. Undersøk \n"
 #~ "kva programmet (nettleser, ftp-klient osb.) støtter. </p>"
@@ -8084,22 +7758,18 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p><b>HTTP Proxy URL</b> is the name of the proxy server for your access\n"
-#~ "to the World Wide Web (WWW).</p>"
-#~ "\n"
+#~ "to the World Wide Web (WWW).</p>\n"
 #~ msgstr ""
 #~ "<p>Under <b>HTTP-mellomserveradresse</b> angjev du adressa til mellomserveren du brukar for å få tilgjenge\n"
-#~ "til Internett (www).</p>"
-#~ "\n"
+#~ "til Internett (www).</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p><b>HTTPS Proxy URL</b> is the name of the proxy server for your secured access\n"
-#~ "to the World Wide Web (WWW).</p>"
-#~ "\n"
+#~ "to the World Wide Web (WWW).</p>\n"
 #~ msgstr ""
 #~ "<p><b>HTTPS-mellomserveradresse</b> er adressa til mellomserveren som gjev deg sikkert tilgjenge\n"
-#~ "til Internett (www).</p>"
-#~ "\n"
+#~ "til Internett (www).</p>\n"
 
 #, fuzzy
 #~ msgid "<p>Example: <i>http://proxy.example.com:3128/</i></p>"
@@ -8127,35 +7797,29 @@
 #~ msgid ""
 #~ "<p><b>No Proxy Domains</b> is a comma-separated list of domains\n"
 #~ "for which the requests should be made directly without caching,\n"
-#~ "for example, <i>%1</i>.</p>"
-#~ "\n"
+#~ "for example, <i>%1</i>.</p>\n"
 #~ msgstr ""
 #~ "<p><b>Ikkje mellomserverdomener</b> er ei liste over domener der førespurnader\n"
 #~ "skal handterast direkte utan mellomlagring,\n"
-#~ "til dømes <i>%1</i>.</p>"
-#~ "\n"
+#~ "til dømes <i>%1</i>.</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>If you are using a proxy server with authorization, enter\n"
 #~ "the <b>Proxy User Name</b> and <b>Proxy Password</b>. A valid username\n"
-#~ "consists of printable ASCII characters only (except for quotation marks).</p>"
-#~ "\n"
+#~ "consists of printable ASCII characters only (except for quotation marks).</p>\n"
 #~ msgstr ""
 #~ "<p>Viss du brukar ein mellomserver som krev autentisering, må du fylla ut felta\n"
 #~ "<b>Brukernavn for mellomserver</b> og <b>Passord for mellomserver</b>. Eit gyldig brukernavn\n"
-#~ "kan berre innehalda ASCII-teikn (bortsedd frå apostrofar).</p>"
-#~ "\n"
+#~ "kan berre innehalda ASCII-teikn (bortsedd frå apostrofar).</p>\n"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>Press <b>Test Proxy Settings</b> to test\n"
-#~ "the current configuration for HTTP, HTTPS, and FTP proxy.</p>"
-#~ " \n"
+#~ "the current configuration for HTTP, HTTPS, and FTP proxy.</p> \n"
 #~ msgstr ""
 #~ "<p>Klikk <b>Test mellomserverinnstillinger</b>\n"
-#~ "for å testa gjeldande oppsett for HTTP-, HTTPS- og FTP-mellomserver</p>"
-#~ " \n"
+#~ "for å testa gjeldande oppsett for HTTP-, HTTPS- og FTP-mellomserver</p> \n"
 
 #, fuzzy
 #~ msgid "&Enable Proxy"

Modified: branches/plus-SLE12-SP2/yast/nn/po/nfs.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/nfs.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/nfs.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -202,8 +202,7 @@
 msgid ""
 "<p>To mount a new NFS share, click <B>Add</B>. To change the configuration of\n"
 "a currently mounted share, click <B>Edit</B>. Remove and unmount a selected\n"
-"share with <B>Delete</B>.</p>"
-"\n"
+"share with <B>Delete</B>.</p>\n"
 msgstr ""
 "<p>Bruk <B>Legg til</B>-knappen for å montera ein ny delt NFS-ressurs. For å endra oppsettet for\n"
 "ein montert delt ressurs, bruk <B>Rediger</B>-knappen. Fjern og avmonter ein vald delt ressurs med \n"
@@ -215,8 +214,7 @@
 "<p>If you need to access NFSv4 shares (NFSv4 is a newer version of the NFS\n"
 "protocol), check the <b>Enable NFSv4</b> option. In that case, you might need\n"
 "to supply specific a <b>NFSv4 Domain Name</b> required for the correct setting\n"
-"of file/directory access rights.</p>"
-"\n"
+"of file/directory access rights.</p>\n"
 msgstr ""
 "<p>Viss du må ha tilgjenge til delte NFSv4-ressursar (NFSv4 er ein nyare versjon\n"
 " av NFS-protokollen), kryss av for <b>Aktivum NFSv4</b>. Det kan hende at du må angje eit\n"
@@ -339,13 +337,11 @@
 msgid ""
 "<p>Enter the <b>NFS Server Hostname</b>.  With\n"
 "<b>Choose</b>, browse through a list of\n"
-"NFS servers on the local network.</p>"
-"\n"
+"NFS servers on the local network.</p>\n"
 msgstr ""
 "<p>Skriv inn <b>Vertsmaskinnavn for NFS-servar</b>. Med\n"
 "<i>Vel</i> kan du bla gjennom ei liste over\n"
-"NFS-servera i lokalnettverket.</p>"
-"\n"
+"NFS-servera i lokalnettverket.</p>\n"
 
 #. help text 2/4
 #. added "Select" button

Modified: branches/plus-SLE12-SP2/yast/nn/po/nfs_server.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/nfs_server.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/nfs_server.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -88,31 +88,31 @@
 msgstr "Ja/Nei-val for aktivering/deaktivering av sikker NFS"
 
 #. summary text
-#: src/clients/nfs_server.rb:196
+#: src/clients/nfs_server.rb:202
 #, fuzzy
 msgid "NFS server is enabled"
 msgstr "NFS-serveren er aktiverte"
 
 #. summary text
-#: src/clients/nfs_server.rb:199
+#: src/clients/nfs_server.rb:205
 #, fuzzy
 msgid "NFS server is disabled"
 msgstr "NFS-serveren er deaktivert"
 
 #. error message
-#: src/clients/nfs_server.rb:215
+#: src/clients/nfs_server.rb:221
 #, fuzzy
 msgid "Required packages (%1) are not installed."
 msgstr "Naudsynte pakker (%1) er ikkje installerte."
 
 #. error
 #. error
-#: src/clients/nfs_server.rb:255 src/clients/nfs_server.rb:285
+#: src/clients/nfs_server.rb:261 src/clients/nfs_server.rb:291
 #, fuzzy
 msgid "No mount point specified."
 msgstr "Monteringspunkt er ikkje spesifiserte."
 
-#: src/clients/nfs_server.rb:260
+#: src/clients/nfs_server.rb:266
 #, fuzzy
 msgid ""
 "The exports table already\n"
@@ -124,12 +124,12 @@
 #. CLI action handler.
 #. @param [Hash] options command options
 #. @return whether successful
-#: src/clients/nfs_server.rb:319
+#: src/clients/nfs_server.rb:325
 #, fuzzy
 msgid "Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command."
 msgstr "Domane kan ikkje angjevast utan å aktivera NFSv4. Bruk 'set enablev4'-kommandoen."
 
-#: src/clients/nfs_server.rb:330
+#: src/clients/nfs_server.rb:336
 #, fuzzy
 msgid "Command 'set' must be used in the form 'set option=value'. Use 'set help' to get information about available options."
 msgstr "Kommandoen må angjevast i formatet 'set alternativt=verd'. Bruk 'set help' for å få informasjon om vala."
@@ -198,48 +198,60 @@
 "Det manglar sannsynlegvis informasjon i konfigurasjonsfilen."
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:58
+#: src/include/nfs_server/ui.rb:68
 #, fuzzy
 msgid "&Directory to Export"
 msgstr "&Katalog som skal eksporterast"
 
 #. button label
-#: src/include/nfs_server/ui.rb:64
+#: src/include/nfs_server/ui.rb:74
 #, fuzzy
 msgid "&Browse..."
 msgstr "&Bla igjennom …"
 
-#: src/include/nfs_server/ui.rb:87
+#: src/include/nfs_server/ui.rb:97
 #, fuzzy
 msgid "Enter a non-empty export path. For example, /exports."
 msgstr "Angje ein eksporteringssti, f.eks /exports."
 
 #. error popup message
-#: src/include/nfs_server/ui.rb:95
+#: src/include/nfs_server/ui.rb:105
 #, fuzzy
 msgid "The exports table already contains this directory."
 msgstr "Eksporttabellen inneheld allereie denne katalogen."
 
+#. message popup; %1, %2 are package names
+#: src/include/nfs_server/ui.rb:113
+#, fuzzy
+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 ikkje eksportera katalogar\n"
+"med mellomrom i namnet.\n"
+"Bruk henne kjernebaserte serveren (%2) for å gjera dette."
+
 #. the dir does not exist
-#: src/include/nfs_server/ui.rb:101
+#: src/include/nfs_server/ui.rb:126
 #, fuzzy
 msgid "The directory does not exist. Create it?"
 msgstr "Katalogen finst ikkje. Vil du oppretta henne?"
 
 #. title in the file selection dialog
-#: src/include/nfs_server/ui.rb:111
+#: src/include/nfs_server/ui.rb:136
 #, fuzzy
 msgid "Select the Directory to Export"
 msgstr "Vel katalog som skal eksporterast"
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:168
+#: src/include/nfs_server/ui.rb:193
 #, fuzzy
 msgid "&Host Wild Card"
 msgstr "&Jokertegn for vertsmaskin"
 
 #. text entry label
-#: src/include/nfs_server/ui.rb:170
+#: src/include/nfs_server/ui.rb:195
 #, fuzzy
 msgid "O&ptions"
 msgstr "A<ernativer"
@@ -247,7 +259,7 @@
 #. 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:222
+#: src/include/nfs_server/ui.rb:250
 #, fuzzy
 msgid ""
 "'fsid=0' is not a valid option unless \n"
@@ -257,7 +269,7 @@
 "ikkje NFSv4 er aktiverte (forrige side)"
 
 #. error popup message
-#: src/include/nfs_server/ui.rb:240
+#: src/include/nfs_server/ui.rb:268
 #, fuzzy
 msgid ""
 "Options for this wild card\n"
@@ -268,13 +280,13 @@
 
 #. Opening NFS server dialog
 #. @return `back, `abort, `next `or finish
-#: src/include/nfs_server/ui.rb:272
+#: src/include/nfs_server/ui.rb:300
 #, fuzzy
 msgid "Unable to read the /etc/idmapd.conf file. Setting the default setting for the domain to 'localdomain'."
 msgstr "Kan ikkje lesa /etc/idmapd.conf-fila. Nytter standardinnstillingen 'localdomain' for domane."
 
 #. Help, part 1 of 2
-#: src/include/nfs_server/ui.rb:295
+#: src/include/nfs_server/ui.rb:323
 #, fuzzy
 msgid ""
 "<P>Here, choose whether to start an NFS server on your computer\n"
@@ -284,7 +296,7 @@
 "og eksportera nokon av katalogane dine til andre.</P>"
 
 #. Help, part 2 of 2
-#: src/include/nfs_server/ui.rb:302
+#: src/include/nfs_server/ui.rb:330
 #, fuzzy
 msgid ""
 "<P>If you choose <B>Start NFS Server</B>, clicking <B>Next</B> opens\n"
@@ -293,7 +305,7 @@
 "<P>Vel <B>Start NFS-servar</B> og klikk <B>Neste</B> for å opne\n"
 "ein konfigurasjonsdialog der kan du velja kva for katalogar du vil eksportera.</P>"
 
-#: src/include/nfs_server/ui.rb:311
+#: src/include/nfs_server/ui.rb:339
 #, fuzzy
 msgid ""
 "<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>\n"
@@ -302,67 +314,65 @@
 msgstr ""
 "<p>Viss serveren må handtera NFSv4-klientar, kryss av for <B>Aktivum NFSv4</B>,\n"
 "og angje NFSv4-domenenavnet som idmapping-nissen skal nytta. bruk\n"
-"'localdomain' eller sjå manualsiden for 'idmapd' og 'idmapd.conf' viss du er uusikker.</p>"
-"\n"
+"'localdomain' eller sjå manualsiden for 'idmapd' og 'idmapd.conf' viss du er uusikker.</p>\n"
 
 #. FIXME: use %1 as nfs-utils.src.rpm produces nfs-kernel-server.rpm
-#: src/include/nfs_server/ui.rb:321
+#: src/include/nfs_server/ui.rb:349
 #, fuzzy
 msgid ""
 "<P>If the server and client must authenticate using GSS library, check the\n"
 "<B>Enable GSS Security</B> box. To use GSS API, you currently need to have Kerberos and gssapi (nfs-utils > 1.0.7) on your system.</P>\n"
 msgstr ""
 "<p>Viss klient og servar skal autentiseres ved hjelp av GSS-bibiloteket, vel <b>Aktivum GSS-tryggleik</b>.\n"
-"Kerberos og gssapi (nfs-utils > 1.0.7) er krevjast for å nytta GSS API.</p>"
-"\n"
+"Kerberos og gssapi (nfs-utils > 1.0.7) er krevjast for å nytta GSS API.</p>\n"
 
 #. frame label
-#: src/include/nfs_server/ui.rb:331
+#: src/include/nfs_server/ui.rb:359
 #, fuzzy
 msgid "NFS Server"
 msgstr "NFS-servar"
 
 #. radio button label
-#: src/include/nfs_server/ui.rb:342
+#: src/include/nfs_server/ui.rb:370
 #, fuzzy
 msgid "&Start"
 msgstr "&Start"
 
 #. radio button label
-#: src/include/nfs_server/ui.rb:351
+#: src/include/nfs_server/ui.rb:379
 #, fuzzy
 msgid "Do &Not Start"
 msgstr "&Ikkje start"
 
 #. frame label
-#: src/include/nfs_server/ui.rb:369
+#: src/include/nfs_server/ui.rb:397
 #, fuzzy
 msgid "Enable NFSv4"
 msgstr "Aktivar NFSv4"
 
-#: src/include/nfs_server/ui.rb:376
+#: src/include/nfs_server/ui.rb:404
 #, fuzzy
 msgid "Enable NFS&v4"
 msgstr "Aktivar NFS&v4"
 
-#: src/include/nfs_server/ui.rb:381
+#: src/include/nfs_server/ui.rb:409
 #, fuzzy
 msgid "Enter NFSv4 do&main name:"
 msgstr "Fyll inn NFSv4-do&menenavn:"
 
-#: src/include/nfs_server/ui.rb:391
+#: src/include/nfs_server/ui.rb:419
 #, fuzzy
 msgid "Enable &GSS Security"
 msgstr "Aktiver &GSS-tryggleik"
 
 #. dialog title
-#: src/include/nfs_server/ui.rb:411
+#: src/include/nfs_server/ui.rb:439
 #, fuzzy
 msgid "NFS Server Configuration"
 msgstr "Konfigurasjon av NFS-servar"
 
 #. Help, part 1 of 4
-#: src/include/nfs_server/ui.rb:487
+#: src/include/nfs_server/ui.rb:515
 #, fuzzy
 msgid ""
 "<P>The upper box contains all the directories to export.\n"
@@ -374,7 +384,7 @@
 "å montera denne katalogen.</P>\n"
 
 #. Help, part 2 of 4
-#: src/include/nfs_server/ui.rb:495
+#: src/include/nfs_server/ui.rb:524
 #, fuzzy
 msgid ""
 "<P><b>Host Wild Card</b> sets which hosts can access the selected directory.\n"
@@ -385,74 +395,80 @@
 "Det kan vera enkle vertsmaskiner, grupper, jokertegn eller\n"
 "IP-nettverk.</P>\n"
 
-#. Help, part 3 of 4
-#: src/include/nfs_server/ui.rb:503
+#. Help, part 3 of 4, variant for kernel space server
+#: src/include/nfs_server/ui.rb:536
 #, fuzzy
 msgid "<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all hosts.</p>"
 msgstr "<p>Bruk ei stjerne (<tt>*</tt>) i staden for eit namn for å velja alle vertsmaskiner.</p>"
 
+#. Help, part 3 of 4, variant for user space server
+#: src/include/nfs_server/ui.rb:544
+#, fuzzy
+msgid "<p>Leave the field empty to specify all hosts.</p>"
+msgstr "<p>La feltet vera tomt for å velja alle vertsmaskiner.</p>"
+
 #. Help, part 4 of 4
-#: src/include/nfs_server/ui.rb:509
+#: src/include/nfs_server/ui.rb:551
 #, fuzzy
 msgid "<P>Refer to <tt>man exports</tt> for more information.</P>\n"
 msgstr "<P>Skriv <tt>ein exports</tt> i ein terminal for å lesa meir informasjon.</P>\n"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:524
+#: src/include/nfs_server/ui.rb:567
 #, fuzzy
 msgid "Add &Directory"
 msgstr "Legg til &katalog"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:526
+#: src/include/nfs_server/ui.rb:569
 #, fuzzy
 msgid "&Edit"
 msgstr "&Rediger"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:528
+#: src/include/nfs_server/ui.rb:571
 #, fuzzy
 msgid "De&lete"
 msgstr "&Slett"
 
 #. table header
-#: src/include/nfs_server/ui.rb:541
+#: src/include/nfs_server/ui.rb:584
 #, fuzzy
 msgid "Host Wild Card"
 msgstr "Jokertegn for vertsmaskin"
 
 #. table header
-#: src/include/nfs_server/ui.rb:543
+#: src/include/nfs_server/ui.rb:586
 #, fuzzy
 msgid "Options"
 msgstr "Alternativ"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:554
+#: src/include/nfs_server/ui.rb:597
 #, fuzzy
 msgid "Add &Host"
 msgstr "Legg til &vertsmaskin"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:556
+#: src/include/nfs_server/ui.rb:599
 #, fuzzy
 msgid "Ed&it"
 msgstr "&Rediger"
 
 #. push button label
-#: src/include/nfs_server/ui.rb:558
+#: src/include/nfs_server/ui.rb:601
 #, fuzzy
 msgid "Dele&te"
 msgstr "S&lett"
 
 #. dialog title
-#: src/include/nfs_server/ui.rb:565
+#: src/include/nfs_server/ui.rb:608
 #, fuzzy
 msgid "Directories to Export"
 msgstr "Katalogar som skal eksporterast"
 
 #. not fatal - write other dirs.
-#: src/modules/NfsServer.rb:158
+#: src/modules/NfsServer.rb:181
 #, fuzzy
 msgid ""
 "Unable to create a missing directory:\n"
@@ -462,7 +478,7 @@
 "%1"
 
 #. error popup message
-#: src/modules/NfsServer.rb:170
+#: src/modules/NfsServer.rb:193
 #, fuzzy
 msgid ""
 "Unable to write to /etc/exports.\n"
@@ -474,71 +490,86 @@
 "eksporterte katalogane.\n"
 
 #. dialog label
-#: src/modules/NfsServer.rb:192
+#: src/modules/NfsServer.rb:228
 #, fuzzy
 msgid "Writing NFS Server Configuration"
 msgstr "Lagrar konfigurasjon for NFS-servar"
 
 #. progress stage label
-#: src/modules/NfsServer.rb:197
+#: src/modules/NfsServer.rb:233
 #, fuzzy
 msgid "Save /etc/exports"
 msgstr "Lagre /etc/exports"
 
 #. progress stage label
-#: src/modules/NfsServer.rb:199
+#: src/modules/NfsServer.rb:235
 #, fuzzy
 msgid "Restart services"
 msgstr "Start tenester på nytt"
 
 #. progress step label
-#: src/modules/NfsServer.rb:203
+#: src/modules/NfsServer.rb:239
 #, fuzzy
 msgid "Saving /etc/exports..."
 msgstr "Lagrar /etc/exports …"
 
 #. progress step label
-#: src/modules/NfsServer.rb:205
+#: src/modules/NfsServer.rb:241
 #, fuzzy
 msgid "Restarting services..."
 msgstr "Startar tenester på nytt …"
 
 #. final progress step label
-#: src/modules/NfsServer.rb:207
+#: src/modules/NfsServer.rb:243
 #, fuzzy
 msgid "Finished"
 msgstr "Fullført"
 
 #. help text
-#: src/modules/NfsServer.rb:215
+#: src/modules/NfsServer.rb:251
 #, fuzzy
 msgid "Writing NFS server settings. Please wait..."
 msgstr "Lagrar innstillingar for NFS-servar. Vent …"
 
 #. Independent of @ref start because of Heartbeat (#27001).
-#: src/modules/NfsServer.rb:229
+#: src/modules/NfsServer.rb:265
 #, fuzzy
 msgid "Unable to write to idmapd.conf."
 msgstr "Kan ikkje skriva til idmapd.conf."
 
+#: src/modules/NfsServer.rb:314
+#, fuzzy
+msgid "Unable to start idmapd. Check your domain setting."
+msgstr "Feil ved start av idmapd. Sjekk domeneinstillingene."
+
+#: src/modules/NfsServer.rb:321
+#, fuzzy
+msgid "Unable to restart idmapd."
+msgstr "Feil ved omstart av idmapd"
+
+#: src/modules/NfsServer.rb:328
+#, fuzzy
+msgid "Unable to stop idmapd."
+msgstr "Feil ved stop av idmapd"
+
 #. FIXME svcgssd is gone! (only nfsserver is left)
-#: src/modules/NfsServer.rb:266
+#: src/modules/NfsServer.rb:339
 #, fuzzy
 msgid "Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup is correct."
 msgstr "Feil ved start av svcgssd. Kontroller at Kerberos og gssapi (nfs-utils) er riktig sett opp."
 
-#: src/modules/NfsServer.rb:275
+#: src/modules/NfsServer.rb:349
 #, fuzzy
-msgid "Unable to restart 'svcgssd' service."
-msgstr "Feil ved omstart av idmapd"
+msgid "'svcgssd' is already running. Unable to restart it."
+msgstr "'svcgssd' køyrer allereie. Feil ved omstart."
 
-#: src/modules/NfsServer.rb:283
+#: src/modules/NfsServer.rb:357
 #, fuzzy
 msgid "'svcgssd' is running. Unable to stop it."
 msgstr "'svcgssd' køyrer allereie. Feil ved stop."
 
 #. error popup message
-#: src/modules/NfsServer.rb:299
+#: src/modules/NfsServer.rb:376
 #, fuzzy
 msgid ""
 "Unable to restart the NFS server.\n"
@@ -548,48 +579,22 @@
 "Endringane vil aktiverast etter omstart av maskina.\n"
 
 #. summary header; directories exported by NFS
-#: src/modules/NfsServer.rb:322
+#: src/modules/NfsServer.rb:399
 #, fuzzy
 msgid "NFS Exports"
 msgstr "NFS-eksportar"
 
 #. add information reg NFSv4 support, domain and security
-#: src/modules/NfsServer.rb:340
+#: src/modules/NfsServer.rb:417
 #, fuzzy
 msgid "The NFSv4 domain for idmapping is %1."
 msgstr "NFSv4-domane for idmapping er %1."
 
 #, fuzzy
-#~ 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 ikkje eksportera katalogar\n"
-#~ "med mellomrom i namnet.\n"
-#~ "Bruk henne kjernebaserte serveren (%2) for å gjera dette."
-
-#, fuzzy
-#~ msgid "<p>Leave the field empty to specify all hosts.</p>"
-#~ msgstr "<p>La feltet vera tomt for å velja alle vertsmaskiner.</p>"
-
-#, fuzzy
-#~ msgid "Unable to start idmapd. Check your domain setting."
-#~ msgstr "Feil ved start av idmapd. Sjekk domeneinstillingene."
-
-#, fuzzy
-#~ msgid "Unable to restart idmapd."
+#~ msgid "Unable to restart 'svcgssd' service."
 #~ msgstr "Feil ved omstart av idmapd"
 
 #, fuzzy
-#~ msgid "Unable to stop idmapd."
-#~ msgstr "Feil ved stop av idmapd"
-
-#, fuzzy
-#~ msgid "'svcgssd' is already running. Unable to restart it."
-#~ msgstr "'svcgssd' køyrer allereie. Feil ved omstart."
-
-#, fuzzy
 #~ msgid "Directories"
 #~ msgstr "Katalogar"
 
@@ -610,19 +615,15 @@
 #~ "<p>In case of multiple exports to a NFSv4 client,\n"
 #~ "you need to bind the exported paths with no fsid=0 to the one with fsid=0.\n"
 #~ "To export the server paths <tt>/Eve</tt> and <tt>/Adam</tt> as\n"
-#~ "<tt>/</tt> and <tt>/husband</tt>, respectively, use<br />"
-#~ "\n"
+#~ "<tt>/</tt> and <tt>/husband</tt>, respectively, use<br />\n"
 #~ "<pre>/Eve         10.0.0.1(fsid=0,crossmnt,ro,...)\n"
-#~ "/Eve/husband 10.0.0.1(bind=/Adam,ro,...)</pre>"
-#~ "\n"
+#~ "/Eve/husband 10.0.0.1(bind=/Adam,ro,...)</pre>\n"
 #~ "</p>"
 #~ msgstr ""
 #~ "<p>Ved fleire eksportar til same NFSv4,\n"
 #~ "må du knyta tilleggseksportene (som ikkje har fsid=0) til eksporten som har fsid=0.\n"
 #~ "For å eksportera serverfilstiene <tt>/Eva</tt> og <tt>/Adam</tt> som høvesvis\n"
-#~ "<tt>/</tt> og <tt>/ektemann</tt>, bruk<br />"
-#~ "\n"
+#~ "<tt>/</tt> og <tt>/ektemann</tt>, bruk<br />\n"
 #~ "<pre>/Eva         10.0.0.1(fsid=0,crossmnt,ro,…)\n"
-#~ "/Eva/ektemann 10.0.0.1(bind=/Adam,ro,…)</pre>"
-#~ "\n"
+#~ "/Eva/ektemann 10.0.0.1(bind=/Adam,ro,…)</pre>\n"
 #~ "</p>"

Modified: branches/plus-SLE12-SP2/yast/nn/po/nis.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/nis.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/nis.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -110,25 +110,21 @@
 msgid ""
 "<p>The <b>Broadcast</b> option enables searching\n"
 "in the local network to find a server after the specified servers\n"
-"fail to respond. It is a security risk.</p>"
-"\n"
+"fail to respond. It is a security risk.</p>\n"
 msgstr ""
 "<p>Alternativet <b>Kringkasting</b> aktiverer søk\n"
 "etter ein annan servar i lokalnettverket dersom dei spesifiserte serverne\n"
-"ikkje svarar. Dette er ein sikkerhetsrisiko.</p>"
-"\n"
+"ikkje svarar. Dette er ein sikkerhetsrisiko.</p>\n"
 
 #. Translators: short for Expert settings
 #: src/include/nis/ui.rb:71
 #, fuzzy
 msgid ""
 "<p><b>Expert</b> gives access to some\n"
-"less frequently used settings.</p>"
-"\n"
+"less frequently used settings.</p>\n"
 msgstr ""
 "<p><b>Avansert</b> gjev tilgjenge til nokre\n"
-"innstillingar som ikkje vert så ofte brukte.</p>"
-"\n"
+"innstillingar som ikkje vert så ofte brukte.</p>\n"
 
 #. pushbutton label
 #. Select all items (in this case NIS servers) of a list
@@ -161,33 +157,27 @@
 #: src/include/nis/ui.rb:228
 #, fuzzy
 msgid ""
-"<p><b>Firewall Settings</b><br>"
-"\n"
+"<p><b>Firewall Settings</b><br>\n"
 "To open the firewall to allow accessing the 'ypbind' service\n"
 "from remote computers, set <b>Open Port in Firewall</b>.\n"
 "To select interfaces on which to open the port, click <b>Firewall Details</b>.\n"
-"This option is only available if the firewall is enabled.</p>"
-"\n"
+"This option is only available if the firewall is enabled.</p>\n"
 msgstr ""
-"<p><b>Brannmurinnstillinger</b><br>"
-"\n"
+"<p><b>Brannmurinnstillinger</b><br>\n"
 "For å opne brannmuren og gje tilgjenge til ypbind-tenesta\n"
 "frå eksertne datamaskiner, vel <b>Opne port i brannmur</b>.\n"
 "For å velja grensesnitt som porten sal vert opna for, klikk <b>Brannmurinformasjon</b>.\n"
-"Dette alternativet er tilgjengeleg berre dersom brannmuren er aktivert.</p>"
-"\n"
+"Dette alternativet er tilgjengeleg berre dersom brannmuren er aktivert.</p>\n"
 
 #. help text
 #: src/include/nis/ui.rb:240
 #, fuzzy
 msgid ""
 "<p>Enter your NIS domain, such as example.com,\n"
-" and the NIS server's address, such as nis.example.com or 10.20.1.1.</p>"
-"\n"
+" and the NIS server's address, such as nis.example.com or 10.20.1.1.</p>\n"
 msgstr ""
 "<p>Angje NIS-domenet (t.d. døme.com)\n"
-"og NIS-serverens adresse (t.d. nis.døme.com eller 10.20.1.1).</p>"
-"\n"
+"og NIS-serverens adresse (t.d. nis.døme.com eller 10.20.1.1).</p>\n"
 
 #. help text for netconfig part
 #: src/include/nis/ui.rb:244
@@ -202,8 +192,7 @@
 "Custom Policy, you can specify a custom policy string, which consists of a\n"
 "space-separated list of interface names, including wildcards, with\n"
 "STATIC/STATIC_FALLBACK as predefined special values. For more information, see\n"
-"the netconfig manual page.</p>"
-"\n"
+"the netconfig manual page.</p>\n"
 msgstr ""
 "<p>Vel korleis NIS-oppsettet skal endrast. Vanlegvis vert handtert dette av netconfig-skriptet, som samordnar data som er statistisk definert her med dynamiske data (t.d. frå DHCP-klient, NetworkManager osb.). Dette er standardinnstillingen, som er tilstrekkeleg for dei fleste oppsett.\n"
 "Viss du vel 'Berre manuelle endringar', vil ikkje netconfig lenger kunna endra oppsettet. I så fall kan du endra fila manuelt. Vel 'Egendefinert praksis' for å angje ein egendefinert streng som består av ei liste over grensesnittnavn adskilt av komene. Jokertegn kan brukast, og STATIC/STATIC_fALLBACK er forhåndsdefinerte spesialverdier. Du finn meir informasjon på manualsiden for netconfig.</p>"
@@ -213,12 +202,10 @@
 #, fuzzy
 msgid ""
 "<p>Specify multiple servers\n"
-"by separating their addresses with spaces.</p>"
-"\n"
+"by separating their addresses with spaces.</p>\n"
 msgstr ""
 "<p>Spesifiser fleire servera\n"
-"ved å leggja inn fleire adresser adskilt av mellomrom.</p>"
-"\n"
+"ved å leggja inn fleire adresser adskilt av mellomrom.</p>\n"
 
 #. help text
 #: src/include/nis/ui.rb:271

Modified: branches/plus-SLE12-SP2/yast/nn/po/nis_server.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/nis_server.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/nis_server.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -192,13 +192,11 @@
 #, fuzzy
 msgid ""
 "<p>Select if your <i>passwd</i> file should be merged with the <i>shadow</i>\n"
-"file (only possible if the <i>shadow</i> file exists).</p>"
-"\n"
+"file (only possible if the <i>shadow</i> file exists).</p>\n"
 msgstr ""
 "<p>Vel om <i>passwd</i>-fila skal slåast saman med <i>shadow</i>\n"
 "-fila og om <i>group</i>-fila skal slåast saman med <i>gshadow</i>\n"
-"-fila (berre mogleg viss <i>shadow</i>- eller <i>gshadow</i>-filene finst).</p>"
-"\n"
+"-fila (berre mogleg viss <i>shadow</i>- eller <i>gshadow</i>-filene finst).</p>\n"
 
 #. help text 3/3
 #: src/include/nis_server/details.rb:81
@@ -262,12 +260,10 @@
 #, fuzzy
 msgid ""
 "<p>Enter a NIS <b>domain</b>. If this host is also a NIS client using this machine as a server, check\n"
-"the corresponding option.</p>"
-"\n"
+"the corresponding option.</p>\n"
 msgstr ""
 "<p>Angje eit NIS-<b>domane</b>. Dersom denne vertsmaskinen òg er ein NIS-klient, kryssar\n"
-"du av for dette.</p>"
-"\n"
+"du av for dette.</p>\n"
 
 #. help text 2/3
 #: src/include/nis_server/master.rb:78
@@ -276,14 +272,12 @@
 "<p>For slave servers to cooperate with this master, check\n"
 "<i>Active Slave NIS server exists</i>. If you check\n"
 "<i>Fast Map distribution</i>, it will speed up the transfer of maps to the\n"
-"slaves.</p>"
-"\n"
+"slaves.</p>\n"
 msgstr ""
 "<p>For at slaveservere skal samarbeida med denne hovedserveren, merk av for\n"
 "<i>Aktivert slave-NIS-servar finst</i>. Vel\n"
 "<i>Rask kartdistribusjon</i> for å auka kartoverføringshastigheten til\n"
-"slavane.</p>"
-"\n"
+"slavane.</p>\n"
 
 #. help text 3/3
 #: src/include/nis_server/master.rb:89
@@ -292,14 +286,12 @@
 "<p><i>Allow changes to passwords</i> lets the users change their\n"
 "passwords in the presence of NIS. Buttons to allow\n"
 "changing the login shell or GECOS (full name and related information) can\n"
-"be used to set up these more specific options.</p>"
-"\n"
+"be used to set up these more specific options.</p>\n"
 msgstr ""
 "<p><i>Tillat endring av passord</i> lèt brukarar endra passorda\n"
 "sine der NIS finnast. Knappane for å tillata endring av\n"
 "innloggingsskall eller GECOS (fullt namn og relatert informasjon) kan brukast\n"
-"for å setja opp meir spesifikke alternativ.</p>"
-"\n"
+"for å setja opp meir spesifikke alternativ.</p>\n"
 
 #. To translators: checkbox label
 #: src/include/nis_server/master.rb:106
@@ -378,21 +370,17 @@
 #: src/include/nis_server/routines.rb:154
 #, fuzzy
 msgid ""
-"<p><b>Firewall Settings</b><br>"
-"\n"
+"<p><b>Firewall Settings</b><br>\n"
 "To open the firewall to allow accessing the NIS server\n"
 "from remote computers, set <b>Open Port in Firewall</b>.\n"
 "To select interfaces on which to open the port, click <b>Firewall Details</b>.\n"
-"This option is only available if the firewall is enabled.</p>"
-"\n"
+"This option is only available if the firewall is enabled.</p>\n"
 msgstr ""
-"<p><b>Brannmurinnstillinger</b><br>"
-"\n"
+"<p><b>Brannmurinnstillinger</b><br>\n"
 "For å opne ein brannmur for å gje tilgjenge til NIS-serveren\n"
 "frå eksertne datamaskiner, vel <b>Opne port i brannmur</b>.\n"
 "For å velja grensesnitt som porten sal vert opna for, klikk <b>Brannmurinformasjon</b>.\n"
-"Dette alternativet er tilgjengeleg berre dersom brannmuren er aktivert.</p>"
-"\n"
+"Dette alternativet er tilgjengeleg berre dersom brannmuren er aktivert.</p>\n"
 
 #. To translators: popup dialog heading
 #: src/include/nis_server/securenets.rb:117
@@ -445,12 +433,10 @@
 #, fuzzy
 msgid ""
 "<p>The entry with <b>netmask</b> <tt>255.0.0.0</tt> and <b>network</b>\n"
-"<tt>127.0.0.0</tt> must exist to allow connections from the local host.</p>"
-"\n"
+"<tt>127.0.0.0</tt> must exist to allow connections from the local host.</p>\n"
 msgstr ""
 "<p>Ein oppføring med <b>nettverksmaske</b> <tt>255.0.0.0</tt> og <b>nettverk</b>\n"
-"<tt>127.0.0.0</tt> må finnast for å tillata tilkoblinger frå den lokale vertsmaskinen.</p>"
-"\n"
+"<tt>127.0.0.0</tt> må finnast for å tillata tilkoblinger frå den lokale vertsmaskinen.</p>\n"
 
 #. help text 4/4
 #: src/include/nis_server/securenets.rb:192
@@ -604,12 +590,10 @@
 #, fuzzy
 msgid ""
 "<p>Select whether to configure the NIS server as a <b>master</b> or a\n"
-"<b>slave</b> or not to configure a NIS server.</p>"
-"\n"
+"<b>slave</b> or not to configure a NIS server.</p>\n"
 msgstr ""
 "<p>Vel om du vil konfigurera NIS-serveren som <b>hovedserver</b> eller\n"
-"<b>slave</b>, eller om du ikkje vil konfigurera ein NIS-servar.</p>"
-"\n"
+"<b>slave</b>, eller om du ikkje vil konfigurera ein NIS-servar.</p>\n"
 
 #. help text 2/2
 #: src/include/nis_server/what.rb:73

Modified: branches/plus-SLE12-SP2/yast/nn/po/ntp-client.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/ntp-client.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/ntp-client.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -86,7 +86,7 @@
 msgstr "&Konfigurer …"
 
 #. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:380
+#: src/clients/ntp-client_proposal.rb:381
 #, fuzzy
 msgid ""
 "Synchronization with NTP server is not possible\n"
@@ -96,19 +96,19 @@
 "utan at pakka %1 er installert"
 
 #. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:392
+#: src/clients/ntp-client_proposal.rb:393
 #, fuzzy
 msgid "Synchronizing with NTP server..."
 msgstr "Synkroniserer med NTP-servar …"
 
 #. update time widgets
-#: src/clients/ntp-client_proposal.rb:438
+#: src/clients/ntp-client_proposal.rb:439
 msgid "Connection to selected NTP server failed."
 msgstr ""
 
 #. Translators: yes-no popup,
 #. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb:469
+#: src/clients/ntp-client_proposal.rb:470
 #, fuzzy
 msgid ""
 "Test query to server '%1' failed.\n"
@@ -576,13 +576,15 @@
 msgstr "NTP-servar"
 
 #. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:331 src/include/ntp-client/widgets.rb:1548
+#: src/include/ntp-client/dialogs.rb:331
+#: src/include/ntp-client/widgets.rb:1548
 #, fuzzy
 msgid "Local NTP Server"
 msgstr "Lokal NTP-servar"
 
 #. TRANSLATORS: frame label
-#: src/include/ntp-client/dialogs.rb:377 src/include/ntp-client/widgets.rb:1549
+#: src/include/ntp-client/dialogs.rb:377
+#: src/include/ntp-client/widgets.rb:1549
 #, fuzzy
 msgid "Public NTP Server"
 msgstr "Offentleg NTP-servar"
@@ -671,53 +673,41 @@
 #: src/include/ntp-client/helps.rb:17
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing NTP Client Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
+"<p><b><big>Initializing NTP Client Configuration</big></b><br>\n"
+"Please wait...<br></p>"
 msgstr ""
-"<p><b><big>Initialiserer konfigurasjon av NTP-klient</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
+"<p><b><big>Initialiserer konfigurasjon av NTP-klient</big></b><br>\n"
+"Vent…<br></p>"
 
 #. Read dialog help 2/2
 #: src/include/ntp-client/helps.rb:21
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
+"<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"
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
 "Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>"
 
 #. Write dialog help 1/2
 #: src/include/ntp-client/helps.rb:25
 #, fuzzy
 msgid ""
-"<p><b><big>Saving NTP Client Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
+"<p><b><big>Saving NTP Client Configuration</big></b><br>\n"
+"Please wait...<br></p>"
 msgstr ""
-"<p><b><big>Lagrar konfigurasjon for NTP-klient</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
+"<p><b><big>Lagrar konfigurasjon for NTP-klient</big></b><br>\n"
+"Vent…<br></p>"
 
 #. Write dialog help 2/2
 #: src/include/ntp-client/helps.rb:29
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing  <b>Abort</b>.\n"
 "An additional dialog will inform you whether it is safe to do so.</p>"
 msgstr ""
-"<p><b><big>Avbryt lagring:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.</p>"
 
@@ -725,35 +715,29 @@
 #: src/include/ntp-client/helps.rb:35
 #, fuzzy
 msgid ""
-"<p><b><big>Start NTP Daemon</big></b><br>"
-"\n"
+"<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"
+"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>Aktivar NTP-nisse</big></b><br>"
-"\n"
+"<p><b><big>Aktivar NTP-nisse</big></b><br>\n"
 "Vel om NTP-nissen skal verta no aktivert og under kvar oppstart av systemet.\n"
 "NTP-nissen tolkar vertsnavn når han initialiseres.\n"
-"Nettverksforbindelsen må aktiverast før NTP-nissen startar.</p>"
-"\n"
+"Nettverksforbindelsen må aktiverast før NTP-nissen startar.</p>\n"
 
 #. help text 2/5
 #: src/include/ntp-client/helps.rb:45
 #, fuzzy
 msgid ""
-"<p><b><big>Chroot Jail</big></b><br>"
-"\n"
+"<p><b><big>Chroot Jail</big></b><br>\n"
 "To run the NTP daemon in chroot jail, set\n"
 "<b>Run NTP Daemon in Chroot Jail</b>. Starting any daemon in a chroot jail\n"
 "is more secure and strongly recommended.</p>"
 msgstr ""
-"<p><b><big>Chroot-varetekt</big></b><br>"
-"\n"
+"<p><b><big>Chroot-varetekt</big></b><br>\n"
 "For å køyra NTP-nissen i chroot-varetekt, vel\n"
 "<b>Køyr NTP-nisse i chroot-varetekt</b>. Det aukar tryggleiken å starta alle nissar i chroot-varetekt,\n"
 "og dette vert rådt til sterkt.</p>"
@@ -761,35 +745,27 @@
 #: src/include/ntp-client/helps.rb:51
 #, fuzzy
 msgid ""
-"<p><b><big>Secure NTP Configuration</big></b><br>"
-"\n"
+"<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"
-"computer. The NTP service is restricted to servers in the <tt>/etc/ntp.conf</tt> file and to localhost.<br>"
-" \n"
-"Access control flags can be fine-tuded in the servers overview table. This option is not available if NTP is configured via DHCP.</p>"
-"\n"
+"computer. The NTP service is restricted to servers in the <tt>/etc/ntp.conf</tt> file and to localhost.<br> \n"
+"Access control flags can be fine-tuded in the servers overview table. This option is not available if NTP is configured via DHCP.</p>\n"
 msgstr ""
-"<p><b><big>Sikkert NTP-oppsett</big></b><br>"
-"\n"
+"<p><b><big>Sikkert NTP-oppsett</big></b><br>\n"
 "Ved å velja <b>Avgrens NTP-tenesta til valde servera</b> hindrar du eksterne maskiner i å visa og endra NTP-innstillingane på datamaskina \n"
-"di. På den måten vert avgrensa NTP-tenesta til serverne som er oppførd i <tt>/etc/ntp.conf</tt> og localhost.<br>"
-" \n"
-"Tilgangskontrollvalgene kan finjusterast i serveroversiktstabellen. Dette valet er ikkje tilgjengeleg viss NTP er sett opp via DHCP.</p>"
-"\n"
+"di. På den måten vert avgrensa NTP-tenesta til serverne som er oppførd i <tt>/etc/ntp.conf</tt> og localhost.<br> \n"
+"Tilgangskontrollvalgene kan finjusterast i serveroversiktstabellen. Dette valet er ikkje tilgjengeleg viss NTP er sett opp via DHCP.</p>\n"
 
 #. help text 3/5
 #: src/include/ntp-client/helps.rb:58
 #, fuzzy
 msgid ""
-"<p><b><big>Configuring via DHCP</big></b><br>"
-"\n"
+"<p><b><big>Configuring via DHCP</big></b><br>\n"
 "To retrieve the information about NTP servers via the DHCP protocol from\n"
 "your network server instead of setting them manually, set\n"
 "<b>Configure NTP Daemon via DHCP</b>. Ask your network administrator if\n"
 "the information about NTP servers is provided by the DHCP server.</p>"
 msgstr ""
-"<p><b><big>Konfigurasjon vigde DHCP</big></b><br>"
-"\n"
+"<p><b><big>Konfigurasjon vigde DHCP</big></b><br>\n"
 "For å henta informasjon om NTP-servera frå nettverksserveren\n"
 "vigde DHCP-protokollen i staden for å definera dei manuelt, vel\n"
 "<b>Konfigurer NTP-nisse vigde DHCP</b>. Spør nettverksadministratoren om\n"
@@ -799,15 +775,13 @@
 #: src/include/ntp-client/helps.rb:66
 #, fuzzy
 msgid ""
-"<p><b><big>Configured Servers</big></b><br>"
-"\n"
+"<p><b><big>Configured Servers</big></b><br>\n"
 "To adjust NTP servers, peers, local clocks, and NTP broadcasting,\n"
 "select the appropriate line and click <b>Edit</b>. To add a new synchronization\n"
 "peer, click <b>Add</b>. To delete an existing synchronization peer,\n"
 "select it and click <b>Delete</b>.</p>"
 msgstr ""
-"<p><b><big>Konfigurerte servera</big></b><br>"
-"\n"
+"<p><b><big>Konfigurerte servera</big></b><br>\n"
 "For å tilpassa NTP-servera, direkteforbindelser, lokale klokker og NTP-kringkasting\n"
 "vel du den aktuelle linja og klikkar <b>Rediger</b>. For å leggja til ein ny synkroniseringsforbindelse,\n"
 "klikk <b>Legg til</b>. Vel ein eksisterande direkteforbindelse for synkronisering\n"
@@ -817,27 +791,21 @@
 #: src/include/ntp-client/helps.rb:74
 #, fuzzy
 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"
+"<p><b><big>Display Log</big></b></p>\n"
+"<p>To view the logs of the NTP daemon, click <b>Display Log</b>.</p>\n"
 msgstr ""
-"<p><b><big>Vis logg </big></b><br>"
-"\n"
-"Du kan visa loggene frå NTP-nissen ved å klikka på <b>Vis logg</b>.</p>"
-"\n"
+"<p><b><big>Vis logg </big></b><br>\n"
+"Du kan visa loggene frå NTP-nissen ved å klikka på <b>Vis logg</b>.</p>\n"
 
 #. help text to a button
 #: src/include/ntp-client/helps.rb:78
 #, fuzzy
 msgid ""
-"<p><b><big>Advanced configuration</big></b><br>"
-"\n"
+"<p><b><big>Advanced configuration</big></b><br>\n"
 "To configure this host to synchronize against multiple remote hosts or against\n"
 "a locally connected clock, use <b>Advanced Configuration</b>."
 msgstr ""
-"<p><b><big>Avansert konfigurasjon</big></b><br>"
-"\n"
+"<p><b><big>Avansert konfigurasjon</big></b><br>\n"
 "For å konfigurera denne vertsmaskinen til å synkronisera mot fleire eksterne vertsmaskiner eller mot\n"
 "ein lokalt tilkoblet klokke, vel <b>Avansert konfigurasjon</b>."
 
@@ -845,25 +813,21 @@
 #: src/include/ntp-client/helps.rb:84
 #, fuzzy
 msgid ""
-"<p><b><big>Clock Type</big></b><br>"
-"\n"
+"<p><b><big>Clock Type</big></b><br>\n"
 "Select the driver for the clock to configure.</p>"
 msgstr ""
-"<p><b><big>Klokketype</big></b><br>"
-"\n"
+"<p><b><big>Klokketype</big></b><br>\n"
 "Vel drivaren for klokka som skal konfigurerast.</p>"
 
 #. help text 2/4
 #: src/include/ntp-client/helps.rb:88
 #, fuzzy
 msgid ""
-"<p><b><big>Unit Number</big></b><br>"
-"\n"
+"<p><b><big>Unit Number</big></b><br>\n"
 "If you have multiple clocks of the same type, you must set\n"
 "<b>Unit Number</b>.</p>"
 msgstr ""
-"<p><b><big>Enhetsnummer</big></b><br>"
-"\n"
+"<p><b><big>Enhetsnummer</big></b><br>\n"
 "Viss du har fleire klokker av same type, må du definera\n"
 "<b>Enhetsnummer</b>.</p>"
 
@@ -871,8 +835,7 @@
 #: src/include/ntp-client/helps.rb:94
 #, fuzzy
 msgid ""
-"<p><b><big>Device</big></b><br>"
-"\n"
+"<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"
 "the device to which the clock is connected. To do this, check\n"
 "<b>Create Symlink</b> and set the <b>Device</b>. To browse for the device,\n"
@@ -880,8 +843,7 @@
 "For some clock types, it is not necessary to create a symbolic link or \n"
 "it must be created manually.</p>"
 msgstr ""
-"<p><b><big>Eining</big></b><br>"
-"\n"
+"<p><b><big>Eining</big></b><br>\n"
 "For at klokka skal fungera, må du kanskje oppretta ei symbolsk lenkje til \n"
 "eininga klokka er kopla til. Kryss av for\n"
 "<b>Opprett symlink</b> for å gjera dette, og vel <b>Eining</b>. Klikk <b>Bla gjennom</b> for å finna eininga.\n"
@@ -892,26 +854,22 @@
 #: src/include/ntp-client/helps.rb:104
 #, fuzzy
 msgid ""
-"<p><b><big>Driver Calibration</big></b><br>"
-"\n"
+"<p><b><big>Driver Calibration</big></b><br>\n"
 "To calibrate the clock driver, click <b>Driver Calibration</b>.</p>"
 msgstr ""
-"<p><b><big>Kalibrering av driver</big></b><br>"
-"\n"
+"<p><b><big>Kalibrering av driver</big></b><br>\n"
 "Klikk <b>Kalibrering av drivar</b> for å kalibrera klokkedriveren.</p>"
 
 #. help text 1/1, alt. 1 part 1/3
 #: src/include/ntp-client/helps.rb:108
 #, fuzzy
 msgid ""
-"<p><b><big>Address of the NTP Server</big></b><br>"
-"\n"
+"<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"
 "To find an NTP server, ask your network administrator or Internet service\n"
 "provider.</p>"
 msgstr ""
-"<p><b><big>NTP-serverens adresse</big></b><br>"
-"\n"
+"<p><b><big>NTP-serverens adresse</big></b><br>\n"
 "Vel NTP-serverens adresse under <b>Adresse</b>.\n"
 "For å finne ein NTP-servar, spør internettleverandøren eller\n"
 "nettverksadministratoren.</p>"
@@ -920,14 +878,12 @@
 #: src/include/ntp-client/helps.rb:115
 #, fuzzy
 msgid ""
-"<p><b><big>Selecting a Server</big></b><br>"
-"\n"
+"<p><b><big>Selecting a Server</big></b><br>\n"
 "To select an NTP server from those found in the local network\n"
 "or from the list of known NTP servers, click <b>Select</b> and\n"
 "choose between <b>Local NTP Server</b> and <b>Public NTP Server</b>.</p>"
 msgstr ""
-"<p><b><big>Velja ein servar</big></b><br>"
-"\n"
+"<p><b><big>Velja ein servar</big></b><br>\n"
 "For å velja ein NTP-servar i lokalnettverket\n"
 "eller frå ei liste over kjende NTP-servera, klikk på <b>Vel</b> og\n"
 "vel <b>Lokal NTP-servar</b> eller <b>Offentleg NTP-servar</b>.</p>"
@@ -936,13 +892,11 @@
 #: src/include/ntp-client/helps.rb:122
 #, fuzzy
 msgid ""
-"<p><b><big>Testing Server Accessibility</big></b><br>"
-"\n"
+"<p><b><big>Testing Server Accessibility</big></b><br>\n"
 "To test if the selected server is up and responds properly,\n"
 "click <b>Test</b>.</p>"
 msgstr ""
-"<p><b><big>Testa servertilgjengelighet</big></b><br>"
-"\n"
+"<p><b><big>Testa servertilgjengelighet</big></b><br>\n"
 "For å testa om den valde serveren køyrer og svarar som han skal,\n"
 "klikk <b>Test</b>.</p>"
 
@@ -950,13 +904,11 @@
 #: src/include/ntp-client/helps.rb:128
 #, fuzzy
 msgid ""
-"<p><b><big>Address</big></b><br>"
-"\n"
+"<p><b><big>Address</big></b><br>\n"
 "To set the address of the host with which to synchronize mutually,\n"
 "use <b>Address</b>.</p>"
 msgstr ""
-"<p><b><big>Adresse</big></b><br>"
-"\n"
+"<p><b><big>Adresse</big></b><br>\n"
 "Definer adressa til vertsmaskinen det skal synkroniserast mot\n"
 "under <b>Adresse</b>.</p>"
 
@@ -964,13 +916,11 @@
 #: src/include/ntp-client/helps.rb:134
 #, fuzzy
 msgid ""
-"<p><b><big>Address</big></b><br>"
-"\n"
+"<p><b><big>Address</big></b><br>\n"
 "To set the address to which to broadcast, use the <b>Address</b>\n"
 "text field.</p>"
 msgstr ""
-"<p><b><big>Adresse</big></b><br>"
-"\n"
+"<p><b><big>Adresse</big></b><br>\n"
 "Nytte tekstfeltet <b>Adresse</b> for å angje\n"
 "kringkastingsadressen.</p>"
 
@@ -978,13 +928,11 @@
 #: src/include/ntp-client/helps.rb:140
 #, fuzzy
 msgid ""
-"<p><b><big>Address</big></b><br>"
-"\n"
+"<p><b><big>Address</big></b><br>\n"
 "To set the address from which to accept broadcast packets, use \n"
 "<b>Address</b>.</p>"
 msgstr ""
-"<p><b><big>Adresse</big></b><br>"
-"\n"
+"<p><b><big>Adresse</big></b><br>\n"
 "Legg inn avsenderadressen for godkjende kringkastingspakker under \n"
 "<b>Adresse</b>.</p>"
 
@@ -993,15 +941,12 @@
 #: src/include/ntp-client/helps.rb:148
 #, fuzzy
 msgid ""
-"<p><b><big>Options</big></b><br>"
-"\n"
+"<p><b><big>Options</big></b><br>\n"
 "To fine-tune the synchronization source, enter the respective options in the\n"
 "<b>Options</b> text field. For details, see\n"
-"<i>/usr/share/doc/packages/ntp-doc/confopt.htm</i>.</p>"
-"\n"
+"<i>/usr/share/doc/packages/ntp-doc/confopt.htm</i>.</p>\n"
 msgstr ""
-"<p><b><big>Val</big></b><br>"
-"\n"
+"<p><b><big>Val</big></b><br>\n"
 "Du kan finjustera synkroniseringskilden ved å skriva inn val i tekstfeltet\n"
 "<b>Alternativ</b>. Du finn meir informasjon i\n"
 "<i>/usr/share/doc/packages/ntp-doc/confopt.htm</i>.</p>"
@@ -1009,36 +954,30 @@
 #: src/include/ntp-client/helps.rb:154
 #, fuzzy
 msgid ""
-"<p><b><big>Access Control Options</big></b><br>"
-"\n"
+"<p><b><big>Access Control Options</big></b><br>\n"
 "Define the access control flags (<b><tt>restrict</tt></b> directive in\n"
 "<i>/etc/ntp.conf</i>) for this server, indicating which types of actions the remote\n"
 "host can perform on your NTP daemon. By default, it is set to <i>notrap\n"
 "nomodify noquery</i>. This option is only available if you have checked the\n"
 "<b>Restrict NTP Service to Configured Servers Only</b> option in\n"
-"<b>Security Settings</b>.</p>"
-"\n"
+"<b>Security Settings</b>.</p>\n"
 msgstr ""
-"<p><b><big>Val for tilgangskontroll</big></b><br>"
-"\n"
+"<p><b><big>Val for tilgangskontroll</big></b><br>\n"
 "Her kan du angje val for tilgangskontroll (<b><tt>restrict</tt></b> i\n"
 "<i>/etc/ntp.conf</i>) for denne serveren ved å velja kva slags handlingar ei ekstern\n"
 "maskin kan utføra på den NTP-nisse. Standardvalget er <i>notrap\n"
 "nomodify noquery</i> Dette valet er berre tilgjengeleg viss du har kryssa av for\n"
 "<b>Avgrens NTP-tenesta til konfigurerte servera</b> under\n"
-"<b>Sikkerhetsinnstillinger</b>.</p>"
-"\n"
+"<b>Sikkerhetsinnstillinger</b>.</p>\n"
 
 #. help text 1/6
 #: src/include/ntp-client/helps.rb:164
 #, fuzzy
 msgid ""
-"<p><b><big>Synchronization Peer Type</big></b><br>"
-"\n"
+"<p><b><big>Synchronization Peer Type</big></b><br>\n"
 "Select the kind of synchronization peer to add here.</p>"
 msgstr ""
-"<p><b><big>Forbindelsestype for synkronisering</big></b><br>"
-"\n"
+"<p><b><big>Forbindelsestype for synkronisering</big></b><br>\n"
 "Her vel du ein direkte synkroniseringsforbindelse som skal verta til lagd.</p>"
 
 #. help text 2/6
@@ -1108,15 +1047,13 @@
 #, fuzzy
 msgid ""
 "<p><big><b>Finding Server in the Local\n"
-"Network</b></big><br>"
-"\n"
+"Network</b></big><br>\n"
 "To find NTP servers in the local network using the\n"
 "Service Location Protocol (SLP), click <b>Lookup</b>.\n"
 "Then select a server from the list of found servers.</p>"
 msgstr ""
 "<p><b><big>Søkja etter servera i lokalnettverket\n"
-"</big></b><br>"
-"\n"
+"</big></b><br>\n"
 "For å finne NTP-servera i lokalnettverket ved hjelp av\n"
 "SLP (Service Location Protocol) klikkar du <b>Søk</b>.\n"
 "Vel deretter ein servar i lista over servera som vart funnen.</p>"
@@ -1125,13 +1062,11 @@
 #: src/include/ntp-client/helps.rb:202
 #, fuzzy
 msgid ""
-"<p><big><b>Selecting a Public NTP Server</b></big><br>"
-"\n"
+"<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"
 "NTP servers only for a particular country, select it in <b>Country</b>.</p>"
 msgstr ""
-"<p><big><b>Velja ein offentleg NTP-servar</b></big><br>"
-"\n"
+"<p><big><b>Velja ein offentleg NTP-servar</b></big><br>\n"
 "Vel NTP-serveren som skal brukast, i lista over<b>offentlege NTP-servera</b> list. For å vise\n"
 "NTP-servera berre for eit spesielt land, vel dette under <b>Land</b>.</p>"
 
@@ -1139,8 +1074,7 @@
 #: src/include/ntp-client/helps.rb:208
 #, fuzzy
 msgid ""
-"<p><big><b>Note</b></big><br>"
-"\n"
+"<p><big><b>Note</b></big><br>\n"
 "The listed NTP servers may not be available from any country, but only\n"
 "for a particular country or region.\n"
 "Before using any NTP server from the list, ask your system administrator\n"
@@ -1149,8 +1083,7 @@
 "You may also see <i>http://www.eecis.udel.edu/~mills/ntp/servers.html</i>\n"
 "to find an NTP server near you.</p>"
 msgstr ""
-"<p><big><b>Merk</b></big><br>"
-"\n"
+"<p><big><b>Merk</b></big><br>\n"
 "NTP-serverne på lista er kanskje ikkje tilgjengelege frå alle land, men berre\n"
 "for eit spesielt land eller område.\n"
 "Før du brukar NTP-serverne på lista, bør du spørja systemadministratoren\n"
@@ -1163,12 +1096,10 @@
 #: src/include/ntp-client/helps.rb:219
 #, fuzzy
 msgid ""
-"<p><big><b>Testing Server Accessibility</b></big><br>"
-"\n"
+"<p><big><b>Testing Server Accessibility</b></big><br>\n"
 "To test if the selected server responds properly, click <b>Test</b>.</p>"
 msgstr ""
-"<p><b><big>Testa servertilgjengelighet:</big></b><br>"
-"\n"
+"<p><b><big>Testa servertilgjengelighet:</big></b><br>\n"
 "Klikk på <b>Test</b> for å kontrollera om serveren svarar som han skal.</p>"
 
 #. help text connected with checkbox: "Use Random Server from pool.ntp.org"
@@ -1176,34 +1107,28 @@
 #: src/include/ntp-client/helps.rb:224
 #, fuzzy
 msgid ""
-"<p><big><b>Use Random Servers</b></big><br>"
-"\n"
+"<p><big><b>Use Random Servers</b></big><br>\n"
 "This service is offered by pool.ntp.org. If you select this option,\n"
 "three different servers are added to the configuration. The server names are\n"
 "permanent, but they change their DNS records (IPs) every hour. This means that\n"
-"your NTP client is synchronized with different servers every hour.</p>"
-"\n"
+"your NTP client is synchronized with different servers every hour.</p>\n"
 msgstr ""
-"<p><big><b>Bruk tilfeldige servera</b></big><br>"
-"\n"
+"<p><big><b>Bruk tilfeldige servera</b></big><br>\n"
 "Denne tenesta vert tilboden av pool.ntp.org. Viss du kryssar av her,\n"
 "vert tre ulike servera lagt til i konfigurasjonen. Servernavnene er\n"
 "permanente, men DNS-oppføringene (IP) endrast kvar time. Dette tyder at\n"
-"NTP-klienten verta med synkronisert ulike servera kvar time.</p>"
-"\n"
+"NTP-klienten verta med synkronisert ulike servera kvar time.</p>\n"
 
 #. help text 1/2
 #: src/include/ntp-client/helps.rb:238
 #, fuzzy
 msgid ""
-"<p><big><b>Clock Driver Calibration</b></big><br>"
-"\n"
+"<p><big><b>Clock Driver Calibration</b></big><br>\n"
 "The clock driver may need to be calibrated. In this dialog, various calibration\n"
 "options can be set. The meaning of particular options depends on the particular\n"
 "driver. Some drivers do not use all the options.</p>"
 msgstr ""
-"<p><big><b>Kalibrering av klokkedriver</b></big><br>"
-"\n"
+"<p><big><b>Kalibrering av klokkedriver</b></big><br>\n"
 "Klokkedriveren må kanskje kalibrerast. I denne dialogen kan ulike alternativ\n"
 "for kalibrering definerast. Resultatet av bestemde alternativ avheng av\n"
 "drivaren. Nokre drivarar nyttar ikkje alle alternativa.</p>"
@@ -1213,8 +1138,7 @@
 #, fuzzy
 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"
+"<i>ntp-doc</i> and see <i>/usr/share/doc/packages/ntp-doc/html/refclock.htm</i>.</p>\n"
 msgstr ""
 "For å få informasjon om vala kan du installera pakka\n"
 "<i>ntp-doc</i> og lesa\n"

Modified: branches/plus-SLE12-SP2/yast/nn/po/oneclickinstall.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/oneclickinstall.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/oneclickinstall.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2015-08-26 20:48+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"
@@ -125,7 +125,8 @@
 msgstr "Du finn meir informasjon på <tt>http://en.opensuse.org/One_click_install</tt>."
 
 #. <region name="Define the UI components"> *
-#: src/clients/OneClickInstallUI.rb:59 src/modules/OneClickInstallWidgets.rb:47
+#: src/clients/OneClickInstallUI.rb:59
+#: src/modules/OneClickInstallWidgets.rb:47
 msgid "Select the software components you wish to install:"
 msgstr "Vel programvarekomponentane du vil installera:"
 
@@ -158,7 +159,8 @@
 
 #. Load the xml communication from the user interface.
 #: src/clients/OneClickInstallUI.rb:107 src/clients/OneClickInstallUI.rb:136
-#: src/clients/OneClickInstallUI.rb:168 src/clients/OneClickInstallWorker.rb:41
+#: src/clients/OneClickInstallUI.rb:168
+#: src/clients/OneClickInstallWorker.rb:41
 msgid "Repositories"
 msgstr "Pakkebrønnar"
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/online-update-configuration.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/online-update-configuration.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/online-update-configuration.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2012-01-29 17:31+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: Norwegian Nynorsk \n"

Modified: branches/plus-SLE12-SP2/yast/nn/po/online-update.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/online-update.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/online-update.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2015-08-12 21:19+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"
@@ -157,12 +157,8 @@
 
 #. help text for online update
 #: src/clients/online_update_install.rb:73
-msgid ""
-"<p>If special messages associated with patches are available, they will be shown in an extra dialog when the patch is installed.</p>"
-"\n"
-msgstr ""
-"<p>Viss det finst spesielle meldingar i samband med pakkeoppdateringane,vert desse viste i eit eige vindauge når oppdateringa vert installert.</p>"
-"\n"
+msgid "<p>If special messages associated with patches are available, they will be shown in an extra dialog when the patch is installed.</p>\n"
+msgstr "<p>Viss det finst spesielle meldingar i samband med pakkeoppdateringane,vert desse viste i eit eige vindauge når oppdateringa vert installert.</p>\n"
 
 #. using SetContents (define in online_update.ycp)
 #: src/clients/online_update_install.rb:81
@@ -419,7 +415,8 @@
 msgid "Try again"
 msgstr "Prøv på nytt"
 
-#: src/modules/OnlineUpdateDialogs.rb:57 src/modules/OnlineUpdateDialogs.rb:318
+#: src/modules/OnlineUpdateDialogs.rb:57
+#: src/modules/OnlineUpdateDialogs.rb:318
 msgid "Skip Patch"
 msgstr "Hopp over oppdateringa"
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/opensuse_mirror.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/opensuse_mirror.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/opensuse_mirror.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"

Modified: branches/plus-SLE12-SP2/yast/nn/po/packager.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/packager.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/packager.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-06 16:04+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2015-08-12 21:19+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"
@@ -35,8 +35,7 @@
 msgid ""
 "<p>Remove entries by selecting them in the table and clicking the \n"
 "<b>Delete</b> button. The entries will be removed immediately from \n"
-"the current configuration.</p>"
-"\n"
+"the current configuration.</p>\n"
 msgstr ""
 "<p>Du kan fjerne oppføringer ved å velja dei\n"
 "i tabellen og klikka <b>Slette</b>-knappen.\n"
@@ -200,13 +199,11 @@
 msgid ""
 "<p>The installation CDs will be copied into the system\n"
 "to create a repository that can be used to install\n"
-"other systems.</p>"
-"\n"
+"other systems.</p>\n"
 msgstr ""
 "<p>Installasjon sin-Cdane vil kopierast til systemet\n"
 "for å oppretta ein pakkebrønn som kan brukast til å installera\n"
-"andre system.</p>"
-"\n"
+"andre system.</p>\n"
 
 #. label for showing repositories
 #: src/clients/inst_mediacopy.rb:57
@@ -217,8 +214,8 @@
 #. force minimum width
 #. table header - name of the repo
 #. table header - name of the repo
-#: src/clients/inst_mediacopy.rb:65 src/clients/repositories.rb:703
-#: src/clients/repositories.rb:716
+#: src/clients/inst_mediacopy.rb:65 src/clients/repositories.rb:674
+#: src/clients/repositories.rb:687
 #: src/include/packager/key_manager_dialogs.rb:306
 #, fuzzy
 msgid "Name"
@@ -322,12 +319,10 @@
 #, fuzzy
 msgid ""
 "<p>The packager is being initialized and \n"
-"the list of servers downloaded from the Web.</p>"
-"\n"
+"the list of servers downloaded from the Web.</p>\n"
 msgstr ""
 "<p>Vent medan pakkehandsamaren initialiseres\n"
-"og lista over servera lastast ned frå nettet.</p>"
-"\n"
+"og lista over servera lastast ned frå nettet.</p>\n"
 
 #. TRANSLATORS: error report
 #: src/clients/inst_productsources.rb:717
@@ -384,26 +379,18 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b>URL:</b> %1<br>"
-"\n"
-"<b>Linked from:</b> %2<br>"
-"\n"
-"<b>Summary:</b> %3<br>"
-"\n"
-"<b>Description:</b> %4<br>"
-"\n"
+"<b>URL:</b> %1<br>\n"
+"<b>Linked from:</b> %2<br>\n"
+"<b>Summary:</b> %3<br>\n"
+"<b>Description:</b> %4<br>\n"
 "%5\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b>Nettadresse:</b> %1<br>"
-"\n"
-"<b>Lenkja frå:</b> %2<br>"
-"\n"
-"<b>Sammendrag:</b> %3<br>"
-"\n"
-"<b>Skildring:</b> %4<br>"
-"\n"
+"<b>Nettadresse:</b> %1<br>\n"
+"<b>Lenkja frå:</b> %2<br>\n"
+"<b>Sammendrag:</b> %3<br>\n"
+"<b>Skildring:</b> %4<br>\n"
 "%5\n"
 "</p>"
 
@@ -437,34 +424,26 @@
 #, fuzzy
 msgid ""
 "<p>List of default online repositories.\n"
-"Click on a repository for details.</p>"
-"\n"
+"Click on a repository for details.</p>\n"
 msgstr ""
 "<p>Her vert viste standardpakkebrønnene som er lasta ned frå Internett.\n"
-"Klikk på ein pakkebrønn for å vise meir informasjon.</p>"
-"\n"
+"Klikk på ein pakkebrønn for å vise meir informasjon.</p>\n"
 
 #. TRANSLATORS: dialog help 2/3 (version for installation)
 #: src/clients/inst_productsources.rb:1269
 #, fuzzy
-msgid ""
-"<p>Select the online repositories you want to use then click <b>Next</b>.</p>"
-"\n"
+msgid "<p>Select the online repositories you want to use then click <b>Next</b>.</p>\n"
 msgstr ""
 "<p>Viss du vil bruka éin eller fleire online-pakkebrønner,\n"
-"vel dei du vil ha, og klikk <b>Neste</b></p>"
-"\n"
+"vel dei du vil ha, og klikk <b>Neste</b></p>\n"
 
 #. TRANSLATORS: dialog help 2/3 (version for running system)
 #: src/clients/inst_productsources.rb:1273
 #, fuzzy
-msgid ""
-"<p>Select the online repositories you want to use then click <b>Finish</b>.</p>"
-"\n"
+msgid "<p>Select the online repositories you want to use then click <b>Finish</b>.</p>\n"
 msgstr ""
 "<p>Viss du vil bruka éin eller fleire online-pakkebrønner,\n"
-"vel dei du vil ha, og klikk <b>Fullfør</b></p>"
-"\n"
+"vel dei du vil ha, og klikk <b>Fullfør</b></p>\n"
 
 #. TRANSLATORS: dialog help 3/3
 #: src/clients/inst_productsources.rb:1278
@@ -481,7 +460,7 @@
 #. TRANSLATORS: dialog help
 #. TRANSLATORS: dialog help
 #: src/clients/inst_productsources.rb:1380
-#: src/include/packager/repositories_include.rb:93
+#: src/include/packager/repositories_include.rb:91
 #, fuzzy
 msgid "<p>The repository manager is downloading repository details...</p>"
 msgstr "<p>Vent medan pakkebrønnhandsamaren lastar ned pakkebrønninformasjon…</p>"
@@ -560,7 +539,7 @@
 
 #. re-initialize package information
 #. force reinitialization
-#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:739
+#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:744
 #, fuzzy
 msgid "Installing Packages..."
 msgstr "Installerer pakker …"
@@ -605,8 +584,8 @@
 #. dialog caption
 #. dialog caption
 #. dialog caption
-#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1845
-#: src/modules/AddOnProduct.rb:684
+#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1810
+#: src/modules/AddOnProduct.rb:682
 #, fuzzy
 msgid "Initializing..."
 msgstr "Initialiserer …"
@@ -642,24 +621,24 @@
 msgstr "Lagrar oppsett for pakkehandsamar …"
 
 #. default (minimal) priority of a repository
-#: src/clients/repositories.rb:58
+#: src/clients/repositories.rb:55
 #, fuzzy
 msgid "&Priority"
 msgstr "&Prioritet"
 
-#: src/clients/repositories.rb:60
+#: src/clients/repositories.rb:57
 #, fuzzy
 msgid "Keep Downloaded Packages"
 msgstr "Hald på nedlastede pakker"
 
 #. Command line help text for the repository module, %1 is "zypper"
-#: src/clients/repositories.rb:75
+#: src/clients/repositories.rb:72
 #, fuzzy
 msgid "Installation Repositories - This module does not support the command line interface, use '%1' instead."
 msgstr "Installasjonspakkebrønner – denne modulen har ikkje støtte for kommandolinjemodus, bruk %1 i staden."
 
 #. pad to 3 characters
-#: src/clients/repositories.rb:169
+#: src/clients/repositories.rb:166
 #, fuzzy
 msgid "Default"
 msgstr "Standard"
@@ -667,83 +646,67 @@
 #. unkown name (alias) of the source
 #. get the editable propertis from 'source' parameter,
 #. get the fixed propertis from the package manager
-#: src/clients/repositories.rb:199 src/clients/repositories.rb:264
+#: src/clients/repositories.rb:195 src/clients/repositories.rb:260
 #, fuzzy
 msgid "Unknown Name"
 msgstr "Ukjent namn"
 
 #. displaye only repositories from the selected service
-#: src/clients/repositories.rb:334 src/clients/repositories.rb:335
-#: src/clients/repositories.rb:377 src/clients/repositories.rb:383
-#: src/modules/SourceManager.rb:436
+#: src/clients/repositories.rb:326 src/clients/repositories.rb:362
+#: src/clients/repositories.rb:368 src/modules/SourceManager.rb:436
 #, fuzzy
 msgid "Unknown"
 msgstr "Ukjent"
 
 #. label to be used instead of URL if not found
-#: src/clients/repositories.rb:337 src/clients/repositories.rb:376
-#: src/modules/AddOnProduct.rb:1336
+#: src/clients/repositories.rb:328 src/clients/repositories.rb:361
+#: src/modules/AddOnProduct.rb:1334
 #, fuzzy
 msgid "URL: %1"
 msgstr "Nettadresse: %1"
 
-#. TRANSLATORS: Raw URL is the address without expanding repo variables
-#. e.g. Raw URL = http://something/$arch -> URL = http://something/x86_64
-#: src/clients/repositories.rb:342
-#, fuzzy
-msgid "Raw URL: %s"
-msgstr "Nettadresse: %1"
-
 #. heading - in case repo name not found
-#: src/clients/repositories.rb:372
+#: src/clients/repositories.rb:357
 #, fuzzy
 msgid "Unknown Repository Name"
 msgstr "Ukjent pakkebrønnnavn"
 
 #. label, %1 is repo category (eg. YUM)
-#: src/clients/repositories.rb:382
+#: src/clients/repositories.rb:367
 #, fuzzy
 msgid "Category: %1"
 msgstr "Kategori: %1"
 
 #. label, %1 is repo category (eg. YUM)
-#: src/clients/repositories.rb:392
+#: src/clients/repositories.rb:377
 #, fuzzy
 msgid "Service: %1"
 msgstr "Teneste: %1"
 
 #. #176013
-#: src/clients/repositories.rb:640
+#: src/clients/repositories.rb:625
 #, fuzzy
 msgid "All repositories"
 msgstr "Alle pakkebrønner"
 
-#: src/clients/repositories.rb:643
+#: src/clients/repositories.rb:628
 #, fuzzy
 msgid "All services"
 msgstr "Alle tenester"
 
-#: src/clients/repositories.rb:652
+#: src/clients/repositories.rb:637
 #, fuzzy
 msgid "Service '%1'"
 msgstr "Tenesta '%1'"
 
-#. TRANSLATORS: Item in selection box that allow user to see only
-#. repositories not associated with service. Sometimes called also
-#. third party as they are usually repositories not provided by SUSE
-#. within product subscription.
-#: src/clients/repositories.rb:669
-msgid "Only repositories not provided by a service"
-msgstr ""
-
 #. combobox label
-#: src/clients/repositories.rb:681
+#: src/clients/repositories.rb:652
 #, fuzzy
 msgid "View"
 msgstr "Vis"
 
 #. table header - priority of the repository - keep the translation as short as possible!
-#: src/clients/repositories.rb:696
+#: src/clients/repositories.rb:667
 #, fuzzy
 msgid "Priority"
 msgstr "Prioritet"
@@ -751,7 +714,7 @@
 #. table header - is the repo enabled? - keep the translation as short as possible!
 #. table header - is the repo enabled? - keep the translation as short as possible!
 #. status info, to be used inside summary
-#: src/clients/repositories.rb:698 src/clients/repositories.rb:711
+#: src/clients/repositories.rb:669 src/clients/repositories.rb:682
 #: src/modules/SourceManager.rb:393
 #, fuzzy
 msgid "Enabled"
@@ -761,154 +724,148 @@
 #. keep the translation as short as possible!
 #. table header - is autorefresh enabled for the repo?
 #. keep the translation as short as possible!
-#: src/clients/repositories.rb:701 src/clients/repositories.rb:714
+#: src/clients/repositories.rb:672 src/clients/repositories.rb:685
 #, fuzzy
 msgid "Autorefresh"
 msgstr "Oppdater automatisk"
 
 #. table header - service to which the repo belongs
-#: src/clients/repositories.rb:705
+#: src/clients/repositories.rb:676
 #, fuzzy
 msgid "Service"
 msgstr "Teneste"
 
 #. table header - URL of the repo
 #. table header - URL of the repo
-#: src/clients/repositories.rb:707 src/clients/repositories.rb:718
+#: src/clients/repositories.rb:678 src/clients/repositories.rb:689
 #, fuzzy
 msgid "URL"
 msgstr "Nettadresse"
 
 #. push button - change URL of the selected repository
-#: src/clients/repositories.rb:818
+#: src/clients/repositories.rb:789
 #, fuzzy
 msgid "&Replace..."
 msgstr "&Erstatt …"
 
 #. push button - refresh the selected repository now
-#: src/clients/repositories.rb:820
+#: src/clients/repositories.rb:791
 #, fuzzy
 msgid "Re&fresh Selected"
 msgstr "Oppdater &valde pakker"
 
 #. push button - disable/enable the selected repository
-#: src/clients/repositories.rb:822
+#: src/clients/repositories.rb:793
 #, fuzzy
 msgid "Status &on or off"
 msgstr "&Endre status (På eller Av)"
 
 #. push button - disable/enable automatic refresh of the selected repository
-#: src/clients/repositories.rb:824
+#: src/clients/repositories.rb:795
 #, fuzzy
 msgid "Refre&sh on or off"
 msgstr "&Oppdater På eller Av"
 
 #. push button - set name of the selected repository
-#: src/clients/repositories.rb:826
+#: src/clients/repositories.rb:797
 #, fuzzy
 msgid "Set &Name..."
 msgstr "Angje &namn …"
 
 #. label
-#: src/clients/repositories.rb:833
+#: src/clients/repositories.rb:804
 #, fuzzy
 msgid "Properties"
 msgstr "Eigenskapar"
 
 #. check box
-#: src/clients/repositories.rb:838
+#: src/clients/repositories.rb:809
 #, fuzzy
 msgid "&Enabled"
 msgstr "&Aktivert"
 
 #. check box
-#: src/clients/repositories.rb:844
+#: src/clients/repositories.rb:815
 #, fuzzy
 msgid "Automatically &Refresh"
 msgstr "Oppdate&r automatisk"
 
 #. push button label
-#: src/clients/repositories.rb:882
+#: src/clients/repositories.rb:853
 #, fuzzy
 msgid "&GPG Keys..."
 msgstr "&GPG-nøklar …"
 
 #. menu button label
-#: src/clients/repositories.rb:887
+#: src/clients/repositories.rb:858
 #, fuzzy
 msgid "Refresh"
 msgstr "Oppdater"
 
 #. menu button label
-#: src/clients/repositories.rb:891
+#: src/clients/repositories.rb:862
 #, fuzzy
 msgid "Refresh all Autor&efreshed"
 msgstr "Oppdater all&e automatisk"
 
 #. menu button label
-#: src/clients/repositories.rb:893
+#: src/clients/repositories.rb:864
 #, fuzzy
 msgid "Refresh all &Enabled"
 msgstr "Oppdater all&e aktivert"
 
 #. dialog caption
-#: src/clients/repositories.rb:900
+#: src/clients/repositories.rb:871
 #, fuzzy
 msgid "Configured Software Repositories"
 msgstr "Valde pakkebrønner"
 
 #. help
-#: src/clients/repositories.rb:903
+#: src/clients/repositories.rb:874
 #, fuzzy
 msgid ""
 "<p>\n"
-"Manage configured software repositories and services.</p>"
-"\n"
+"Manage configured software repositories and services.</p>\n"
 msgstr ""
 "<p>\n"
 "I denne dialogen kan du administrera valde pakkebrønner og tenester.</p>"
 
-#: src/clients/repositories.rb:909
+#: src/clients/repositories.rb:880
 #, fuzzy
 msgid "<P>A <B>service</B> or <B>Repository Index Service (RIS) </B> is a protocol for package repository management. A service can offer one or more software repositories which can be dynamically changed by the service administrator.</P>"
 msgstr "<P>Ei<B>teneste</B> eller <B>pakkebrønnindekstjeneste</B>  er ein protokoll for administrasjon av pakkebrønner. Ei teneste kan innehalda éin eller fleire pakkebrønner som kan endrast dynamisk av tjenesteadministrator.</P>"
 
-#: src/clients/repositories.rb:916
+#: src/clients/repositories.rb:887
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b>Adding a new Repository or a Service</b><br>"
-"\n"
+"<b>Adding a new Repository or a Service</b><br>\n"
 "To add a new repository, use <b>Add</b> and specify the software repository or service.\n"
 "YaST will automatically detect whether a service or a repository is available at the entered location.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b>Leggja til ny pakkebrønn.</P> eller ny teneste </b><br>"
-"\n"
+"<b>Leggja til ny pakkebrønn.</P> eller ny teneste </b><br>\n"
 "For å leggja til ein ny pakkebrønn, klikk <b>Legg til</b> og angje ein pakkebrønn eller ei teneste.\n"
 "YaST oppdagar automatisk om det finst ei teneste eller ein pakkebrønn på den angjevne staden.\n"
 "</p>"
 
 #. help, continued
-#: src/clients/repositories.rb:928
+#: src/clients/repositories.rb:899
 #, fuzzy
 msgid ""
 "<p>\n"
 "To install packages from <b>CD</b>,\n"
 "have the CD set or the DVD available.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "For å installera pakker frå <b>CD</b>\n"
 "må du ha settet med CD-er eller DVD-ein tilgjengeleg.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help, continued
-#: src/clients/repositories.rb:939
+#: src/clients/repositories.rb:910
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -918,8 +875,7 @@
 "CD is located, for example, /data1/<b>CD1</b>.\n"
 "Only the base path is required if all CDs are copied\n"
 "into one directory.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "CD-eine kan kopierast til <b>harddisken</b>\n"
@@ -928,32 +884,27 @@
 "CD er lagra, til dømes /data1/<b>CD1</b>.\n"
 "Berre grunnstien vert kravd viss alle Cdane er kopierte\n"
 "til same katalog.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help, continued
-#: src/clients/repositories.rb:955
+#: src/clients/repositories.rb:926
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b>Modifying Status of a Repository or a Service</b><br>"
-"\n"
+"<b>Modifying Status of a Repository or a Service</b><br>\n"
 "To change a repository location, use <b>Edit</b>. To remove a repository, use\n"
 "<b>Delete</b>. To enable or disable the repository or to change the refresh status at initialization time, select the repository in the table and use the check boxes below.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b>Endre status for ein pakkebrønn eller ei tenesta</b><br>"
-"\n"
+"<b>Endre status for ein pakkebrønn eller ei tenesta</b><br>\n"
 "For å endra plasseringa til ein pakkebrønn, klikk <b>Rediger</b>. For å fjerne ein pakkebrønn, klikk\n"
 "<b>Slett</b>. For å aktivare eller deaktivere pakkebrønnen eller velja om han skal\n"
 "oppdaterast ved initialisering, vel pakkebrønnen i tabellen og bruk avkryssingsboksene nedanfor.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text, continued
-#: src/clients/repositories.rb:967
+#: src/clients/repositories.rb:938
 #, fuzzy
 msgid ""
 "<P><B>Priority of a Repository</B><BR>\n"
@@ -963,13 +914,13 @@
 "Pakkebrønnprioritet er ein heltallverdi mellom 0 (høgaste prioritet) og 200 (lågaste prioritet). Standardprioriteten er 99. Viss ei pakke er tilgjengeleg frå fleire pakkebrønner, vil pakkebrønnen med høgast prioritet brukast.</P>"
 
 #. help text, continued
-#: src/clients/repositories.rb:975
+#: src/clients/repositories.rb:946
 #, fuzzy
 msgid "<P>Select the appropriate option on top of the window for navigation in repositories and services.</P>"
 msgstr "<P>Vel ønsket alternativ øvst i vindauget for å navigera i pakkebrønner og tenester.</P>"
 
 #. help text, continued
-#: src/clients/repositories.rb:983
+#: src/clients/repositories.rb:954
 #, fuzzy
 msgid ""
 "<P><B>Keep Downloaded Packages</B><BR>Check this option to keep downloaded\n"
@@ -977,13 +928,13 @@
 "reinstalled. If not checked, the downloaded packages are deleted after installation.</P>"
 msgstr "<P><B>Hald på nedlastede pakker</B><BR>Kryss av her for å halda på nedlastede pakkar i eit lokalt minne, slik at dei kan gjenbrukast viss pakker seinare skal installerast på nytt. Viss dette valet ikkje er avkrysset, vil nedlastede pakker slettast etter installasjon.</P>"
 
-#: src/clients/repositories.rb:989
+#: src/clients/repositories.rb:960
 #, fuzzy
 msgid "<P>The default local cache is located in directory <B>/var/cache/zypp/packages</B>. Change the location in <B>/etc/zypp/zypp.conf</B> file.</P>"
 msgstr "<P>Standardkatalogen på den lokale maskina er <B>/var/cache/zypp/packages</B>, men plasseringa kan endrast i fila <B>/etc/zypp/zypp.conf</B>.</P>"
 
 #. popup message part 1
-#: src/clients/repositories.rb:1034
+#: src/clients/repositories.rb:1005
 #, fuzzy
 msgid ""
 "Unable to save changes to the repository\n"
@@ -994,7 +945,7 @@
 
 #. popup message part 2 followed by other info
 #. popup message, after message header, header of details
-#: src/clients/repositories.rb:1040 src/modules/Packages.rb:1329
+#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1329
 #: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
 #, fuzzy
 msgid "Details:"
@@ -1003,20 +954,20 @@
 #. popup message part 3
 #. end of popup message, question
 #. end of popup message, question
-#: src/clients/repositories.rb:1042 src/modules/Packages.rb:1337
+#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1337
 #: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
 #, fuzzy
 msgid "Try again?"
 msgstr "Vil du prøva igjen?"
 
 #. popup headline
-#: src/clients/repositories.rb:1059
+#: src/clients/repositories.rb:1030
 #, fuzzy
 msgid "Abort Repository Configuration"
 msgstr "Avbryt pakkebrønnoppsett"
 
 #. popup message
-#: src/clients/repositories.rb:1061
+#: src/clients/repositories.rb:1032
 #, fuzzy
 msgid ""
 "Abort the repository configuration?\n"
@@ -1026,7 +977,7 @@
 "Alle endringar vil gå tapt."
 
 #. refresh also the combobox widget
-#: src/clients/repositories.rb:1364
+#: src/clients/repositories.rb:1329
 #, fuzzy
 msgid ""
 "There is no service at URL:\n"
@@ -1036,47 +987,47 @@
 " %1"
 
 #. TODO: add help text
-#: src/clients/repositories.rb:1475
+#: src/clients/repositories.rb:1440
 #, fuzzy
 msgid "Refreshing Repositories"
 msgstr "Oppdaterer pakkebrønner "
 
-#: src/clients/repositories.rb:1476
+#: src/clients/repositories.rb:1441
 #, fuzzy
 msgid "Refreshing Services"
 msgstr "Oppdaterer tenester"
 
-#: src/clients/repositories.rb:1481
+#: src/clients/repositories.rb:1446
 #, fuzzy
 msgid "Refresh Repositories"
 msgstr "Oppdater pakkebrønner"
 
-#: src/clients/repositories.rb:1482
+#: src/clients/repositories.rb:1447
 #, fuzzy
 msgid "Refresh Services"
 msgstr "Oppdater tenester"
 
 #. progress bar label
-#: src/clients/repositories.rb:1514
+#: src/clients/repositories.rb:1479
 #, fuzzy
 msgid "Refreshing Repository %1..."
 msgstr "Oppdaterer pakkebrønnen %1 …"
 
 #. refreshing services
 #. progress bar label
-#: src/clients/repositories.rb:1540
+#: src/clients/repositories.rb:1505
 #, fuzzy
 msgid "Refreshing Service %1..."
 msgstr "Oppdaterer tenesta %1 …"
 
 #. yes-no popup
-#: src/clients/repositories.rb:1559
+#: src/clients/repositories.rb:1524
 #, fuzzy
 msgid "Delete the selected repository from the list?"
 msgstr "Vil du sletta han valde pakkebrønnen frå lista?"
 
 #. yes-no popup
-#: src/clients/repositories.rb:1573
+#: src/clients/repositories.rb:1538
 #, fuzzy
 msgid ""
 "Delete service %1\n"
@@ -1086,7 +1037,7 @@
 " med tilhøyrande katalogar?"
 
 #. popup message
-#: src/clients/repositories.rb:1641
+#: src/clients/repositories.rb:1606
 #, fuzzy
 msgid ""
 "For the selected repository, refresh\n"
@@ -1096,7 +1047,7 @@
 "for denne pakkebrønnen."
 
 #. popup question, %1 is repository URL
-#: src/clients/repositories.rb:1803
+#: src/clients/repositories.rb:1768
 #, fuzzy
 msgid ""
 "Repository %1\n"
@@ -1110,14 +1061,10 @@
 "Vil du verkeleg leggja til denne pakkebrønnen på nytt?"
 
 #. Error popup
-#: src/clients/repositories.rb:1871
+#: src/clients/repositories.rb:1836
 #, fuzzy
-msgid ""
-"<p>Errors occurred while restoring the repository configuration.</p>"
-"\n"
-msgstr ""
-"<p>Feil under gjenoppretting av pakkebrønnoppsett.</p>"
-"\n"
+msgid "<p>Errors occurred while restoring the repository configuration.</p>\n"
+msgstr "<p>Feil under gjenoppretting av pakkebrønnoppsett.</p>\n"
 
 #. the language_changed flag has NOT been set by the NLD frame
 #. the language_changed flag has NOT been set by the NLD frame
@@ -1245,7 +1192,7 @@
 "Vil du installera dei no?\n"
 
 #. start the repository manager
-#: src/clients/sw_single.rb:614
+#: src/clients/sw_single.rb:619
 #, fuzzy
 msgid ""
 "Cannot configure online update repository \n"
@@ -1254,7 +1201,7 @@
 "Pakkebrønnen på nettet kan ikkje veljast \n"
 "utan at pakka %1 er installert"
 
-#: src/clients/sw_single.rb:640
+#: src/clients/sw_single.rb:645
 #, fuzzy
 msgid ""
 "Cannot search packages in online repositories\n"
@@ -1264,7 +1211,7 @@
 "må pakka %1 installerast"
 
 #. error report, %1 is a list of packages
-#: src/clients/sw_single.rb:668
+#: src/clients/sw_single.rb:673
 #, fuzzy
 msgid ""
 "The following packages have not been found on the medium:\n"
@@ -1574,8 +1521,7 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"Manage known GPG public keys.</p>"
-"\n"
+"Manage known GPG public keys.</p>\n"
 msgstr ""
 "<p>\n"
 "I denne dialogen kan du administrera kjende offentlege GPG-nøklar.</p>"
@@ -1584,15 +1530,12 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b>Adding a New GPG Key</b><br>"
-"\n"
+"<b>Adding a New GPG Key</b><br>\n"
 "To add a new GPG key, specify the path to the key file.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b>Leggja til ny GPG-nøkkel</b><br>"
-"\n"
+"<b>Leggja til ny GPG-nøkkel</b><br>\n"
 "For å leggja til ein ny GPG-nøkkel, klikk <b>Legg til</b> og angje stigen til nøkkelfilen.\n"
 "</p>"
 
@@ -1618,14 +1561,12 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b>Adding a New GPG Key</b><br>"
-"\n"
+"<b>Adding a New GPG Key</b><br>\n"
 "To add a new GPG key, use <b>Add</b> and specify the path to the key file.\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b>Leggja til ny GPG-nøkkel</b><br>"
-"\n"
+"<b>Leggja til ny GPG-nøkkel</b><br>\n"
 "For å leggja til ein ny GPG-nøkkel, klikk <b>Legg til</b> og angje stigen til nøkkelfilen.\n"
 "</p>"
 
@@ -1637,15 +1578,13 @@
 "<b>Modifying a GPG Key Status</b>\n"
 "To modify the trusted flag, use <b>Edit</b>. To remove a GPG key, use\n"
 "<b>Delete</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "<b>Endre status for GPG-nøkkel</b>\n"
 "Bruk <b>Rediger</b> for å endra pålitelighetsstatus. Bruk\n"
 "<b>Slett</b> for å slette ein GPG-nøkkel.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. table header
 #: src/include/packager/key_manager_dialogs.rb:306
@@ -1664,50 +1603,50 @@
 "'%2'?"
 
 #. TRANSLATORS: dialog caption
-#: src/include/packager/repositories_include.rb:79
+#: src/include/packager/repositories_include.rb:77
 #, fuzzy
 msgid "Adding a New Repository"
 msgstr "Legger til ny pakkebrønn"
 
-#: src/include/packager/repositories_include.rb:83
+#: src/include/packager/repositories_include.rb:81
 #, fuzzy
 msgid "Check Repository Type"
 msgstr "Kontrollar pakkebrønntype"
 
-#: src/include/packager/repositories_include.rb:84
+#: src/include/packager/repositories_include.rb:82
 #, fuzzy
 msgid "Add Repository"
 msgstr "Legg til pakkebrønn"
 
-#: src/include/packager/repositories_include.rb:85
+#: src/include/packager/repositories_include.rb:83
 #, fuzzy
 msgid "Read Repository License"
 msgstr "Lesar pakkebrønnlisens"
 
-#: src/include/packager/repositories_include.rb:88
+#: src/include/packager/repositories_include.rb:86
 #, fuzzy
 msgid "Checking Repository Type"
 msgstr "Kontrollerer pakkebrønntype"
 
-#: src/include/packager/repositories_include.rb:89
+#: src/include/packager/repositories_include.rb:87
 #, fuzzy
 msgid "Adding Repository"
 msgstr "Legger til pakkebrønn"
 
-#: src/include/packager/repositories_include.rb:90
+#: src/include/packager/repositories_include.rb:88
 #, fuzzy
 msgid "Reading Repository License"
 msgstr "Lesar pakkebrønnlisens"
 
 #. add at least one product if the scan result is empty (no product info available)
-#: src/include/packager/repositories_include.rb:154
+#: src/include/packager/repositories_include.rb:152
 #, fuzzy
 msgid "Repository"
 msgstr "Pakkebrønn"
 
 #. continue-back popup
 #. continue-back popup
-#: src/include/packager/repositories_include.rb:226
+#: src/include/packager/repositories_include.rb:224
 #: src/modules/SourceManager.rb:330
 #, fuzzy
 msgid ""
@@ -1725,7 +1664,7 @@
 
 #. popup message part 1
 #. Import GPG keys found in the inst-sys
-#: src/include/packager/repositories_include.rb:321
+#: src/include/packager/repositories_include.rb:319
 #: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306
 #, fuzzy
 msgid ""
@@ -1736,7 +1675,7 @@
 "frå adressa '%1'."
 
 #. error message
-#: src/include/packager/repositories_include.rb:333
+#: src/include/packager/repositories_include.rb:331
 #, fuzzy
 msgid ""
 "Using an ISO image over ftp or http protocol is not possible.\n"
@@ -1746,13 +1685,13 @@
 "Vel ein annan protokoll eller pakk ut ISO-diskbildet på serveren."
 
 #. popup message part 2
-#: src/include/packager/repositories_include.rb:343
+#: src/include/packager/repositories_include.rb:341
 #, fuzzy
 msgid "Change the URL and try again?"
 msgstr "Vil du endra adressa og freista igjen?"
 
 #. popup error message, %1 is the package name
-#: src/include/packager/repositories_include.rb:420
+#: src/include/packager/repositories_include.rb:418
 #, fuzzy
 msgid ""
 "Cannot search for SLP repositories\n"
@@ -1768,21 +1707,21 @@
 #. error report
 #. popup error
 #. popup error
-#: src/modules/AddOnProduct.rb:518 src/modules/AddOnProduct.rb:620
+#: src/modules/AddOnProduct.rb:516 src/modules/AddOnProduct.rb:618
 #: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730
 #, fuzzy
 msgid "An error occurred while preparing the installation system."
 msgstr "Det oppstod ein feil under klargjøring av installasjonssystemet."
 
 #. error report
-#: src/modules/AddOnProduct.rb:655
+#: src/modules/AddOnProduct.rb:653
 #, fuzzy
 msgid "Control file %1 not found on media."
 msgstr "Kontrollfilen %1 vart ikkje funnen på mediet."
 
 #. FATE #305578: Add-On Product Requiring Registration
 #. or check the content file
-#: src/modules/AddOnProduct.rb:896
+#: src/modules/AddOnProduct.rb:894
 msgid ""
 "Package '%s' is not installed.\n"
 "The add-on product cannot be registered."
@@ -1790,30 +1729,30 @@
 
 #. TRANSLATORS: error report
 #. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1263 src/modules/AddOnProduct.rb:1427
+#: src/modules/AddOnProduct.rb:1261 src/modules/AddOnProduct.rb:1425
 #, fuzzy
 msgid "Unable to use additional products."
 msgstr "Kan ikkje bruka tilleggsprodukter."
 
 #. fill up internal map (used later when item selected)
-#: src/modules/AddOnProduct.rb:1314 src/modules/AddOnProduct.rb:1320
+#: src/modules/AddOnProduct.rb:1312 src/modules/AddOnProduct.rb:1318
 #, fuzzy
 msgid "%1, URL: %2"
 msgstr "%1, adresse: %2"
 
-#: src/modules/AddOnProduct.rb:1330
+#: src/modules/AddOnProduct.rb:1328
 #, fuzzy
 msgid "URL: %1, Path: %2"
 msgstr "Adresse: %1, Stig: %2"
 
 #. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1361
+#: src/modules/AddOnProduct.rb:1359
 #, fuzzy
 msgid "Additional Products"
 msgstr "Tilleggsprodukter"
 
 #. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1367
+#: src/modules/AddOnProduct.rb:1365
 #, fuzzy
 msgid ""
 "The installation repository also contains the listed additional repositories.\n"
@@ -1822,38 +1761,38 @@
 "Installasjsonspakkebrønnen inneheld òg dei angjevne tilleggspakkebrønnene.\n"
 "Vel dei du vil bruka."
 
-#: src/modules/AddOnProduct.rb:1378
+#: src/modules/AddOnProduct.rb:1376
 #, fuzzy
 msgid "Additional Products to Select"
 msgstr "Tilleggsprodukter som kan veljast"
 
 #. push button label
-#: src/modules/AddOnProduct.rb:1385
+#: src/modules/AddOnProduct.rb:1383
 #, fuzzy
 msgid "Add Selected &Products"
 msgstr "Legg til valde &produkt"
 
 #. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1517
+#: src/modules/AddOnProduct.rb:1515
 #, fuzzy
 msgid "Insert the addon %1 medium"
 msgstr "Sett inn CD-ein med tilleggsproduktet"
 
 #. %1 is the product name, %2 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1522
+#: src/modules/AddOnProduct.rb:1520
 #, fuzzy
 msgid "Insert the %1 %2 medium"
 msgstr "Sett inn første installasjonsmedium."
 
 #. TRANSLATORS: error message, %1 is replaced with product URL
-#: src/modules/AddOnProduct.rb:1574
+#: src/modules/AddOnProduct.rb:1572
 #, fuzzy
 msgid "Unable to add product %1."
 msgstr "Kan ikkje leggja til produktet %1."
 
 #. adding the product to the list of products (BNC #269625)
 #. no such products
-#: src/modules/AddOnProduct.rb:1766 src/modules/AddOnProduct.rb:1772
+#: src/modules/AddOnProduct.rb:1764 src/modules/AddOnProduct.rb:1770
 #: src/modules/Packages.rb:471
 #, fuzzy
 msgid "Unknown Product"
@@ -2154,20 +2093,12 @@
 #. it is part of a package name (like "sles-release")
 #: src/modules/Packages.rb:760
 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"
+"<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>"
+"</li></ul></li></ul>"
 msgstr ""
 
 #. error in proposal, %1 is URL
@@ -2182,8 +2113,7 @@
 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"
-"download updated release notes from the SUSE Linux Web server.</b></p>"
-"\n"
+"download updated release notes from the SUSE Linux Web server.</b></p>\n"
 msgstr ""
 "<p><b>Disse versjonsmerknadene er laga for den opphavlege versjonen og følgjer med\n"
 "på installasjonsmediene. Viss du har tilgjenge til Internett under installasjonen,\n"
@@ -2294,13 +2224,11 @@
 msgid ""
 "<p>Read the license agreement carefully and select\n"
 "one of the available options. If you do not agree to the license agreement,\n"
-"the configuration will be aborted.</p>"
-"\n"
+"the configuration will be aborted.</p>\n"
 msgstr ""
 "<p>Les lisensavtalen grundig, og vel\n"
 "eitt av alternativa. Viss du ikkje godkjenner lisensavtalen,\n"
-"vil konfigurasjonen avbrytast.</p>"
-"\n"
+"vil konfigurasjonen avbrytast.</p>\n"
 
 #. dialog title
 #. #459391
@@ -2473,7 +2401,7 @@
 
 #. radio button
 #. radio button
-#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1757
+#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1750
 #, fuzzy
 msgid "S&MB/CIFS"
 msgstr "&SMB/CIFS"
@@ -2541,12 +2469,10 @@
 #, fuzzy
 msgid ""
 "<p>If the repository is on multiple media,\n"
-"set the location of the first media of the set.</p>"
-"\n"
+"set the location of the first media of the set.</p>\n"
 msgstr ""
 "<p>Angje plasseringa til det første mediet\n"
-"viss pakkebrønnen er fordelt på fleire medium.</p>"
-"\n"
+"viss pakkebrønnen er fordelt på fleire medium.</p>\n"
 
 #. text entry
 #: src/modules/SourceDialogs.rb:135
@@ -2556,7 +2482,7 @@
 
 #. text entry
 #. text entry
-#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1621
+#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1614
 #, fuzzy
 msgid "&Path to Directory or ISO Image"
 msgstr "&Stig til katalog eller ISO-bilete"
@@ -2635,7 +2561,7 @@
 
 #. label / dialog caption
 #. dialog caption
-#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:926
+#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:919
 #, fuzzy
 msgid "Local Directory"
 msgstr "Lokal katalog"
@@ -2659,145 +2585,128 @@
 msgstr "Servar og katalog"
 
 #. popup message
-#: src/modules/SourceDialogs.rb:468
+#: src/modules/SourceDialogs.rb:461
 #, fuzzy
 msgid "The name of the repository cannot be empty."
 msgstr "Eit pakkebrønnnavn må angjevast."
 
 #. text entry
-#: src/modules/SourceDialogs.rb:480
+#: src/modules/SourceDialogs.rb:473
 #, fuzzy
 msgid "&Repository Name"
 msgstr "Pakkeb&rønnavn"
 
 #. help text
-#: src/modules/SourceDialogs.rb:495
+#: src/modules/SourceDialogs.rb:488
 #, fuzzy
 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"
+"<p><big><b>Repository Name</b></big><br>\n"
+"Use <b>Repository Name</b> to specify the name of the repository. If it is empty, YaST will use the product name (if available) or the URL as the name.</p>\n"
 msgstr ""
-"<p><big><b>Pakkebrønnnavn</b></big><br>"
-"\n"
-"Nytte <b>Pakkebrønnnavn</b> for å angje pakkebrønnens namn. Viss feltet er tomt, vil Yast bruka produktnavnet (viss det er tilgjengeleg) eller nettadressen.</p>"
-"\n"
+"<p><big><b>Pakkebrønnnavn</b></big><br>\n"
+"Nytte <b>Pakkebrønnnavn</b> for å angje pakkebrønnens namn. Viss feltet er tomt, vil Yast bruka produktnavnet (viss det er tilgjengeleg) eller nettadressen.</p>\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:509
+#: src/modules/SourceDialogs.rb:502
 #, fuzzy
 msgid "&Service Name"
 msgstr "Namn på tena&ste"
 
 #. help text
-#: src/modules/SourceDialogs.rb:517
+#: src/modules/SourceDialogs.rb:510
 #, fuzzy
 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"
+"<p><big><b>Service Name</b></big><br>\n"
+"Use <b>Service Name</b> to specify the name of the service. If it is empty, YaST will use part of the service URL as the name.</p>\n"
 msgstr ""
-"<p><big><b>Namn på teneste</b></big><br>"
-"\n"
-"Bruk <b>Namn på teneste</b> for å angje tjenestenavnet. Viss feltet er tomt, vil Yast bruka ein del av tenesta si nettadresse.</p>"
-"\n"
+"<p><big><b>Namn på teneste</b></big><br>\n"
+"Bruk <b>Namn på teneste</b> for å angje tjenestenavnet. Viss feltet er tomt, vil Yast bruka ein del av tenesta si nettadresse.</p>\n"
 
 #. popup message
-#: src/modules/SourceDialogs.rb:552
+#: src/modules/SourceDialogs.rb:545
 #, fuzzy
 msgid "URL cannot be empty."
 msgstr "Du må angje ein nettadresse."
 
 #. text entry
-#: src/modules/SourceDialogs.rb:566
+#: src/modules/SourceDialogs.rb:559
 #, fuzzy
 msgid "&URL"
 msgstr "&Nettadresse"
 
 #. help text
-#: src/modules/SourceDialogs.rb:580
+#: src/modules/SourceDialogs.rb:573
 #, fuzzy
 msgid ""
-"<p><big><b>Repository URL</b></big><br>"
-"\n"
+"<p><big><b>Repository URL</b></big><br>\n"
 "Use <b>URL</b> to specify the URL of the repository.</p>"
 msgstr ""
-"<p><big><b>Pakkebrønnadresse</b></big><br>"
-"\n"
-"Nytte <b>Nettadresse</b> for å angje adressa til pakkebrønnen."
-"<p>"
+"<p><big><b>Pakkebrønnadresse</b></big><br>\n"
+"Nytte <b>Nettadresse</b> for å angje adressa til pakkebrønnen.<p>"
 
 #. Get widget description map
 #. @return widget description map
 #. Get widget description map
 #. @return widget description map
-#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
+#: src/modules/SourceDialogs.rb:746 src/modules/SourceDialogs.rb:1886
 #, fuzzy
 msgid "Edit Parts of the URL"
 msgstr "Rediger deler av adressa"
 
-#: src/modules/SourceDialogs.rb:760 src/modules/SourceDialogs.rb:1900
+#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
 #, fuzzy
 msgid "Edit Complete URL"
 msgstr "Rediger heile adressa"
 
 #. help text
-#: src/modules/SourceDialogs.rb:772
+#: src/modules/SourceDialogs.rb:765
 #, fuzzy
 msgid ""
-"<p><big><b>NFS Server</b></big><br>"
-"\n"
+"<p><big><b>NFS Server</b></big><br>\n"
 "Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
 "to specify the NFS server host name and path on the server.</p>"
 msgstr ""
-"<p><big><b>NFS-servar</b></big><br>"
-"\n"
+"<p><big><b>NFS-servar</b></big><br>\n"
 "Nytte <b>Servernavn</b> og <b>Stig til katalog eller ISO-bilete</b>\n"
-"for å  angje NFS-serverens vertsnavn og stigen på serveren."
-"<p>"
+"for å  angje NFS-serverens vertsnavn og stigen på serveren.<p>"
 
-#: src/modules/SourceDialogs.rb:779
+#: src/modules/SourceDialogs.rb:772
 msgid ""
-"<p><big><b>Mount Options</b></big><br>"
-"\n"
+"<p><big><b>Mount Options</b></big><br>\n"
 "You can specify extra options used for mounting the NFS volume.\n"
 "This is an expert option, keeping the default value is recommened. See <b>man 5 nfs</b>\n"
 "for details and the list of supported options."
 msgstr ""
 
 #. radio button
-#: src/modules/SourceDialogs.rb:834
+#: src/modules/SourceDialogs.rb:827
 #, fuzzy
 msgid "&CD-ROM"
 msgstr "&CD-ROM"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:836
+#: src/modules/SourceDialogs.rb:829
 #, fuzzy
 msgid "&DVD-ROM"
 msgstr "&DVD-ROM"
 
-#: src/modules/SourceDialogs.rb:841
+#: src/modules/SourceDialogs.rb:834
 #, fuzzy
 msgid ""
-"<p><big><b>CD or DVD Media</b></big><br>"
-"\n"
+"<p><big><b>CD or DVD Media</b></big><br>\n"
 "Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>"
 msgstr ""
-"<p><big><b>CD- eller DVD-medium</b></big><br>"
-"\n"
+"<p><big><b>CD- eller DVD-medium</b></big><br>\n"
 "Vel <b>CD-ROM</b> eller <b>DVD-ROM</b> for å angje medietypen.</p>"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:941
+#: src/modules/SourceDialogs.rb:934
 #, fuzzy
 msgid "ISO Image File"
 msgstr "ISO-bildefil"
 
 #. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:964
+#: src/modules/SourceDialogs.rb:957
 #, fuzzy
 msgid ""
 "The entered path is not a directory\n"
@@ -2807,7 +2716,7 @@
 "eller katalogen finst ikkje.\n"
 
 #. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:994
+#: src/modules/SourceDialogs.rb:987
 #, fuzzy
 msgid ""
 "The entered path is not a file\n"
@@ -2817,7 +2726,7 @@
 "eller fila finst ikkje.\n"
 
 #. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:1018
+#: src/modules/SourceDialogs.rb:1011
 #, fuzzy
 msgid ""
 "File '%1'\n"
@@ -2829,68 +2738,62 @@
 "Vil du bruka han likevel?\n"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1039
+#: src/modules/SourceDialogs.rb:1032
 #, fuzzy
 msgid "&Path to Directory"
 msgstr "&Stig til katalog"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1047 src/modules/SourceDialogs.rb:1305
-#: src/modules/SourceDialogs.rb:1372
+#: src/modules/SourceDialogs.rb:1040 src/modules/SourceDialogs.rb:1298
+#: src/modules/SourceDialogs.rb:1365
 #, fuzzy
 msgid "&Plain RPM Directory"
 msgstr "&Ren RPM-katalog"
 
-#: src/modules/SourceDialogs.rb:1062
+#: src/modules/SourceDialogs.rb:1055
 #, fuzzy
 msgid ""
-"<p><big><b>Local Directory</b></big><br>"
-"\n"
+"<p><big><b>Local Directory</b></big><br>\n"
 "Use <b>Path to Directory</b> to specify the path to the\n"
 "directory. If the directory contains only RPM packages without\n"
 "any metadata (i.e. there is no product information), then check option\n"
-"<b>Plain RPM Directory</b>.</p>"
-"\n"
+"<b>Plain RPM Directory</b>.</p>\n"
 msgstr ""
-"<p><big><b>Lokal katalog</b></big><br>"
-"\n"
+"<p><big><b>Lokal katalog</b></big><br>\n"
 "Bruk <b>Stig til katalog</b> for å angje stigen til katalogen.\n"
 "Om katalogen inneheld berre RPM-pakker utan noka form\n"
 "for metadata (f.eks ikkje noko produktinformasjon) må\n"
 "<b>Ren RPM-katalog</b> veljast.</p>"
 
 #. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1298
+#: src/modules/SourceDialogs.rb:1291
 #, fuzzy
 msgid "&USB Mass Storage Device"
 msgstr "&USB masselagringsenhet"
 
 #. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1303 src/modules/SourceDialogs.rb:1370
+#: src/modules/SourceDialogs.rb:1296 src/modules/SourceDialogs.rb:1363
 #, fuzzy
 msgid "&File System"
 msgstr "&Filsystem"
 
-#: src/modules/SourceDialogs.rb:1304 src/modules/SourceDialogs.rb:1371
+#: src/modules/SourceDialogs.rb:1297 src/modules/SourceDialogs.rb:1364
 #, fuzzy
 msgid "Dire&ctory"
 msgstr "&Katalog"
 
-#: src/modules/SourceDialogs.rb:1309
+#: src/modules/SourceDialogs.rb:1302
 #, fuzzy
 msgid ""
-"<p><big><b>USB Stick or Disk</b></big><br>"
-"\n"
+"<p><big><b>USB Stick or Disk</b></big><br>\n"
 "Select the USB device on which the repository is located.\n"
 "Use <b>Path to Directory</b> to specify the directory of the repository.\n"
 "If the path is omitted, the system will use the root directory of the disk.\n"
 "If the directory contains only RPM packages without\n"
 "any metadata (i.e. there is no product information), then check option\n"
-"<b>Plain RPM Directory</b>.</p>"
-"\n"
+"<b>Plain RPM Directory</b>.</p>\n"
 msgstr ""
-"<p><big><b>USB-pinne eller disk</b></big><br>"
-"\n"
+"<p><big><b>USB-pinne eller disk</b></big><br>\n"
 "Vel USB-eininga som inneheld pakkebrønnen.\n"
 "Bruk <b>Stig til katalog</b> for å angje stigen til katalogen.\n"
 "Viss ikkje stigen er angjeven, vil systemet bruk disken sin rotkatalog.\n"
@@ -2900,39 +2803,35 @@
 
 #. 'auto' is a value in the combo box widget, do not translate it!
 #. 'auto' is a value in the combo box widget, do not translate it!
-#: src/modules/SourceDialogs.rb:1319 src/modules/SourceDialogs.rb:1386
+#: src/modules/SourceDialogs.rb:1312 src/modules/SourceDialogs.rb:1379
 #, fuzzy
 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"
-"want to use a certain file system, select it from the list.</p>"
-"\n"
+"want to use a certain file system, select it from the list.</p>\n"
 msgstr ""
 "<p>Filsystemet som vert nytta på eininga, vil verta finnast automatisk\n"
 "viss 'auto' er vald for filsystem. Viss filsystemet ikkje vert funnet\n"
 "eller viss du vil bruka eit spesielt filsystem, vel du dette frå lista.</p>"
 
 #. combobox title
-#: src/modules/SourceDialogs.rb:1369
+#: src/modules/SourceDialogs.rb:1362
 #, fuzzy
 msgid "&Disk Device"
 msgstr "&Diskenhet"
 
-#: src/modules/SourceDialogs.rb:1376
+#: src/modules/SourceDialogs.rb:1369
 #, fuzzy
 msgid ""
-"<p><big><b>Disk</b></big><br>"
-"\n"
+"<p><big><b>Disk</b></big><br>\n"
 "Select the disk on which the repository is located.\n"
 "Use <b>Path to Directory</b> to specify the directory of the repository.\n"
 "If the path is omitted, the system will use the root directory of the disk.\n"
 "If the directory contains only RPM packages without\n"
 "any metadata (i.e. there is no product information), then check option\n"
-"<b>Plain RPM Directory</b>.</p>"
-"\n"
+"<b>Plain RPM Directory</b>.</p>\n"
 msgstr ""
-"<p><big><b>Disk</b></big><br>"
-"\n"
+"<p><big><b>Disk</b></big><br>\n"
 "Vel disken som inneheld pakkebrønnen.\n"
 "Bruk <b>Stig til katalog</b> for å angje stigen til katalogen.\n"
 "Viss stigen ikkje er angjeven, vil systemet bruka disken sin rotkatalog.\n"
@@ -2941,169 +2840,157 @@
 "<b>Ren RPM-katalog</b>.</p>"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1402
+#: src/modules/SourceDialogs.rb:1395
 #, fuzzy
 msgid "&Path to ISO Image"
 msgstr "&Stig til ISO-bilete"
 
 #. push button
-#: src/modules/SourceDialogs.rb:1422
+#: src/modules/SourceDialogs.rb:1415
 #, fuzzy
 msgid ""
-"<p><big><b>Local ISO Image</b></big><br>"
-"\n"
+"<p><big><b>Local ISO Image</b></big><br>\n"
 "Use <b>Path to ISO Image</b> to specify the path to the\n"
 "ISO image file.</p>"
 msgstr ""
-"<p><big><b>Lokalt ISO-bilete</b></big><br>"
-"\n"
+"<p><big><b>Lokalt ISO-bilete</b></big><br>\n"
 "Bruk <b>Stig til ISO-bilete</b> for å angje stigen til\n"
 "fila som inneheld ISO-biletet av installasjonsmediet.</p>"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1603
+#: src/modules/SourceDialogs.rb:1596
 #, fuzzy
 msgid "Server &Name"
 msgstr "Servar&namn"
 
-#: src/modules/SourceDialogs.rb:1607
+#: src/modules/SourceDialogs.rb:1600
 #, fuzzy
 msgid "&Port"
 msgstr "&Port"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1612
+#: src/modules/SourceDialogs.rb:1605
 #, fuzzy
 msgid "&Share"
 msgstr "&Delt ressurs"
 
 #. checkbox label
-#: src/modules/SourceDialogs.rb:1625
+#: src/modules/SourceDialogs.rb:1618
 #, fuzzy
 msgid "ISO &Image"
 msgstr "&ISO-bilete"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1628
+#: src/modules/SourceDialogs.rb:1621
 #, fuzzy
 msgid "&Directory on Server"
 msgstr "&Katalog på servar"
 
 #. frame
-#: src/modules/SourceDialogs.rb:1633
+#: src/modules/SourceDialogs.rb:1626
 #, fuzzy
 msgid "Au&thentication"
 msgstr "Au&tentisering"
 
 #. check box
-#: src/modules/SourceDialogs.rb:1640
+#: src/modules/SourceDialogs.rb:1633
 #, fuzzy
 msgid "&Anonymous"
 msgstr "&Anonym"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1649
+#: src/modules/SourceDialogs.rb:1642
 #, fuzzy
 msgid "&Workgroup or Domain"
 msgstr "&Arbeidsgruppe eller domane"
 
 #. text entry
-#: src/modules/SourceDialogs.rb:1658
+#: src/modules/SourceDialogs.rb:1651
 #, fuzzy
 msgid "&User Name"
 msgstr "&Brukernavn"
 
 #. password entry
-#: src/modules/SourceDialogs.rb:1665
+#: src/modules/SourceDialogs.rb:1658
 #, fuzzy
 msgid "&Password"
 msgstr "&Passord"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1740
+#: src/modules/SourceDialogs.rb:1733
 #, fuzzy
 msgid "&FTP"
 msgstr "&FTP"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1743
+#: src/modules/SourceDialogs.rb:1736
 #, fuzzy
 msgid "H&TTP"
 msgstr "H&TTP"
 
 #. radio button
-#: src/modules/SourceDialogs.rb:1750
+#: src/modules/SourceDialogs.rb:1743
 #, fuzzy
 msgid "HTT&PS"
 msgstr "HTT&PS"
 
 #. help text - server dialog
-#: src/modules/SourceDialogs.rb:1924
+#: src/modules/SourceDialogs.rb:1917
 #, fuzzy
 msgid ""
-"<p><big><b>Server and Directory</b></big><br>"
-"\n"
+"<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"
 "to specify the NFS server host name and path on the server.\n"
 "To enable authentication, uncheck <b>Anonymous</b> and specify the\n"
-"<b>User Name</b> and the <b>Password</b>.</p>"
-"\n"
+"<b>User Name</b> and the <b>Password</b>.</p>\n"
 "<p>\n"
 "For the SMB/CIFS repository, specify <b>Share</b> name and <b>Path to Directory\n"
 "or ISO Image</b>. \n"
 "If the location is a file holding an ISO image\n"
-"of the media, set <b>ISO Image</b>.</p>"
-"\n"
+"of the media, set <b>ISO Image</b>.</p>\n"
 msgstr ""
-"<p><big><b>Servar og katalog</b></big><br>"
-"\n"
+"<p><big><b>Servar og katalog</b></big><br>\n"
 "Nytte <b>Servernavn</b> og <b>Stig til katalog eller ISO-bilete</b>\n"
 "for å angje NFS-serverens vertsnavn og stigen på serveren.\n"
 "For å aktivare autentisering, fjern avkryssingen for <b>Anonym sitt</b>, og angje\n"
-"<b>Brukernavn</b> og <b>Passord</b>."
+"<b>Brukernavn</b> og <b>Passord</b>.<p>\n"
 "<p>\n"
-"<p>\n"
 "For SMB/CIFS-pakkebrønner, angje namn på <b>Delt ressurs</b> og <b>Sti til katalog\n"
 "eller ISO-diskbilde</b>. \n"
 "Viss plasseringa er ei fil med eit ISO-diskbilde\n"
-"av mediet, vel <b>ISO-diskbilde</b>.</p>"
-"\n"
+"av mediet, vel <b>ISO-diskbilde</b>.</p>\n"
 
 #. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1937
+#: src/modules/SourceDialogs.rb:1930
 #, fuzzy
 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"
+"Leave it empty to use the default port.</p>\n"
 msgstr ""
 "<p>Ein <b>Port</b>-nummer kan angjevast for ein HTTP/HTTPS-pakkebrønn.\n"
-"La feltet vera blankt for å bruka standardporten.</p>"
-"\n"
+"La feltet vera blankt for å bruka standardporten.</p>\n"
 
 #. Returns whether Community Repositories are defined in the control file.
 #.
 #. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1999
+#: src/modules/SourceDialogs.rb:1992
 msgid "I would like to install an additional Add On Product"
 msgstr ""
 
 #. help text
-#: src/modules/SourceDialogs.rb:2126
+#: src/modules/SourceDialogs.rb:2119
 #, fuzzy
 msgid ""
-"<p><big><b>Media Type</b></big><br>"
-"\n"
+"<p><big><b>Media Type</b></big><br>\n"
 "The software repository can be located on CD, on a network server,\n"
 "or on the hard disk.</p>"
 msgstr ""
-"<p><big><b>Medietype</b></big><br>"
-"\n"
+"<p><big><b>Medietype</b></big><br>\n"
 "Pakkebrønnen kan vera på ein CD, på ein nettverksserver\n"
 "eller på harddisken.</p>"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2135
+#: src/modules/SourceDialogs.rb:2128
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -3115,90 +3002,82 @@
 "må du ha ein CD  eller DVD med produktet tilgjengeleg.</p>"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2145
+#: src/modules/SourceDialogs.rb:2138
 #, fuzzy
 msgid ""
 "<p>\n"
 "The product CDs can be copied to the hard disk.\n"
 "Enter the path to the first CD, for example, /data1/<b>CD1</b>.\n"
 "Only the base path is required if all CDs are copied\n"
-"into the same directory.</p>"
-"\n"
+"into the same directory.</p>\n"
 msgstr ""
 "<p>\n"
 "Produkt-CD-er kan kopierast til harddisken.\n"
 "Angje kor første\n"
 "CD er lagra, til dømes /data1/<b>CD1</b>.\n"
 "Berre grunnstien vert kravd viss alle CD-eine er kopiert\n"
-"til same katalog.</p>"
-"\n"
+"til same katalog.</p>\n"
 
 #. help, continued
-#: src/modules/SourceDialogs.rb:2157
+#: src/modules/SourceDialogs.rb:2150
 #, fuzzy
 msgid ""
 "<p>\n"
 "Network installation requires a working network connection.\n"
 "Specify the directory in which the packages from\n"
-"the first CD are located, such as /data1/CD1.</p>"
-"\n"
+"the first CD are located, such as /data1/CD1.</p>\n"
 msgstr ""
 "<p>\n"
 "Ein nettverksinstallasjon krev ein fungerande nettverksforbindelse.\n"
 "Angje katalogen der pakkene frå\n"
-"første CD er plasserte, til dømes /data1/CD1.</p>"
-"\n"
+"første CD er plasserte, til dømes /data1/CD1.</p>\n"
 
 #. error popup
-#: src/modules/SourceDialogs.rb:2172
+#: src/modules/SourceDialogs.rb:2165
 #, fuzzy
 msgid "Select the media type"
 msgstr "Vel medietype."
 
-#: src/modules/SourceDialogs.rb:2178
+#: src/modules/SourceDialogs.rb:2171
 #, fuzzy
 msgid "Insert the add-on product CD"
 msgstr "Sett inn CD-ein med tilleggsproduktet"
 
-#: src/modules/SourceDialogs.rb:2179
+#: src/modules/SourceDialogs.rb:2172
 #, fuzzy
 msgid "Insert the add-on product DVD"
 msgstr "Sett inn DVD-ein med tilleggsproduktet"
 
 #. ask for a medium
-#: src/modules/SourceDialogs.rb:2197
+#: src/modules/SourceDialogs.rb:2190
 #, fuzzy
 msgid "No USB disk was detected."
 msgstr "Ingen USB-disk vart funnen."
 
-#. use three slashes as third slash means path
-#: src/modules/SourceDialogs.rb:2403
+#. TODO: disable "download" option when CD or DVD source is selected
+#: src/modules/SourceDialogs.rb:2393
 #, fuzzy
 msgid ""
-"<p><b>Download Files</b><br>"
-"\n"
+"<p><b>Download Files</b><br>\n"
 "Each repository has description files which describe the content of the\n"
 "repository. Check <b>Download repository description files</b> to download the\n"
 "files when closing this YaST module. If the option is unchecked, YaST will\n"
-"automatically download the files when it needs them later. </p>"
-"\n"
+"automatically download the files when it needs them later. </p>\n"
 msgstr ""
-"<p><b>La ned filer</b><br>"
-"\n"
+"<p><b>La ned filer</b><br>\n"
 "Kvar pakkebrønn har filer som skildrar inneholdet i pakkebrønnen.\n"
 "Kryss av for <b>Last ned beskrivelsesfiler for pakkebrønnen</b> for å lasta dei ned\n"
 "når du lukkar denne Yast-modulen. Viss du ikkje kryssar av her, vil Yast\n"
-"automatisk lasta ned filene når det er behov for dei seinare. </p>"
-"\n"
+"automatisk lasta ned filene når det er behov for dei seinare. </p>\n"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:2623
+#: src/modules/SourceDialogs.rb:2613
 #, fuzzy
 msgid "Media Type"
 msgstr "Medietype"
 
 #. dialog caption
-#: src/modules/SourceDialogs.rb:2647
+#: src/modules/SourceDialogs.rb:2637
 #, fuzzy
 msgid "Add On Product"
 msgstr "Tilleggsprodukter"
@@ -3206,7 +3085,7 @@
 #. Returns boolean whether user confirmed to abort the configuration
 #.
 #. @return [Boolean] whether to abort
-#: src/modules/SourceDialogs.rb:2678
+#: src/modules/SourceDialogs.rb:2668
 msgid "URL scheme '%s' is not valid."
 msgstr ""
 
@@ -3454,6 +3333,10 @@
 msgstr "Fjern nokon pakkar frå utvalet."
 
 #, fuzzy
+#~ msgid "Raw URL: %s"
+#~ msgstr "Nettadresse: %1"
+
+#, fuzzy
 #~ msgid "Downloading patch RPM %1 (download size %2)"
 #~ msgstr "Laster ned pakkeoppdaterings-RPM %1 (nedlastingsstørrelse %2)"
 
@@ -3472,12 +3355,10 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>All registered repositories are shown here.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
 #~ "<p>Alle registrerte pakkebrønner verta her viste.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #, fuzzy
 #~ msgid "All changes will be lost. Really exit?"
@@ -3561,30 +3442,23 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><big><b>Package Search</b></big><br>"
-#~ "\n"
-#~ "Use the functionality of <i>Webpin package search</i> to search in all known openSUSE build-service and openSUSE community repositories.</p>"
-#~ "\n"
+#~ "<p><big><b>Package Search</b></big><br>\n"
+#~ "Use the functionality of <i>Webpin package search</i> to search in all known openSUSE build-service and openSUSE community repositories.</p>\n"
 #~ msgstr ""
-#~ "<p><big><b>Pakkesøk</b></big><br>"
-#~ "\n"
+#~ "<p><big><b>Pakkesøk</b></big><br>\n"
 #~ "Med denne YaST-modulen kan du bruka funksjonen <i>Webpin-pakkesøk</i>.\n"
 #~ "Han søkjer i alle kjende pakkebrønner som er oppretta av openSUSE build-service og openSUSE-fellesskapet.</p>"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><big><b>Security</b></big><br>"
-#~ " The software found is often not part of the\n"
+#~ "<p><big><b>Security</b></big><br> The software found is often not part of the\n"
 #~ "distribution itself. You need to decide whether to trust the source of a\n"
-#~ "package. We do not take any responsibility for installing such software.</p>"
-#~ "\n"
+#~ "package. We do not take any responsibility for installing such software.</p>\n"
 #~ msgstr ""
-#~ "<p><big><b>Tryggleik</b></big><br>"
-#~ "\n"
+#~ "<p><big><b>Tryggleik</b></big><br>\n"
 #~ "Programvara som vert funnen, er ofte ikkje ein del av sjølve distribusjonen, og det er opp\n"
 #~ "opp til deg om du vil stola på dei. Vi tek ikkje ansvaret viss du installerer denne typen\n"
-#~ "programvare.</p>"
-#~ "\n"
+#~ "programvare.</p>\n"
 
 #, fuzzy
 #~ msgid "Select packages to install."
@@ -3600,23 +3474,18 @@
 
 #, fuzzy
 #~ msgid "<p><b>No packages matching entered criteria were found.</b></p>"
-#~ msgstr ""
-#~ "<p><b>Ingen pakkar som samsvarer med kriteria, vart funne</b>"
-#~ "<p>"
+#~ msgstr "<p><b>Ingen pakkar som samsvarer med kriteria, vart funne</b><p>"
 
 #, fuzzy
 #~ msgid ""
 #~ "<p>\n"
-#~ "<b>Adding a New GPG Key</b><br>"
-#~ "\n"
+#~ "<b>Adding a New GPG Key</b><br>\n"
 #~ "To add a new GPG key, specify the path to the key file.\n"
 #~ "Check the <B>Trusted</B> check box if the key is trusted.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
 #~ "<p>\n"
-#~ "<b>Leggja til ny GPG-nøkkel</b><br>"
-#~ "\n"
+#~ "<b>Leggja til ny GPG-nøkkel</b><br>\n"
 #~ "Legg til ein ny GPG-nøkkel ved å angje stigen til nøkkelfilen.\n"
 #~ "Kryss av for <B>Påliteleg</B> viss du stolar på nøkkelen.\n"
 #~ "</p>"

Modified: branches/plus-SLE12-SP2/yast/nn/po/pam.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/pam.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/pam.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2012-02-06 21:28+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: Norwegian Nynorsk \n"

Modified: branches/plus-SLE12-SP2/yast/nn/po/pkg-bindings.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/pkg-bindings.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/pkg-bindings.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2012-01-29 17:42+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: Norwegian Nynorsk \n"
@@ -42,12 +42,12 @@
 msgstr "<P><BIG><B>Oppdaterer pakkebrønn</B></BIG></P><P>Pakkehandsamaren oppdaterer innhaldet i pakkebrønnen …</P>"
 
 #. error message
-#: src/Package.cc:655
+#: src/Package.cc:658
 msgid "The package cannot be selected to install."
 msgstr "Kan ikkje velja pakken for installering."
 
 #. error message
-#: src/Package.cc:661
+#: src/Package.cc:664
 msgid "The package is not available."
 msgstr "Pakken er ikkje tilgjengeleg."
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/printer.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/printer.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/printer.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2015-12-13 20:03+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"
@@ -218,7 +218,7 @@
 #. where %1 will be replaced by the server name:
 #. where %1 will be replaced by the server name:
 #. where %1 will be replaced by the server name:
-#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1098
+#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1101
 #: src/include/printer/policies.rb:135
 #: src/include/printer/printingvianetwork.rb:463
 #: src/include/printer/sharing.rb:639
@@ -236,8 +236,8 @@
 #. Only a simple message because this error does not happen on a normal system
 #. (i.e. a system which is not totally broken or totally messed up).
 #. Remove the 'ServerName' entry in /etc/cups/client.conf:
-#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:217
-#: src/include/printer/overview.rb:1115 src/include/printer/policies.rb:153
+#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:220
+#: src/include/printer/overview.rb:1118 src/include/printer/policies.rb:153
 #: src/include/printer/printingvianetwork.rb:478
 #: src/include/printer/sharing.rb:657
 #, fuzzy
@@ -375,7 +375,7 @@
 #: src/include/printer/basicmodify.rb:371
 #: src/include/printer/basicmodify.rb:899
 #: src/include/printer/connectionwizard.rb:551
-#: src/include/printer/overview.rb:86
+#: src/include/printer/overview.rb:89
 #, fuzzy
 msgid "Description"
 msgstr "Skildring"
@@ -487,8 +487,8 @@
 #. does not set a valid Printer::selected_connections_index so that the BasicAddDialog
 #. does not preselect a connection so that the first connection in the list is preselected
 #. (via Table widget fallback) which is still better than an arbitrary preselected entry:
-#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:590
-#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150
+#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:593
+#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153
 #, fuzzy
 msgid "Nothing Selected"
 msgstr "Ikkje noko er valt"
@@ -1763,16 +1763,12 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Initializing printer Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<b><big>Initializing printer Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b><big>Initialiserer skriveroppsett</big></b><br>"
-"\n"
-"Vent…<br>"
-"\n"
+"<b><big>Initialiserer skriveroppsett</big></b><br>\n"
+"Vent…<br>\n"
 "</p>"
 
 #. Write dialog help 1/1:
@@ -1780,16 +1776,12 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Finishing printer Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<b><big>Finishing printer Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b><big>Fullfører skriveroppsett</big></b><br>"
-"\n"
-"Vent…<br>"
-"\n"
+"<b><big>Fullfører skriveroppsett</big></b><br>\n"
+"Vent…<br>\n"
 "</p>"
 
 #. Overview dialog help 1/7:
@@ -1797,29 +1789,22 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Print Queue Overview</big></b><br>"
-"\n"
-"A printer device is not used directly but via a print queue.<br>"
-"\n"
+"<b><big>Print Queue Overview</big></b><br>\n"
+"A printer device is not used directly but via a print queue.<br>\n"
 "When various applications submit print jobs simultaneously,\n"
 "these jobs are put in a queue and are sent one after the other to the printer\n"
-"device.<br>"
-"\n"
+"device.<br>\n"
 "It is possible to have several different print queues for the same printer\n"
 "device.\n"
 "For example a second queue with a monochrome-only driver for a color device\n"
 "or a PostScript queue and a queue with a PCL driver for a PostScript+PCL printer.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b><big>Oversyn over utskriftskø</big></b><br>"
-"\n"
-"Ein skriverenhet vert brukt ikkje direkte, men via ein utskriftskø.<br>"
-"\n"
+"<b><big>Oversyn over utskriftskø</big></b><br>\n"
+"Ein skriverenhet vert brukt ikkje direkte, men via ein utskriftskø.<br>\n"
 "Når fleire program sender utskriftsjobber samstundes,\n"
-"vert jobbane plassert i kø og seint til skrivaren i rekkjefølgd.<br>"
-"\n"
+"vert jobbane plassert i kø og seint til skrivaren i rekkjefølgd.<br>\n"
 "Det kan vera fleire ulike utskriftskøer for kvar skriv,\n"
 "til dømes ein ekstra kø med ein svart-kvitt-driv for ein fargeskriver\n"
 "eller ein PostScript-kø og ein kø med ein PCL-driv for ein PostScript+PCL-skriv.\n"
@@ -1830,30 +1815,23 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Using Remote Queues:</big></b><br>"
-"\n"
+"<b><big>Using Remote Queues:</big></b><br>\n"
 "Remote queues exist on other hosts in the network,\n"
-"therefore they cannot be changed on this host.<br>"
-"\n"
+"therefore they cannot be changed on this host.<br>\n"
 "The remote queues listed here are known on this host.\n"
 "Usually they can be used directly by applications\n"
 "so there is no need to set up a local queue for a printer\n"
-"that is already available via a remote queue.<br>"
-"\n"
-"</p>"
-"\n"
+"that is already available via a remote queue.<br>\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b><big>Bruka eksterne køar:</big></b><br>"
-"\n"
+"<b><big>Bruka eksterne køar:</big></b><br>\n"
 "Eksterne køar er på andre vertsmaskiner på nettverket\n"
-"og kan difor ikkje endrast frå denne maskina.<br>"
-"\n"
+"og kan difor ikkje endrast frå denne maskina.<br>\n"
 "Dei eksterne køane som er angjevne her, er registrerte av denne vertsmaskinen,\n"
 "og kan difor brukast direkte av programma.\n"
 "Det er difor ikkje naudsynt å setja opp ein lokal skrivar\n"
-"som allereie er tilgjengeleg via ein ekstern kø.<br>"
-"\n"
+"som allereie er tilgjengeleg via ein ekstern kø.<br>\n"
 "</p>"
 
 #. Overview dialog help 3/7:
@@ -1861,14 +1839,12 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Configure a printer:</big></b><br>"
-"\n"
+"<b><big>Configure a printer:</big></b><br>\n"
 "Press <b>Add</b> to set up a new queue for a printer device.\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Sett opp ein skriv:</big></b><br>"
-"\n"
+"<b><big>Sett opp ein skriv:</big></b><br>\n"
 "Klikk på <b>Legg til</b> for å setja opp ein ny kø for ein skriv.\n"
 "</p>"
 
@@ -1877,14 +1853,12 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Change the settings for a queue:</big></b><br>"
-"\n"
+"<b><big>Change the settings for a queue:</big></b><br>\n"
 "Select a local queue and press <b>Edit</b>.\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Endre innstillingane for ein kø</big></b><br>"
-"\n"
+"<b><big>Endre innstillingane for ein kø</big></b><br>\n"
 "Vel ein lokal kø og klikk <b>Sett opp</b>.\n"
 "</p>"
 
@@ -1893,14 +1867,12 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Remove a queue:</big></b><br>"
-"\n"
+"<b><big>Remove a queue:</big></b><br>\n"
 "Select a local queue and press <b>Delete</b>.\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Slette ein kø:</big></b><br>"
-"\n"
+"<b><big>Slette ein kø:</big></b><br>\n"
 "Vel ein lokal kø og klikk <b>Slett</b>.\n"
 "</p>"
 
@@ -1909,14 +1881,12 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Print a test page:</big></b><br>"
-"\n"
+"<b><big>Print a test page:</big></b><br>\n"
 "Select the queue and press <b>Print Test Page</b>.\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>'Skriv ut ein testside:</big></b><br>"
-"\n"
+"<b><big>'Skriv ut ein testside:</big></b><br>\n"
 "Vel køen og klikk <b>Skriv ut testside</b>.\n"
 "</p>"
 
@@ -1925,20 +1895,17 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Refresh the list of queues:</big></b><br>"
-"\n"
+"<b><big>Refresh the list of queues:</big></b><br>\n"
 "After changes to the network printing settings,\n"
 "the available remote queues may have changed.\n"
 "Usually it takes some time (up to several minutes)\n"
 "until such changes become known to the local host.\n"
 "Press <b>Refresh List</b> after some time to get an \n"
 "up-to-date list of available remote queues.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b><big>Oppdater lista over køar:</big></b><br>"
-"\n"
+"<b><big>Oppdater lista over køar:</big></b><br>\n"
 "Spesielt etter endringar i samband med utskrift via nettverket,\n"
 "kan tilgjengelege eksterne køar endrast.\n"
 "Det tek ofte litt tid (inntil nokre minutt)\n"
@@ -1953,18 +1920,14 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>AutoYaST Print Queue Overview</big></b><br>"
-"\n"
-"AutoYaST supports only settings for printing with CUPS via network.<br>"
-"\n"
+"<b><big>AutoYaST Print Queue Overview</big></b><br>\n"
+"AutoYaST supports only settings for printing with CUPS via network.<br>\n"
 "There is no AutoYaST support to set up local print queues.\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>AutoYaST-oversyn over utskriftskøer</big></b><br>"
-"\n"
-"AutoYaST støttar berre innstillingar for utskrift med CUP sin via nettverket.<br>"
-"\n"
+"<b><big>AutoYaST-oversyn over utskriftskøer</big></b><br>\n"
+"AutoYaST støttar berre innstillingar for utskrift med CUP sin via nettverket.<br>\n"
 "AutoYaST støttar ikkje oppsett av lokale utskriftskøer.\n"
 "</p>"
 
@@ -1973,13 +1936,10 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Set Up a New Queue for a Printer Device</big></b><br>"
-"\n"
-"A printer device is not used directly but via a print queue.<br>"
-"\n"
+"<b><big>Set Up a New Queue for a Printer Device</big></b><br>\n"
+"A printer device is not used directly but via a print queue.<br>\n"
 "When various application programs submit print jobs simultaneously,\n"
-"the jobs queue up and are sent one after the other to the printer device.<br>"
-"\n"
+"the jobs queue up and are sent one after the other to the printer device.<br>\n"
 "It is possible to have several different print queues for the same printer device.\n"
 "Usually several print queues are needed when several different printer drivers\n"
 "should be used for the same printer device.\n"
@@ -1990,13 +1950,10 @@
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Sett opp ny kø for ein skriverenhet</big></b><br>"
-"\n"
-"Ein skriverenhet vert brukt ikkje direkte, men via ein utskriftskø.<br>"
-"\n"
+"<b><big>Sett opp ny kø for ein skriverenhet</big></b><br>\n"
+"Ein skriverenhet vert brukt ikkje direkte, men via ein utskriftskø.<br>\n"
 "Når fleire program sender utskriftsjobber samstundes,\n"
-"vert jobbane plassert i kø og sendt til skriverenheten i rekkjefølgd.<br>"
-"\n"
+"vert jobbane plassert i kø og sendt til skriverenheten i rekkjefølgd.<br>\n"
 "Same skriverenhet kan ha fleire utskriftskøer.\n"
 "Det kan vera behov for fleire utskriftskøer dersom fleire skriverdrivere\n"
 "skal nyttast for same skriv,\n"
@@ -2011,22 +1968,16 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"To set up a new queue:<br>"
-"\n"
-"Select the connection of the matching printer device,<br>"
-"\n"
-"find and assign a suitable printer driver, and<br>"
-"\n"
+"To set up a new queue:<br>\n"
+"Select the connection of the matching printer device,<br>\n"
+"find and assign a suitable printer driver, and<br>\n"
 "set a unique queue name.\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"Setja opp ein ny kø:<br>"
-"\n"
-"Vel tilkoblingen for den samsvarande skrivaren,<br>"
-"\n"
-"finn og aktiver ein eigna drivar og<br>"
-"\n"
+"Setja opp ein ny kø:<br>\n"
+"Vel tilkoblingen for den samsvarande skrivaren,<br>\n"
+"finn og aktiver ein eigna drivar og<br>\n"
 "angje eit unikt kønavn.\n"
 "</p>"
 
@@ -2035,32 +1986,25 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"The <b>connection</b> determines which way data is sent to the printer device.<br>"
-"\n"
+"The <b>connection</b> determines which way data is sent to the printer device.<br>\n"
 "If a wrong connection is selected, no data can be sent to the device\n"
-"so that there cannot be any printout.<br>"
-"\n"
+"so that there cannot be any printout.<br>\n"
 "If a printer device is accessible via more than one connection type,\n"
-"it is shown for each connection type.<br>"
-"\n"
+"it is shown for each connection type.<br>\n"
 "In particular HP devices are often accessible both via the 'usb:/...'\n"
 "and the 'hp:/...' connection.\n"
 "The latter is provided by the HP driver package 'hplip'.\n"
 "For plain printing, both kinds of connections should work, but for anything else\n"
 "(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one device)\n"
 "the 'hp:/...' connection must be used.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b>Tilkobling</b> angjev korleis data vert sendt til skrivaren.<br>"
-"\n"
+"<b>Tilkobling</b> angjev korleis data vert sendt til skrivaren.<br>\n"
 "Viss feil tilkobling er vald, kan ingen data sendast til eininga,\n"
-"og utskrift vil ikkje vera mogleg.<br>"
-"\n"
+"og utskrift vil ikkje vera mogleg.<br>\n"
 "Viss ein skrivar er tilgjengeleg via meir enn éin tilkoblingstype,\n"
-"vil den visast under kvar tilkoblingstype.<br>"
-"\n"
+"vil den visast under kvar tilkoblingstype.<br>\n"
 "Særleg HP-einingar er ofte tilgjengelege både vigde tilkoblingene 'usb:/…'\n"
 "'hp:/…'.\n"
 "Den siste typen finst i HP-driverpakken 'hplip'.\n"
@@ -2075,23 +2019,19 @@
 msgid ""
 "<p>\n"
 "The <b>driver</b> determines that the right data is produced for the\n"
-"specific printer model.<br>"
-"\n"
+"specific printer model.<br>\n"
 "If a wrong driver is assigned, wrong data is sent to the printer\n"
-"which results bad looking printout, chaotic printout, or no printout at all.<br>"
-"\n"
+"which results bad looking printout, chaotic printout, or no printout at all.<br>\n"
 "Initially the input field for the driver search string is preset\n"
 "with the autodetected model name of the currently selected connection\n"
 "and those drivers where the driver description matches to the model name\n"
-"are shown by default.<br>"
-"\n"
+"are shown by default.<br>\n"
 "If driver descriptions match to the autodetected model name\n"
 "and if all matching driver descriptions seem to belong to the same model,\n"
 "the driver descriptions are sorted so that the most reasonable driver\n"
 "should be listed topmost and this one is automatically preselected.\n"
 "If no driver is automatically preselected, you must manually\n"
-"find and select an appropriate driver.<br>"
-"\n"
+"find and select an appropriate driver.<br>\n"
 "On the other hand if a driver was automatically preselected,\n"
 "it does not necessarily mean that this driver is\n"
 "a reasonable driver for your particular needs.\n"
@@ -2101,19 +2041,16 @@
 "can only work based upon comparison of strings\n"
 "(the autodetected model name and the driver descriptions)\n"
 "so that the result can be only a best-guess proposal\n"
-"how to set up your particular printer model.<br>"
-"\n"
+"how to set up your particular printer model.<br>\n"
 "Therefore check if the currently preselected values make sense\n"
 "and feel free to play around and modify the settings\n"
-"to what you know what works best for your printer.<br>"
-"\n"
+"to what you know what works best for your printer.<br>\n"
 "If no driver description matches to the autodetected model name,\n"
 "it does not necessarily mean that there is no driver available for the model.\n"
 "Often only the model name in the driver descriptions\n"
 "is different from the autodetected model name.\n"
 "Therefore you can enter whatever you like as driver search string\n"
-"and search through all available driver descriptions.<br>"
-"\n"
+"and search through all available driver descriptions.<br>\n"
 "Usually the default driver option settings should be reasonable\n"
 "so that the driver works for your particular printer model.\n"
 "Some driver option settings must match to your particular printer.\n"
@@ -2130,23 +2067,19 @@
 msgstr ""
 "<p>\n"
 "Ein <b>drivar</b> sørgar for at ein spesifikk skrivermodell\n"
-"vert med forsynt riktige data.<br>"
-"\n"
+"vert med forsynt riktige data.<br>\n"
 "Viss feil driv tilordnes, vert feil data sendt til skrivaren,\n"
-"noko som resulterer i utskrifter av dårleg kvalitet, kaotiske utskrifter eller ingen utskrift i det heile.<br>"
-"\n"
+"noko som resulterer i utskrifter av dårleg kvalitet, kaotiske utskrifter eller ingen utskrift i det heile.<br>\n"
 "Redigeringsfeltet for driversøkestrengen vert automatisk utfylt\n"
 "med modellnavnet på den tilkoblede og valde skrivaren\n"
 "og drivarane med driverbeskrivelser som svarar til modellnavnet,\n"
-"vert viste som standard.<br>"
-"\n"
+"vert viste som standard.<br>\n"
 "Viss driverbeskrivelsene tilsvarer modellnavnet som vart funne automatisk\n"
 "og viss det ser ut til at alle samsvarande driverbeskrivelser tilhøyrer same modell,\n"
 "vert driverbeskrivelsene sortert slik at den meste fornuftige drivaren\n"
 "som oftast er oppførd først og er forhåndsvalgt.\n"
 "Viss ingen drivar er automatisk forhåndsvalgt, må du\n"
-"finna og velja ein eigna drivar manuelt.<br>"
-"\n"
+"finna og velja ein eigna drivar manuelt.<br>\n"
 "On the other hand if a driv was automatically preselected,\n"
 "it does nót necessarily mean that this driv is\n"
 "a reasonable driv for your particular needs.\n"
@@ -2156,19 +2089,16 @@
 "can only work based upon comparison of strings\n"
 "(the autodetected model name and the driv descriptions)\n"
 "so that the result can be only a best-guess proposal\n"
-"how to set up your particular printar model.<br>"
-"\n"
+"how to set up your particular printar model.<br>\n"
 "Therefore check if the currently preselected values make sense\n"
 "and feel free to play around and modify the settings\n"
-"to what you know what works best for your printar.<br>"
-"\n"
+"to what you know what works best for your printar.<br>\n"
 "If no driv description matchast to the autodetected model name,\n"
 "it does nót necessarily mean that there is no driv available for the model.\n"
 "Often only the model name in the driv descriptions\n"
 "is different from the autodetected model name.\n"
 "Therefore you can enter whatever you like as driv search string\n"
-"and search through all available drivar descriptions.<br>"
-"\n"
+"and search through all available drivar descriptions.<br>\n"
 "Usually the default driv option settings should be reasonable\n"
 "so that the drivar works for your particular printar model.\n"
 "Some driv option settings musa match to your particular printar.\n"
@@ -2189,16 +2119,14 @@
 msgid ""
 "<p>\n"
 "Application programs do not show the actual printer device\n"
-"but its associated <b>queue name</b>.<br>"
-"\n"
+"but its associated <b>queue name</b>.<br>\n"
 "Only letters (a-z and A-Z), numbers (0-9), and the underscore '_'\n"
 "are allowed for the queue name and it must start with a letter.\n"
 "</p>"
 msgstr ""
 "<p>\n"
 "Programma viser ikkje sjølve skriverenheten,\n"
-"men eit <b>kønavn</b> som er tilordnet skrivaren.<br>"
-"\n"
+"men eit <b>kønavn</b> som er tilordnet skrivaren.<br>\n"
 "Berre bokstavar (A-Z og a-z), tal (0-9 og understrek '_')\n"
 "er tillatne i kønavnet, og namnet må byrja med ein bokstav.\n"
 "</p>"
@@ -2208,36 +2136,30 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"One of the print queues may be set to be <b>used by default</b>.<br>"
-"\n"
+"One of the print queues may be set to be <b>used by default</b>.<br>\n"
 "Application programs should use such a system default print queue\n"
 "if no other print queue was specified by the user.\n"
 "But there is no such thing as the 'one and only' default queue.\n"
 "Beside a system default queue any user can maintain his own\n"
 "default queue setting and furthermore any application program\n"
 "may implement its own particular way of default queue setting\n"
-"(e.g. the application may remember the previously used queue).<br>"
-"\n"
+"(e.g. the application may remember the previously used queue).<br>\n"
 "For details see the openSUSE support database\n"
-"article 'Print Settings with CUPS' at<br>"
-"\n"
+"article 'Print Settings with CUPS' at<br>\n"
 "http://en.opensuse.org/SDB:Print_Settings_with_CUPS\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"Ein av utskriftskøene kan <b>veljast som standard</b>.<br>"
-"\n"
+"Ein av utskriftskøene kan <b>veljast som standard</b>.<br>\n"
 "Installerte program skal bruka denne systemstandardkøen automatisk\n"
 "viss ikkje ein annan køa angjevast av brukaren.\n"
 "Men det kan vera meir enn 'ein ein einaste' standardkø.\n"
 "I tillegg til systemstandardkøen kan kvar enkelt brukar ha sin eigen\n"
 "standardkø, og enkeltprogrammer\n"
 "kan òg ha sin eiga innstilling for standardkø\n"
-"(programmet kan t.d. hugsa den køen som vart brukt sist).<br>"
-"\n"
+"(programmet kan t.d. hugsa den køen som vart brukt sist).<br>\n"
 "openSUSE support database inneheld meir informasjon i\n"
-"artikklen 'Print Settings with CUP sin' på<br>"
-"\n"
+"artikklen 'Print Settings with CUP sin' på<br>\n"
 "http://ein.opensuse.org/SDB:Print_settings_with_cUPs\n"
 "</p>"
 
@@ -2246,8 +2168,7 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"An alternative way to set up HP devices is to <b>run hp-setup</b>.<br>"
-"\n"
+"An alternative way to set up HP devices is to <b>run hp-setup</b>.<br>\n"
 "HP's own tool 'hp-setup' provides setup support in particular\n"
 "for HP printers and HP all-in-one devices which require\n"
 "a proprietary driver plugin to be downloaded from HP and\n"
@@ -2255,17 +2176,14 @@
 "Furthermore 'hp-setup' can provide better setup support\n"
 "for HP network printers and HP all-in-one network devices\n"
 "because HP's own tool can implement special handling\n"
-"for special HP network devices.<br>"
-"\n"
+"for special HP network devices.<br>\n"
 "For details see the openSUSE support database\n"
-"article 'How to set-up a HP printer' at<br>"
-"\n"
+"article 'How to set-up a HP printer' at<br>\n"
 "http://en.opensuse.org/SDB:How_to_set-up_a_HP_printer\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"Ein annan måte å setja opp HP-einingar på  er med kommandoen <b>run hp-setup</b>.<br>"
-"\n"
+"Ein annan måte å setja opp HP-einingar på  er med kommandoen <b>run hp-setup</b>.<br>\n"
 "HPs eige 'hp-setup'-verktøy er spesielt eigna for oppsett\n"
 "av HP-skrivarar og HP all-i-eit-einingar som krev\n"
 "at eit proprietært driverinnstikk lastast ned frå HP og\n"
@@ -2273,11 +2191,9 @@
 "'hp-setup' kan dessutan gje betre støtte\n"
 "for HP nettverksskrivere og HP alt-i-eit-nettverksenheter\n"
 "fordi HPs eige verktøy kan implementera spesielle funksjonar\n"
-"for einskilde HP-nettverksenheter.<br>"
-"\n"
+"for einskilde HP-nettverksenheter.<br>\n"
 "openSUSE support database inneheld meir informasjon i\n"
-"artikkelen 'How to set-up a HP printar' på<br>"
-"\n"
+"artikkelen 'How to set-up a HP printar' på<br>\n"
 "http://ein.opensuse.org/SDB:How_to_seit-up_a_hP_printer\n"
 "</p>"
 
@@ -2286,17 +2202,13 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Modify a Print Queue</big></b><br>"
-"\n"
-"To modify a queue, select only what you really want to be changed.<br>"
-"\n"
+"<b><big>Modify a Print Queue</big></b><br>\n"
+"To modify a queue, select only what you really want to be changed.<br>\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Endre ein utskriftskø</big></b><br>"
-"\n"
-"Vel berre det du vil endra når du endrar ein utskriftskø.<br>"
-"\n"
+"<b><big>Endre ein utskriftskø</big></b><br>\n"
+"Vel berre det du vil endra når du endrar ein utskriftskø.<br>\n"
 "</p>"
 
 #. BasicModifyDialog help 2/4:
@@ -2304,27 +2216,22 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"The <b>connection</b> determines how data is sent to the printer device.<br>"
-"\n"
+"The <b>connection</b> determines how data is sent to the printer device.<br>\n"
 "If a wrong connection is selected, no data can be sent to the device\n"
-"so that there cannot be any printout.<br>"
-"\n"
+"so that there cannot be any printout.<br>\n"
 "If a printer device is accessible via more than one connection type,\n"
-"it is shown for each connection type.<br>"
-"\n"
+"it is shown for each connection type.<br>\n"
 "In particular HP devices are often accessible both via the 'usb:/...'\n"
 "and the 'hp:/...' connection.\n"
 "The latter is provided by the HP driver package 'hplip'.\n"
 "For plain printing, both kinds of connections should work, but for anything else\n"
 "(e.g. device status via 'hp-toolbox' or scanning with a HP all-in-one device)\n"
-"the 'hp:/...' connection must be used.<br>"
-"\n"
+"the 'hp:/...' connection must be used.<br>\n"
 "When you exchange the currently used connection with another one,\n"
 "the input field for the driver search string is preset\n"
 "with the autodetected model name of the new selected connection.\n"
 "The drivers for which the driver description matches the model name\n"
-"are shown by default.<br>"
-"\n"
+"are shown by default.<br>\n"
 "If driver descriptions match the autodetected model name\n"
 "and if all matching driver descriptions seem to belong to the same model,\n"
 "the driver descriptions are sorted so that the most reasonable driver\n"
@@ -2335,43 +2242,35 @@
 "printer model. The automated driver selection\n"
 "compares strings (the autodetected model name and the driver \n"
 "descriptions) so the result can only be a best-guess proposal\n"
-"how to set up your particular printer model.<br>"
-"\n"
+"how to set up your particular printer model.<br>\n"
 "Therefore check if the currently preselected values make sense.\n"
 "Feel free to play around and modify the settings\n"
-"to what you know works best for your printer.<br>"
-"\n"
+"to what you know works best for your printer.<br>\n"
 "If no driver description matches the autodetected model name, it does \n"
 "not necessarily mean that there is no driver available for the model.\n"
 "Often the model name in the driver descriptions\n"
 "is different from the autodetected model name.\n"
 "Therefore you can enter whatever you like as driver search string\n"
 "and search through all available driver descriptions.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"Ein <b>tilkobling</b> avgjer korleis data vert send til skriverenheten.<br>"
-"\n"
+"Ein <b>tilkobling</b> avgjer korleis data vert send til skriverenheten.<br>\n"
 "Viss feil tilkobling vert vald, kan ingen data sendast til eininga,\n"
-"og ingen utskrifter vil utførast.<br>"
-"\n"
+"og ingen utskrifter vil utførast.<br>\n"
 "Viss ein skriverenhet er tilgjengeleg via meir enn éin tilkoblingstype,\n"
-"vert viste han under kvar tilkoblingstype.<br>"
-"\n"
+"vert viste han under kvar tilkoblingstype.<br>\n"
 "Spesielt HP-einingar er ofte tilgjengelege både vigde 'usb:/…'-\n"
 "og 'hp:/…'-tilkoblinger.\n"
 "Sistnemnde er tilgjengeleg med HP-driverpakken 'hplip'.\n"
 "For enkle utskrifter bør begge typane fungera, men for alt anna\n"
 "(t.d. enhetsstatus vigde 'hp-toolbox' eller skanning med ein HP alt-i-ei-eining)\n"
-"må 'hp:/…'-tilkoblingen vert nytta.<br>"
-"\n"
+"må 'hp:/…'-tilkoblingen vert nytta.<br>\n"
 "Når du erstattar gjeldande tilkobling med ein annan,\n"
 "vert redigeringsfeltet for driversøkestrengen automatisk utfylt\n"
 "med namnet på den automatiske registrerte modellen med den nye tilkoblingen, \n"
 "og drivarane som samsvarer med han tilkoblede og valde skrivaren,\n"
-"vert vist som standard.<br>"
-"\n"
+"vert vist som standard.<br>\n"
 "Viss driverbeskrivelsene samsvarer med den automatiske registrerte modellen\n"
 "og det verkar som alle samsvarande driverbeskrivelser tilhøyrer same modell,\n"
 "vert sortert driverbeskrivelsene slik at den meste fornuftige drivaren\n"
@@ -2384,12 +2283,10 @@
 "berre fungerer ved å samanlikna søkestrenger\n"
 "(det automatisk registrerte modellnavnet og driverbeskrivelsene),\n"
 "slik at resultatet berre kan vera eit forslag om\n"
-"korleis din skrivermodell kan vert opp sett.<br>"
-"\n"
+"korleis din skrivermodell kan vert opp sett.<br>\n"
 "Kontrollar difor om dei forhåndsvalgte verda verkar fornuftige\n"
 "og eksperiment gjerne med innstillingane\n"
-"for å finne fram til det som fungerer best med skrivaren.<br>"
-"\n"
+"for å finne fram til det som fungerer best med skrivaren.<br>\n"
 "Viss ingen driverbeskrivelse samsvarer med det automatisk registrerte modellnavnet,\n"
 "tyder det ikkje naudsynlegvis at det ikkje finst nokon driv for den aktuelle modellen.\n"
 "Det er ofte berre modellnavnet i driverbeskrivelsen\n"
@@ -2404,32 +2301,26 @@
 msgid ""
 "<p>\n"
 "The <b>driver</b> determines that the right data is produced for the\n"
-"specific printer model.<br>"
-"\n"
+"specific printer model.<br>\n"
 "If a wrong driver is assigned, wrong data is sent to the printer\n"
-"which results bad looking printout, chaotic printout, or no printout at all.<br>"
-"\n"
+"which results bad looking printout, chaotic printout, or no printout at all.<br>\n"
 "You can either select another driver and modify its driver option settings later\n"
-"or keep the currently used driver and modify its driver option settings now.<br>"
-"\n"
+"or keep the currently used driver and modify its driver option settings now.<br>\n"
 "Some driver option settings must match to your particular printer.\n"
 "For example the default paper size setting of the driver\n"
-"must match to the paper which is actually loaded in your printer.<br>"
-"\n"
+"must match to the paper which is actually loaded in your printer.<br>\n"
 "For other driver option settings you can choose what you like.\n"
 "For example any choice of the available printing resolutions\n"
 "should work for the particular driver.\n"
 "Nevertheless it may happen that your particular printer fails to print\n"
 "with high resolution. For example when you have a laser printer\n"
-"which has insufficient built-in memory to process high resolution pages.<br>"
-"\n"
+"which has insufficient built-in memory to process high resolution pages.<br>\n"
 "When you exchange the currently used driver by another one,\n"
 "you must first apply this change to the print queue\n"
 "so that the new driver is used for the queue\n"
 "(i.e. you must finish this dialog as a first step)\n"
 "and then in a second step you can adjust all driver options\n"
-"by using this dialog again.<br>"
-"\n"
+"by using this dialog again.<br>\n"
 "Initially the input field for the driver search string is preset\n"
 "with the description of the currently used driver when the connection was not changed.\n"
 "This results usually only one single driver which matches\n"
@@ -2442,32 +2333,26 @@
 msgstr ""
 "<p>\n"
 "Ein <b>drivar</b> sørgar for at riktig informasjon vert produsert for\n"
-"ein spesifikk skrivermodell.<br>"
-"\n"
+"ein spesifikk skrivermodell.<br>\n"
 "Viss feil drivar er vald, vil feil informasjon sendast til skrivaren,\n"
-"noko som vil gje eit dårleg utskriftsresultat eller ingen utskrift i det heile.<br>"
-"\n"
+"noko som vil gje eit dårleg utskriftsresultat eller ingen utskrift i det heile.<br>\n"
 "Du kan anten velja ein annan driv og endra driverinnstillingene seinare,\n"
-"eller halda på gjeldande driv og endra driverinnstillingene no.<br>"
-"\n"
+"eller halda på gjeldande driv og endra driverinnstillingene no.<br>\n"
 "Nokre driverinnstillinger må samsvara med skrivaren du brukar.\n"
 "Standard papirstørrelse for drivaren må til dømes\n"
-"samsvara med papiret som faktisk er lagt inn i skrivaren.<br>"
-"\n"
+"samsvara med papiret som faktisk er lagt inn i skrivaren.<br>\n"
 "For andre driverinnstillinger, kan du velja kva du foretrekker.\n"
 "Du kan til dømes vel kva for ein som helst av\n"
 "oppløsningsvalgene som er tilgjengelege for drivaren.\n"
 "Det kan likevel henda at utskrift mislukkast viss du vel\n"
 "for høg oppløysing, til dømes viss du har ein laserskriver\n"
-"som ikkje har nok minne til å produsera sider med høg oppløysing.<br>"
-"\n"
+"som ikkje har nok minne til å produsera sider med høg oppløysing.<br>\n"
 "Når du erstattar gjeldande driv med ein annan,\n"
 "må du først aktivera denne endringa for utskriftskøen\n"
 "slik at den nye drivaren vert brukt for køen\n"
 "(dvs. at du først må fullføra denne dialogen),\n"
 "og deretter justera alle drivervalg i neste trinn\n"
-"ved å gå tilbake til denne dialogen.<br>"
-"\n"
+"ved å gå tilbake til denne dialogen.<br>\n"
 "Redigeringsfeltet for driversøkestrengen er forhåndsutfylt\n"
 "med skildringa for drivaren som vart brukt før tilkoblingen vart endra.\n"
 "Dette resulterer normalt i éin enkelt samsvarande drivar,\n"
@@ -2516,30 +2401,23 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Set Driver Options</big></b><br>"
-"\n"
+"<b><big>Set Driver Options</big></b><br>\n"
 "Usually it is best to leave the driver defaults because\n"
-"the defaults should be reasonable for most cases.<br>"
-"\n"
+"the defaults should be reasonable for most cases.<br>\n"
 "Additionally, the print dialogs in most applications\n"
 "show the driver options too so that each user can specify\n"
-"driver options for each individual printout.<br>"
-"\n"
+"driver options for each individual printout.<br>\n"
 "The only setting which should be checked in any case is the paper size,\n"
 "which must be set to what is actually used by default in the printer.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b><big>Definera drivervalg</big></b><br>"
-"\n"
+"<b><big>Definera drivervalg</big></b><br>\n"
 "Det er vanlegvis best å bruka standardinnstillingene fordi\n"
-"desse bør fungera bra for vanleg utskrift.<br>"
-"\n"
+"desse bør fungera bra for vanleg utskrift.<br>\n"
 "Utskriftsdialogene i dei vanlegaste programmen viser dessutan\n"
 "òg drivervalgene, slik at brukaren kan angje\n"
-"drivervalg for kvar enkelt utskrift.<br>"
-"\n"
+"drivervalg for kvar enkelt utskrift.<br>\n"
 "Han einaste innstillignen som alltid bør kontrollerast, er papirstørrelsen.\n"
 "Han bør alltid samsvara med papirstørrelsen som faktisk vert brukt i skrivaren.\n"
 "</p>"
@@ -2550,22 +2428,17 @@
 msgid ""
 "<p>\n"
 "Non-default settings may not work in all cases or have unexpected\n"
-"consequences.<br>"
-" \n"
+"consequences.<br> \n"
 "For example, a high resolution setting may not work for a laser printer\n"
 "when its default built-in memory is insufficient to process high resolution\n"
-"pages.<br>"
-" \n"
+"pages.<br> \n"
 "Or a high quality setting may print intolerably slow on an inkjet printer.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"Det er ikkje sikkert at andre val enn standardinnstillingene fungerer, og dei kan gje uventa resultat.<br>"
-"\n"
+"Det er ikkje sikkert at andre val enn standardinnstillingene fungerer, og dei kan gje uventa resultat.<br>\n"
 "Det er t.d. ikkje sikkert at høg oppløysing fungerer for ein laserskriver\n"
-"dersom skrivaren sin internminne ikkje er tilstrekkeleg for å produsera sider med høg oppløysing,<br>"
-"\n"
+"dersom skrivaren sin internminne ikkje er tilstrekkeleg for å produsera sider med høg oppløysing,<br>\n"
 "eller utskrif av høg kvalitet kan føra til svært treig handsaming i ein blekkskriver.\n"
 "</p>"
 
@@ -2575,25 +2448,20 @@
 msgid ""
 "<p>\n"
 "In certain cases printer-specific driver settings\n"
-"must be adjusted to get the full functionality of a printer.<br>"
-"\n"
+"must be adjusted to get the full functionality of a printer.<br>\n"
 "In particular, when the printer has optional units installed like\n"
 "a duplex unit or optional paper feeders, the respective driver settings\n"
-"should be checked and adjusted.<br>"
-"\n"
+"should be checked and adjusted.<br>\n"
 "For example, a duplex unit option must be set to 'installed' or 'true'\n"
 "otherwise the driver may ignore duplex printing option settings.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Men i nokre tilfelle må skriverspesifikke driverinnstillinger\n"
-"brukast for å få fullt utbytta av funksjonane til skrivaren.<br>"
-"\n"
+"brukast for å få fullt utbytta av funksjonane til skrivaren.<br>\n"
 "Dette gjeld spesielt viss det er montert tilleggsenheter på skrivaren, som\n"
 "einingar for tosidig utskrift eller ekstra papirmatere. Då bør driverinnstillingene\n"
-"kontrollerast og vert justert.<br>"
-"\n"
+"kontrollerast og vert justert.<br>\n"
 "Valet for ein duplex-eining må t.d. kanskje verta til sett 'installed' eller 'truga'.\n"
 "Elles kan det henda at drivaren ikkje brukar innstillingane for tosidig utskrift.\n"
 "</p>"
@@ -2603,30 +2471,23 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Add or Remove Printer Driver Packages</big></b><br>"
-"\n"
+"<b><big>Add or Remove Printer Driver Packages</big></b><br>\n"
 "If a printer driver package is not marked, it is not installed.\n"
-"Select the package if you want to install it.<br>"
-"\n"
+"Select the package if you want to install it.<br>\n"
 "If a printer driver package is marked, it is installed.\n"
 "Deselect the package if you want to remove it.\n"
 "In the latter case, make sure that there is no printer configuration \n"
-"which needs the driver.<br>"
-"\n"
-"</p>"
-"\n"
+"which needs the driver.<br>\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-" <b><big>Legg til eller fjern skriverdrivere</big></b><br>"
-"\n"
+" <b><big>Legg til eller fjern skriverdrivere</big></b><br>\n"
 " Viss ein skriverdriver ikkje er merkte, er han ikkje installert,\n"
-" og du kan velja han for installasjon.<br>"
-"\n"
+" og du kan velja han for installasjon.<br>\n"
 " Viss ein skriverdriver er merkt, er han installert\n"
 " og du kan fjerne merkingen for å fjerne henne.\n"
 " I så fall må du forsikra deg om\n"
-" at det ikkje er noko oppsett som treng drivaren.<br>"
-"\n"
+" at det ikkje er noko oppsett som treng drivaren.<br>\n"
 " </p>"
 
 #. AddDriverDialog help 2/2:
@@ -2634,19 +2495,15 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Add a Printer Description File</big></b><br>"
-"\n"
+"<b><big>Add a Printer Description File</big></b><br>\n"
 "To set up a printer configuration, a printer description file\n"
-"(PPD file) is required.<br>"
-"\n"
+"(PPD file) is required.<br>\n"
 "If a PPD file is not located in the /usr/share/cups/model/ directory,\n"
 "it is not available to set up a printer configuration with it.\n"
 "Therefore you can specify the full path of a PPD file,\n"
 "which is located elsewhere on your system, to get it installed\n"
-"in the /usr/share/cups/model/ directory.<br>"
-"\n"
-"Note that a printer description file is not a driver.<br>"
-"\n"
+"in the /usr/share/cups/model/ directory.<br>\n"
+"Note that a printer description file is not a driver.<br>\n"
 "For non-PostScript printers the PPD file alone is\n"
 "not sufficient to set up a working printer configuration.\n"
 "In particular, it does not work for non-PostScript printers\n"
@@ -2657,31 +2514,24 @@
 "For non-PostScript printers, you need a printer driver\n"
 "and a PPD file which matches exactly the particular driver.\n"
 "Matching PPD files are automatically installed at the right place\n"
-"when you install the above mentioned printer driver packages.<br>"
-"\n"
+"when you install the above mentioned printer driver packages.<br>\n"
 "Only for PostScript printers, a PPD file alone is usually\n"
 "sufficient to set up a working PostScript printer configuration.\n"
 "In particular, it is sufficient when the PPD file does not\n"
 "contain a 'cupsFilter' entry because such an entry would\n"
-"reference a printer driver.<br>"
-"\n"
-"</p>"
-"\n"
+"reference a printer driver.<br>\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-" <b><big>Legg til ein skriverbeskrivelsesfil</big></b><br>"
-"\n"
+" <b><big>Legg til ein skriverbeskrivelsesfil</big></b><br>\n"
 " For å setja opp ein skrivar krevjast det ein skriverbeskrivelsesfil\n"
-" (PPD-fil).<br>"
-"\n"
+" (PPD-fil).<br>\n"
 " Viss ein PPD-fil ikkje finst i /usr/share/cup sin/model/ directory,\n"
 " er han ikkje tilgjengeleg for bruk i eit skriveroppsett.\n"
 " Difor kan du angje heile filstien til ein PPD-fil\n"
 " dersom han er plassert eit annan stad i systemet, slik at han vert installert\n"
-" i katalogen /usr/share/cup sin/model/.<br>"
-"\n"
-" Hugs at ein skriverbeskrivelsesfil ikkje er ein driv.<br>"
-"\n"
+" i katalogen /usr/share/cup sin/model/.<br>\n"
+" Hugs at ein skriverbeskrivelsesfil ikkje er ein driv.<br>\n"
 " For ikkje-PostScript-skrivarar er ikkje PPD-fila åleine\n"
 " tilstrekkeleg for eit fungerande skriveroppsett.\n"
 " For ikkje-PostScript-skrivarar fungerer det ikkje\n"
@@ -2692,14 +2542,12 @@
 " For ikkje-PostScript-skrivarar treng du ein skriverdriver\n"
 " og ein PPD-fil som samsvarer nøyaktig med denne drivaren.\n"
 " Samsvarande PPD-filer installerast automatisk på riktig stad\n"
-" når du installerer dei aktuelle skriverdriverpakkene.<br>"
-"\n"
+" når du installerer dei aktuelle skriverdriverpakkene.<br>\n"
 " For PostScript-skrivarar er berre ein PPD-fil vanlegvis\n"
 " tilstrekkeleg for å setja opp ein fungerande skrivar.\n"
 " Dette gjeld spesielt dersom PPD-fila ikkje\n"
 " innholder ein 'cupsFilter'-oppføring. Ein sånn oppføring kan referera\n"
-" til ein skriverdriver.<br>"
-"\n"
+" til ein skriverdriver.<br>\n"
 " </p>"
 
 #. ConnectionWizardDialog help 1/7:
@@ -2707,20 +2555,15 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Specify the Connection</big></b><br>"
-"\n"
-"The <b>connection</b> determines how data is sent to the printer device.<br>"
-"\n"
+"<b><big>Specify the Connection</big></b><br>\n"
+"The <b>connection</b> determines how data is sent to the printer device.<br>\n"
 "If a wrong connection is used, no data can be sent to the device\n"
 "so that there cannot be any printout.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b><big>Angje tilkobling</big></b><br>"
-"\n"
-"<b>Tilkobling</b> angjev korleis data vert send til skrivaren.<br>"
-"\n"
+"<b><big>Angje tilkobling</big></b><br>\n"
+"<b>Tilkobling</b> angjev korleis data vert send til skrivaren.<br>\n"
 "Viss feil tilkoblingstype vert vald, kan ingen informajon sendast til skrivaren,\n"
 "og ingen utskrift vil vera mogleg.\n"
 "</p>"
@@ -2730,88 +2573,60 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Printer Device URI</big></b><br>"
-"\n"
-"A connection is specified as so called <b>device URI</b>.<br>"
-"\n"
+"<b><big>Printer Device URI</big></b><br>\n"
+"A connection is specified as so called <b>device URI</b>.<br>\n"
 "Its first word (the so called URI scheme) specifies the kind of data-transfer,\n"
-"for example 'usb', 'socket', 'lpd', or 'ipp'.<br>"
-"\n"
+"for example 'usb', 'socket', 'lpd', or 'ipp'.<br>\n"
 "After the scheme there are more or less additional components\n"
-"which specify the details for this kind of data-transfer.<br>"
-"\n"
+"which specify the details for this kind of data-transfer.<br>\n"
 "Space characters are not allowed in an URI.\n"
 "Therefore a space character in a value of an URI component\n"
-"is encoded as '%20' (20 is the hexadecimal value of the space character).<br>"
-"\n"
+"is encoded as '%20' (20 is the hexadecimal value of the space character).<br>\n"
 "The components of an URI are separated by special reserved characters like\n"
-"colon ':', slash '/', question mark '?', ampersand '&', or equals sign '='.<br>"
-"\n"
+"colon ':', slash '/', question mark '?', ampersand '&', or equals sign '='.<br>\n"
 "Finally there could be optional parameters (separated by a question mark '?')\n"
 "of the form 'option1=value1&option2=value2&option3=value3' so that\n"
-"a full device URI could be for example:<br>"
-"\n"
-"ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false<br>"
-"\n"
-"Some examples:<br>"
-"\n"
+"a full device URI could be for example:<br>\n"
+"ipp://server.domain:631/printers/queuename?waitjob=false&waitprinter=false<br>\n"
+"Some examples:<br>\n"
 "A USB printer model 'Fun Printer 1000+' made by 'ACME'\n"
-"with serial number 'A1B2C3' may have a device URI like:<br>"
-"\n"
-"usb://ACME/Fun%20Printer%201000%2B?serial=A1B2C3<br>"
-"\n"
+"with serial number 'A1B2C3' may have a device URI like:<br>\n"
+"usb://ACME/Fun%20Printer%201000%2B?serial=A1B2C3<br>\n"
 "A network printer with IP 192.168.100.1 which is accessible\n"
-"via port 9100 may have a device URI like:<br>"
-"\n"
-"socket://192.168.100.1:9100<br>"
-"\n"
+"via port 9100 may have a device URI like:<br>\n"
+"socket://192.168.100.1:9100<br>\n"
 "A network printer with IP 192.168.100.2 which is accessible\n"
 "via LPD protocol with a remote LPD queue name 'LPT1'\n"
-"may have a device URI like:<br>"
-"\n"
+"may have a device URI like:<br>\n"
 "lpd://192.168.100.2/LPT1\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>URI for skriverenhet</big></b><br>"
-"\n"
-"Ein tilkobling vert angjevne som ein såklat <b>eining si-URI</b>.<br>"
-"\n"
+"<b><big>URI for skriverenhet</big></b><br>\n"
+"Ein tilkobling vert angjevne som ein såklat <b>eining si-URI</b>.<br>\n"
 "Det første ordet (såkalla URI-skjema) angjev dataoverføringstypen,\n"
-"til dømes 'parallel', 'usb', 'socket', 'lpd' eller 'ipp'.<br>"
-"\n"
+"til dømes 'parallel', 'usb', 'socket', 'lpd' eller 'ipp'.<br>\n"
 "Etter skjemaet kan det vera få eller mange ekstra komponentar\n"
-"som spesifiserer den aktuelle dataoverføringstypen meir detaljert.<br>"
-"\n"
+"som spesifiserer den aktuelle dataoverføringstypen meir detaljert.<br>\n"
 "Mellomrom er ikkje tillaten i ein URI.\n"
 "Difor er eit mellomromtegn i ein URI-komponent\n"
-"koda som '%20' (20 er heksadesimalverdien for mellomromtegnet).<br>"
-"\n"
+"koda som '%20' (20 er heksadesimalverdien for mellomromtegnet).<br>\n"
 "Komponentane i ein URI er adskilt av spesielle teikn som\n"
-"kolon ':', skråstrek '/', spørsmålstegn '?', eit '&' eller er lik-teikna '='.<br>"
-"\n"
+"kolon ':', skråstrek '/', spørsmålstegn '?', eit '&' eller er lik-teikna '='.<br>\n"
 "Til slutt kan det vera valfrie parametrar (adskilt av eit spørsmålstegn '?')\n"
 "eller forma 'option1=verd1&option2=verd2&option3=verd3' slik at\n"
-"ei fullstendig eining si-URI til dømes kan vera:<br>"
-"\n"
-"ipp://servar.domane:631/skrivarar/kønavn?waitjob=falsa&waitprinter=falsa<br>"
-"\n"
-"Nokre døme:<br>"
-"\n"
+"ei fullstendig eining si-URI til dømes kan vera:<br>\n"
+"ipp://servar.domane:631/skrivarar/kønavn?waitjob=falsa&waitprinter=falsa<br>\n"
+"Nokre døme:<br>\n"
 "Ein USB-skrivermodell 'Fun Printar 1000+' produsert av 'ACME'\n"
-"med serienummer 'A1B2C3' kan ha eining si-URI:<br>"
-"\n"
-"usb://ACME/Fun%20Printar%201000%2B?Seriell=A1B2C3<br>"
-"\n"
+"med serienummer 'A1B2C3' kan ha eining si-URI:<br>\n"
+"usb://ACME/Fun%20Printar%201000%2B?Seriell=A1B2C3<br>\n"
 "A nettverk printar med IP 192.168.100.1 which er accessible\n"
-"vigd pellert 9100 may har a Eining URI like:<br>"
-"\n"
-"socket://192.168.100.1:9100<br>"
-"\n"
+"vigd pellert 9100 may har a Eining URI like:<br>\n"
+"socket://192.168.100.1:9100<br>\n"
 "A nettverk printar med IP 192.168.100.2 which er accessible\n"
 "vigd LPD Protokoll med a ekstern LPD queue Namn 'LPT1'\n"
-"may har a Eining URI like:<br>"
-"\n"
+"may har a Eining URI like:<br>\n"
 "lpd://192.168.100.2/LPT1\n"
 "</p>"
 
@@ -2820,8 +2635,7 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Percent Encoding</big></b><br>"
-"\n"
+"<b><big>Percent Encoding</big></b><br>\n"
 "The issue is complicated.\n"
 "It is recommended to avoid reserved characters and spaces\n"
 "for component values in URIs if the values are under your control\n"
@@ -2836,11 +2650,9 @@
 "(e.g. only letters, digits, and underscore are known to work\n"
 "for a CUPS print queue name and case is not significant there).\n"
 "Therefore it is best to use only lowercase letters, digits,\n"
-"and underscore for all values in all URIs if possible.<br>"
-"\n"
+"and underscore for all values in all URIs if possible.<br>\n"
 "Reserved characters and space characters in the value of a component\n"
-"must be percent-encoded (also known as URL encoding).<br>"
-"\n"
+"must be percent-encoded (also known as URL encoding).<br>\n"
 "When an input field in the dialog is intended to enter\n"
 "only a single value for a single component of the URI\n"
 "(e.g. separated input fields for username and password),\n"
@@ -2851,8 +2663,7 @@
 "For example if a password is actually 'Foo%20Bar' (non-percent-encoded),\n"
 "it must be entered literally in the password input field in the dialog.\n"
 "The automated percent-encoding results 'Foo%2520Bar' which is how\n"
-"the value of the password component is actually stored in the URI.<br>"
-"\n"
+"the value of the password component is actually stored in the URI.<br>\n"
 "In contrast when an input field in the dialog is intended to enter\n"
 "more that a single value for a single component of the URI\n"
 "(e.g. a single input field for all optional parameters\n"
@@ -2869,61 +2680,36 @@
 "a first optional parameter 'option=this' and\n"
 "a second optional parameter which is only 'that'.\n"
 "Therefore a single optional parameter 'option=this&that'\n"
-"must be entered percent-encoded as 'option=this%26that'<br>"
-"\n"
+"must be entered percent-encoded as 'option=this%26that'<br>\n"
 "Input fields which require percent-encoded input\n"
-"are denoted by a '[percent-encoded]' hint.<br>"
-"\n"
-"Listing of characters and their percent encoding:<br>"
-"\n"
-"space ' ' is percent encoded as %20<br>"
-"\n"
-"exclamation mark ! is percent encoded as %21<br>"
-"\n"
-"number sign # is percent encoded as %23<br>"
-"\n"
-"Dollar sign $ is percent encoded as %24<br>"
-"\n"
-"percentage % is percent encoded as %25<br>"
-"\n"
-"ampersand & is percent encoded as %26<br>"
-"\n"
-"apostrophe / single quotation mark ' is percent encoded as %27<br>"
-"\n"
-"left parenthesis ( is percent encoded as %28<br>"
-"\n"
-"right parenthesis ) is percent encoded as %29<br>"
-"\n"
-"asterisk * is percent encoded as %2A<br>"
-"\n"
-"plus sign + is percent encoded as %2B<br>"
-"\n"
-"comma , is percent encoded as %2C<br>"
-"\n"
-"slash / is percent encoded as %2F<br>"
-"\n"
-"colon : is percent encoded as %3A<br>"
-"\n"
-"semicolon ; is percent encoded as %3B<br>"
-"\n"
-"equals sign = is percent encoded as %3D<br>"
-"\n"
-"question mark ? is percent encoded as %3F<br>"
-"\n"
-"at sign @ is percent encoded as %40<br>"
-"\n"
-"left bracket [ is percent encoded as %5B<br>"
-"\n"
-"right bracket ] is percent encoded as %5D<br>"
-"\n"
-"For details see 'Uniform Resource Identifier (URI): Generic Syntax' at<br>"
-"\n"
+"are denoted by a '[percent-encoded]' hint.<br>\n"
+"Listing of characters and their percent encoding:<br>\n"
+"space ' ' is percent encoded as %20<br>\n"
+"exclamation mark ! is percent encoded as %21<br>\n"
+"number sign # is percent encoded as %23<br>\n"
+"Dollar sign $ is percent encoded as %24<br>\n"
+"percentage % is percent encoded as %25<br>\n"
+"ampersand & is percent encoded as %26<br>\n"
+"apostrophe / single quotation mark ' is percent encoded as %27<br>\n"
+"left parenthesis ( is percent encoded as %28<br>\n"
+"right parenthesis ) is percent encoded as %29<br>\n"
+"asterisk * is percent encoded as %2A<br>\n"
+"plus sign + is percent encoded as %2B<br>\n"
+"comma , is percent encoded as %2C<br>\n"
+"slash / is percent encoded as %2F<br>\n"
+"colon : is percent encoded as %3A<br>\n"
+"semicolon ; is percent encoded as %3B<br>\n"
+"equals sign = is percent encoded as %3D<br>\n"
+"question mark ? is percent encoded as %3F<br>\n"
+"at sign @ is percent encoded as %40<br>\n"
+"left bracket [ is percent encoded as %5B<br>\n"
+"right bracket ] is percent encoded as %5D<br>\n"
+"For details see 'Uniform Resource Identifier (URI): Generic Syntax' at<br>\n"
 "http://tools.ietf.org/html/rfc3986\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Prosentkodet</big></b><br>"
-"\n"
+"<b><big>Prosentkodet</big></b><br>\n"
 "Dette er komplisert.\n"
 "Det vert rådt til å unngå reserverte teikn og mellomrom\n"
 "eller komponentverdier i URI-er viss verda er under kontrollen din\n"
@@ -2938,11 +2724,9 @@
 "(t.d. er det berre bokstavar, tall og understrek som heilt sikkert fungerer i eit\n"
 "namn på ein CUP sin-utskriftskø, og her skilst det ikkje mellom små og store bokstavar).\n"
 "Difor er det best å bruka berre små bokstavar, tal,\n"
-"og understrek i alle URI-er viss det er mogleg.<br>"
-"\n"
+"og understrek i alle URI-er viss det er mogleg.<br>\n"
 "Reserverte teikn og mellomromtegn i  verdet for ein komponent\n"
-"må vera prosentkodet (òg kalla URL-koda).<br>"
-"\n"
+"må vera prosentkodet (òg kalla URL-koda).<br>\n"
 "Når eit tekstfelt i ein dialog skal innehalda berre \n"
 "ein eit einskilt verd eller ein einskild komponent i  URI-ein\n"
 "(t.d. adskilte felt for brukernavn og passord),\n"
@@ -2953,8 +2737,7 @@
 "Viss til dømes passordet faktisk er  'Foo%20Bar' (ikkje prosentkodet),\n"
 "må det skrivast inn akkurat sånn i passordfeltet i dialogen.\n"
 "Den automatiske prosentkodingen gjev 'Foo%2520Bar', som er korleis\n"
-"verdet av passordkomponenten vert lagra i URI-ein.<br>"
-"\n"
+"verdet av passordkomponenten vert lagra i URI-ein.<br>\n"
 "Viss derimot tekstfeltet i ein dialog skal innehalda\n"
 "meir enn eit einskilt verd eller ein enkelt URI-komponent,\n"
 "(t.d. eit enkelt tekstfelt for alle valgparametere\n"
@@ -2971,55 +2754,31 @@
 "eit første valgparameter 'option=this' og\n"
 "eit andre valgparameter som berre er 'that'.\n"
 "Difor må ein enkel valgparameter 'option=this&that'\n"
-"prosentkodes som 'option=this%26that'<br>"
-"\n"
+"prosentkodes som 'option=this%26that'<br>\n"
 "Felt som krev prosentkoding,\n"
-"er merkte med '[prosentkodet]'.<br>"
-"\n"
-"Liste over teikn med tilhøyrande prosentkoding:<br>"
-"\n"
-"mellomrom ' ' prosentkodes som %20<br>"
-"\n"
-"utropstegn ! prosentkodes som %21<br>"
-"\n"
-"number sign # is percent encoded as %23<br>"
-"\n"
-"Dollartegnet $ prosentkodes som %24<br>"
-"\n"
-"prosent % prosentkodes som %25<br>"
-"\n"
-"eit & prosentkodes som %26<br>"
-"\n"
-"apostrof / enkelt hermeteikn ' prosentkodes som %27<br>"
-"\n"
-"venstre parentes ( prosentkodes som %28<br>"
-"\n"
-"høgre parentes ) prosentkodes som %29<br>"
-"\n"
-"stjerne * prosentkodes som %2A<br>"
-"\n"
-"plusstegn + prosentkodes som %2B<br>"
-"\n"
-"komma , prosentkodes som %2C<br>"
-"\n"
-"skråstrek / prosentkodes som %2F<br>"
-"\n"
-"kolon : prosentkodes som %3A<br>"
-"\n"
-"semikolon ; prosentkodes som %3B<br>"
-"\n"
-"er lik-teikn = prosentkodes som %3D<br>"
-"\n"
-"spørsmålstegn ? prosentkodes som %3F<br>"
-"\n"
-"alfakrøll @ prosentkodes som %40<br>"
-"\n"
-"venstre hakeparentes [ prosentkodes som %5B<br>"
-"\n"
-"høgre hakeparentes ] prosentkodes som %5D<br>"
-"\n"
-"For meir informasjon, sjå 'Uniform Resource Identifier (URI): Generic på' at<br>"
-"\n"
+"er merkte med '[prosentkodet]'.<br>\n"
+"Liste over teikn med tilhøyrande prosentkoding:<br>\n"
+"mellomrom ' ' prosentkodes som %20<br>\n"
+"utropstegn ! prosentkodes som %21<br>\n"
+"number sign # is percent encoded as %23<br>\n"
+"Dollartegnet $ prosentkodes som %24<br>\n"
+"prosent % prosentkodes som %25<br>\n"
+"eit & prosentkodes som %26<br>\n"
+"apostrof / enkelt hermeteikn ' prosentkodes som %27<br>\n"
+"venstre parentes ( prosentkodes som %28<br>\n"
+"høgre parentes ) prosentkodes som %29<br>\n"
+"stjerne * prosentkodes som %2A<br>\n"
+"plusstegn + prosentkodes som %2B<br>\n"
+"komma , prosentkodes som %2C<br>\n"
+"skråstrek / prosentkodes som %2F<br>\n"
+"kolon : prosentkodes som %3A<br>\n"
+"semikolon ; prosentkodes som %3B<br>\n"
+"er lik-teikn = prosentkodes som %3D<br>\n"
+"spørsmålstegn ? prosentkodes som %3F<br>\n"
+"alfakrøll @ prosentkodes som %40<br>\n"
+"venstre hakeparentes [ prosentkodes som %5B<br>\n"
+"høgre hakeparentes ] prosentkodes som %5D<br>\n"
+"For meir informasjon, sjå 'Uniform Resource Identifier (URI): Generic på' at<br>\n"
 "http://tools.ietf.org/html/rfc3986\n"
 "</p>"
 
@@ -3027,12 +2786,10 @@
 #: src/include/printer/helps.rb:557
 msgid ""
 "<p>\n"
-"<b><big>Device URIs for Directly Connected Devices</big></b><br>"
-"\n"
+"<b><big>Device URIs for Directly Connected Devices</big></b><br>\n"
 "Devices which are connected via USB\n"
 "are autodetected and the appropriate device URI is autogenerated.\n"
-"For example:<br>"
-"\n"
+"For example:<br>\n"
 msgstr ""
 
 #. ConnectionWizardDialog help 5/7:
@@ -3040,26 +2797,20 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Device URIs to Access a Network Printer or a Printserver Box</big></b><br>"
-"\n"
+"<b><big>Device URIs to Access a Network Printer or a Printserver Box</big></b><br>\n"
 "A printserver box is a small device with a network connection\n"
 "and a USB or parallel port connection to connect the actual printer.\n"
 "A network printer has such a device built-in.\n"
 "Access happens via three different network protocols.\n"
 "See the manual of your network printer or printserver box\n"
-"to find out what your particular device supports:<br>"
-"\n"
-"<b>TCP Port (AppSocket/JetDirect)</b><br>"
-"\n"
+"to find out what your particular device supports:<br>\n"
+"<b>TCP Port (AppSocket/JetDirect)</b><br>\n"
 "The IP address and a port number is needed to access it.\n"
 "Often the port number 9100 is the right one.\n"
 "It is the simplest, fastest, and generally the most reliable protocol.\n"
-"The matching device URI is:<br>"
-"\n"
-"socket://ip-address:port-number<br>"
-".\n"
-"<b>Line Printer Daemon (LPD) Protocol</b><br>"
-"\n"
+"The matching device URI is:<br>\n"
+"socket://ip-address:port-number<br>.\n"
+"<b>Line Printer Daemon (LPD) Protocol</b><br>\n"
 "A LPD runs on the device and provides one or more LPD queues.\n"
 "The IP address and a LPD queue name is needed to access it.\n"
 "Almost all network printers and printserver boxes support it.\n"
@@ -3067,50 +2818,36 @@
 "But using a correct LPD queue which does not change\n"
 "the data or add additional formfeeds or banner pages\n"
 "could be essential for reliable printing.\n"
-"The matching device URI is:<br>"
-"\n"
-"lpd://ip-address/queue<br>"
-".\n"
-"<b>Internet Printing Protocol (IPP)</b><br>"
-"\n"
+"The matching device URI is:<br>\n"
+"lpd://ip-address/queue<br>.\n"
+"<b>Internet Printing Protocol (IPP)</b><br>\n"
 "IPP is the native protocol for CUPS running on a real computer,\n"
 "but if IPP is implemented in a small printserver box,\n"
 "it is often not implemented properly. Only use IPP if the vendor\n"
 "actually documents official support for it. \n"
-"The matching device URI is:<br>"
-"\n"
-"ipp://ip-address:port-number/resource<br>"
-".\n"
+"The matching device URI is:<br>\n"
+"ipp://ip-address:port-number/resource<br>.\n"
 "What 'port-number' and 'resource' exactly is depends\n"
-"on the particular network printer or printserver box model.<br>"
-"\n"
-"For <b>more information</b> have a look at<br>"
-"\n"
+"on the particular network printer or printserver box model.<br>\n"
+"For <b>more information</b> have a look at<br>\n"
 "http://www.cups.org/documentation.php/network.html\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b><big>Eining si-URIer for tilgjenge til nettverksskriver eller utskriftsserverboks</big></b><br>"
-"\n"
+"<b><big>Eining si-URIer for tilgjenge til nettverksskriver eller utskriftsserverboks</big></b><br>\n"
 "Ein utskriftsserverboks er ei lita eining med nettverksforbindelse\n"
 "og dessutan USB- eller parallellportforbindelse til sjølve skrivaren.\n"
 "Ein nettverksskriver har ei tilsvarande eining innebygget.\n"
 "Tilgjenge er mogleg via tre ulike nettverksprotokoller.\n"
 "Brukerveiledningen for nettverksskriveren eller utskriftsserverboksen inneheld informasjon\n"
-"om kva eininga støttar:<br>"
-"\n"
-"<b>TCP-port (AppSocket/JetDirect)</b><br>"
-"\n"
+"om kva eininga støttar:<br>\n"
+"<b>TCP-port (AppSocket/JetDirect)</b><br>\n"
 "IP-adressa og eit portnummer vert kravt for å få tilgjenge.\n"
 "Portnummer 9100 er ofte riktig.\n"
 "Dette er den enklaste, raskaste og generelt meste pålitelege protokollen.\n"
-"Samsvarande eining si-URI er:<br>"
-"\n"
-"socket://ip-adresse:portnummer<br>"
-"\n"
-"<b>LDP (Line Printar Daemon)</b><br>"
-"\n"
+"Samsvarande eining si-URI er:<br>\n"
+"socket://ip-adresse:portnummer<br>\n"
+"<b>LDP (Line Printar Daemon)</b><br>\n"
 "Ein LPD-nisse køyrer på eininga og produserer éin eller fleire LPD-køar.\n"
 "IP-adresse og eit LPD-kønavn vert kravt for å få tilgjenge.\n"
 "Nesten alle nettverksskrivere og utskriftsserverbokser støttar denne protokollen.\n"
@@ -3118,25 +2855,18 @@
 "Men å bruka eit riktig LPD-kønavn som ikkje endrar\n"
 "data eller legger til format eller bannersider,\n"
 "kan vera avgjerande for påliteleg utskrift.\n"
-"Samsvarande enhetsURI er:<br>"
-"\n"
-"lpd://ip-adresse/kø<br>"
-"\n"
-"<b>IPP (Internet Printing Protocol)</b><br>"
-"\n"
+"Samsvarande enhetsURI er:<br>\n"
+"lpd://ip-adresse/kø<br>\n"
+"<b>IPP (Internet Printing Protocol)</b><br>\n"
 "IPP er standardprotokollen for CUP sin på ei fysisk datamaskin,\n"
 "men dersom IPP vert nytta på ein liten utskriftsserverboks,\n"
 "vert han ofte ikkje riktig implementert. Nytte IPP berre dersom produsenten\n"
 "dokumenterer offisiell støtte for protokollen. \n"
-"Samsvarande eining si-URI er:<br>"
-"\n"
-"ipp://ip-adresse:portnummer/ressurs<br>"
-"\n"
+"Samsvarande eining si-URI er:<br>\n"
+"ipp://ip-adresse:portnummer/ressurs<br>\n"
 "Kva 'portnummer' og 'ressurs' er, avheng av\n"
-"nettverksskriver- eller utskriftsserverboksmodellen.<br>"
-"\n"
-"Du finn<b>meir informasjon</b> på<br>"
-"\n"
+"nettverksskriver- eller utskriftsserverboksmodellen.<br>\n"
+"Du finn<b>meir informasjon</b> på<br>\n"
 "http://www.cup sin.org/documentation.php/network.html\n"
 "</p>"
 
@@ -3145,34 +2875,27 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Device URIs to Print Via a Print Server Machine</big></b><br>"
-"\n"
+"<b><big>Device URIs to Print Via a Print Server Machine</big></b><br>\n"
 "In contrast to a printserver box a print server machine\n"
-"means a real computer which offers a print service.<br>"
-"\n"
+"means a real computer which offers a print service.<br>\n"
 "Access happens via various different network protocols.\n"
 "Ask your network administrator what which print server machine\n"
-"provides in your particular network:<br>"
-"\n"
-"<b>Windows (R) or Samba (SMB/CIFS)</b><br>"
-"\n"
+"provides in your particular network:<br>\n"
+"<b>Windows (R) or Samba (SMB/CIFS)</b><br>\n"
 "To access a SMB printer share, the RPM package samba-client must be installed.\n"
 "The package provides the CUPS backend 'smb' which is a link to\n"
 "the <tt>/usr/bin/smbspool</tt> program which actually sends the data\n"
-"to a SMB printer share.<br>"
-"\n"
+"to a SMB printer share.<br>\n"
 "A server name and a printer share name and optionally a workgroup name\n"
 "is needed to access it.\n"
 "Furthermore a user name and a password may be required to get access.\n"
 "Have in mind that spaces and special characters in those values\n"
-"must be percent-encoded (see above).<br>"
-"\n"
+"must be percent-encoded (see above).<br>\n"
 "By default CUPS runs backends (here smbspool) as user 'lp'.\n"
 "When printing in an Active Directory (R) environment (AD)\n"
 "the user 'lp' is not allowed to print in this environment\n"
 "so that the traditional way to print via smbspool as user 'lp'\n"
-"would not work.<br>"
-"\n"
+"would not work.<br>\n"
 "For printing in an AD environment additionally\n"
 "the RPM package samba-krb-printing must be installed.\n"
 "In this case the CUPS backend 'smb' link\n"
@@ -3195,77 +2918,55 @@
 "and the user's workstation must send its printing data\n"
 "directly to the SMB printer share in the AD environment.\n"
 "In particular it does not work on a separated CUPS server machine\n"
-"where users who submit print jobs are not logged in.<br>"
-"\n"
-"For the traditional way a matching full device URI is:<br>"
-"\n"
-"smb://username:password@workgroup/server/printer<br>"
-"\n"
+"where users who submit print jobs are not logged in.<br>\n"
+"For the traditional way a matching full device URI is:<br>\n"
+"smb://username:password@workgroup/server/printer<br>\n"
 "For example 'John Doe' with password '@home!' may use something like\n"
-"the following device URI to access a 'Fun Printer 1000+' share:<br>"
-"\n"
-"smb://John%20Doe:%40home%21@MYGROUP/homeserver/Fun%20Printer%201000%2B<br>"
-"\n"
-"For <b>more information</b> have a look at <tt>man smbspool</tt> and<br>"
-"\n"
-"http://en.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share<br>"
-"\n"
+"the following device URI to access a 'Fun Printer 1000+' share:<br>\n"
+"smb://John%20Doe:%40home%21@MYGROUP/homeserver/Fun%20Printer%201000%2B<br>\n"
+"For <b>more information</b> have a look at <tt>man smbspool</tt> and<br>\n"
+"http://en.opensuse.org/SDB:Printing_via_SMB_(Samba)_Share_or_Windows_Share<br>\n"
 "'Windows' and 'Active Directory' are registered trademarks\n"
-"of Microsoft Corporation in the United States and/or other countries.<br>"
-"\n"
-"<b>Traditional UNIX Server (LPR)</b><br>"
-"\n"
+"of Microsoft Corporation in the United States and/or other countries.<br>\n"
+"<b>Traditional UNIX Server (LPR)</b><br>\n"
 "A Line Printer Daemon (LPD) runs on a traditional UNIX server\n"
 "and provides one or more LPD queues.\n"
 "The IP address and a LPD queue name is needed to access it.\n"
-"The matching device URI is:<br>"
-"\n"
-"lpd://ip-address/queue<br>"
-"\n"
-"<b>CUPS Server</b><br>"
-"\n"
+"The matching device URI is:<br>\n"
+"lpd://ip-address/queue<br>\n"
+"<b>CUPS Server</b><br>\n"
 "Usually you should not set up a local print queue to access\n"
 "a remote queue on a CUPS server. Instead do the setup\n"
 "in the <b>Print Via Network</b> dialog.\n"
 "Only if you really know that you must set up a local print queue\n"
-"to access a remote queue on a CUPS server proceed here.<br>"
-"\n"
+"to access a remote queue on a CUPS server proceed here.<br>\n"
 "IPP is the native protocol for CUPS which runs on a server.\n"
 "The official IANA port for IPP is 631.\n"
-"The matching device URI is:<br>"
-"\n"
-"ipp://ip-address:631/printers/queue<br>"
-"\n"
+"The matching device URI is:<br>\n"
+"ipp://ip-address:631/printers/queue<br>\n"
 msgstr ""
 "<p>\n"
-"<b><big>Eining si-URI-er for å skriva ut via ein utskriftsservermaskin</big></b><br>"
-"\n"
+"<b><big>Eining si-URI-er for å skriva ut via ein utskriftsservermaskin</big></b><br>\n"
 "I motsetnad til ein utskriftsserverboks er ein utskriftsservermaskin\n"
-"ei vanleg datamaskin som tilbyr ein utskriftstjeneste.<br>"
-"\n"
+"ei vanleg datamaskin som tilbyr ein utskriftstjeneste.<br>\n"
 "Tilgjenge vert skaffa via ulike nettverksprotokoller.\n"
 "Spør nettverksadministratoren kva for ein protokoll utskriftsservermaskinen\n"
-"i nettverket ditt nyttar:<br>"
-"\n"
-"<b>Windows (R) eller Samba (SMB/CIFS)</b><br>"
-"\n"
+"i nettverket ditt nyttar:<br>\n"
+"<b>Windows (R) eller Samba (SMB/CIFS)</b><br>\n"
 "For å få tilgjenge til ein delt SMB-utskriftsserver, må pakka samba-client installerast.\n"
 "Pakka inneheld CUP sin-bakgrunnsprosessen 'smb', som er ei lenkje til\n"
 "programmet <tt>/usr/bin/smbspool</tt>, som sender datum\n"
-"til ein delt SMB-skrivar.<br>"
-"\n"
+"til ein delt SMB-skrivar.<br>\n"
 "Det vert kravt eit servernavn, namnet på ein delt skrivar og eventuelt eit arbeidsgruppenavn\n"
 "for å få tilgjenge.\n"
 "Det kan dessutan henda at det vert kravt brukernavn og passord for å få tilgjenge.\n"
 "Hugs at mellomrom og spesialtegn i desse verda\n"
-"må vera prosentkodet (sjå ovanfor).<br>"
-"\n"
+"må vera prosentkodet (sjå ovanfor).<br>\n"
 "Som standard køyrer CUP sin bakgrunnsprosesser (her smbspool) som brukaren 'LP'.\n"
 "Ved utskrift i eit Active Directory (R)-miljø (AD)\n"
 "har ikkje brukaren 'LP' lov til å skriva ut,\n"
 "slik at den vanlege utskriftsmetoden vigde smbspool som brukaren 'LP'\n"
-"ikkje vil fungera.<br>"
-"\n"
+"ikkje vil fungera.<br>\n"
 "For utskrift i eit AD-miljø må òg\n"
 "pakka samba-krb-printing installerast.\n"
 "I dette tilfellet må lenkja til CUP sin-bakgrunnsprosessen 'smb' link\n"
@@ -3288,49 +2989,33 @@
 "og brukaren sin arbeidsstasjon må senda sine utskrift data\n"
 "direkte til den delte SMB-skrivaren i AD-miljøet.\n"
 "Det vil ikkje fungera på ein separat CUP sin-servermaskin\n"
-"der brukarar som sender utskriftsjobber ikkje er logga på.<br>"
-"\n"
-"For den tradisjonelle metoden er ein samsvarande og fullstendig eining si-URI:<br>"
-"\n"
-"smb://brukernavn:passord@arbeidsgruppe/servar/skriv<br>"
-"\n"
+"der brukarar som sender utskriftsjobber ikkje er logga på.<br>\n"
+"For den tradisjonelle metoden er ein samsvarande og fullstendig eining si-URI:<br>\n"
+"smb://brukernavn:passord@arbeidsgruppe/servar/skriv<br>\n"
 "Til dømes kan 'Ola Nordmann' med passordet '@home!' bruka no slikt som\n"
-"denne eining si-URI-ein for å få tilgjenge til ein delt 'Fun Printar 1000+':<br>"
-"\n"
-"smb://Ola%20Nordmann:%40home%21@MINGRUPPE/homeserver/Fun%20Printar%201000%2B<br>"
-"\n"
-"For <b>meir informasjon</b>, sjå <tt>ein smbspool</tt> og<br>"
-"\n"
-"http://ein.openSUSE.org/SDB:printing_via_sMB_(Samba)_share_or_windows_share<br>"
-"\n"
+"denne eining si-URI-ein for å få tilgjenge til ein delt 'Fun Printar 1000+':<br>\n"
+"smb://Ola%20Nordmann:%40home%21@MINGRUPPE/homeserver/Fun%20Printar%201000%2B<br>\n"
+"For <b>meir informasjon</b>, sjå <tt>ein smbspool</tt> og<br>\n"
+"http://ein.openSUSE.org/SDB:printing_via_sMB_(Samba)_share_or_windows_share<br>\n"
 "'Windows' og 'Active Directory' er registrerte varemerke\n"
-"for Microsoft Corporation i USA og/eller andre land.<br>"
-"\n"
-"<b>Tradisjonell UNIX-servar (LPR)</b><br>"
-"\n"
+"for Microsoft Corporation i USA og/eller andre land.<br>\n"
+"<b>Tradisjonell UNIX-servar (LPR)</b><br>\n"
 "Ein linjeutskriftsnisse (LPD) køyrar på ein tradisjonell UNIX-servar\n"
 "og tilbyr éin eller fleire LPD-køar.\n"
 "Det vert kravt ein ip-adresse og eit LPD-kønavn for å få tilgjenge.\n"
-"Ei samsvarande eining si-URI er:<br>"
-"\n"
-"lpd://ip-adresse/kø<br>"
-"\n"
-"<b>Servane til-CUP</b><br>"
-"\n"
+"Ei samsvarande eining si-URI er:<br>\n"
+"lpd://ip-adresse/kø<br>\n"
+"<b>Servane til-CUP</b><br>\n"
 "Normalt set du ikkje opp ein lokal utskriftskø for å få tilgjenge\n"
 "til ein ekstern kø på servane til ein-CUP. Dette vert i staden opp sett\n"
 "i dialogen <b>Skriv ut via nettverket</b>.\n"
 "Bara viss du veit nøyaktig kva du gjer, bør du setja opp ein lokal kø for å få\n"
-"tilgjenge til ein ekstern kø på servane til ein-CUP.<br>"
-"\n"
+"tilgjenge til ein ekstern kø på servane til ein-CUP.<br>\n"
 "IPP er den interne protokollen for CUP sin som køyrer på ein servar.\n"
 "Den offisielle IANA-porten for IPP er 631.\n"
-"Samsvarande eining si-URI er:<br>"
-"\n"
-"ipp://ip-adresse:631/skrivarar/kø<br>"
-"\n"
-"<b>Novell Netware-utskriftsserver (IPX)</b><br>"
-"\n"
+"Samsvarande eining si-URI er:<br>\n"
+"ipp://ip-adresse:631/skrivarar/kø<br>\n"
+"<b>Novell Netware-utskriftsserver (IPX)</b><br>\n"
 "For å få tilgjenge til utskriftskøer på ein Novell Netware-utskriftsserver\n"
 "må pakka ncpfs installerast.\n"
 "Pakka inneheld CUP sin-bakgrunnsprosessen 'novell', som køyrer\n"
@@ -3338,10 +3023,8 @@
 "Til ein Novell Netware-utskriftskø.\n"
 "Eit servernavn og eit utskriftskønavn vert kravt for å få tilgjenge it.\n"
 "Det kan òg henda at det vert kravt brukernavn og passord for å få tilgjenge.\n"
-"Samsvarande eining si-URI er:<br>"
-"\n"
-"novell://brukernavn:passord@servar/kø<br>"
-"\n"
+"Samsvarande eining si-URI er:<br>\n"
+"novell://brukernavn:passord@servar/kø<br>\n"
 "For <b>meir informasjon</b>, sjå <tt>ein nprint</tt> og\n"
 "annan dokumentasjon i pakka ncpfs.\n"
 "</p>"
@@ -3351,114 +3034,79 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Special Device URIs</big></b><br>"
-"\n"
+"<b><big>Special Device URIs</big></b><br>\n"
 "<b>Specify an Arbitrary Device URI</b>\n"
 "if you know the exact right device URI for your particular case\n"
-"or to modify an existing device URI in a special way.<br>"
-"\n"
-"<b>Send Print Data to Other Program (pipe)</b><br>"
-"\n"
+"or to modify an existing device URI in a special way.<br>\n"
+"<b>Send Print Data to Other Program (pipe)</b><br>\n"
 "To do this, the RPM package cups-backends must be installed.\n"
 "The package provides the CUPS backend 'pipe' which runs\n"
 "the program that you specified here.\n"
-"The matching device URI is:<br>"
-"\n"
-"pipe:/path/to/targetcommand<br>"
-"\n"
-"<b>Daisy-chain Backend Error Handler (beh)</b><br>"
-"\n"
+"The matching device URI is:<br>\n"
+"pipe:/path/to/targetcommand<br>\n"
+"<b>Daisy-chain Backend Error Handler (beh)</b><br>\n"
 "To do this, the RPM package cups-backends must be installed.\n"
-"The package provides the CUPS backend 'beh'.<br>"
-"\n"
+"The package provides the CUPS backend 'beh'.<br>\n"
 "The backend 'beh' is a wrapper for the usual backend,\n"
 "which is then called by beh.\n"
 "This way beh can, depending on its configuration,\n"
 "repeat the call of the backend or simply hide the error status\n"
 "of the backend from being seen by the CUPS daemon.\n"
-"The matching device URI is:<br>"
-"\n"
-"beh:/nodisable/attempts/delay/originalDeviceURI<br>"
-"\n"
+"The matching device URI is:<br>\n"
+"beh:/nodisable/attempts/delay/originalDeviceURI<br>\n"
 "If nodisable is '1' beh always exits successfully\n"
 "so that the queue gets never disabled but on the other hand\n"
-"print jobs are lost if there is an error.<br>"
-"\n"
+"print jobs are lost if there is an error.<br>\n"
 "Attempts is the number of attempts to recall the backend\n"
-"in case of an error. '0' means infinite retries.<br>"
-"\n"
+"in case of an error. '0' means infinite retries.<br>\n"
 "Delay is the number of seconds between two attempts\n"
-"to call the backend.<br>"
-"\n"
-"The last parameter is the original URI, which the queue had before.<br>"
-"\n"
-"Example:<br>"
-"\n"
-"beh:/1/3/5/socket://ip-address:port-number<br>"
-"\n"
+"to call the backend.<br>\n"
+"The last parameter is the original URI, which the queue had before.<br>\n"
+"Example:<br>\n"
+"beh:/1/3/5/socket://ip-address:port-number<br>\n"
 "The beh backend tries to access a network printer 3 times with 5 second delay\n"
 "between the attempts. If access still fails, the queue is not disabled\n"
-"and the print job is lost.<br>"
-"\n"
-"For <b>more information</b> have a look at <tt>/usr/lib[64]/cups/backend/beh</tt> and<br>"
-"\n"
+"and the print job is lost.<br>\n"
+"For <b>more information</b> have a look at <tt>/usr/lib[64]/cups/backend/beh</tt> and<br>\n"
 "http://www.linuxfoundation.org/en/OpenPrinting/Database/BackendErrorHandler\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Spesielle eining si-URI-er</big></b><br>"
-"\n"
+"<b><big>Spesielle eining si-URI-er</big></b><br>\n"
 "<b>Angje ein annan URI-type</b>\n"
 "viss du kjenner nøyaktig eining si-URI i eit spesielt tilfelle\n"
-"eller for å endra ein eksisterande enehtes-URI på ein spesiell måte.<br>"
-"\n"
-"<b>Send utskriftsdata til anna program (pipa)</b><br>"
-"\n"
+"eller for å endra ein eksisterande enehtes-URI på ein spesiell måte.<br>\n"
+"<b>Send utskriftsdata til anna program (pipa)</b><br>\n"
 "For å gjera dette må pakka cup sin-backends installerast.\n"
 "Pakka inneheld CUP sin-grunnsystemet 'pipa', som køyrer\n"
 "programmet du angjev her.\n"
-"Samsvarande eining si-URI er:<br>"
-"\n"
-"pipa:/stig/til/målkommando<br>"
-"\n"
-"<b>Feilhåndteringskjede for grunnsystem (beh)</b><br>"
-"\n"
+"Samsvarande eining si-URI er:<br>\n"
+"pipa:/stig/til/målkommando<br>\n"
+"<b>Feilhåndteringskjede for grunnsystem (beh)</b><br>\n"
 "For å bruka dette må pakka cup sin-backends installerast.\n"
-"Pakka inneheld CUP sin-grunnsystemet 'beh'.<br>"
-"\n"
+"Pakka inneheld CUP sin-grunnsystemet 'beh'.<br>\n"
 "'beh'-systemet er eit innpakning rundt det vanlege grunnsystemet,\n"
 "som deretter vil kallast beh.\n"
 "På den måten kan beh, avhengig av oppsettet,\n"
 "gjenta grunnsystemkommanoden eller skjula ein feilstatus\n"
 "for grunnsystemet for CUP sin-nissen.\n"
-"Samsvarande eining si-URI er:<br>"
-"\n"
-"beh:/ikkedeaktiver/forsøk/forskinkelse/opprinneligEnhets-URI<br>"
-"\n"
+"Samsvarande eining si-URI er:<br>\n"
+"beh:/ikkedeaktiver/forsøk/forskinkelse/opprinneligEnhets-URI<br>\n"
 "Viss ikkedeaktiver er '1', vil beh alltid avsluttast utan feil\n"
 "slik at køen aldri vert deaktivert, men på den andre sida vil\n"
-"utskriftsjobber fjernast viss det oppstår ein feil.<br>"
-"\n"
+"utskriftsjobber fjernast viss det oppstår ein feil.<br>\n"
 "Forsøk er mengd forsøk på å aktivera grunnsystemet på nytt\n"
-"viss det oppstår ein feil. '0' tyder uavgrensa mengd nye forsøk.<br>"
-"\n"
+"viss det oppstår ein feil. '0' tyder uavgrensa mengd nye forsøk.<br>\n"
 "Forseinking er mengd sekund mellom to forsøk\n"
-"på å aktivera grunnsystemet.<br>"
-"\n"
-"Siste parameter er den originale eining si-URI-ein som køen hadde tidlegare.<br>"
-"\n"
-"Døme:<br>"
-"\n"
-"beh:/1/3/5/socket://ip-adresse:portnummer<br>"
-"\n"
+"på å aktivera grunnsystemet.<br>\n"
+"Siste parameter er den originale eining si-URI-ein som køen hadde tidlegare.<br>\n"
+"Døme:<br>\n"
+"beh:/1/3/5/socket://ip-adresse:portnummer<br>\n"
 "beh-grunnsystemet freistar å få tilgjenge til ein nettverksskriver 3 gonger med forseinkinga til 5 sekund\n"
 "mellom forsøka. Viss tilkobling framleis mislukkast, vert ikkje køen deaktivert,\n"
-"med utskriftsjobben vert fjerna.<br>"
-"\n"
-"Du finn <b>meir informasjon</b> i <tt>/usr/lib[64]/cup sin/backend/beh</tt> og på <br>"
-"\n"
-"http://www.linuxfoundation.org/ein/OpenPrinting/Database/BackendErrorHandler<br>"
-"\n"
+"med utskriftsjobben vert fjerna.<br>\n"
+"Du finn <b>meir informasjon</b> i <tt>/usr/lib[64]/cup sin/backend/beh</tt> og på <br>\n"
+"http://www.linuxfoundation.org/ein/OpenPrinting/Database/BackendErrorHandler<br>\n"
 "</p>"
 
 #. PrintingViaNetworkDialog help 1/4:
@@ -3466,34 +3114,26 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Printing Via Network</big></b><br>"
-"\n"
-"Usually CUPS (Common Unix Printing System) is used to print via network.<br>"
-"\n"
+"<b><big>Printing Via Network</big></b><br>\n"
+"Usually CUPS (Common Unix Printing System) is used to print via network.<br>\n"
 "By default CUPS uses its so called 'Browsing' mode\n"
-"to make printers available via network.<br>"
-"\n"
+"to make printers available via network.<br>\n"
 "In this case remote CUPS servers must publish their printers via network\n"
 "and accordingly on your host the CUPS daemon process (cupsd) must run\n"
-"which is listening for incoming information about published printers.<br>"
-"\n"
-"CUPS Browsing information is received via UDP port 631.<br>"
-"\n"
-"Regarding firewall:<br>"
-"\n"
+"which is listening for incoming information about published printers.<br>\n"
+"CUPS Browsing information is received via UDP port 631.<br>\n"
+"Regarding firewall:<br>\n"
 "Check if a firewall is active for a network zone\n"
 "in which printers are published via network.\n"
 "By default the SuSEfirewall allows any incoming information\n"
 "via a network interface which belongs to the 'internal zone'\n"
-"because this zone is trusted by default.<br>"
-"\n"
+"because this zone is trusted by default.<br>\n"
 "It does not make sense to do printing in a trusted internal network\n"
 "with a network interface which belongs to the untrusted 'external zone'\n"
 "(the latter is the default setting for network interfaces to be safe).\n"
 "In particular do not disable firewall protection for CUPS\n"
 "(i.e. for IPP which uses TCP port 631 and UDP port 631)\n"
-"for the untrusted 'external zone'.<br>"
-"\n"
+"for the untrusted 'external zone'.<br>\n"
 "To use remote printers in a trusted internal network\n"
 "and be protected by the firewall against unwanted access\n"
 "from any external network (in particular from the Internet),\n"
@@ -3502,30 +3142,22 @@
 "Use the YaST Firewall setup module to do this fundamental setup\n"
 "to gain security plus usefulness in your network\n"
 "and using remote printers in a trusted internal network\n"
-"will work without any further firewall setup.<br>"
-"\n"
+"will work without any further firewall setup.<br>\n"
 "For details see the openSUSE support database\n"
-"article 'CUPS and SANE Firewall settings' at<br>"
-"\n"
+"article 'CUPS and SANE Firewall settings' at<br>\n"
 "http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Utskrift via nettverk</big></b><br>"
-"\n"
-"CUP sin (Common Unix Printing System) verta vanlegvis brukt til utskrift via nettverket.<br>"
-"\n"
+"<b><big>Utskrift via nettverk</big></b><br>\n"
+"CUP sin (Common Unix Printing System) verta vanlegvis brukt til utskrift via nettverket.<br>\n"
 "Som standard brukar CUP sin ein såkalla 'Browsing'-modus\n"
-"for å gjera skrivarar tilgjengelege via nettverket.<br>"
-"\n"
+"for å gjera skrivarar tilgjengelege via nettverket.<br>\n"
 "I dette tilfellet må eksterne CUP sin-servera publisera skrivarane sine via nettverket,\n"
 "og vertsmaskinene må køyra CUP sin-nissen (cupsd),\n"
-"ein prosess som lyttar etter innkommende informasjon om publiserte skrivarar.<br>"
-"\n"
-"CUP sin Browsing-informasjon vert motteken via UDP-port 631.<br>"
-"\n"
-"Om brannmurar:<br>"
-"\n"
+"ein prosess som lyttar etter innkommende informasjon om publiserte skrivarar.<br>\n"
+"CUP sin Browsing-informasjon vert motteken via UDP-port 631.<br>\n"
+"Om brannmurar:<br>\n"
 "Kontrollar om ein brannmur er aktivert for nettverkssonen\n"
 "der skrivarar vert publisert via nettverket.\n"
 "Som standard tillèt SuSEfirewall all innkommende informasjon\n"
@@ -3548,11 +3180,9 @@
 "Bruk brannmurmodulen i YaST for å utføra dette grunnoppsettet\n"
 "for eit effektivt og sikkert nettverk.\n"
 "Eksterne skrivarar kan då brukast i eit påliteleg internt nettverk\n"
-"utan ytterlegare brannmurinnstillinger.<br>"
-"\n"
+"utan ytterlegare brannmurinnstillinger.<br>\n"
 "Du finn meir informasjon i openSUSE support database\n"
-"i artikkelen 'Anda til CUP SANE Firewall settings' på<br>"
-"\n"
+"i artikkelen 'Anda til CUP SANE Firewall settings' på<br>\n"
 "http://ein.opensuse.org/SDB:CUP sin_and_sANE_firewall_settings\n"
 "</p>"
 
@@ -3566,8 +3196,7 @@
 "or when you cannot accept incoming information about published printers\n"
 "(e.g. because you must have firewall protection for the network zone\n"
 "in which printers are published), you can request printer information\n"
-"from CUPS servers (provided the CUPS servers allow your access).<br>"
-"\n"
+"from CUPS servers (provided the CUPS servers allow your access).<br>\n"
 "For each CUPS server which is requested, a cups-polld process\n"
 "is launched by the CUPS daemon process (cupsd) on your host.\n"
 "By default each cups-polld polls a remote CUPS server\n"
@@ -3580,8 +3209,7 @@
 "eller viss du ikkje kan godkjenna innkommende informasjon om publiserte skrivarar\n"
 "(t.d. fordi du har brannmurbeskyttelse mot nettverkssonen\n"
 "der skrivarane er publiserte), kan du spørja etter skriverinformasjon\n"
-"frå CUP sin-servera (viss du har tilgjenge til CUP sin-serverne).<br>"
-"\n"
+"frå CUP sin-servera (viss du har tilgjenge til CUP sin-serverne).<br>\n"
 "For servane til kvar-CUP som får ein førespurnad, vert ein cup sin-polld-prosess\n"
 "starta av CUP sin-nissen (cupsd) på din vertsmaskin.\n"
 "Standardinnstillingen er at kvar cup sin-polld skannar servane til ein-ekstern CUP\n"
@@ -3595,8 +3223,7 @@
 "<p>\n"
 "If you print only via network and if you use only one single CUPS server,\n"
 "there is no need to use CUPS Browsing and have a CUPS daemon running on your host.\n"
-"Instead it is simpler to specify the CUPS server and access it directly.<br>"
-"\n"
+"Instead it is simpler to specify the CUPS server and access it directly.<br>\n"
 "A possible drawback is that application programs may be delayed\n"
 "for some time (until a timeout happens) when they try\n"
 "to access the CUPS server but it is actually not available\n"
@@ -3608,8 +3235,7 @@
 "<p>\n"
 "Viss du skriv ut berre via nettverket og viss du alltid brukar servane til same-CUP,\n"
 "er det ikkje naudsynt å bruka Søket til-CUP og ha nissen til ein-CUP køyrande på vertsmaskinen.\n"
-"Då er det enklare å angje CUP sin-serveren og gje direkte tilgjenge til han.<br>"
-"\n"
+"Då er det enklare å angje CUP sin-serveren og gje direkte tilgjenge til han.<br>\n"
 "Ein mogleg ulempe er at program kan hengja\n"
 "eit bel (inntill eit tidsavbrudd) når dei freistar\n"
 "å koble til Servane til-CUP medan han ikkje er tilgjengeleg\n"
@@ -3628,8 +3254,7 @@
 "or when you must access a network printer directly,\n"
 "or when you use another kind of print server\n"
 "e.g. when printing via a Windows (R) or Samba server\n"
-"or when printing via a traditional Unix server.<br>"
-"\n"
+"or when printing via a traditional Unix server.<br>\n"
 "'Windows' is a registered trademark\n"
 "of Microsoft Corporation in the United States and/or other countries.\n"
 "</p>"
@@ -3640,8 +3265,7 @@
 "eller viss du må ha direkte tilgjenge til ein nettverksskriver,\n"
 "eller viss du brukar ein annan type utskriftsserver,\n"
 "t.d. utskrift via ein Windows (R). eller Sambaserver\n"
-"eller utskrift via ein tradisjonell Unix-servar.<br>"
-"\n"
+"eller utskrift via ein tradisjonell Unix-servar.<br>\n"
 "'Windows' er a registrert varemerke\n"
 "for Microsoft Corporation i USA og/eller andre land.\n"
 "</p>"
@@ -3651,28 +3275,22 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Sharing Print Queues and Publish Them Via Network</big></b><br>"
-"\n"
+"<b><big>Sharing Print Queues and Publish Them Via Network</big></b><br>\n"
 "Usually CUPS (Common Unix Printing System) should be set up to use\n"
-"its so called 'Browsing' mode to make printers available via network.<br>"
-"\n"
+"its so called 'Browsing' mode to make printers available via network.<br>\n"
 "In this case CUPS servers publish their local print queues via network\n"
 "and accordingly on CUPS client systems the CUPS daemon process (cupsd) must run\n"
-"which is listening for incoming information about published printers.<br>"
-"\n"
+"which is listening for incoming information about published printers.<br>\n"
 "CUPS Browsing information is received via UDP port 631.\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Dela utskriftskøer og publisera dei via nettverket</big></b><br>"
-"\n"
+"<b><big>Dela utskriftskøer og publisera dei via nettverket</big></b><br>\n"
 "Vanlegvis bør CUP sin (Common Unix Printing System) verta opp sett for å bruka\n"
-"såkalla 'lyttemodus' for å gjera skrivarar tilgjengelege via nettverket.<br>"
-"\n"
+"såkalla 'lyttemodus' for å gjera skrivarar tilgjengelege via nettverket.<br>\n"
 "I så fall publiserer CUP sin-serveren sine lokale skrivarar via nettverket\n"
 "og CUP sin-nissen (cupsd) må køyra på CUP sin-klientane\n"
-"for å laut etter innkommende informasjon om publiserte skrivarar.<br>"
-"\n"
+"for å laut etter innkommende informasjon om publiserte skrivarar.<br>\n"
 "CUP sin-informasjonen vert motteken via UDP-port 631.\n"
 "</p>"
 
@@ -3682,14 +3300,11 @@
 msgid ""
 "<p>\n"
 "First of all CUPS client systems must be allowed to access the CUPS server.\n"
-"Then specify whether or not printers should be published to the clients.<br>"
-"\n"
+"Then specify whether or not printers should be published to the clients.<br>\n"
 "In a local network the usual way to set up CUPS Browsing is\n"
 "to allow remote access for all hosts in the local network\n"
-"and to publish printers to all those hosts.<br>"
-"\n"
-"It is not required to publish printers in any case.<br>"
-"\n"
+"and to publish printers to all those hosts.<br>\n"
+"It is not required to publish printers in any case.<br>\n"
 "If you have only one single CUPS server, there is no need to use CUPS Browsing.\n"
 "Instead it is simpler to specify the CUPS server on the client systems\n"
 "(via 'Printing Via Network') so that the clients access the server directly.\n"
@@ -3700,8 +3315,7 @@
 "Angje deretter om skrivarar skal publiserast for klientane eller ikkje.\n"
 "I eit lokalnettverk er det vanlegast å setja opp CUP sin-lytting slik at\n"
 "alle vertsmaskiner i lokalnettverket har har eksternt tilgjenge\n"
-"og publisera skrivarane til alle desse vertsmaskinene.<br>"
-"\n"
+"og publisera skrivarane til alle desse vertsmaskinene.<br>\n"
 "Det er ikkje naudsynt å publisera skrivarane i alle tilfelle.\n"
 "Viss du berre har servane til éin-CUP, er det ikkje naudsynt å bruka CUP sin-lytting.\n"
 "I så fall er det enklare å spesifisera CUP sin-serveren på klientsystemene\n"
@@ -3714,38 +3328,32 @@
 msgid ""
 "<p>\n"
 "There are various ways which can coexist how to specify\n"
-"which remote hosts are allowed to access the CUPS server.<br>"
-"\n"
+"which remote hosts are allowed to access the CUPS server.<br>\n"
 "Allow remote access for computers within the local network\n"
 "will allow access from all hosts in the local network.\n"
 "A remote host is in the local network when it has an IP address\n"
 "that belongs to the same network as the CUPS server\n"
 "and when the network connection of the host\n"
 "uses a non-PPP interface on the CUPS server\n"
-"(an interface whose IFF_POINTOPOINT flag is not set).<br>"
-"\n"
+"(an interface whose IFF_POINTOPOINT flag is not set).<br>\n"
 "Alternatively or additionally an explicite list of network interfaces\n"
-"from which remote access is allowed can be specified.<br>"
-"\n"
+"from which remote access is allowed can be specified.<br>\n"
 "Alternatively or additionally an explicite list of\n"
 "allowed IP addresses and/or networks can be specified.\n"
 "</p>"
 msgstr ""
 "<p>\n"
 "Det finst fleire metodar, som kan brukast parallelt, for å angje\n"
-"kva for eksterne maskiner som skal ha tilgjenge til CUP sin-serveren.<br>"
-"\n"
+"kva for eksterne maskiner som skal ha tilgjenge til CUP sin-serveren.<br>\n"
 "Å tillat eksternt tilgjenge for maskiner i lokalnettverket\n"
 "vil gje tilgjenge for alle vertsmaskiner i lokalnettverket.\n"
 "Ein ekstern vertsmaskin er medlem av lokalnettverket Viss han har ein IP-adresse\n"
 "som tilhøyrer same nettverk som CUP sin-serveren\n"
 "og viss vertsmaskinens nettverksforbindelse\n"
 "brukar eit ikkje-PPP-grensesnitt på CUP sin serveren\n"
-"(eit grensesnitt som ikkje har eit definert IFF_pOINTOPOINT-flagg).<br>"
-"\n"
+"(eit grensesnitt som ikkje har eit definert IFF_pOINTOPOINT-flagg).<br>\n"
 "Alternativt eller i tillegg kan det opprettast ein eksplisitt liste over nettverksgrensesnitt\n"
-"som skal tillatast eksternt tilgjenge.<br>"
-"\n"
+"som skal tillatast eksternt tilgjenge.<br>\n"
 "Alternativt eller i tillegg kan det opprettast ein eksplisitt liste over\n"
 "tillatne IP-adresser og/eller nettverk.\n"
 "</p>"
@@ -3755,28 +3363,23 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"Regarding firewall:<br>"
-"\n"
+"Regarding firewall:<br>\n"
 "A firewall is used to protect running server processes\n"
 "(in this case the CUPS server process 'cupsd')\n"
-"on your host against unwanted access via network.<br>"
-"\n"
+"on your host against unwanted access via network.<br>\n"
 "Printing via network happens in a trusted internal network\n"
 "(nobody lets arbitrary users from whatever external network\n"
 "print on his printer) and usually the users need\n"
-"physical printer access to get their paper output.<br>"
-"\n"
+"physical printer access to get their paper output.<br>\n"
 "By default the SuSEfirewall lets any network traffic pass\n"
 "via a network interface which belongs to the 'internal zone'\n"
-"because this zone is trusted by default.<br>"
-"\n"
+"because this zone is trusted by default.<br>\n"
 "It does not make sense to do printing in a trusted internal network\n"
 "with a network interface which belongs to the untrusted 'external zone'\n"
 "(the latter is the default setting for network interfaces to be safe).\n"
 "Do not disable firewall protection for CUPS\n"
 "(i.e. for IPP which uses TCP port 631 and UDP port 631)\n"
-"for the untrusted 'external zone'.<br>"
-"\n"
+"for the untrusted 'external zone'.<br>\n"
 "To make printers accessible in a trusted internal network\n"
 "and be protected by the firewall against unwanted access\n"
 "from any external network (in particular from the Internet),\n"
@@ -3785,37 +3388,30 @@
 "Use the YaST Firewall setup module to do this fundamental setup\n"
 "to gain security plus usefulness in your network and\n"
 "sharing printers in a trusted internal network\n"
-"will work without any further firewall setup.<br>"
-"\n"
+"will work without any further firewall setup.<br>\n"
 "For details see the openSUSE support database\n"
-"article 'CUPS and SANE Firewall settings' at<br>"
-"\n"
+"article 'CUPS and SANE Firewall settings' at<br>\n"
 "http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"Om brannmurar:<br>"
-"\n"
+"Om brannmurar:<br>\n"
 "Ein brannmur vert nytta for å verna køyrande serverprosesser\n"
 "(i dette tilfellet CUP sin-serverprosessen 'cupsd')\n"
-"på din vertsmaskin mot uønska tilgjenge via nettverket.<br>"
-"\n"
+"på din vertsmaskin mot uønska tilgjenge via nettverket.<br>\n"
 "Utskrift via nettverket vert utført i eit påliteleg internt nettverk\n"
 "(ingen lèt vilkårlige brukarar frå nokre eksterne nettverk\n"
 "skriva ut på skrivaren sin), og brukarar treng normalt\n"
-"fysisk skrivertilgang for å henta utskrifter.<br>"
-"\n"
+"fysisk skrivertilgang for å henta utskrifter.<br>\n"
 "Som standard slepp SuSEfirewall gjennom all nettverkstrafikk\n"
 "via eit nettverksgrensesnitt som tilhøyrer 'intern sone'\n"
-"fordi denne sona er påliteleg.<br>"
-"\n"
+"fordi denne sona er påliteleg.<br>\n"
 "Det gjev inga meining å skriva ut via eit påliteleg internt nettverk\n"
 "med eit nettverksgrensesnitt som er tilordnet ein upålitelig 'ekstern sone'\n"
 "(det siste er av sikkerhetsgrunner standardinnstillingen for nettverksgrensesnitt).\n"
 "Ikkje deaktiver brannmurbeskyttelsen for CUP sin\n"
 "(dvs. for IPP som brukar TCP port 631 og UDP via port 631)\n"
-"for den upålitelige 'ekstern sone'.<br>"
-"\n"
+"for den upålitelige 'ekstern sone'.<br>\n"
 "For å få tilgjenge til skrivarar i eit påliteleg internt nettverk\n"
 "og vernast av brannmuren mot uønska tilgjenge\n"
 "frå eksterne nettverk (spesielt Internett),\n"
@@ -3824,11 +3420,9 @@
 "Bruk brannmurmodulen i YaST for å utføra dette grunnoppsettet.\n"
 "Det gjev eit sikkert og effektivt nettverk, og\n"
 "skrivarane kan delast i eit påliteleg internt nettverk\n"
-"utan ytterlegare brannmurinnstillinger.<br>"
-"\n"
+"utan ytterlegare brannmurinnstillinger.<br>\n"
 "Du finn meir informasjon i openSUSE support database\n"
-"i artikkelen Anda til CUP SANE Firewall settings' at<br>"
-"\n"
+"i artikkelen Anda til CUP SANE Firewall settings' at<br>\n"
 "http://ein.opensuse.org/SDB:CUP sin_and_sANE_firewall_settings\n"
 "</p>"
 
@@ -3837,8 +3431,7 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>CUPS Operation Policy</big></b><br>"
-"\n"
+"<b><big>CUPS Operation Policy</big></b><br>\n"
 "Operation policies are the rules used for each operation in CUPS.\n"
 "Such operations are for example 'print something', 'cancel a printout',\n"
 "'configure a printer', 'modify or remove a printer configuration',\n"
@@ -3846,8 +3439,7 @@
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Handlingspraksis for CUP sin</big></b><br>"
-"\n"
+"<b><big>Handlingspraksis for CUP sin</big></b><br>\n"
 "Handlingspraksiser er reglene som vert brukte for kvar handling i CUP sin.\n"
 "Slike handlingar kan til dømes vera 'skriv ut noko', 'avbryt ein utskrift',\n"
 "'sett opp ein skriv', 'endra eller slett eit skriveroppsett'\n"
@@ -3859,11 +3451,9 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>CUPS Error Policy</big></b><br>"
-"\n"
+"<b><big>CUPS Error Policy</big></b><br>\n"
 "The error policy defines the default policy that is used when\n"
-"CUPS fails to send a print job to the printer device.<br>"
-"\n"
+"CUPS fails to send a print job to the printer device.<br>\n"
 "Depending on the particular way how the printer is connected\n"
 "(for example 'usb', 'socket', 'lpd', or 'ipp'),\n"
 "and depending on the actual kind of failure,\n"
@@ -3875,23 +3465,17 @@
 "This could happen when any attempt to establish\n"
 "the communication with the printer is useless\n"
 "so that it does no make sense to retry the job.\n"
-"<br>"
-"\n"
-"The following error policies exist:<br>"
-"\n"
-"Stop the printer and keep the job for future printing.<br>"
-"\n"
-"Re-send the job from the beginning after waiting some time (30 seconds by default).<br>"
-"\n"
+"<br>\n"
+"The following error policies exist:<br>\n"
+"Stop the printer and keep the job for future printing.<br>\n"
+"Re-send the job from the beginning after waiting some time (30 seconds by default).<br>\n"
 "Abort and delete the job and proceed with the next job.\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Regler ved Feilen til-CUP</big></b><br>"
-"\n"
+"<b><big>Regler ved Feilen til-CUP</big></b><br>\n"
 "Reglene for feil definerer standardregelen som vil brukast dersom\n"
-"CUP sin mislukkast i å senda ein utskirftsjobb til ein skriverenhet.<br>"
-"\n"
+"CUP sin mislukkast i å senda ein utskirftsjobb til ein skriverenhet.<br>\n"
 "Avhengig av måten skrivaren er tilkoblet på,\n"
 "(til dømes'parallell', 'usb', 'sokkel', 'lpd' eller 'ipp'),\n"
 "og avhenig av feiltypen,\n"
@@ -3903,14 +3487,10 @@
 "Dette kan skje dersom alle forsøk på å\n"
 "kommunisera med skrivaren vil vera nytteløse,\n"
 "slik at det ikkje er nokon vits i å freista å senda jobben på nytt.\n"
-"<br>"
-"\n"
-"Følgjande regker ved feil finst:<br>"
-"\n"
-"Stopp skrivaren, og hald på jobben for utskrift seinare.<br>"
-"\n"
-"Send jobben på nytt frå byrjinga etter å venta litt (30 sekund som standard).<br>"
-"\n"
+"<br>\n"
+"Følgjande regker ved feil finst:<br>\n"
+"Stopp skrivaren, og hald på jobben for utskrift seinare.<br>\n"
+"Send jobben på nytt frå byrjinga etter å venta litt (30 sekund som standard).<br>\n"
 "Avbryt og slett jobben, og hald fram med neste jobb.\n"
 "</p>"
 
@@ -3919,17 +3499,14 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Automatic Configuration for Local Connected Printers</big></b><br>"
-"\n"
+"<b><big>Automatic Configuration for Local Connected Printers</big></b><br>\n"
 "Check the check box to run YaST's automatic configuration\n"
-"for printers which are connected to the local host.<br>"
-"\n"
+"for printers which are connected to the local host.<br>\n"
 "For each autodetected local connected printer,\n"
 "YaST tests if there exists already a configuration.\n"
 "If there is not yet a configuration,\n"
 "YaST tries to find a matching driver for the printer\n"
-"and if one is found, the printer is configured.<br>"
-"\n"
+"and if one is found, the printer is configured.<br>\n"
 "The resulting configuration is basically the same\n"
 "as if one would have selected an autodetected printer\n"
 "in the 'Add New Printer Configuration' dialog\n"
@@ -3937,17 +3514,14 @@
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Automatisk oppsett av lokalt tilkoblede skrivarar</big></b><br>"
-"\n"
+"<b><big>Automatisk oppsett av lokalt tilkoblede skrivarar</big></b><br>\n"
 "Kryss av i boksen for å køyra automatisk oppsett\n"
-"av skrivarar som er koblet direkte til maskina.<br>"
-"\n"
+"av skrivarar som er koblet direkte til maskina.<br>\n"
 "For kvar lokal skriv som vert automatisk registrert,\n"
 "kontrollerer YaST om det finst eit eksisterande oppsett.\n"
 "Viss det ikkje finst noko oppsett,\n"
 "freistar YaST å finna ein eigna drivar for skrivaren\n"
-"og setja opp skrivaren viss ein drivar vert funnen.<br>"
-"\n"
+"og setja opp skrivaren viss ein drivar vert funnen.<br>\n"
 "Det resulterande oppsettet vert i prinsippet det same\n"
 "som om brukaren hadde valt ein automatisk oppdaga skrivar\n"
 "i dialogen «Legg til nytt skriveroppsett»\n"
@@ -3959,17 +3533,13 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Automatic Configuration for USB Printers</big></b><br>"
-"\n"
+"<b><big>Automatic Configuration for USB Printers</big></b><br>\n"
 "The RPM package 'udev-configure-printer' provides\n"
-"automatic configuration when USB printers are plugged in.<br>"
-"\n"
+"automatic configuration when USB printers are plugged in.<br>\n"
 "When its check box is initially not checked, it is not installed\n"
-"and then you can select it so that it will be installed.<br>"
-"\n"
+"and then you can select it so that it will be installed.<br>\n"
 "When its check box is initially checked, it is already installed\n"
-"and then you can un-select it so that it will be removed.<br>"
-"\n"
+"and then you can un-select it so that it will be removed.<br>\n"
 "When udev-configure-printer is installed,\n"
 "automatic USB printer configuration happens via the entries\n"
 "in its udev config file /lib/udev/rules.d/70-printers.rules\n"
@@ -3981,17 +3551,13 @@
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Automatisk oppsett av USB-skrivarar</big></b><br>"
-"\n"
+"<b><big>Automatisk oppsett av USB-skrivarar</big></b><br>\n"
 "Pakka 'udev-configure-printar' sørgar for\n"
-"automatisk oppsett av USB-skrivarar når dei kobles til.<br>"
-"\n"
+"automatisk oppsett av USB-skrivarar når dei kobles til.<br>\n"
 "Viss valet ikkje er avkrysset, er ikkje pakka installert.\n"
-"I så fall kan du kryssa av i boksen for å installera henne.<br>"
-"\n"
+"I så fall kan du kryssa av i boksen for å installera henne.<br>\n"
 "Viss valet allereie er avkrysset, er pakka installert,\n"
-"og du kan velja å fjerna henne.<br>"
-"\n"
+"og du kan velja å fjerna henne.<br>\n"
 "Viss udev-configure-printar er installert,\n"
 "vil USB-skrivarar verta automatisk sett opp vigd oppføringene i\n"
 "den aktuelle udev-oppsettfilen /lib/udev/rules.d/70-printers.rules,nsom i turen sin utløyser køyring av fila 'udev-configure-printar add'\n"
@@ -4026,65 +3592,65 @@
 #. Authors:     Johannes Meixner 
 #.
 #. $Id: overview.ycp 29363 2006-03-24 08:20:43Z mzugec $
-#: src/include/printer/overview.rb:46
+#: src/include/printer/overview.rb:49
 #, fuzzy
 msgid "Show"
 msgstr "Vis"
 
 #. CheckBox to select local print queues to be listed:
-#: src/include/printer/overview.rb:52
+#: src/include/printer/overview.rb:55
 #, fuzzy
 msgid "&Local"
 msgstr "&Lokal"
 
 #. CheckBox to select remote print queues to be listed:
-#: src/include/printer/overview.rb:59
+#: src/include/printer/overview.rb:62
 #, fuzzy
 msgid "&Remote"
 msgstr "Ekste&rn"
 
 #. Where the queue configuration exists (local or remote):
-#: src/include/printer/overview.rb:80
+#: src/include/printer/overview.rb:83
 #, fuzzy
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
 #. Header of a Table column with a list of print queues.
 #. Print queue name:
-#: src/include/printer/overview.rb:83
+#: src/include/printer/overview.rb:86
 #, fuzzy
 msgid "Name"
 msgstr "Namn"
 
 #. Header of a Table column with a list of print queues.
 #. Location of the printer (e.g. second floor, room 2.3):
-#: src/include/printer/overview.rb:89
+#: src/include/printer/overview.rb:92
 #, fuzzy
 msgid "Location"
 msgstr "Plassering"
 
 #. Header of a Table column with a list of print queues.
 #. Whether or not is is the default queue:
-#: src/include/printer/overview.rb:92
+#: src/include/printer/overview.rb:95
 #, fuzzy
 msgid "Default"
 msgstr "Standard"
 
 #. Header of a Table column with a list of print queues.
 #. Queue status (accepting/rejecting and enabled/disabled):
-#: src/include/printer/overview.rb:95
+#: src/include/printer/overview.rb:98
 #, fuzzy
 msgid "Status"
 msgstr "Status"
 
 #. PushButton label to refresh the list of print queues:
-#: src/include/printer/overview.rb:107
+#: src/include/printer/overview.rb:110
 #, fuzzy
 msgid "Re&fresh List"
 msgstr "Opp&dater liste"
 
 #. PushButton label to print a test page:
-#: src/include/printer/overview.rb:112
+#: src/include/printer/overview.rb:115
 #, fuzzy
 msgid "Print &Test Page"
 msgstr "Skriv ut &testside"
@@ -4095,7 +3661,7 @@
 #. to check whether or not a local cupsd is accessible.
 #. The command is shown here to the user (even if it is a bit technical)
 #. to have him informed what goes on here and what he can do on his own.
-#: src/include/printer/overview.rb:128
+#: src/include/printer/overview.rb:131
 #, fuzzy
 msgid ""
 "A locally running CUPS daemon is required, but it seems to be not accessible.\n"
@@ -4112,7 +3678,7 @@
 #. By default the cupsd uses the official IPP port (631).
 #. If not, the user must have intentionally and manually changed
 #. the port setting for the cupsd in /etc/cups/cupsd.conf
-#: src/include/printer/overview.rb:140
+#: src/include/printer/overview.rb:143
 #, fuzzy
 msgid ""
 "The CUPS daemon seems not to listen on the official IANA IPP port (631).\n"
@@ -4136,7 +3702,7 @@
 
 #. Busy message:
 #. Body of a Popup::ShowFeedback
-#: src/include/printer/overview.rb:182
+#: src/include/printer/overview.rb:185
 #, fuzzy
 msgid ""
 "Running several tests regarding CUPS server accessibility...\n"
@@ -4146,14 +3712,14 @@
 "(dette kan ta eit bel)"
 
 #. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:201
+#: src/include/printer/overview.rb:204
 #, fuzzy
 msgid "Do no longer use the inaccessible CUPS server '%1'?"
 msgstr "Vil du ikkje lengjer brukar den utilgjengelige CUP sin-serveren '%1'?"
 
 #. Popup::YesNoHeadline body recommendation how to answer the headline question
 #. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:207
+#: src/include/printer/overview.rb:210
 #, fuzzy
 msgid "To proceed, you should agree that '%1' will be no longer used."
 msgstr "For å halda fram må du stadfesta at '%1' ikkje lenger vil brukast."
@@ -4161,20 +3727,20 @@
 #. The 'ServerName' entry in /etc/cups/client.conf was removed
 #. so that it is now no longer a real client-only config and
 #. therefore the Printerlib::client_* values must be determined anew:
-#: src/include/printer/overview.rb:223 src/include/printer/overview.rb:234
+#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237
 #, fuzzy
 msgid "A non-accessible server leads to an endless sequence of delays and failures."
 msgstr "Ein servar du ikkje har tilgjenge til, fører til ei endelaus rekkje av forseinkingar og feil."
 
 #. where %1 will be replaced by the CUPS server name.
-#: src/include/printer/overview.rb:253
+#: src/include/printer/overview.rb:256
 #, fuzzy
 msgid "CUPS Server %1"
 msgstr "Servane til-CUP %1"
 
 #. Busy message:
 #. Body of a Popup::ShowFeedback:
-#: src/include/printer/overview.rb:277
+#: src/include/printer/overview.rb:280
 #, fuzzy
 msgid "Testing if CUPS server is accessible..."
 msgstr "Kontrollerer om servane til ein-CUP er tilgjengeleg …"
@@ -4182,42 +3748,42 @@
 #. Body of a Popup::AnyMessage when no queue was selected from the list:
 #. Body of a Popup::AnyMessage when no queue was selected from the list:
 #. Body of a Popup::AnyMessage when no queue was selected from the list:
-#: src/include/printer/overview.rb:592 src/include/printer/overview.rb:678
-#: src/include/printer/overview.rb:1152
+#: src/include/printer/overview.rb:595 src/include/printer/overview.rb:681
+#: src/include/printer/overview.rb:1155
 #, fuzzy
 msgid "Select an entry."
 msgstr "Vel ein oppføring."
 
-#: src/include/printer/overview.rb:605
+#: src/include/printer/overview.rb:608
 #, fuzzy
 msgid "Cannot Delete"
 msgstr "Kan ikkje sletta"
 
 #. Body of a Popup::AnyMessage when a remote queue was selected to be deleted:
-#: src/include/printer/overview.rb:607
+#: src/include/printer/overview.rb:610
 #, fuzzy
 msgid "This is a remote configuration. Only local configurations can be deleted."
 msgstr "Dette er eit eksternt oppsett. Berre lokale oppsett kan slettes."
 
-#: src/include/printer/overview.rb:614
+#: src/include/printer/overview.rb:617
 #, fuzzy
 msgid "Confirm Deletion"
 msgstr "Stadfest sletting"
 
 #. Body of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:616
+#: src/include/printer/overview.rb:619
 #, fuzzy
 msgid "The selected configuration would be deleted immediately and cannot be restored."
 msgstr "Det valde oppsettet vil slettast umiddelbart, og kan ikkje gjenopprettes."
 
 #. 'Yes' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:620
+#: src/include/printer/overview.rb:623
 #, fuzzy
 msgid "Delete configuration %1"
 msgstr "Slett oppsettet %1"
 
 #. 'No' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:622
+#: src/include/printer/overview.rb:625
 #, fuzzy
 msgid "Do not delete it"
 msgstr "Ikkje slett"
@@ -4229,24 +3795,24 @@
 #. Nevertheless it is possible to delete a class with the YaST printer module
 #. so that the user can get rid of a class which may have been created by accident
 #. with whatever other setup tool:
-#: src/include/printer/overview.rb:637
+#: src/include/printer/overview.rb:640
 #, fuzzy
 msgid "Confirm Deletion of a Class"
 msgstr "Stadfest sletting av ei klasse"
 
 #. Body of a confirmation popup before a class will be deleted:
-#: src/include/printer/overview.rb:639
+#: src/include/printer/overview.rb:642
 #, fuzzy
 msgid "A deleted class cannot be re-created with this tool."
 msgstr "Ei slette klasse kan ikkje gjenopprettes med dette verktøyet."
 
-#: src/include/printer/overview.rb:685
+#: src/include/printer/overview.rb:688
 #, fuzzy
 msgid "Rejecting Print Jobs"
 msgstr "Avviser utskriftsjobber"
 
 #. Body of a Popup::AnyMessage when the queue rejects print jobs:
-#: src/include/printer/overview.rb:687
+#: src/include/printer/overview.rb:690
 #, fuzzy
 msgid "The testpage cannot be printed because print jobs are rejected."
 msgstr "Testsiden kan ikkje skrivast ut fordi utskriftsjobber vert avvist."
@@ -4254,13 +3820,13 @@
 #. Do a refresh of the overview content to be on the safe side.
 #. Perhaps the actual current queue state is no longer "rejecting".
 #. Re-run the OverviewDialog (with re-created queue status) via the sequencer:
-#: src/include/printer/overview.rb:697
+#: src/include/printer/overview.rb:700
 #, fuzzy
 msgid "Printout Disabled"
 msgstr "Utskrift deaktivert"
 
 #. Body of a Popup::AnyMessage when printing is disabled for the queue:
-#: src/include/printer/overview.rb:699
+#: src/include/printer/overview.rb:702
 #, fuzzy
 msgid "The testpage cannot be printed because printout is disabled."
 msgstr "Testsiden kan ikkje skrivast ut fordi utskrift er deaktivert."
@@ -4270,28 +3836,28 @@
 #. the test above makes sure that the queue has printing enabled.
 #. When this command fails for whatever reason, it is a safe fallback
 #. to assume that there are no pending jobs in the queue:
-#: src/include/printer/overview.rb:728
+#: src/include/printer/overview.rb:731
 #, fuzzy
 msgid "There are pending print jobs which might be deleted before the testpage is printed."
 msgstr "Det er utskriftsjobber i køen som kanskje vil slettast før testsiden skrivast ut."
 
 #. where %1 will be replaced by the queue name.
 #. where %1 will be replaced by the queue name.
-#: src/include/printer/overview.rb:748 src/include/printer/overview.rb:917
+#: src/include/printer/overview.rb:751 src/include/printer/overview.rb:920
 #, fuzzy
 msgid "Delete Pending Print Jobs For %1"
 msgstr "Slett ventande utskriftsjobber for %1"
 
 #. 'Yes' button label of a confirmation popup
 #. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:756
+#: src/include/printer/overview.rb:759
 #, fuzzy
 msgid "Delete them before printing testpage"
 msgstr "Slett dei før utskrift av testside"
 
 #. 'No' button label of a confirmation popup
 #. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:759
+#: src/include/printer/overview.rb:762
 #, fuzzy
 msgid "Print testpage after the other jobs"
 msgstr "Skriv ut testsiden etter dei andre utskriftsjobbene"
@@ -4300,7 +3866,7 @@
 #. Only a simple message because this error does not happen on a normal system.
 #. where %1 will be replaced by the queue name.
 #. Only a simple message because this error does not happen on a normal system.
-#: src/include/printer/overview.rb:772 src/include/printer/overview.rb:941
+#: src/include/printer/overview.rb:775 src/include/printer/overview.rb:944
 #, fuzzy
 msgid "Failed to delete all pending jobs for %1."
 msgstr "Kunne ikkje sletta alle jobbar i køen for %1."
@@ -4320,32 +3886,32 @@
 #. +  (Printed with CUPS) show
 #. make it obvious that it is not a YaST testpage but a CUPS testpage
 #. and it is now independent of the CUPS version.
-#: src/include/printer/overview.rb:799
+#: src/include/printer/overview.rb:802
 #, fuzzy
 msgid "Test printout"
 msgstr "Utskriftstest"
 
 #. Popup::AnyQuestion message:
-#: src/include/printer/overview.rb:801
+#: src/include/printer/overview.rb:804
 #, fuzzy
 msgid "Print one or two pages e.g. to test duplex printing"
 msgstr "Skriv ut éin eller to sider, t.d. for å testa tosidig utskrift"
 
 #. Popup::AnyQuestion so called 'yes' (default) button label:
-#: src/include/printer/overview.rb:803
+#: src/include/printer/overview.rb:806
 #, fuzzy
 msgid "Single test page"
 msgstr "Éin testside"
 
 #. Popup::AnyQuestion so called 'no' button label:
-#: src/include/printer/overview.rb:805
+#: src/include/printer/overview.rb:808
 #, fuzzy
 msgid "Two test pages"
 msgstr "To testsider"
 
 #. where %1 will be replaced by the queue name.
 #. Only a simple message because this error does not happen on a normal system.
-#: src/include/printer/overview.rb:835
+#: src/include/printer/overview.rb:838
 #, fuzzy
 msgid "Failed to print testpage for %1."
 msgstr "Kunne ikkje skriva ut testside for %1."
@@ -4354,28 +3920,28 @@
 #. there might be whatever reason (e.g. a remote queue might have been deleted in the meantime)
 #. so that a refresh of the overview content is needed to be on the safe side.
 #. Re-run the OverviewDialog (with re-created queue status) via the sequencer:
-#: src/include/printer/overview.rb:852
+#: src/include/printer/overview.rb:855
 #, fuzzy
 msgid "Wait Until Testpage Printing Finished"
 msgstr "Vent til testutskriften er fullførde"
 
 #. Popup::AnyQuestion message regarding testpage printout result
 #. where %1 will be replaced by the queue name.
-#: src/include/printer/overview.rb:856
+#: src/include/printer/overview.rb:859
 #, fuzzy
 msgid "Sent testpage to %1. Printing should start soon."
 msgstr "Testside send til %1. Utskriften bør snart starta."
 
 #. Popup::AnyQuestion 'Yes' button label
 #. regarding a positive testpage printout result:
-#: src/include/printer/overview.rb:861
+#: src/include/printer/overview.rb:864
 #, fuzzy
 msgid "Testpage printout was successful"
 msgstr "Testutskriften var vellukka"
 
 #. Popup::AnyQuestion 'No' button label
 #. regarding a negative testpage printout result:
-#: src/include/printer/overview.rb:864
+#: src/include/printer/overview.rb:867
 #, fuzzy
 msgid "Testpage printing failed"
 msgstr "Testutskrift mislukkast."
@@ -4396,62 +3962,62 @@
 #. spit out zillions of sheets with nonsense characters.
 #. When this command fails for whatever reason, it is a safe fallback
 #. to assume that there are no pending jobs in the queue:
-#: src/include/printer/overview.rb:897
+#: src/include/printer/overview.rb:900
 #, fuzzy
 msgid "There are pending print jobs which might be deleted now."
 msgstr "Det er utskriftsjobber i køen som kan slettast no."
 
 #. 'Yes' button label of a confirmation popup
 #. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:925
+#: src/include/printer/overview.rb:928
 #, fuzzy
 msgid "Delete all pending jobs"
 msgstr "Slett alle ventande jobbar"
 
 #. 'No' button label of a confirmation popup
 #. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:928
+#: src/include/printer/overview.rb:931
 #, fuzzy
 msgid "Do not delete them"
 msgstr "Ikkje slett"
 
 #. Ignore an effectively empty test_print_cups_error_log:
-#: src/include/printer/overview.rb:1043
+#: src/include/printer/overview.rb:1046
 #, fuzzy
 msgid "For the full log, see the /var/log/cups/error_log file."
 msgstr "Fila /var/log/cup sin/error_log inneheld heile loggen."
 
-#: src/include/printer/overview.rb:1048
+#: src/include/printer/overview.rb:1051
 #, fuzzy
 msgid "CUPS log information while processing the testpage for %1 (English only)"
 msgstr "CUP sin-logg for handsaming av testside for %1 (berre engelsk)"
 
 #. but the test_print_cups_error_log was effectively empty,
 #. show a very generic info to the user to show at least something:
-#: src/include/printer/overview.rb:1065
+#: src/include/printer/overview.rb:1068
 #, fuzzy
 msgid "For CUPS log information, see the /var/log/cups/error_log file."
 msgstr "Fila /var/log/cup sin/error_log inneheld Informasjonen til-CUP."
 
 #. show a very generic info to the user to show at least something:
-#: src/include/printer/overview.rb:1075
+#: src/include/printer/overview.rb:1078
 #, fuzzy
 msgid "When printing via a remote system fails, you may ask an admin of the remote system."
 msgstr "Be ein administrator for det eksterne systemet om hjelp viss ein utskrift via eit eksternt system mislukkast."
 
 #. PopupYesNoHeadline body:
-#: src/include/printer/overview.rb:1102
+#: src/include/printer/overview.rb:1105
 #, fuzzy
 msgid "A remote CUPS server setting conflicts with adding a configuration."
 msgstr "Det er ein konflikt mellom ekstern CUP sin-serverinnstilling og nytt oppsett."
 
-#: src/include/printer/overview.rb:1159
+#: src/include/printer/overview.rb:1162
 #, fuzzy
 msgid "Cannot Modify"
 msgstr "Kan ikkje endra"
 
 #. Body of a Popup::AnyMessage when a remote queue was selected to be modified:
-#: src/include/printer/overview.rb:1161
+#: src/include/printer/overview.rb:1164
 #, fuzzy
 msgid "This is a remote configuration. Only local configurations can be modified."
 msgstr "Dette er eit eksternt oppsett. Berre lokale oppsett kan endrast."
@@ -4987,14 +4553,12 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"AutoYaST settings for printing with CUPS via network.<br>"
-"\n"
+"AutoYaST settings for printing with CUPS via network.<br>\n"
 "There is no AutoYaST support for local print queues.\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"AutoYaST-innstillingar for utskrift med CUP sin via nettverket.<br>"
-"\n"
+"AutoYaST-innstillingar for utskrift med CUP sin via nettverket.<br>\n"
 "Det er ingen AutoYaST-støtte for lokale utskriftskøer.\n"
 "</p>"
 
@@ -5550,77 +5114,56 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>\n"
-#~ "<b><big>Device URIs for Directly Connected Devices</big></b><br>"
-#~ "\n"
+#~ "<b><big>Device URIs for Directly Connected Devices</big></b><br>\n"
 #~ "Devices which are connected via the parallel port or via USB\n"
 #~ "are autodetected and the appropriate device URI is autogenerated.\n"
-#~ "For example:<br>"
-#~ "\n"
-#~ "parallel:/dev/lp0<br>"
-#~ "\n"
-#~ "usb://ACME/Fun%20Printer?serial=A1B2C3<br>"
-#~ "\n"
-#~ "hp:/usb/HP_LaserJet?serial=1234<br>"
-#~ "\n"
+#~ "For example:<br>\n"
+#~ "parallel:/dev/lp0<br>\n"
+#~ "usb://ACME/Fun%20Printer?serial=A1B2C3<br>\n"
+#~ "hp:/usb/HP_LaserJet?serial=1234<br>\n"
 #~ "Usually only the autogenerated device URIs work.\n"
 #~ "When the device is not autodetected, there is usually no communication\n"
-#~ "with the device possible and no data can be sent to the device.<br>"
-#~ "\n"
+#~ "with the device possible and no data can be sent to the device.<br>\n"
 #~ "To access a HP printer or all-in-one device via the backend 'hp',\n"
 #~ "the RPM package hplip must be installed.\n"
-#~ "The package provides HP's printing and scanning software HPLIP.<br>"
-#~ "\n"
+#~ "The package provides HP's printing and scanning software HPLIP.<br>\n"
 #~ "In contrast devices which are connected via serial port or bluetooth\n"
 #~ "are not autodetected so that the device URI must be manually specified.\n"
 #~ "The serial device URI parameters must comply with\n"
 #~ "what the serial port in the printer requires,\n"
 #~ "see the manual of your serial printer.\n"
-#~ "Example device URIs:<br>"
-#~ "\n"
-#~ "serial:/dev/ttyS9?baud=9600+bits=8+parity=none+flow=soft+stop=1<br>"
-#~ "\n"
-#~ "bluetooth://1A2B3C4D5E6F<br>"
-#~ "\n"
+#~ "Example device URIs:<br>\n"
+#~ "serial:/dev/ttyS9?baud=9600+bits=8+parity=none+flow=soft+stop=1<br>\n"
+#~ "bluetooth://1A2B3C4D5E6F<br>\n"
 #~ "To access a device via bluetooth, the RPM package bluez-cups must be installed.\n"
 #~ "The package provides the CUPS backend 'bluetooth' which actually sends the data\n"
 #~ "to a bluetooth printer.\n"
 #~ "</p>"
 #~ msgstr ""
 #~ "<p>\n"
-#~ "<b><big>Eining si-URI-er for direktetilkoblede einingar</big></b><br>"
-#~ "\n"
+#~ "<b><big>Eining si-URI-er for direktetilkoblede einingar</big></b><br>\n"
 #~ "Einingar som kobles til vigde parallellporten eller vigde USB,\n"
 #~ "vert registrert automatisk, og ei eining si-URI is genererast automatisk.\n"
-#~ "Til dømes:<br>"
-#~ "\n"
-#~ "parallel:/dev/LP0<br>"
-#~ "\n"
-#~ "usb://ACME/Fun%20Printar?serial=A1B2C3<br>"
-#~ "\n"
-#~ "hp:/usb/HP_laserJet?serial=1234<br>"
-#~ "\n"
+#~ "Til dømes:<br>\n"
+#~ "parallel:/dev/LP0<br>\n"
+#~ "usb://ACME/Fun%20Printar?serial=A1B2C3<br>\n"
+#~ "hp:/usb/HP_laserJet?serial=1234<br>\n"
 #~ "Normalt vil berre automatisk genererte eining si-URI-er fungera.\n"
 #~ "Viss eininga ikkje vert oppdaga automatisk, vil det normalt ikkje vera mogleg å kommunisera\n"
-#~ "med eininga, og ingen data vil sendast til han.<br>"
-#~ "\n"
+#~ "med eininga, og ingen data vil sendast til han.<br>\n"
 #~ "For å få tilgjenge til ein HP-skriv eller ein alt-i-ei-eining vigd 'hp'-grunnsystemet\n"
 #~ "må RPM-pakka hplip installerast.\n"
-#~ "Pakka inneheld HPs utskrifts- og skanneprogramvare HPLIP.<br>"
-#~ "\n"
+#~ "Pakka inneheld HPs utskrifts- og skanneprogramvare HPLIP.<br>\n"
 #~ "Einingar som kobles til via ein serieport, bluetooth,\n"
 #~ "eller SCSI vert vanlegvis registrert ikkje automatisk, slik at ei eining si-URI må\n"
 #~ "angjevast manuelt.\n"
 #~ "URI-parametrar for serielle einingar må samsvara med\n"
 #~ "skrivaren sin serieport.\n"
 #~ "Sjå brukerveiledningen for den serielle skrivaren.\n"
-#~ "Døme på eining si-URI-er:<br>"
-#~ "\n"
-#~ "serial:/dev/ttyS9?baud=9600+bitar sine=8+parity=none+flow=soft+stop=1<br>"
-#~ "\n"
-#~ "bluetooth://1A2B3C4D5E6F<br>"
-#~ "\n"
-#~ "scsi:/dev/sg9<br>"
-#~ "\n"
+#~ "Døme på eining si-URI-er:<br>\n"
+#~ "serial:/dev/ttyS9?baud=9600+bitar sine=8+parity=none+flow=soft+stop=1<br>\n"
+#~ "bluetooth://1A2B3C4D5E6F<br>\n"
+#~ "scsi:/dev/sg9<br>\n"
 #~ "For å få tilgjenge til ei eining vigd bluetooth må RP-pakka bluez-cup sin installerast.\n"
 #~ "Pakka inneheld CUP sin-grunnsystemet 'bluetooth', som sender data\n"
 #~ "til ein bluetooth-skriv.\n"

Modified: branches/plus-SLE12-SP2/yast/nn/po/product-creator.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/product-creator.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/product-creator.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -514,12 +514,10 @@
 #, fuzzy
 msgid ""
 "<p>Verify the data in the summary box then\n"
-"press Finish to return to main dialog.</p>"
-"\n"
+"press Finish to return to main dialog.</p>\n"
 msgstr ""
 "<p>Kontroller at informasjonen i Sammendrag-feltet er riktig, og\n"
-"trykk deretter på Fullfør for å gå tilbake til hoveddialogen.</p>"
-"\n"
+"trykk deretter på Fullfør for å gå tilbake til hoveddialogen.</p>\n"
 
 #. caption
 #: src/include/product-creator/complex.rb:583
@@ -531,26 +529,22 @@
 #, fuzzy
 msgid ""
 "<p>Verifying data and packages...\n"
-"                    </p>"
-"\n"
+"                    </p>\n"
 "                    \n"
 msgstr ""
 "<p>Vent medan informasjonen og pakkene vert kontrollerte...\n"
-"                    </p>"
-"\n"
+"                    </p>\n"
 "                    "
 
 #: src/include/product-creator/complex.rb:592
 #, fuzzy
 msgid ""
 "<p>If there is something missing, the process will be aborted.\n"
-"Fix the problem and try again.</p>"
-"\n"
+"Fix the problem and try again.</p>\n"
 "                    "
 msgstr ""
 "<p>Viss noko er gale, vil prosessen avbrytast.\n"
-"Rett opp feilen, og forsøk igjen.</p>"
-"\n"
+"Rett opp feilen, og forsøk igjen.</p>\n"
 "                    "
 
 #: src/include/product-creator/complex.rb:600
@@ -1025,13 +1019,11 @@
 #: src/include/product-creator/dialogs.rb:1830
 #, fuzzy
 msgid ""
-"<p><big><b>Sign</b></big><br>"
-"\n"
+"<p><big><b>Sign</b></big><br>\n"
 "To make it possible for users to verify your product, sign it with a GPG key. \n"
 "This key is checked when the product is added as a repository.</p>"
 msgstr ""
-"<p><big><b>Signar</b></big><br>"
-"\n"
+"<p><big><b>Signar</b></big><br>\n"
 "Ved å signera produktet med ein GPG-nøkkel, kan brukarar verifisera produktet.\n"
 "Nøkkelen vert kontrollert når produktet vert lagt til som ein pakkebrønn.</p>"
 
@@ -1096,8 +1088,7 @@
 #, fuzzy
 msgid ""
 "<p>Verify the data in the summary then press Next to continue.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>Kontroller at informasjonen i sammendraget er riktig, og\n"
 "trykk Neste for å halda fram.\n"
@@ -1107,134 +1098,98 @@
 #: src/include/product-creator/helps.rb:35
 #, fuzzy
 msgid ""
-"<p><b><big>Boot Options</big></b><br>"
-"\n"
+"<p><b><big>Boot Options</big></b><br>\n"
 "Add additional boot menu entries with boot options.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Oppstartsalternativer</big></b><br>"
-"\n"
+"<p><b><big>Oppstartsalternativer</big></b><br>\n"
 "Her kan du leggja til fleire oppføringer i oppstartsmenyen og nokon oppstartsvalg.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/product-creator/helps.rb:40
 #, fuzzy
 msgid ""
 "<p>For example, \n"
 "configure the CD for automatic installations and specify the installation\n"
-"source location. If you are not sure, leave the file untouched and the original is used.</p>"
-"\n"
+"source location. If you are not sure, leave the file untouched and the original is used.</p>\n"
 msgstr ""
 "<p>Du kan til dømes \n"
 "setja opp CD-ein for automatisk installasjon og angje ein installasjonskilde.\n"
-"Viss du er usikker, bør du ikkje endra denne fila, men bruka originalen.</p>"
-"\n"
+"Viss du er usikker, bør du ikkje endra denne fila, men bruka originalen.</p>\n"
 
 #. Read dialog help 1/2
 #: src/include/product-creator/helps.rb:46
 #, fuzzy
-msgid ""
-"<p><b><big>Initializing Configuration</big></b></p>"
-"\n"
+msgid "<p><b><big>Initializing Configuration</big></b></p>\n"
 msgstr ""
-"<p><b><big>Initialiserer oppsett</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer oppsett</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/product-creator/helps.rb:50
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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 avbryta oppsettverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
+"Du kan trygt avbryta oppsettverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/product-creator/helps.rb:54
 #, fuzzy
-msgid ""
-"<p><b><big>Saving Configuration</big></b></p>"
-"\n"
+msgid "<p><b><big>Saving Configuration</big></b></p>\n"
 msgstr ""
-"<p><b><big>Lagrar konfigurasjon</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar konfigurasjon</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/product-creator/helps.rb:58
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog will inform you whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryt lagring:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Ovreview dialog help 1/3
 #: src/include/product-creator/helps.rb:65
 #, fuzzy
 msgid ""
-"<p><b><big>Product Creator Configuration Overview</big></b><br>"
-"\n"
+"<p><b><big>Product Creator Configuration Overview</big></b><br>\n"
 "Obtain an overview of available configurations. Additionally\n"
-"edit those configurations.<br>"
-"</p>"
-"\n"
+"edit those configurations.<br></p>\n"
 msgstr ""
-"<p><b><big>Oversyn over oppsett av produktgenerator</big></b><br>"
-"\n"
+"<p><b><big>Oversyn over oppsett av produktgenerator</big></b><br>\n"
 "Her kan du visa eit oversyn over tilgjengelege oppsett. Du kan òg\n"
-"redigera desse oppsetta.<br>"
-"</p>"
-"\n"
+"redigera desse oppsetta.<br></p>\n"
 
 #. Ovreview dialog help 2/3
 #: src/include/product-creator/helps.rb:71
 #, fuzzy
 msgid ""
-"<p><b><big>Adding a Configuration:</big></b><br>"
-"\n"
+"<p><b><big>Adding a Configuration:</big></b><br>\n"
 "Press <b>Add</b> to create a new configuration.</p>"
 msgstr ""
-"<p><b><big>Legg til eit oppsett:</big></b><br>"
-"\n"
+"<p><b><big>Legg til eit oppsett:</big></b><br>\n"
 "Trykk på <b>Legg til</b> for å oppretta eit nytt oppsett.</p>"
 
 #. Ovreview dialog help 3/3
 #: src/include/product-creator/helps.rb:75
 #, fuzzy
 msgid ""
-"<p><b><big>Editing or Deleting:</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting:</big></b><br>\n"
 "Choose a configuration to change or remove.\n"
-"Then press <b>Edit</b> or <b>Delete</b> respectively.</p>"
-"\n"
+"Then press <b>Edit</b> or <b>Delete</b> respectively.</p>\n"
 msgstr ""
-"<p><b><big>Rediger eller slett:</big></b><br>"
-"\n"
+"<p><b><big>Rediger eller slett:</big></b><br>\n"
 "Vel eit oppsett du vil endra eller sletta.\n"
-"Klikk deretter <b>Rediger</b> eller <b>Slett</b>.</p>"
-"\n"
+"Klikk deretter <b>Rediger</b> eller <b>Slett</b>.</p>\n"
 
 #. overview dialog help part 4
 #: src/include/product-creator/helps.rb:81
@@ -1258,117 +1213,86 @@
 #: src/include/product-creator/helps.rb:89
 #, fuzzy
 msgid ""
-"<p><b><big>Configuration Name and Packages</big></b><br>"
-"\n"
+"<p><b><big>Configuration Name and Packages</big></b><br>\n"
 "Choose a configuration name and the method with which to select \n"
-"the packages to add to the ISO image.<br>"
-"</p>"
-"\n"
+"the packages to add to the ISO image.<br></p>\n"
 msgstr ""
-"<p><b><big>Namn på oppsett og pakker</big></b><br>"
-"\n"
+"<p><b><big>Namn på oppsett og pakker</big></b><br>\n"
 "Vel eit namn for oppsettet og ein metode for val av pakker\n"
-"som skal leggjast til i ISO-diskbildet.<br>"
-"</p>"
-"\n"
+"som skal leggjast til i ISO-diskbildet.<br></p>\n"
 
 #. Configure1 dialog help 3/4
 #: src/include/product-creator/helps.rb:95
 #, fuzzy
 msgid ""
-"<b>AutoYaST Profile</b>"
-"<p>\n"
+"<b>AutoYaST Profile</b><p>\n"
 "Select an AutoYaST profile with the software configuration.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<b>AutoYaST-profil</b>"
-"<p>\n"
+"<b>AutoYaST-profil</b><p>\n"
 "Vel ein AutoYaST-profil for programvareoppsettet.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Configure1 dialog help 3/4
 #: src/include/product-creator/helps.rb:101
 #, fuzzy
 msgid ""
-"<b>Software Manager</b>"
-"<p>\n"
+"<b>Software Manager</b><p>\n"
 "Use the software manager without any preselected packages. All\n"
 "packages that would be automatically selected during installation must be\n"
 "selected manually based on the hardware and architecture for which you are\n"
 "creating this CD.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<b>Pakkehandsamar</b>"
-"<p>\n"
+"<b>Pakkehandsamar</b><p>\n"
 "Nytte pakkehandsamaren utan forhåndsvalgte pakkar. Alle\n"
 "pakkar som elles ville ha vorte valde automatisk under installasjonen, må\n"
 "veljast manuelt i samsvar med maskinvaren og arkitekturen du\n"
 "opprettar denne CDEN-ein for.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Source selection help 1/2
 #: src/include/product-creator/helps.rb:110
 #, fuzzy
 msgid ""
-"<p><b><big>Select Package Sources</big></b><br>"
-"\n"
-"Select at least one package source.<br>"
-"</p>"
-"\n"
+"<p><b><big>Select Package Sources</big></b><br>\n"
+"Select at least one package source.<br></p>\n"
 msgstr ""
-"<p><b><big>Vel pakkekilder</big></b><br>"
-"\n"
-"Vel minst ein pakkekilde.</p>"
-"\n"
+"<p><b><big>Vel pakkekilder</big></b><br>\n"
+"Vel minst ein pakkekilde.</p>\n"
 
 #. Source selection help 2/2
 #: src/include/product-creator/helps.rb:114
 #, fuzzy
 msgid ""
-"<p><b><big>Target Architecture</big></b><br>"
-"\n"
+"<p><b><big>Target Architecture</big></b><br>\n"
 "It is possible to create a product for a different architecture than that of\n"
 "the machine you are currently working on.\n"
-"All selected repositories must support the target architecture.<br>"
-"\n"
+"All selected repositories must support the target architecture.<br>\n"
 "<b>Note:</b> KIWI does not support different architectures yet, do not change\n"
-"the architecture if you intend to create a KIWI image from the current configuration.</p>"
-"\n"
+"the architecture if you intend to create a KIWI image from the current configuration.</p>\n"
 msgstr ""
-"<p><b><big>Målarkitektur</big></b><br>"
-"\n"
+"<p><b><big>Målarkitektur</big></b><br>\n"
 "Du kan oppretta eit produkt for andre arkitekturar, enn arkitekturen på denne maskina.\n"
-"Alle valde pakkebrønner må støtte målarkitekturen.<br>"
-"\n"
+"Alle valde pakkebrønner må støtte målarkitekturen.<br>\n"
 "<b>Merk:</b> KIWI støttar førebels ikkje fleire arkitekturar. Du må ikkje endra\n"
-"arkitekturen viss du vil oppretta ein KIWI-diskbilde med dette oppsettet.</p>"
-"\n"
+"arkitekturen viss du vil oppretta ein KIWI-diskbilde med dette oppsettet.</p>\n"
 
 #. Configure2 dialog help 1/2
 #: src/include/product-creator/helps.rb:123
 #, fuzzy
 msgid ""
-"<p><b><big>ISO Directory and Image</big></b><br>"
-"\n"
+"<p><b><big>ISO Directory and Image</big></b><br>\n"
 "Enter the location in which to create the skeleton directory. All needed\n"
 "files will be copied to this directory. Select a location with enough disk\n"
 "space.\n"
-"<br>"
-"</p>"
-"\n"
+"<br></p>\n"
 msgstr ""
-"<p><b><big>ISO-katalog og diskbilde</big></b><br>"
-"\n"
+"<p><b><big>ISO-katalog og diskbilde</big></b><br>\n"
 "Angje kor katalogen med grunnstrukturen skal opprettast. Alle naudsynte\n"
 "filer vil kopierast til denne katalogen. Vel ei plassering med nok plass på\n"
 "disken.\n"
-"<br>"
-"</p>"
-"\n"
+"<br></p>\n"
 
 #. Configure2 dialog help 2/3
 #: src/include/product-creator/helps.rb:131
@@ -1376,13 +1300,11 @@
 msgid ""
 "<p>Create an ISO image or a directory that is suitable for \n"
 "creating an ISO image at a later time.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>Opprett eit ISO-diskbilde eller berre ein katalog der \n"
 "eit ISO-diskbilde kan verta seinare oppretta.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Configure2 dialog help 2/3
 #: src/include/product-creator/helps.rb:137
@@ -1390,13 +1312,11 @@
 msgid ""
 "<p>To save space, select the check box to copy only needed files \n"
 "to the skeleton. \n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>For å spara plass kan du kryssa av for at berre naudsynte filer \n"
 "skal verta til kopiert grunnstrukturen. \n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text - the base selection dialog 1/4
 #: src/include/product-creator/helps.rb:143
@@ -1410,13 +1330,11 @@
 msgid ""
 "<p>One of the used repositories must be marked as the base product. The base\n"
 "product repository should be bootable to ensure the newly created product is also\n"
-"bootable.</p>"
-"\n"
+"bootable.</p>\n"
 msgstr ""
 "<p>Ein av pakkebrønnene må merkast som grunnpakkebrønn. Grunnpakkebrønnen\n"
 "må kunna brukast til oppstart for å sikre at det oppretta produktet òg\n"
-"kan brukast til oppstart av ei maskin.</p>"
-"\n"
+"kan brukast til oppstart av ei maskin.</p>\n"
 
 #. help text - the base selection dialog 3/4
 #: src/include/product-creator/helps.rb:153
@@ -1430,8 +1348,7 @@
 msgid ""
 "<p>The product creator solves dependencies of the selected products and proposes\n"
 "the base product. If the proposed value is wrong, select the right base\n"
-"repository from the list.</p>"
-"\n"
+"repository from the list.</p>\n"
 msgstr ""
 "<p>Produktgeneratoren løyser konfliktar for dei valde produkta og foreslår\n"
 "eit grunnprodukt. Viss det foreslegne verdet er feil, vel riktig grunnpakkebrønn\n"
@@ -1641,25 +1558,18 @@
 #: src/include/product-creator/kiwi_dialogs.rb:1513
 #, fuzzy
 msgid ""
-"<p>Packages from section '%1' are not available with selected repositories:</p>"
-"\n"
-"<p>%2.</p>"
-"\n"
+"<p>Packages from section '%1' are not available with selected repositories:</p>\n"
+"<p>%2.</p>\n"
 "<p>\n"
-"Either remove the packages from the section, check the detailed package selection or ignore the situation.</p>"
-"\n"
+"Either remove the packages from the section, check the detailed package selection or ignore the situation.</p>\n"
 "<p>\n"
 "Going to detailed package selection and accepting the view without any further changes results in removal of problematic packages from the section.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p>Desse pakkene frå seksjonen '%1' er ikkje tilgjengelege med valde pakkebrønner:</p>"
-"\n"
-"<p>%2.</p>"
-"\n"
+"<p>Desse pakkene frå seksjonen '%1' er ikkje tilgjengelege med valde pakkebrønner:</p>\n"
+"<p>%2.</p>\n"
 "<p>\n"
-"Du kan fjerna pakkene frå seksjonen og kryssa av for detaljert pakkevalg, eller ignorera situasjonen.</p>"
-"\n"
+"Du kan fjerna pakkene frå seksjonen og kryssa av for detaljert pakkevalg, eller ignorera situasjonen.</p>\n"
 "<p>\n"
 "Viss du går til detaljert pakkevalg, og stadfestar visningen utan endringar, vil problempakker fjernast frå seksjonen.\n"
 "</p>"
@@ -2152,12 +2062,10 @@
 #, fuzzy
 msgid ""
 "<p>For each user, specify the <b>Name</b>, <b>Password</b>, <b>Home Directory</b> and group\n"
-"to which the users belongs.</p>"
-"\n"
+"to which the users belongs.</p>\n"
 msgstr ""
 "<p>For kvar brukar, angje <b>Namn</b>, <b>Passord</b>, <b>Hjemmekatalog</b> og gruppa\n"
-"som brukaren tilhøyrer.</p>"
-"\n"
+"som brukaren tilhøyrer.</p>\n"
 
 #. dialog caption
 #: src/include/product-creator/kiwi_dialogs.rb:2911

Modified: branches/plus-SLE12-SP2/yast/nn/po/proxy.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/proxy.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/proxy.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -92,8 +92,7 @@
 #. Proxy dialog help 1/8
 #: src/include/proxy/dialogs.rb:405
 msgid ""
-"<p>Configure your Internet proxy (caching) settings here.</p>"
-"\n"
+"<p>Configure your Internet proxy (caching) settings here.</p>\n"
 "<p><b>Note:</b> It is generally recommended to relogin for the settings to take effect, \n"
 "however in some cases the application may pick up new settings immediately. Please check \n"
 "what your application (web browser, ftp client,...) supports. </p>"
@@ -103,16 +102,14 @@
 #: src/include/proxy/dialogs.rb:412
 msgid ""
 "<p><b>HTTP Proxy URL</b> is the name of the proxy server for your access\n"
-"to the World Wide Web (WWW).</p>"
-"\n"
+"to the World Wide Web (WWW).</p>\n"
 msgstr ""
 
 #. Proxy dialog help 3/8
 #: src/include/proxy/dialogs.rb:416
 msgid ""
 "<p><b>HTTPS Proxy URL</b> is the name of the proxy server for your secured access\n"
-"to the World Wide Web (WWW).</p>"
-"\n"
+"to the World Wide Web (WWW).</p>\n"
 msgstr ""
 
 #. Proxy dialog help 3.5/8
@@ -140,8 +137,7 @@
 msgid ""
 "<p><b>No Proxy Domains</b> is a comma-separated list of domains\n"
 "for which the requests should be made directly without caching,\n"
-"for example, <i>%1</i>.</p>"
-"\n"
+"for example, <i>%1</i>.</p>\n"
 msgstr ""
 
 #. Proxy dialog help 7/8
@@ -149,16 +145,14 @@
 msgid ""
 "<p>If you are using a proxy server with authorization, enter\n"
 "the <b>Proxy User Name</b> and <b>Proxy Password</b>. A valid username\n"
-"consists of printable ASCII characters only (except for quotation marks).</p>"
-"\n"
+"consists of printable ASCII characters only (except for quotation marks).</p>\n"
 msgstr ""
 
 #. Proxy dialog help 8/8
 #: src/include/proxy/dialogs.rb:450
 msgid ""
 "<p>Press <b>Test Proxy Settings</b> to test\n"
-"the current configuration for HTTP, HTTPS, and FTP proxy.</p>"
-" \n"
+"the current configuration for HTTP, HTTPS, and FTP proxy.</p> \n"
 msgstr ""
 
 #. CheckBox entry label

Modified: branches/plus-SLE12-SP2/yast/nn/po/qt-pkg.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/qt-pkg.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/qt-pkg.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -132,7 +132,8 @@
 msgid "Update if newer version available"
 msgstr "Oppgrader viss nyare versjon er tilgjengeleg"
 
-#: src/YQPackageSelector.cc:747 src/YQPkgObjList.cc:415 src/YQPkgObjList.cc:436
+#: src/YQPackageSelector.cc:747 src/YQPkgObjList.cc:415
+#: src/YQPkgObjList.cc:436
 msgid "Update unconditionally"
 msgstr "Oppgrader uansett"
 
@@ -869,12 +870,8 @@
 
 #: src/YQPkgConflictDialog.cc:391
 #, fuzzy
-msgid ""
-"<p>Use this to generate extensive logs to help tracking down bugs in the dependency resolver. The logs will be stored in directory <br>"
-"<tt>%1</tt></p>"
-msgstr ""
-"<p>Bruk dette valet for å generera detaljerte loggar for feilsøking av konfliktløsningen. Loggene vil lagrast i katalogen <br>"
-"<tt>%1</tt></p>"
+msgid "<p>Use this to generate extensive logs to help tracking down bugs in the dependency resolver. The logs will be stored in directory <br><tt>%1</tt></p>"
+msgstr "<p>Bruk dette valet for å generera detaljerte loggar for feilsøking av konfliktløsningen. Loggene vil lagrast i katalogen <br><tt>%1</tt></p>"
 
 #. parent
 #: src/YQPkgConflictDialog.cc:395
@@ -884,14 +881,8 @@
 
 #: src/YQPkgConflictDialog.cc:410
 #, fuzzy
-msgid ""
-"<p>Dependency resolver test case written to <br>"
-"<tt>%1</tt></p>"
-"<p>Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?</p>"
-msgstr ""
-"<p>Testkasus for konfliktløsning lagra i <br>"
-"<tt>%1</tt></p>"
-"<p>vil du oppretta arkivet <tt>y2log sin.tgz tek</tt> som vedlegg til Bugzilla?</p>"
+msgid "<p>Dependency resolver test case written to <br><tt>%1</tt></p><p>Prepare <tt>y2logs.tgz tar</tt> archive to attach to Bugzilla?</p>"
+msgstr "<p>Testkasus for konfliktløsning lagra i <br><tt>%1</tt></p><p>vil du oppretta arkivet <tt>y2log sin.tgz tek</tt> som vedlegg til Bugzilla?</p>"
 
 #. parent
 #: src/YQPkgConflictDialog.cc:413
@@ -902,12 +893,8 @@
 #. caption
 #: src/YQPkgConflictDialog.cc:426
 #, fuzzy
-msgid ""
-"<p><b>Error</b> creating dependency resolver test case</p>"
-"<p>Please check disk space and permissions for <tt>%1</tt></p>"
-msgstr ""
-"<p><b>Feil</b> under skiping av testkasus for konfliktløsning</p>"
-"<p>Kontroller at det er nok plass på disken, og at du er autorisert for <tt>%1</tt></p>"
+msgid "<p><b>Error</b> creating dependency resolver test case</p><p>Please check disk space and permissions for <tt>%1</tt></p>"
+msgstr "<p><b>Feil</b> under skiping av testkasus for konfliktløsning</p><p>Kontroller at det er nok plass på disken, og at du er autorisert for <tt>%1</tt></p>"
 
 #. startsWith
 #. filter
@@ -1715,49 +1702,37 @@
 #: src/YQPkgUpdateProblemFilterView.cc:60
 #, fuzzy
 msgid ""
-"<br>"
-"\n"
-"<h2>Update Problem</h2>"
-"\n"
+"<br>\n"
+"<h2>Update Problem</h2>\n"
 "<p>\n"
 "The packages in this list cannot be updated automatically.\n"
-"</p>"
-"\n"
-"<p>Possible reasons:</p>"
-"\n"
+"</p>\n"
+"<p>Possible reasons:</p>\n"
 "<ul>\n"
 "<li>They are obsoleted by other packages\n"
 "<li>There is no newer version to update to on any installation media\n"
 "<li>They are third-party packages\n"
-"</ul>"
-"\n"
-"</p>"
-"\n"
+"</ul>\n"
+"</p>\n"
 "<p>\n"
 "Please choose manually what to do with them.\n"
 "The safest course of action is to delete them.\n"
 "</p>"
 msgstr ""
-"<br>"
-"\n"
-"<h2>Oppgraderingsproblem</h2>"
-"\n"
+"<br>\n"
+"<h2>Oppgraderingsproblem</h2>\n"
 "<p>\n"
 "<font color=blue>\n"
 "Pakkene i denne lista kan ikkje oppgraderast automatisk.\n"
 "</font>\n"
-"</p>"
-"\n"
-"<p>Moglege årsaker:</p>"
-"\n"
+"</p>\n"
+"<p>Moglege årsaker:</p>\n"
 "<ul>\n"
 "<li>Dei har vorte forelda pga. andre pakker\n"
 "<li>Det finst ingen nyare versjon å oppgradera til på nokon installasjonsmedier\n"
 "<li>Det er tredjepartspakker\n"
-"</ul>"
-"\n"
-"</p>"
-"\n"
+"</ul>\n"
+"</p>\n"
 "<p>\n"
 "Vel manuelt kva du vil gjera med dei.\n"
 "Det sikraste alternativet er å sletta dei.\n"

Modified: branches/plus-SLE12-SP2/yast/nn/po/rdp.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/rdp.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/rdp.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -78,13 +78,11 @@
 
 #: src/include/rdp/dialogs.rb:54
 msgid ""
-"<p><b><big>Remote Administration Settings</big></b></p>"
-"\n"
+"<p><b><big>Remote Administration Settings</big></b></p>\n"
 "<p>If this feature is enabled, you can\n"
 "administer this machine remotely from another machine. Use a RDP\n"
 "client, such as rdesktop (connect to <tt><hostname>:%1</tt>).\n"
-"This form of remote administration is less secure than using SSH.</p>"
-"\n"
+"This form of remote administration is less secure than using SSH.</p>\n"
 msgstr ""
 
 #. Dialog frame title

Modified: branches/plus-SLE12-SP2/yast/nn/po/rear.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/rear.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/rear.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -146,9 +146,7 @@
 msgstr ""
 
 #: src/include/rear/ui.rb:440
-msgid ""
-"<p><b>OK</b> saves the configuration and quits while <b>Cancel</b> closes the configuration dialog without saving."
-"<p>"
+msgid "<p><b>OK</b> saves the configuration and quits while <b>Cancel</b> closes the configuration dialog without saving.<p>"
 msgstr ""
 
 #. prepare advanced menu
@@ -234,11 +232,11 @@
 msgstr ""
 
 #: src/include/rear/ui.rb:698
-msgid "Analyzing system"
+msgid "Reading rear settings"
 msgstr ""
 
 #: src/include/rear/ui.rb:698
-msgid "Reading rear settings"
+msgid "Analyzing system"
 msgstr ""
 
 #: src/include/rear/ui.rb:699

Modified: branches/plus-SLE12-SP2/yast/nn/po/registration.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/registration.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/registration.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -60,7 +60,7 @@
 #. dialog title
 #. display and run a dialog for updating the current registration
 #. @return [Symbol] user input
-#: src/clients/inst_scc.rb:186
+#: src/clients/inst_scc.rb:189
 #: src/lib/registration/ui/autoyast_config_dialog.rb:104
 #: src/lib/registration/ui/base_system_registration_dialog.rb:48
 #: src/lib/registration/ui/migration_repos_workflow.rb:287
@@ -77,24 +77,24 @@
 msgstr ""
 
 #. popup message: registration finished properly
-#: src/clients/scc_auto.rb:201
+#: src/clients/scc_auto.rb:204
 #, fuzzy
 msgid "Registration was successfull."
 msgstr "Registreringa er fullførd."
 
 #. remove possible duplicates
-#: src/clients/scc_auto.rb:229
+#: src/clients/scc_auto.rb:232
 msgid "SLP discovery failed, no server found"
 msgstr ""
 
 #. download and install the specified SSL certificate to the system
 #. @param url [String] URL of the certificate
-#: src/clients/scc_auto.rb:247
+#: src/clients/scc_auto.rb:250
 #, fuzzy
 msgid "Downloading SSL Certificate"
 msgstr "Serverens CA-sertifikat:"
 
-#: src/clients/scc_auto.rb:251
+#: src/clients/scc_auto.rb:254
 #, fuzzy
 msgid "Importing SSL Certificate"
 msgstr "Serverens CA-sertifikat:"
@@ -102,8 +102,8 @@
 #. %s is name of given product
 #. then register the product(s)
 #. %s is name of given product
-#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:281
-#: src/lib/registration/registration_ui.rb:311
+#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:283
+#: src/lib/registration/registration_ui.rb:316
 #, fuzzy
 msgid "Registering %s ..."
 msgstr "Registreringskode"
@@ -257,29 +257,18 @@
 msgstr "Fingeravtrykk:"
 
 #. Error popup
-#: src/lib/registration/connect_helpers.rb:74
-msgid ""
-"Network is not configured, the registration server cannot be reached.\n"
-"Do you want to configure the network now?"
-msgstr ""
-
-#: src/lib/registration/connect_helpers.rb:80
-msgid "Network error, check the network configuration."
-msgstr ""
-
-#. Error popup
-#: src/lib/registration/connect_helpers.rb:85
+#: src/lib/registration/connect_helpers.rb:76
 msgid "Connection time out."
 msgstr ""
 
 #. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:93
+#: src/lib/registration/connect_helpers.rb:84
 #, fuzzy
 msgid "Check that this system is known to the registration server."
 msgstr "Registreringskode"
 
 #. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:99
+#: src/lib/registration/connect_helpers.rb:90
 msgid ""
 "If you are upgrading from SLE11 make sure the SCC server\n"
 "knows the old NCC registration. Synchronization from NCC to SCC\n"
@@ -295,34 +284,34 @@
 #. update the message when an old SMT server is found
 #. Error popup
 #. update the message when an old SMT server is found
-#: src/lib/registration/connect_helpers.rb:113
-#: src/lib/registration/connect_helpers.rb:118
-#: src/lib/registration/connect_helpers.rb:121
-#: src/lib/registration/connect_helpers.rb:128
-#: src/lib/registration/connect_helpers.rb:179
-#: src/lib/registration/connect_helpers.rb:182
+#: src/lib/registration/connect_helpers.rb:104
+#: src/lib/registration/connect_helpers.rb:109
+#: src/lib/registration/connect_helpers.rb:112
+#: src/lib/registration/connect_helpers.rb:119
+#: src/lib/registration/connect_helpers.rb:170
+#: src/lib/registration/connect_helpers.rb:173
 #, fuzzy
 msgid "Registration failed."
 msgstr "Registreringskode"
 
-#: src/lib/registration/connect_helpers.rb:123
+#: src/lib/registration/connect_helpers.rb:114
 #, fuzzy
 msgid "Registration client error."
 msgstr "Registreringa kan ikkje utførast."
 
-#: src/lib/registration/connect_helpers.rb:125
+#: src/lib/registration/connect_helpers.rb:116
 msgid ""
 "Registration server error.\n"
 "Retry registration later."
 msgstr ""
 
 #. error message
-#: src/lib/registration/connect_helpers.rb:167
+#: 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:197
+#: src/lib/registration/connect_helpers.rb:188
 #, fuzzy
 msgid "Details: %s"
 msgstr "Detaljer …"
@@ -330,7 +319,7 @@
 #. TRANSLATORS: multiline error message - a SSL certificate has been
 #. imported but the registration server still cannot be accessed securely,
 #. user has to solve the certificate issue manually.
-#: src/lib/registration/connect_helpers.rb:226
+#: src/lib/registration/connect_helpers.rb:217
 msgid ""
 "A certificate has been already imported\n"
 "but the server connection still cannot be trusted.\n"
@@ -340,23 +329,23 @@
 msgstr ""
 
 #. progress label
-#: src/lib/registration/connect_helpers.rb:238
+#: src/lib/registration/connect_helpers.rb:229
 msgid "Importing the SSL certificate"
 msgstr ""
 
-#: src/lib/registration/connect_helpers.rb:239
+#: src/lib/registration/connect_helpers.rb:230
 msgid "Importing '%s' certificate..."
 msgstr ""
 
 #. try to use a translatable message first, if not found then use
 #. the original error message from openSSL
-#: src/lib/registration/connect_helpers.rb:260
+#: src/lib/registration/connect_helpers.rb:251
 msgid "Secure connection error: %s"
 msgstr ""
 
 #. TRANSLATORS: error message, %s is a server URL,
 #. e.g. https://smt.example.com
-#: src/lib/registration/connect_helpers.rb:279
+#: src/lib/registration/connect_helpers.rb:270
 msgid ""
 "An old registration server was detected at\n"
 "%s.\n"
@@ -364,6 +353,24 @@
 "protocol is installed at the server."
 msgstr ""
 
+#. FIXME: use a better message, this one has been reused after the text freeze
+#. error message, the entered URL is not valid
+#: src/lib/registration/connect_helpers.rb:282
+#: src/lib/registration/ui/local_server_dialog.rb:67
+msgid "Invalid URL."
+msgstr ""
+
+#. Error popup
+#: src/lib/registration/connect_helpers.rb:286
+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:292
+msgid "Network error, check the network configuration."
+msgstr ""
+
 #. progress step title
 #: src/lib/registration/finish_dialog.rb:35
 #, fuzzy
@@ -393,7 +400,7 @@
 #. FIXME: reused an existing message due to text freeze
 #. (later use a better text, it's system update actually...)
 #: src/lib/registration/registration_ui.rb:80
-#: src/lib/registration/registration_ui.rb:267
+#: src/lib/registration/registration_ui.rb:269
 msgid "Registering the System..."
 msgstr ""
 
@@ -402,15 +409,15 @@
 #. updating registered addon/extension, %s is an extension name
 #. TRANSLATORS: Progress label
 #: src/lib/registration/registration_ui.rb:106
-#: src/lib/registration/registration_ui.rb:146
-#: src/lib/registration/registration_ui.rb:346
+#: src/lib/registration/registration_ui.rb:148
+#: src/lib/registration/registration_ui.rb:353
 #: src/lib/registration/ui/migration_repos_workflow.rb:304
 #, fuzzy
 msgid "Updating to %s ..."
 msgstr "Registreringskode"
 
 #. TRANSLATORS: progress label
-#: src/lib/registration/registration_ui.rb:163
+#: src/lib/registration/registration_ui.rb:165
 #, fuzzy
 msgid "Synchronizing Products..."
 msgstr "Registreringskode"
@@ -421,30 +428,30 @@
 #. @return [ArrayRegistration::Addon] available addons
 #. download the addons from SCC, let the user select addons to install
 #. @return [Symbol] the user input
-#: src/lib/registration/registration_ui.rb:177
+#: src/lib/registration/registration_ui.rb:179
 #: src/lib/registration/ui/autoyast_config_workflow.rb:106
 #, fuzzy
 msgid "Loading Available Extensions and Modules..."
 msgstr "Hjelp for registreringsmodul"
 
-#: src/lib/registration/registration_ui.rb:191
+#: src/lib/registration/registration_ui.rb:193
 #, fuzzy
 msgid "Loading Migration Products..."
 msgstr "Registreringskode"
 
 #. dialog title
-#: src/lib/registration/registration_ui.rb:208
+#: src/lib/registration/registration_ui.rb:210
 #, fuzzy
 msgid "Register Extensions and Modules"
 msgstr "Hjelp for registreringsmodul"
 
 #. help text
-#: src/lib/registration/registration_ui.rb:212
+#: src/lib/registration/registration_ui.rb:214
 msgid "<p>Extensions and Modules are being registered.</p>"
 msgstr ""
 
 #. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:237
+#: src/lib/registration/registration_ui.rb:239
 #, fuzzy
 msgid ""
 "The registration server offers update repositories.\n"
@@ -452,7 +459,7 @@
 msgstr "Hjelp for registreringsmodul"
 
 #. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:241
+#: src/lib/registration/registration_ui.rb:243
 msgid ""
 "Would you like to enable these repositories during installation\n"
 "in order to receive the latest updates?"
@@ -460,7 +467,7 @@
 
 #. Yast::Mode.update
 #. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:245
+#: src/lib/registration/registration_ui.rb:247
 msgid ""
 "Would you like to enable these repositories during upgrade\n"
 "in order to receive the latest updates?"
@@ -493,7 +500,7 @@
 
 #. error message
 #. error message
-#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292
+#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:293
 #, fuzzy
 msgid "Saving repository configuration failed."
 msgstr "Startar registrering …"
@@ -515,12 +522,12 @@
 msgstr ""
 
 #. error message
-#: src/lib/registration/sw_mgmt.rb:279
+#: src/lib/registration/sw_mgmt.rb:280
 msgid "Refreshing service '%s' failed."
 msgstr ""
 
 #. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:486
+#: src/lib/registration/sw_mgmt.rb:487
 msgid ""
 "Cannot find remote product %s.\n"
 "The product cannot be registered."
@@ -570,8 +577,7 @@
 #. help text
 #: src/lib/registration/ui/addon_reg_codes_dialog.rb:50
 msgid ""
-"<p>Enter registration codes for the requested extensions or modules.</p>"
-"\n"
+"<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 ""
 
@@ -720,7 +726,7 @@
 #. handle nil specifically, it cannot be stored in XML profile
 #: src/lib/registration/ui/autoyast_addon_dialog.rb:191
 #: src/lib/registration/ui/autoyast_config_dialog.rb:108
-#: src/lib/registration/ui/base_system_registration_dialog.rb:133
+#: src/lib/registration/ui/base_system_registration_dialog.rb:140
 #, fuzzy
 msgid "Registration &Code"
 msgstr "Registreringskode"
@@ -751,7 +757,7 @@
 #. part of the main dialog definition - the input fields
 #. @return [Yast::Term] UI term
 #: src/lib/registration/ui/autoyast_config_dialog.rb:106
-#: src/lib/registration/ui/base_system_registration_dialog.rb:131
+#: src/lib/registration/ui/base_system_registration_dialog.rb:138
 msgid "&E-mail Address"
 msgstr ""
 
@@ -832,12 +838,12 @@
 msgstr ""
 
 #. help text
-#: src/lib/registration/ui/base_system_registration_dialog.rb:142
+#: src/lib/registration/ui/base_system_registration_dialog.rb:149
 msgid "Enter SUSE Customer Center credentials here to register the system to get updates and extensions."
 msgstr ""
 
 #. Popup question: confirm skipping the registration
-#: src/lib/registration/ui/base_system_registration_dialog.rb:177
+#: src/lib/registration/ui/base_system_registration_dialog.rb:184
 msgid ""
 "If you do not register your system we will not be able\n"
 "to grant you access to the update repositories.\n"
@@ -850,7 +856,7 @@
 
 #. label text describing the registration (1/2)
 #. use \n to split to more lines if needed (use max. 76 chars/line)
-#: src/lib/registration/ui/base_system_registration_dialog.rb:194
+#: src/lib/registration/ui/base_system_registration_dialog.rb:201
 msgid ""
 "Please enter a registration or evaluation code for this product and your\n"
 "User Name/E-mail address from the SUSE Customer Center in the fields below.\n"
@@ -861,7 +867,7 @@
 #. label text describing the registration (2/2),
 #. not displayed in installed system
 #. use \n to split to more lines if needed (use max. 76 chars/line)
-#: src/lib/registration/ui/base_system_registration_dialog.rb:206
+#: src/lib/registration/ui/base_system_registration_dialog.rb:213
 msgid ""
 "If you skip product registration now, remember to register after\n"
 "installation has completed."
@@ -869,9 +875,9 @@
 
 #. UI term for the network configuration button (or empty if not needed)
 #. @return [Yast::Term] UI term
-#: src/lib/registration/ui/base_system_registration_dialog.rb:218
+#: src/lib/registration/ui/base_system_registration_dialog.rb:225
 #, fuzzy
-msgid "Network Configuration..."
+msgid "Net&work Configuration..."
 msgstr "Oppset for Novell kundesenter"
 
 #. SSL error message
@@ -921,11 +927,6 @@
 msgid "<p><b>Importing an unknown certificate without verification is a big security risk.</b></p>"
 msgstr ""
 
-#. error message, the entered URL is not valid
-#: src/lib/registration/ui/local_server_dialog.rb:67
-msgid "Invalid URL."
-msgstr ""
-
 #. input field label
 #: src/lib/registration/ui/local_server_dialog.rb:106
 #, fuzzy
@@ -1137,12 +1138,12 @@
 msgstr ""
 
 #. ignore SUSE manager registration servers (bnc#894470)
-#: src/lib/registration/url_helpers.rb:203
+#: src/lib/registration/url_helpers.rb:211
 #, fuzzy
 msgid "Searching..."
 msgstr "Kontrollerer …"
 
-#: src/lib/registration/url_helpers.rb:203
+#: src/lib/registration/url_helpers.rb:211
 #, fuzzy
 msgid "Looking up local registration servers..."
 msgstr "Bruk lokal registreringsserver"
@@ -1435,8 +1436,7 @@
 #~ "The registration process will contact a Novell server (or a local registration server if your company provides one).\n"
 #~ "Make sure that the network and proxy settings are correct.\n"
 #~ "You can go back to the network setup to check or change the settings.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
 #~ "<p>\n"
 #~ "Under registreringsprosessen vil ein Novell-servar kontaktast (eller ein lokal registreringsserver viss det finst for føretaket ditt).\n"
@@ -1637,11 +1637,9 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>Other information used for registration is shown in <b>Registration\n"
-#~ "Data</b>.<br>"
-#~ "To add a new key and value pair, press <b>Add</b> then enter the\n"
+#~ "Data</b>.<br>To add a new key and value pair, press <b>Add</b> then enter the\n"
 #~ "appropriate values. These parameters are the ones that can be passed with <tt>suse_register\n"
-#~ "-a</tt>.<br>"
-#~ "Get more information with <tt>suse_register -p</tt>. Remove a\n"
+#~ "-a</tt>.<br>Get more information with <tt>suse_register -p</tt>. Remove a\n"
 #~ "key-value pair with <b>Delete</b> or modify an existing pair with <b>Edit</b>.</p>"
 #~ msgstr "<p>Annan informasjon som vert brukt ved registreringa, vert vist under <b>Registreringsdata</b>. Legg til ein nytt nøkkel/verd-par ved å trykkja <b>Legg til</b> og angje aktuelle verd. Desse parametrane kan sendast med kommandoen <tt>susa_register -a</tt>. Bruk kommandoen <tt>susa_register -p</tt> for å vise meir informasjon om parametrane.   Fjern eit par med <b>Slett</b> eller endre eit eksisterande par med <b>Rediger</b>.</p>"
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/reipl.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/reipl.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/reipl.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -28,7 +28,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:64
+#: src/clients/reipl_bootloader_finish.rb:66
 #, fuzzy
 msgid ""
 "\n"
@@ -44,7 +44,7 @@
 #. %2 is replaced with a WWPN name
 #. %3 is replaced with a LUN name
 #. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:83
+#: src/clients/reipl_bootloader_finish.rb:85
 #, fuzzy
 msgid ""
 "\n"
@@ -59,7 +59,7 @@
 "med WWPN '%2'\n"
 "og LUN '%3'.\n"
 
-#: src/clients/reipl_bootloader_finish.rb:97
+#: src/clients/reipl_bootloader_finish.rb:99
 #, fuzzy
 msgid ""
 "\n"
@@ -174,63 +174,45 @@
 #: src/include/reipl/helps.rb:36
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing reipl Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Initializing reipl Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Initialiserer reipl-oppsett</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer reipl-oppsett</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/reipl/helps.rb:40
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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 avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
+"Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/reipl/helps.rb:44
 #, fuzzy
 msgid ""
-"<p><b><big>Saving reipl Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Saving reipl Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Lagrar reipl-oppsett</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar reipl-oppsett</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/reipl/helps.rb:48
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryt lagring:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Configure dialog help 1
 #: src/include/reipl/helps.rb:55
@@ -246,8 +228,7 @@
 "listed inside <b>reipl methods</b>. Depending on what your machine supports,\n"
 "choose between CCW (channel command word) devices and SCSI devices,\n"
 "which are attached through zFCP (fibre channel protocol). Then fill out the\n"
-"necessary parameter entry fields for the respective method.</p>"
-"\n"
+"necessary parameter entry fields for the respective method.</p>\n"
 msgstr ""
 "<p>Vel ein av metodane for omstart av maskina med valgknappene\n"
 "under <b>reipl-metodar</b>. Avhengig av kva maskina støttar,\n"
@@ -286,8 +267,7 @@
 #, fuzzy
 msgid ""
 "<p>The <b>worldwide port number</b> (WWPN) must be entered with lowercase\n"
-"letters as a 16-digit hex value, such as 0x5005076300c40e5a.</p>"
-"\n"
+"letters as a 16-digit hex value, such as 0x5005076300c40e5a.</p>\n"
 msgstr ""
 "<p>Det <b>globale portnummeret</b> (WWPN) må verta med angjeve små\n"
 "bokstavar som ein heksverdi med 16 siffer, t.d. 0x5005076300c40e5a.</p>"
@@ -321,8 +301,7 @@
 "<p>The <b>boot record logical block address</b> (LBA) specifies the master\n"
 "boot record and is currently always 0.</p>"
 msgstr ""
-" "
-"<p><b>Logisk blokkadresse for oppstartsoppføring</b> (LBA) angjev\n"
+" <p><b>Logisk blokkadresse for oppstartsoppføring</b> (LBA) angjev\n"
 "hovedoppstartsoppføringen og er førebels alltid 0.</p>"
 
 #. Configure dialog help 9

Modified: branches/plus-SLE12-SP2/yast/nn/po/relocation-server.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/relocation-server.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/relocation-server.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -186,66 +186,48 @@
 #. Read dialog help 1/2
 #: src/include/relocation-server/helps.rb:36
 msgid ""
-"<p><b><big>Initializing relocation-server Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Initializing relocation-server Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
 
 #. Read dialog help 2/2
 #: src/include/relocation-server/helps.rb:40
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<p><b><big>Aborting Initialization:</big></b><br>\n"
+"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n"
 msgstr ""
 
 #. Write dialog help 1/2
 #: src/include/relocation-server/helps.rb:44
 msgid ""
-"<p><b><big>Saving relocation-server Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Saving relocation-server Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
 
 #. Write dialog help 2/2
 #: src/include/relocation-server/helps.rb:48
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 
 #: src/include/relocation-server/helps.rb:54
 msgid ""
-"<p><b>Relocation Address</b><br>"
-"\n"
-"Address xend should listen on for relocation-socket connections</p>"
-"\n"
-"<p><b>Allowed Hosts</b><br>"
-"\n"
-"The hosts allowed to talk to the relocation port. If this is empty, then all connections are allowed. Otherwise, this should be a space-separated sequence of regular expressions. Any host with a fully-qualified domain name or an IP address that matches one of these regular expressions will be accepted.</p>"
-"\n"
-"<p><b>SSL Key File/SSL Cert File</b><br>"
-"\n"
+"<p><b>Relocation Address</b><br>\n"
+"Address xend should listen on for relocation-socket connections</p>\n"
+"<p><b>Allowed Hosts</b><br>\n"
+"The hosts allowed to talk to the relocation port. If this is empty, then all connections are allowed. Otherwise, this should be a space-separated sequence of regular expressions. Any host with a fully-qualified domain name or an IP address that matches one of these regular expressions will be accepted.</p>\n"
+"<p><b>SSL Key File/SSL Cert File</b><br>\n"
 "SSL key and certificate to use for the ssl relocation interface</p>"
 msgstr ""
 
 #: src/include/relocation-server/helps.rb:62
 msgid ""
-"<p><b><big>Tunneled migration</big></b><br>"
-"\n"
-"The source host libvirtd opens a direct connection to the destination host libvirtd for sending migration data. This allows the option of encrypting the data stream.</p>"
-"\n"
-"<p><b><big>Plain migration</big></b><br>"
-"\n"
+"<p><b><big>Tunneled migration</big></b><br>\n"
+"The source host libvirtd opens a direct connection to the destination host libvirtd for sending migration data. This allows the option of encrypting the data stream.</p>\n"
+"<p><b><big>Plain migration</big></b><br>\n"
 "The source host VM opens a direct unencrypted TCP connection to the destination host for sending the migration data. Unless a port is manually specified, libvirt will choose a migration port in the default range.</p>"
 msgstr ""
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/samba-client.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/samba-client.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/samba-client.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -525,63 +525,45 @@
 #: src/include/samba-client/helps.rb:36
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing Samba Client Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Initializing Samba Client Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Initialiserer konfigurasjon av Samba-klient</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer konfigurasjon av Samba-klient</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/samba-client/helps.rb:40
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting the Initialization</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b>.</p>"
-"\n"
+"<p><b><big>Aborting the Initialization</big></b><br>\n"
+"Safely abort the configuration utility by pressing <b>Abort</b>.</p>\n"
 msgstr ""
-"<p><b><big>Avbryta initialiseringen</big></b><br>"
-"\n"
-"Du kan trygt avslutta konfigurasjonsverktøyet ved å klikka <B>Avbryt</b>.</p>"
-"\n"
+"<p><b><big>Avbryta initialiseringen</big></b><br>\n"
+"Du kan trygt avslutta konfigurasjonsverktøyet ved å klikka <B>Avbryt</b>.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/samba-client/helps.rb:44
 #, fuzzy
 msgid ""
-"<p><b><big>Saving Samba Client Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Saving Samba Client Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Lagrar konfigurasjon for Samba-klient</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar konfigurasjon for Samba-klient</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/samba-client/helps.rb:48
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs you whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryta lagring</big></b><br>"
-"\n"
+"<p><b><big>Avbryta lagring</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. translators: Samba workgroup dialog help title
 #. translators: Samba membership dialog help title (installation)
@@ -595,24 +577,20 @@
 #, fuzzy
 msgid ""
 "<p>A Linux client can be a member of a workgroup, NT domain, or Active Directory domain.\n"
-"Specify the name of the membership.</p>"
-"\n"
+"Specify the name of the membership.</p>\n"
 msgstr ""
 "<p>Ein Linux-klient kan vera medlem av ein arbeidsgruppe, eit NT-domane eller eit Active Directory-domane. \n"
-"Her spesifiserer du namnet på medlemskapen </p>"
-"\n"
+"Her spesifiserer du namnet på medlemskapen </p>\n"
 
 #. Samba role dialog help 2/3
 #: src/include/samba-client/helps.rb:63
 #, fuzzy
 msgid ""
 "<p><b>Use SMB Information for Linux Authentication</b> allows \n"
-"verification of passwords with the NT server or the Kerberos server if joining an AD domain.</p>"
-"\n"
+"verification of passwords with the NT server or the Kerberos server if joining an AD domain.</p>\n"
 msgstr ""
 "<p><b>Nytte SMB-informasjon for Linux-autentisering</b> tillèt \n"
-"verifisering av passord mot NT-serveren eller Kerberos-serveren ved medlemskap i eit AD-domane.</p>"
-"\n"
+"verifisering av passord mot NT-serveren eller Kerberos-serveren ved medlemskap i eit AD-domane.</p>\n"
 
 #. Samba role dialog help 2.5/3
 #: src/include/samba-client/helps.rb:67
@@ -626,34 +604,26 @@
 #, fuzzy
 msgid ""
 "<p>When you press <b>OK</b>, the system verifies the membership and,\n"
-"if it is a NT or Active Directory domain, allows this host to join the domain.</p>"
-"\n"
+"if it is a NT or Active Directory domain, allows this host to join the domain.</p>\n"
 msgstr ""
 "<p>Når du klikkar <b>OK</b>, vil systemet kontrollera medlemskapen og\n"
-"tillata denne vertsmaskinen å verta medlem i eit eventuelt NT-eller Active Directory-domane.</p>"
-"\n"
+"tillata denne vertsmaskinen å verta medlem i eit eventuelt NT-eller Active Directory-domane.</p>\n"
 
 #. translators: Samba membership dialog help 1/2 (installation)
 #: src/include/samba-client/helps.rb:79
 #, fuzzy
-msgid ""
-"<p>Specify the name of the NT or Active Directory domain.</p>"
-"\n"
-msgstr ""
-"<p>Spesifiser namnet på NT-domenet eller Active Directory-domenet.</p>"
-"\n"
+msgid "<p>Specify the name of the NT or Active Directory domain.</p>\n"
+msgstr "<p>Spesifiser namnet på NT-domenet eller Active Directory-domenet.</p>\n"
 
 #. translators: Samba membership dialog help 2/2 (installation)
 #: src/include/samba-client/helps.rb:81
 #, fuzzy
 msgid ""
 "<p>When you press <b>Next</b>, the system verifies the domain and\n"
-"allows this host to join the domain.</p>"
-"\n"
+"allows this host to join the domain.</p>\n"
 msgstr ""
 "<p>Når du klikkar <b>Fullfør</b>, vil systemet kontrollera domenet og\n"
-"tillata denne vertsmaskinen å verta medlem.</p>"
-"\n"
+"tillata denne vertsmaskinen å verta medlem.</p>\n"
 
 #. Samba membership dialog help (common part 1/4)
 #: src/include/samba-client/helps.rb:85
@@ -700,14 +670,12 @@
 "<p>\n"
 "To synchronize your time with an NTP server, configure your computer\n"
 "as an NTP client. Access the configuration with <b>NTP Configuration</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "For å synkronisera tida med ein NTP-servar, konfigurerer du maskina\n"
 "som ein NTP-klient. Dette kan du gjera under <b>NTP-konfigurasjon</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. default value of Machine Account
 #: src/include/samba-client/routines.rb:62
@@ -1011,90 +979,90 @@
 msgstr ""
 
 #. summary header
-#: src/modules/Kerberos.rb:947
+#: src/modules/Kerberos.rb:953
 msgid "PAM Login"
 msgstr ""
 
 #. summary item
-#: src/modules/Kerberos.rb:953
+#: src/modules/Kerberos.rb:959
 msgid "Use Kerberos"
 msgstr ""
 
 #. summary item
-#: src/modules/Kerberos.rb:955
+#: src/modules/Kerberos.rb:961
 msgid "Do Not Use Kerberos"
 msgstr ""
 
 #. summary header
-#: src/modules/Kerberos.rb:959
+#: src/modules/Kerberos.rb:965
 msgid "Default Realm"
 msgstr ""
 
 #. summary header
-#: src/modules/Kerberos.rb:966
+#: src/modules/Kerberos.rb:972
 msgid "Default Domain"
 msgstr ""
 
 #. summary header
-#: src/modules/Kerberos.rb:973
+#: src/modules/Kerberos.rb:979
 msgid "KDC Server Address"
 msgstr ""
 
 #. summary header
-#: src/modules/Kerberos.rb:977
+#: src/modules/Kerberos.rb:983
 msgid "Clock Skew"
 msgstr ""
 
 #. summary text, %1 is value
-#: src/modules/Kerberos.rb:993
+#: src/modules/Kerberos.rb:999
 msgid "<b>KDC Server</b>: %1<br>"
 msgstr ""
 
 #. summary text, %1 is value
-#: src/modules/Kerberos.rb:998
+#: src/modules/Kerberos.rb:1004
 #, fuzzy
 msgid "<b>Default Domain</b>: %1<br>"
 msgstr "<p><b>Arbeidsgruppe eller domane</b>: %1</p>"
 
 #. summary text, %1 is value
-#: src/modules/Kerberos.rb:1004
+#: src/modules/Kerberos.rb:1010
 msgid "<b>Default Realm</b>: %1<br>"
 msgstr ""
 
 #. summary text (yes/no follows)
-#: src/modules/Kerberos.rb:1010
+#: src/modules/Kerberos.rb:1016
 #, fuzzy
 msgid "<b>Kerberos Authentication Enabled</b>: %1"
 msgstr "Frakoblet autentisering aktivert"
 
 #. summary value
 #. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1112
+#: src/modules/Kerberos.rb:1019 src/modules/Samba.rb:1112
 #, fuzzy
 msgid "Yes"
 msgstr "Ja"
 
 #. summary value
 #. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1114
+#: src/modules/Kerberos.rb:1021 src/modules/Samba.rb:1114
 #, fuzzy
 msgid "No"
 msgstr "Nei"
 
 #. summary line
-#: src/modules/Kerberos.rb:1022
+#: src/modules/Kerberos.rb:1028
 msgid "Configuration Acquired via DNS"
 msgstr ""
 
 #. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1050
+#: src/modules/Kerberos.rb:1056
 msgid ""
 "Clock skew is invalid.\n"
 "Try again.\n"
 msgstr ""
 
 #. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1053
+#: src/modules/Kerberos.rb:1059
 msgid ""
 "Lifetime is invalid.\n"
 "Try again."

Modified: branches/plus-SLE12-SP2/yast/nn/po/samba-server.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/samba-server.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/samba-server.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -296,7 +296,7 @@
 "Because users are currently connected to this Samba server,\n"
 "the server configuration has been reloaded instead of restarted.\n"
 "To confirm that all settings are applied despite possibly disconnecting the users,\n"
-"run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
+"run 'systemctl restart smb' and 'systemctl restart nmb'"
 msgstr ""
 "Fordi brukarar er koblet til denne Sambaen-serveren,\n"
 "er serverkonfigurasjonen lasta på nytt utan omstart av serveren.\n"
@@ -969,119 +969,85 @@
 #: src/include/samba-server/helps.rb:37
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing Samba Server Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Initializing Samba Server Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Initialiserer konfigurasjon av Samba-servar </big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer konfigurasjon av Samba-servar </big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/samba-server/helps.rb:41
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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>Avbryta initialisering:</big></b><br>"
-"\n"
-"Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryta initialisering:</big></b><br>\n"
+"Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/samba-server/helps.rb:45
 #, fuzzy
 msgid ""
-"<p><b><big>Saving Samba Server Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Saving Samba Server Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Lagrar konfigurasjon for Samba-servar </big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar konfigurasjon for Samba-servar </big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/samba-server/helps.rb:49
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog will inform you whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryta lagring:</big></b><br>"
-"\n"
+"<p><b><big>Avbryta lagring:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Samba selecting workgroup or domain 1/1 - Installation step 1
 #: src/include/samba-server/helps.rb:56
 #, fuzzy
 msgid ""
-"<p><b><big>Workgroup or Domain Selection</big></b><br>"
-"\n"
+"<p><b><big>Workgroup or Domain Selection</big></b><br>\n"
 "Select existing name of workgroup or domain or type your own new name and click <b>Next</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Val av arbeidsgruppe eller domane</big></b><br>"
-"\n"
+"<p><b><big>Val av arbeidsgruppe eller domane</big></b><br>\n"
 "Vel eit eksisterande namn på ein arbeidsgruppe eller et domen, eller skriv eit nytt namn og klikk <b>Neste</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Samba select Samba Server type - Installation step 2
 #: src/include/samba-server/helps.rb:62
 #, fuzzy
 msgid ""
-"<p><b><big>Samba Server Type</big></b></p>"
-"\n"
-"<p>A domain controller allows Windows clients to log in to a Windows NT style domain.</p>"
-"\n"
+"<p><b><big>Samba Server Type</big></b></p>\n"
+"<p>A domain controller allows Windows clients to log in to a Windows NT style domain.</p>\n"
 "<p>The backup controller uses another domain controller for validation.\n"
-"The primary controller uses its own information about users and their passwords.</p>"
-"\n"
+"The primary controller uses its own information about users and their passwords.</p>\n"
 "<p>The options available in the configuration dialogs depend on the settings in this selection. Windows NT style domain controller functionality will be phased out in future releases.</p>"
 msgstr ""
-"<p><b><big>Samba-servertype</big></b></p>"
-"\n"
-"<p>Ein domenekontroller tillèt Windows-klientar å logga på eit Windows-domane.</p>"
-"\n"
+"<p><b><big>Samba-servertype</big></b></p>\n"
+"<p>Ein domenekontroller tillèt Windows-klientar å logga på eit Windows-domane.</p>\n"
 "<p>Den sekundære kontrolleren brukar ein annan domenekontroller for validering.\n"
-"Den primære kontrolleren brukar sin eigen informasjon om brukarar og passord.</p>"
-"\n"
+"Den primære kontrolleren brukar sin eigen informasjon om brukarar og passord.</p>\n"
 "<p>Tilgjengelege val i konfigurasjonsdialogen avheng av innstillingane her.</p>"
 
 #. Samba select Samba Server type - Installation step 2
 #: src/include/samba-server/helps.rb:73
 #, fuzzy
 msgid ""
-"<p><b><big>Samba Server Type</big></b></p>"
-"\n"
-"<p>A domain controller allows Windows clients to log in to a Windows domain.</p>"
-"\n"
+"<p><b><big>Samba Server Type</big></b></p>\n"
+"<p>A domain controller allows Windows clients to log in to a Windows domain.</p>\n"
 "<p>The options available in the configuration dialogs \n"
 "depend on the settings in this selection.</p>"
 msgstr ""
-"<p><b><big>Samba-servertype</big></b></p>"
-"\n"
-"<p>Ein domenekontroller tillèt Windows-klientar å logga på eit Windows-domane.</p>"
-"\n"
+"<p><b><big>Samba-servertype</big></b></p>\n"
+"<p>Ein domenekontroller tillèt Windows-klientar å logga på eit Windows-domane.</p>\n"
 "<p>Tilgjengelege val i konfigurasjonsdialogene \n"
 "avheng av innstillingane her.</p>"
 
@@ -1095,12 +1061,10 @@
 #, fuzzy
 msgid ""
 "<p>This is a list of already configured shares, whether they \n"
-"are enabled or disabled, and some basic information about them.<br>"
-"</p>"
+"are enabled or disabled, and some basic information about them.<br></p>"
 msgstr ""
 "<p>Dette er ei liste over konfigurerte delte ressursar, anten dei \n"
-"er aktiverte eller deaktiverte, og litt grunnleggjande informasjon om dei.<br>"
-"</p>"
+"er aktiverte eller deaktiverte, og litt grunnleggjande informasjon om dei.<br></p>"
 
 #. Share list dialog help 2/4
 #: src/include/samba-server/helps.rb:87
@@ -1126,15 +1090,13 @@
 "Homes is a special system share for accessing home directories\n"
 "of users. The system shares can be hidden from the table\n"
 "by selecting <b>Do Not Show System Shares</b> in the <b>Filter</b>\n"
-"menu.</p>"
-"\n"
+"menu.</p>\n"
 msgstr ""
 "<p>Nokre delte ressursar er spesielle. Ressursen\n"
 "Homes er til dømes ein spesiell systemressurs som gjev tilgjenge til brukarane sine\n"
 "hjemmekataloger. Delte systemressurser kan skjulast i tabellen\n"
 "ved å velja <b>Ikkje vis delte systemressurser</b> i <b>Filter</b>-\n"
-"menyen.</p>"
-"\n"
+"menyen.</p>\n"
 
 #. Share list dialog help 4/4
 #: src/include/samba-server/helps.rb:103
@@ -1142,29 +1104,23 @@
 msgid ""
 "<p>Use <b>Add</b> to add a new share, <b>Edit</b> to modify\n"
 "already existing share, and <b>Delete</b> to \n"
-"remove the information about a share.</p>"
-"\n"
+"remove the information about a share.</p>\n"
 msgstr ""
 "<p>Bruk <b>Legg til</b> for å leggja til ein ny delt ressurs, <b>Rediger</b> for å endra\n"
 "eksisterande delte ressursar og <b>Slett</b> for å slette\n"
-"informasjonen om ein delt ressurs.</p>"
-"\n"
+"informasjonen om ein delt ressurs.</p>\n"
 
 #. Identity dialog help 1/5
 #: src/include/samba-server/helps.rb:109
 #, fuzzy
 msgid ""
-"<p><b><big>Identity</big></b><br>"
-"\n"
+"<p><b><big>Identity</big></b><br>\n"
 "These options allow setup of the identity of the server and its\n"
-"primary role in the network.</p>"
-"\n"
+"primary role in the network.</p>\n"
 msgstr ""
-"<p><b><big>Identitet</big></b><br>"
-"\n"
+"<p><b><big>Identitet</big></b><br>\n"
 "Med desse vala kan du setja opp serverens identitet og\n"
-"kva for ein primær rolle han skal ha i nettverket.</p>"
-"\n"
+"kva for ein primær rolle han skal ha i nettverket.</p>\n"
 
 #. Samba role dialog help 2/5
 #: src/include/samba-server/helps.rb:115
@@ -1175,16 +1131,14 @@
 "uses another domain controller for validation. The primary controller\n"
 "uses its own information about users and their passwords.\n"
 "If the server should not participate as a domain controller, choose the\n"
-"<b>Not a DC</b> value.</p>"
-"\n"
+"<b>Not a DC</b> value.</p>\n"
 msgstr ""
 "<p>Grunninnstillingene avgjer domenets og\n"
 "serverens rolle. <b>Sekundær domenekontroller</b> og <b>Primær domenekontroller</b> tillèt Windows-klientar å logga på eit Windows-domane. Den sekundære kontrolleren \n"
 "brukar ein annan domenekontroller for validering. Den primære kontrolleren\n"
 "nyttar eigen informasjon om brukarar og passord.\n"
 "Viss serveren ikkje skal vera ein domenekontroller, vel verdet\n"
-"<b>Ingen DC</b>.</p>"
-"\n"
+"<b>Ingen DC</b>.</p>\n"
 
 #. Samba role dialog help 2/5
 #: src/include/samba-server/helps.rb:124
@@ -1193,14 +1147,12 @@
 "<p>The <b>Base Settings</b> set up the domain and the\n"
 "server role. <b>Primary Domain Controller</b> allows Windows clients\n"
 "to log in to a Windows domain. If the server should not participate\n"
-"as a domain controller, choose <b>Not a DC</b>.</p>"
-"\n"
+"as a domain controller, choose <b>Not a DC</b>.</p>\n"
 msgstr ""
 "<p><b>Grunninnstillinger</b> avgjer domenets og\n"
 "serverens rolle. <b>Primær domenekontroller</b> tillèt\n"
 "Windows-klientar å logga på eit Windows-domane. Viss serveren ikkje skal vera\n"
-"ein domenekontroller, vel verdet <b>Ingen DC</b>.</p>"
-"\n"
+"ein domenekontroller, vel verdet <b>Ingen DC</b>.</p>\n"
 
 #. Samba role dialog help 3/5
 #: src/include/samba-server/helps.rb:131
@@ -1211,16 +1163,14 @@
 "a NetBIOS name. The Samba server can be a \n"
 "WINS server or can use another server for its\n"
 "queries. In the latter case, choose <b>Remote WINS Server</b>\n"
-"and enter the IP address of the WINS server.</p>"
-"\n"
+"and enter the IP address of the WINS server.</p>\n"
 msgstr ""
 "<p><b>WINS</b> er ein nettverksprotokoll som konverterer\n"
 "nettverksidentifikasjon på lågt nivå (til dømes IP adresse) for ein vertsmaskin til eit\n"
 "NetBIOS-namn. Samba-serveren kan vera ein \n"
 "<b>WINS-servar</b> eller han kan bruka ein annan servar ved\n"
 "førespurnader. Vel i så fall <b>Ekstern WINS-servar</b>\n"
-"og angje WINS-serverens IP-adresse.</p>"
-"\n"
+"og angje WINS-serverens IP-adresse.</p>\n"
 
 #. Samba role dialog help 4/5
 #: src/include/samba-server/helps.rb:140
@@ -1237,31 +1187,25 @@
 #, fuzzy
 msgid ""
 "<p><b>Advanced Settings</b> provides access to \n"
-"detailed configuration, user authentication sources, and expert global settings.</p>"
-"\n"
+"detailed configuration, user authentication sources, and expert global settings.</p>\n"
 msgstr ""
 "<p><b>Avanserte innstillingar</b> gjev tilgjenge til \n"
-"detaljerte oppsett, brukerautentiseringskilder og avanserte generelle innstillingar.</p>"
-"\n"
+"detaljerte oppsett, brukerautentiseringskilder og avanserte generelle innstillingar.</p>\n"
 
 #: src/include/samba-server/helps.rb:147
 #, fuzzy
 msgid ""
-"<p><b><big>Trusted Domains</big></b><br>"
-"\n"
+"<p><b><big>Trusted Domains</big></b><br>\n"
 "NT-style trusted domains represent a possibility to assign\n"
 "access rights to users from another domain.\n"
 "Here, create a list of domains for which \n"
-"the Samba server should provide access.</p>"
-"\n"
+"the Samba server should provide access.</p>\n"
 msgstr ""
-"<p><b><big>Sikre domener</big></b><br>"
-"\n"
+"<p><b><big>Sikre domener</big></b><br>\n"
 "Med sikre domener av NT-typen kan tilgangsrettigheter\n"
 "tilordnes brukarar frå eit anna domane.\n"
 "Her kan du oppretta ei liste over domener som \n"
-"Samba-serveren skal gje tilgjenge til.</p>"
-"\n"
+"Samba-serveren skal gje tilgjenge til.</p>\n"
 
 #: src/include/samba-server/helps.rb:154
 #, fuzzy
@@ -1271,95 +1215,75 @@
 "and a password in the dialog that opens. The password is used by the Samba\n"
 "server to access the trusted domain. After <b>OK</b> is pressed,\n"
 "the trust relationship is established. To delete a domain,\n"
-"choose it in the list and press <b>Delete</b>.</p>"
-"\n"
+"choose it in the list and press <b>Delete</b>.</p>\n"
 msgstr ""
 "<p>For å leggja til eit note domane på lista, klikk <b>Legg til</b>.\n"
 "Angje namnet på det sikre domenet\n"
 "og eit passord i dialogen som kjem opp. Passordet vert brukt av Samba-\n"
 "serveren for å få tilgjenge til det sikre domenet. Når du klikkar <b>OK</b>,\n"
 "vert det sikre sambandet etablert. For å slette eit domane,\n"
-"vel du det i lista og klikkar <b>Slett</b>.</p>"
-"\n"
+"vel du det i lista og klikkar <b>Slett</b>.</p>\n"
 
 #: src/include/samba-server/helps.rb:162
 #, fuzzy
 msgid ""
 "<p>For more details about how trusted domains work,\n"
-"see the Samba HOWTO collection.</p>"
-"\n"
+"see the Samba HOWTO collection.</p>\n"
 msgstr ""
 "<p>Du finn meir informasjon om korleis sikre domener fungerer,\n"
-"i <i>HOWTO-samlinga for Samba</i>.</p>"
-"\n"
+"i <i>HOWTO-samlinga for Samba</i>.</p>\n"
 
 #. Single share editing dialog help 1/2
 #: src/include/samba-server/helps.rb:166
 #, fuzzy
 msgid ""
-"<p><b><big>Edit a Share</big></b><br>"
-"\n"
-"Here, fine-tune the options of a share.</p>"
-"\n"
+"<p><b><big>Edit a Share</big></b><br>\n"
+"Here, fine-tune the options of a share.</p>\n"
 msgstr ""
-"<p><b><big>Rediger delt ressurs</big></b><br>"
-"\n"
-"Her kan du finjustera alternativa for ein delt ressurs.</p>"
-"\n"
+"<p><b><big>Rediger delt ressurs</big></b><br>\n"
+"Her kan du finjustera alternativa for ein delt ressurs.</p>\n"
 
 #. Single share editing dialog help 2/2
 #: src/include/samba-server/helps.rb:170
 #, fuzzy
 msgid ""
 "<p>Use <b>Add</b> to add a new configuration option, <b>Edit</b> to modify\n"
-"an existing option, and <b>Delete</b> to delete an option.</p>"
-"\n"
+"an existing option, and <b>Delete</b> to delete an option.</p>\n"
 msgstr ""
 "<p>Bruk <b>Legg til</b> for å leggja til eit nytt konfigurasjonsalternativ, <b>Rediger</b> for å endra\n"
-"eit eksisterande alternativ og <b>Slett</b> for å slette eit alternativ.</p>"
-"\n"
+"eit eksisterande alternativ og <b>Slett</b> for å slette eit alternativ.</p>\n"
 
 #. Global settings editing dialog help 1/2
 #: src/include/samba-server/helps.rb:174
 #, fuzzy
 msgid ""
-"<p><b><big>Expert Global Settings Configuration</big></b><br>"
-"\n"
-"Here, fine-tune the global options of the server.</p>"
-"\n"
+"<p><b><big>Expert Global Settings Configuration</big></b><br>\n"
+"Here, fine-tune the global options of the server.</p>\n"
 msgstr ""
-"<p><b><big>Avansert generell konfigurasjon</big></b><br>"
-"\n"
-"Her kan du finjustera generelle alternativ for serveren.</p>"
-"\n"
+"<p><b><big>Avansert generell konfigurasjon</big></b><br>\n"
+"Her kan du finjustera generelle alternativ for serveren.</p>\n"
 
 #. Global settings editing dialog help 2/2
 #: src/include/samba-server/helps.rb:178
 #, fuzzy
 msgid ""
 "<p>Use <b>Add</b> to add a new configuration option, <b>Edit</b> to modify\n"
-"already existing option, and <b>Delete</b> to delete an option.</p>"
-"\n"
+"already existing option, and <b>Delete</b> to delete an option.</p>\n"
 msgstr ""
 "<p>Bruk <b>Legg til</b> for å leggja til eit nytt konfigurasjonsalternativ, <b>Rediger</b> for å endra\n"
-"eit eksisterande alternativ og <b>Slett</b> for å slette eit alternativ.</p>"
-"\n"
+"eit eksisterande alternativ og <b>Slett</b> for å slette eit alternativ.</p>\n"
 
 #. Advanced SAMBA configuration dialog help 1/3
 #: src/include/samba-server/helps.rb:182
 #, fuzzy
 msgid ""
-"<p><b><big>LDAP Samba Server Options</big></b><br>"
-"\n"
+"<p><b><big>LDAP Samba Server Options</big></b><br>\n"
 "Here, set up details about use of LDAP by the Samba\n"
-"server.</p>"
-"\n"
+"server.</p>\n"
 msgstr ""
-"<p><b><big>LDAP-alternativ for Samba-serveren</big></b><br>"
-"\n"
+"<p><b><big>LDAP-alternativ for Samba-serveren</big></b><br>\n"
 "Her kan du velja detaljerte innstillingar for bruk av LDAP via Samba-\n"
-"serveren.</p>"
-"\n"
+"serveren.</p>\n"
 
 #. Advanced SAMBA configuration dialog help 2/3
 #: src/include/samba-server/helps.rb:188
@@ -1369,54 +1293,42 @@
 "the base at which to start searching the information. <b>Administration DN</b> is used when\n"
 "creating new users and groups. If the administration DN requires\n"
 "a password for write access, set the password using\n"
-"<b>Set LDAP Administration Password</b>.</p>"
-"\n"
+"<b>Set LDAP Administration Password</b>.</p>\n"
 msgstr ""
 "<p><b>Søk i base-DN</b> (Distinguished Name) er\n"
 "staden der søk etter informasjon skal byrja, og <b>Administrasjon sin-DN</b> er utgangspunktet når\n"
 "nye brukarar og grupper skal opprettast. Viss administrasjon sin-DN krev\n"
 "eit passord for skrivetilgang, må dette angjevast ved å bruka\n"
-"<b>Vel passord for LDAP-administrasjon</B>.</p>"
-"\n"
+"<b>Vel passord for LDAP-administrasjon</B>.</p>\n"
 
 #. Advanced SAMBA configuration dialog help 3/3
 #: src/include/samba-server/helps.rb:196
 #, fuzzy
-msgid ""
-"<p><b>Note:</b> Settings are saved before the LDAP administration password is set.</p>"
-"\n"
-msgstr ""
-"<p><b>Merk:</b>Innstillingane vert lagra før passordet for LDAP-administrasjon er angjeve.</p>"
-"\n"
+msgid "<p><b>Note:</b> Settings are saved before the LDAP administration password is set.</p>\n"
+msgstr "<p><b>Merk:</b>Innstillingane vert lagra før passordet for LDAP-administrasjon er angjeve.</p>\n"
 
 #. passdb backend configuration dialog help 1
 #: src/include/samba-server/helps.rb:200
 #, fuzzy
 msgid ""
-"<p><b><big>User Authentication Information Backends</big></b><br>"
-"\n"
+"<p><b><big>User Authentication Information Backends</big></b><br>\n"
 "Choose where the Samba server should look for the authentication\n"
 "information. Samba does not support multiple backends at once anymore,\n"
-"only one is allowed.</p>"
-"\n"
+"only one is allowed.</p>\n"
 msgstr ""
-"<p><b><big>Bakstykke for brukerautentisering</big></b><br>"
-"\n"
+"<p><b><big>Bakstykke for brukerautentisering</big></b><br>\n"
 "Her vel du kor Samba-serveren skal søkja etter autentiseringsinformasjon.\n"
-"Samba støttar ikkje fleire bakstykke samstundes lengjer, berre eit bakstykke er tillate.</p>"
-"\n"
+"Samba støttar ikkje fleire bakstykke samstundes lengjer, berre eit bakstykke er tillate.</p>\n"
 
 #. passdb backend configuration dialog help 2
 #: src/include/samba-server/helps.rb:207
 #, fuzzy
 msgid ""
 "<p>If you want to change the user authentication source, remove the current one first\n"
-"by pressing <b>Delete</b> and add a new one with <b>Add</b>.</p>"
-"\n"
+"by pressing <b>Delete</b> and add a new one with <b>Add</b>.</p>\n"
 msgstr ""
 "<p>Viss du vil endra brukaren autentiseringskilde, må du først fjerne gjeldande kjelde\n"
-"ved å trykkja <b>Slett</b>. Legg deretter til ein ny med <b>Legg til</b>-knappen.</p>"
-"\n"
+"ved å trykkja <b>Slett</b>. Legg deretter til ein ny med <b>Legg til</b>-knappen.</p>\n"
 
 #. passdb backend configuration dialog help 3
 #: src/include/samba-server/helps.rb:211
@@ -1425,38 +1337,32 @@
 "<p><b>smbpasswd file</b> is the file using the same format as\n"
 "the previous versions of Samba. Its layout is similar to the\n"
 "passwd file. It is possible to have a multiple files in this \n"
-"format.</p>"
-"\n"
+"format.</p>\n"
 msgstr ""
 "<p><b>smbpasswd-fil</b> har same format som\n"
 "tidlegare versjonar av Samba. Oppsettet er omtrent som i\n"
 "passwd-fila. Fleire filer i dette formatet er \n"
-"mogleg.</p>"
-"\n"
+"mogleg.</p>\n"
 
 #. passdb backend configuration dialog help 4
 #: src/include/samba-server/helps.rb:218
 #, fuzzy
 msgid ""
 "<p><b>LDAP</b> is a URL of an LDAP server to check for\n"
-"the information.</p>"
-"\n"
+"the information.</p>\n"
 msgstr ""
 "<p><b>LDAP</b> er ein nettadresse for ein LDAP-servar der det skal søkjast etter\n"
-"informasjonen.</p>"
-"\n"
+"informasjonen.</p>\n"
 
 #. passdb backend configuration dialog help 5
 #: src/include/samba-server/helps.rb:222
 #, fuzzy
 msgid ""
 "<p><b>TDB database</b> uses an internal Samba database binary format\n"
-"to store and look up the information.</p>"
-"\n"
+"to store and look up the information.</p>\n"
 msgstr ""
 "<p><b>TDB-database</b> brukar ein intern Samba-database i binærformat\n"
-"for lagring og søk etter informasjon.</p>"
-"\n"
+"for lagring og søk etter informasjon.</p>\n"
 
 #. we don't seem to support mysql anymore
 #. /* passdb backend configuration dialog help 5/7 */
@@ -1481,15 +1387,11 @@
 #: src/include/samba-server/helps.rb:248
 #, fuzzy
 msgid ""
-"<p><b><big>Add a New Share</big></b><br>"
-"\n"
-"Here, enter the basic information about a share to add.</p>"
-"\n"
+"<p><b><big>Add a New Share</big></b><br>\n"
+"Here, enter the basic information about a share to add.</p>\n"
 msgstr ""
-"<p><b><big>Legg til ny delt ressurs</big></b><br>"
-"\n"
-"Her kan du leggja inn grunnleggjande informasjon om ein ny delt ressurs.</p>"
-"\n"
+"<p><b><big>Legg til ny delt ressurs</big></b><br>\n"
+"Her kan du leggja inn grunnleggjande informasjon om ein ny delt ressurs.</p>\n"
 
 #. add new share dialog help 2/3
 #: src/include/samba-server/helps.rb:252
@@ -1510,14 +1412,12 @@
 "<p>There are two types of shares. A <b>Printer</b> share\n"
 "is presented as a printer to clients. A <b>Directory</b> share \n"
 "is presented as a network disk. <b>Share Path</b> must be\n"
-"entered for a directory share.</p>"
-"\n"
+"entered for a directory share.</p>\n"
 msgstr ""
 "<p>Det er to typar delte ressursar. Ein <b>skriverressurs</b>\n"
 "visast som ein skrivar for klientane. Ein <b>katalogressurs</b> \n"
 "vert viste som ein nettverksdisk. <b>Stig til delt ressurs</b> må\n"
-"angjevast for ein katalogressurs.</p>"
-"\n"
+"angjevast for ein katalogressurs.</p>\n"
 
 #. add new share dialog help 4/3
 #: src/include/samba-server/helps.rb:265
@@ -1525,32 +1425,26 @@
 msgid ""
 "<p>If <b>Read-Only</b> is checked, users\n"
 "of a service may not create or modify files in the service's\n"
-"directory.</p>"
-"\n"
+"directory.</p>\n"
 msgstr ""
 "<p>Viss <b>Skrivebeskyttet</b> er avkrysset, kan ikkje\n"
 "brukarane av ei teneste oppretta eller endra filer katalogen til\n"
-"tenesta.</p>"
-"\n"
+"tenesta.</p>\n"
 
 #: src/include/samba-server/helps.rb:270
 #, fuzzy
 msgid ""
 "<p><b>Inherit ACLS</b> can be used to ensure\n"
 "that if default ACLs exist on parent directories, they are always\n"
-"honored when creating a subdirectory.</p>"
-"\n"
+"honored when creating a subdirectory.</p>\n"
 msgstr ""
 "<p><b>Overta ACLS</b> kan brukast for å sikre\n"
 "at viss standard-ACLer finn for overordna katalogar, vil desse alltid\n"
-"takast omsyn til når underkataloger vert oppretta.</p>"
-"\n"
+"takast omsyn til når underkataloger vert oppretta.</p>\n"
 
 #. add new share dialog help
 #: src/include/samba-server/helps.rb:276
-msgid ""
-"<p>With <b>Expose Snapshots</b> selected, Samba exposes snapshots created by Snapper for access and manipulation by CIFS/SMB clients. This option is only available if Samba offers Snapper support, and the Share Path corresponds to a Btrfs backed Snapper configuration subvolume.<br>"
-" Relevant permissions must also be granted, see Samba's <b>vfs_snapper(8)</b> man page for further details.</p>"
+msgid "<p>With <b>Expose Snapshots</b> selected, Samba exposes snapshots created by Snapper for access and manipulation by CIFS/SMB clients. This option is only available if Samba offers Snapper support, and the Share Path corresponds to a Btrfs backed Snapper configuration subvolume.<br> Relevant permissions must also be granted, see Samba's <b>vfs_snapper(8)</b> man page for further details.</p>"
 msgstr ""
 
 #: src/include/samba-server/helps.rb:283
@@ -1561,41 +1455,29 @@
 #: src/include/samba-server/helps.rb:289
 #, fuzzy
 msgid ""
-"<p><b><big>LDAP Settings</big></b><br>"
-"\n"
+"<p><b><big>LDAP Settings</big></b><br>\n"
 "Here, determine the LDAP server to use for authentication.\n"
-"</p>"
-"\n"
+"</p>\n"
 "<p>\n"
 "Setting <b>LDAP Password Back-End</b> allows storing user information in the LDAP tree specified by the URL. With <b>LDAP Idmap Back-End</b>, store SID/uid/gid mapping tables in LDAP.\n"
-"</p>"
-"<p>\n"
+"</p><p>\n"
 "In the Authentication section, set the credentials for the LDAP server, including full Administrator DN.\n"
-"</p>"
-"\n"
+"</p>\n"
 "<b>Search Base DN</b> is the LDAP suffix appended to Samba-specific LDAP objects.\n"
-"</p>"
-"<p>\n"
-"To test the connection to your LDAP server, click <b>Test Connection</b>. To set expert LDAP settings or use default values, click <b>Advanced Settings</b>."
-"<p>"
+"</p><p>\n"
+"To test the connection to your LDAP server, click <b>Test Connection</b>. To set expert LDAP settings or use default values, click <b>Advanced Settings</b>.<p>"
 msgstr ""
-"<p><b><big>LDAP-innstillingar</big></b><br>"
-"\n"
+"<p><b><big>LDAP-innstillingar</big></b><br>\n"
 "Her angjev du LDAP-serveren som skal verta til brukt autentisering.\n"
-"</p>"
-"\n"
+"</p>\n"
 "<p>\n"
 "Ved å angje <b>LDAP-passord for grunnsystem</b> kan brukerinformasjon lagrast i LDAP-filstrukturen som nettadressen spesifiserer. Med <b>LDAP Idmap-grunnsystem</b> kan SID/uid/gjev-mappingtabeller lagrast i LDAP.\n"
-"</p>"
-"<p>\n"
+"</p><p>\n"
 "Under Autentisering kan rettane for LDAP-serveren definerast, inkludert full administrator-DN.\n"
-"</p>"
-"\n"
+"</p>\n"
 "<b>Grunn-DN for søk</b> er LDAP-suffikset som vert lagt til Samba-spesifikke LDAP-objekt.\n"
-"</p>"
-"<p>\n"
-"For å testa sambandet til LDAP-serveren, klikk <b>Test samband</b>. For å bruka avanserte LDAP-innstillingar eller standardverdier, klikk <b>Avanserte innstillingar</b>."
-"<p>"
+"</p><p>\n"
+"For å testa sambandet til LDAP-serveren, klikk <b>Test samband</b>. For å bruka avanserte LDAP-innstillingar eller standardverdier, klikk <b>Avanserte innstillingar</b>.<p>"
 
 #. help for SambaLDAPSettingsSuffixesWidget
 #: src/include/samba-server/helps.rb:303
@@ -1607,12 +1489,10 @@
 #: src/include/samba-server/helps.rb:307
 #, fuzzy
 msgid ""
-"<p><b>Replication Sleep</b> is the amount of milliseconds Samba will wait after writing to the LDAP server, so LDAP replicas can catch up.</p>"
-"\n"
+"<p><b>Replication Sleep</b> is the amount of milliseconds Samba will wait after writing to the LDAP server, so LDAP replicas can catch up.</p>\n"
 "<p><b>Time-Out</b> specifies the timeout for LDAP operations (in seconds).</p>"
 msgstr ""
-"<p><b>Replikasjonsdvale</b> er mengd millisekunder Samba vil vil venta etter å ha skrive til LDAP-serveren, slik at LDAP-replikasjonene kan halda tritt.</p>"
-"\n"
+"<p><b>Replikasjonsdvale</b> er mengd millisekunder Samba vil vil venta etter å ha skrive til LDAP-serveren, slik at LDAP-replikasjonene kan halda tritt.</p>\n"
 "<p><b>Tidsavbrudd</b> angjev tidsavbruddet for LDAP-handlingar (i sekund).</p>"
 
 #. help for SambaLDAPSettingsSecurityWidget
@@ -1625,12 +1505,10 @@
 #: src/include/samba-server/helps.rb:315
 #, fuzzy
 msgid ""
-"<p><b>Delete DN</b> specifies if the delete operation deletes the complete LDAP entry or only the Samba-specific attributes.</p>"
-"\n"
+"<p><b>Delete DN</b> specifies if the delete operation deletes the complete LDAP entry or only the Samba-specific attributes.</p>\n"
 "<p>With <b>Synchronize Passwords</b>, define possible synchronization of the LDAP password with the NT and LM hashes. See the <tt>smb.conf</tt> manual page for details.</p>"
 msgstr ""
-"<p><b>Slett DN</b> angjev om slettehandlingen skal sletta hel LDAP-oppføringen eller bara Samba-spesifikke attributt.</p>"
-"\n"
+"<p><b>Slett DN</b> angjev om slettehandlingen skal sletta hel LDAP-oppføringen eller bara Samba-spesifikke attributt.</p>\n"
 "<p>Med <b>Synkroniser passord</b> kan du definera synkronisering av LDAP-passordet med NT- og LM-kryptering. Manualsiden <tt>smb.conf</tt> inneheld meir informasjon.</p>"
 
 #. translators: warning text
@@ -1696,13 +1574,11 @@
 msgid ""
 "<p><b>Advanced Settings</b> provides access to \n"
 "detailed configuration, such as LDAP settings, user authentication sources, and\n"
-"expert global settings.</p>"
-"\n"
+"expert global settings.</p>\n"
 msgstr ""
 "<p><b>Avanserte innstillingar</b> gjev tilgjenge til \n"
 "avanserte konfigurasjonar, t.d. LDAP-innstillingar, brukerautentiseringskilder og\n"
-"avanserte generelle innstillingar.</p>"
-"\n"
+"avanserte generelle innstillingar.</p>\n"
 
 #. translators: combo box value
 #: src/include/samba-server/ldap-widget.rb:67

Modified: branches/plus-SLE12-SP2/yast/nn/po/samba-users.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/samba-users.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/samba-users.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2012-02-06 21:32+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: Norwegian Nynorsk \n"
@@ -88,8 +88,7 @@
 "which is the Name of the Group as it should appear to Samba-Clients. All other\n"
 "settings are computed automatically. If you leave the <b>Samba Group Name</b>\n"
 "empty, the same name as configured in the Global Settings of this Group will\n"
-"be used.</p>"
-"\n"
+"be used.</p>\n"
 msgstr ""
 "<p>Dette programtillegget kan brukast for å gjera ei LDAP-gruppe tilgjengelgeg i Samba.\n"
 "Einaste instilling tilgjengeleg er <b>Samba-gruppenamn</b>, som er namnet\n"

Modified: branches/plus-SLE12-SP2/yast/nn/po/scanner.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/scanner.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/scanner.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -412,14 +412,12 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Initializing Scanner Configuration</big></b><br>"
-"\n"
+"<b><big>Initializing Scanner Configuration</big></b><br>\n"
 "Please wait...\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Initialiserer skannerkonfigurasjon</big></b><br>"
-"\n"
+"<b><big>Initialiserer skannerkonfigurasjon</big></b><br>\n"
 "Vent...\n"
 "</p>"
 
@@ -428,14 +426,12 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Saving Scanner Configuration</big></b><br>"
-"\n"
+"<b><big>Saving Scanner Configuration</big></b><br>\n"
 "Please wait...\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Lagrar skannerkonfigurasjon</big></b><br>"
-"\n"
+"<b><big>Lagrar skannerkonfigurasjon</big></b><br>\n"
 "Vent...\n"
 "</p>"
 
@@ -444,14 +440,12 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Scanner Configuration</big></b><br>"
-"\n"
+"<b><big>Scanner Configuration</big></b><br>\n"
 "Set up or change the scanner configuration and show the already active scanners.\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Skannerkonfigurasjon</big></b><br>"
-"\n"
+"<b><big>Skannerkonfigurasjon</big></b><br>\n"
 "Konfigurer eller rediger skannerkonfigurasjonen og vis skannere som allereie er aktivert.\n"
 "</p>"
 
@@ -496,8 +490,7 @@
 "If you have difficulties configuring your scanner,\n"
 "check whether it appears in the output of <tt>lsusb</tt>.\n"
 "If it is not listed there, the USB system cannot communicate with the scanner.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Ein vanleg USB-skannar byrd finnast automatisk.\n"
@@ -516,8 +509,7 @@
 "Viss du har problem med å setja opp skanneren her,\n"
 "kontrollar resultatet av kommandoen <tt>lsusb</tt>.\n"
 "Viss ikkje skanneren vert funnet av den kommandoen, kan ikkje USB-systemet kommunisera med skanneren.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Overview dialog help 4/8:
 #. Do not change or translate "lsscsi", it is a command name.
@@ -553,8 +545,7 @@
 "which is connected to the parallel port,\n"
 "you may have to run <tt>hp-setup</tt> via <b>Other</b> and <b>Run hp-setup</b>\n"
 "before you can configure the scanner unit with this tool using <b>Add</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Parallellportskannere kan ikkje verta opp sett med dette verktøyet,\n"
@@ -588,8 +579,7 @@
 "which is connected via a built-in network interface,\n"
 "you may have to run <tt>hp-setup</tt> via <b>Other</b> and <b>Run hp-setup</b>\n"
 "before it works to configure the scanner unit with this tool using <b>Add</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Nettverksskannere kan ikkje verta opp sett med dette verktøyet,\n"
@@ -673,8 +663,7 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Scanner Model Selection</big></b><br>"
-"\n"
+"<b><big>Scanner Model Selection</big></b><br>\n"
 "All known scanner models, both supported and unsupported, are listed here.\n"
 "Read all information carefully before selecting a model and pressing <b>Next</b>.\n"
 "The information is based on data of the SANE project at\n"
@@ -682,8 +671,7 @@
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Val av skannermodell</big></b><br>"
-"\n"
+"<b><big>Val av skannermodell</big></b><br>\n"
 "Alle kjende skannermodeller er oppførde her, anten dei er støtta eller ikkje.\n"
 "Les all informasjon grundig før du vel ein modell, og klikk <b>Neste</b>.\n"
 "Informasjonen er basert på data frå SANE-prosjektet som du finn på\n"
@@ -699,8 +687,7 @@
 "<p>\n"
 "A model is supported if there is at least one appropriate scanner driver available.\n"
 "Most scanner drivers are from the SANE project and provided in the sane-backends package.\n"
-"The support status for a particular model varies from minimal to complete.<br>"
-"\n"
+"The support status for a particular model varies from minimal to complete.<br>\n"
 "When a driver is shown as 'unmaintained', it does not mean that the driver does not work.\n"
 "Even an unmaintained driver could work perfectly well.\n"
 "But it means that there is no longer someone who knows about the driver internals\n"
@@ -710,8 +697,7 @@
 "<p>\n"
 "Ein modell vert støtta viss det er minst éin tilgjengeleg skannerdriver.\n"
 "Dei fleste skannerdrivere kjem frå SANE-prosjektet og finst i pakka sane-backends.\n"
-"Status for ulike modellar varierer frå minimal til full støtt.<br>"
-"\n"
+"Status for ulike modellar varierer frå minimal til full støtt.<br>\n"
 "Når ein driv skildrast som 'ikkje vedlikeholdt', tyder det ikkje at han ikkje fungerer.\n"
 "Ein ikkje vedlikholdt driv kan fungera perfekt,\n"
 "men det tyder at det ikkje lenger finst nokon som har kunnskap om funksjonen til drivaren,\n"
@@ -779,19 +765,16 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Scanner and Driver Setup</big></b><br>"
-"\n"
+"<b><big>Scanner and Driver Setup</big></b><br>\n"
 "The driver is activated and the associated scanners are probed.\n"
 "This may take a few seconds, so you must wait until you can press <b>Next</b>.\n"
 "If you press <b>Back</b>, the driver is deactivated.\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Konfigurasjon av skannar og driv</big></b><br>"
-"\n"
+"<b><big>Konfigurasjon av skannar og driv</big></b><br>\n"
 "Drivaren vert aktivert, og systemet søkjer etter tilhøyrande skannere.\n"
-"Dette kan ta nokre sekund, og du må venta til du kan klikka <b>Neste</b>.<br>"
-"\n"
+"Dette kan ta nokre sekund, og du må venta til du kan klikka <b>Neste</b>.<br>\n"
 "Klikk på <b>Tilbake</b> for å deaktivere drivaren.\n"
 "</p>"
 
@@ -800,16 +783,14 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Additional Packages</big></b><br>"
-"\n"
+"<b><big>Additional Packages</big></b><br>\n"
 "If the package that provides the driver is not yet installed,\n"
 "an appropriate dialog is shown to install the package.\n"
 "Such packages may not be available for all architectures.\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Tilleggspakker</big></b><br>"
-"\n"
+"<b><big>Tilleggspakker</big></b><br>\n"
 "Viss pakka som inneheld drivaren ikkje er installert enno,\n"
 "kjem ein installasjonsdialog opp.\n"
 "Slike pakker er kanskje ikkje tilgjengelege for alle arkitekturar\n"
@@ -820,14 +801,12 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Firmware Upload</big></b><br>"
-"\n"
+"<b><big>Firmware Upload</big></b><br>\n"
 "Some models require a firmware upload.\n"
 "In this case, an appropriate explanatory text is shown.\n"
 "</p>"
 msgstr ""
-"<p> <b><big>Opplasting av fastvare:</big></b><br>"
-"\n"
+"<p> <b><big>Opplasting av fastvare:</big></b><br>\n"
 "Nokre modellar krev opplasting av fastvare.\n"
 "Dersom dette vert kravt, vil ei forklaring visast.\n"
 "</p>"
@@ -845,8 +824,7 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>HP All-in-One Devices</big></b><br>"
-"\n"
+"<b><big>HP All-in-One Devices</big></b><br>\n"
 "HP all-in-one devices may require a special setup.\n"
 "In this case, an appropriate dialog is shown.\n"
 "There are two software packages that provide support for HP all-in-one devices:\n"
@@ -860,8 +838,7 @@
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>HP alt i eit-einingar:</big></b><br>"
-"\n"
+"<b><big>HP alt i eit-einingar:</big></b><br>\n"
 "HP alt i eit-einingar kan krevja eit spesielt oppsett.\n"
 "Ein dialog vil koma opp dersom dette er naudsynt.\n"
 "Det finst to programvarepakker som støttar HP alt i eit-einingar:\n"
@@ -881,14 +858,12 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Scanning via Network</big></b><br>"
-"\n"
+"<b><big>Scanning via Network</big></b><br>\n"
 "Enter the appropriate information and press <b>Next</b>\n"
 "to set up scanning via network.\n"
 "</p>"
 msgstr ""
-"<p> <b><big>Skanning via nettverket</big></b><br>"
-"\n"
+"<p> <b><big>Skanning via nettverket</big></b><br>\n"
 "Angje naudsynt informasjon og trykk <b>Neste</b>\n"
 "for å konfigurera skanning via nettverket.\n"
 "</p>"
@@ -902,8 +877,7 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Server Settings</big></b><br>"
-"\n"
+"<b><big>Server Settings</big></b><br>\n"
 "If you have locally connected scanners and want to make them accessible via the network,\n"
 "set up the saned network scanning daemon so that your host becomes a server.\n"
 "In <b>Permitted Clients</b>, enter which client hosts are permitted to access saned on your server.\n"
@@ -914,8 +888,7 @@
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Serverinnstillinger</big></b><br>"
-"\n"
+"<b><big>Serverinnstillinger</big></b><br>\n"
 "Viss du har lokalt tilkoblede skannere som du vil gjera tilgjengelege via nettverket,\n"
 "må du konfigurera saned-nissen for nettverksskanning slik at vertsmaskinen vert ein servar.\n"
 "Angje kva for klientvertsmaskiner som har tilgjenge til saned på serveren under <b>Tillatne klientar</b>.\n"
@@ -936,8 +909,7 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Regarding Firewall</big></b><br>"
-"\n"
+"<b><big>Regarding Firewall</big></b><br>\n"
 "A firewall is used to protect running server processes\n"
 "on your host against unwanted access via network.\n"
 "For using scanners via network the SANE network daemon (the saned)\n"
@@ -945,16 +917,14 @@
 "can access scanners which are connected to your local host.\n"
 "Client hosts contact the saned via the sane-port (TCP port 6566)\n"
 "but scanning data is transferred via an additional random port.\n"
-"Therefore only port 6566 is not sufficient for scanning via network.<br>"
-"\n"
+"Therefore only port 6566 is not sufficient for scanning via network.<br>\n"
 "Do not open the sane-port 6566 or any other port\n"
 "regarding using scanners for the external zone in the firewall.\n"
 "This is dangerous because it allows access to the saned from foreign hosts\n"
 "so that the firewall does no longer provide any protection for the saned.\n"
 "Allowing access from the external network (i.e. for the external zone)\n"
 "does not make sense because scanning documents requires\n"
-"physical scanner access by trusted users.<br>"
-"\n"
+"physical scanner access by trusted users.<br>\n"
 "On the other hand the default firewall settings allow\n"
 "any access from an internal (i.e. trusted) network.\n"
 "To make the saned on your server accessible from an internal network,\n"
@@ -962,17 +932,14 @@
 "to the internal zone of the firewall.\n"
 "Use the YaST Firewall setup module to do this fundamental setup\n"
 "regarding network security and firewall and scanning via network\n"
-"will work without any further firewall setup.<br>"
-"\n"
+"will work without any further firewall setup.<br>\n"
 "For details see the openSUSE support database\n"
-"article 'CUPS and SANE Firewall settings' at<br>"
-"\n"
+"article 'CUPS and SANE Firewall settings' at<br>\n"
 "http://en.opensuse.org/SDB:CUPS_and_SANE_Firewall_settings\n"
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Om brannmurar</big></b><br>"
-"\n"
+"<b><big>Om brannmurar</big></b><br>\n"
 "Ein brannmur vert nytta for å verna køyrande serverprosesser\n"
 "på din vertsmaskin mot uønska tilgjenge via nettverket.\n"
 "For å bruka skannere via nettverket er det SANE-nettverksnissen (saned)\n"
@@ -980,16 +947,14 @@
 "har tilgjenge til skannere som er koblet til din vertsmaskin.\n"
 "Klientmaskiner kontaktar saned vigde sane-porten (TCP-port 6566),\n"
 "men skannedata vert overførde via fleire vilkårlige portar.\n"
-"Difor er ikkje port 6566 nok for skanning via nettverket.<br>"
-"\n"
+"Difor er ikkje port 6566 nok for skanning via nettverket.<br>\n"
 "sane-port 6566 eller andre portar\n"
 "som vert til brukte skanning, må ikkje opnast for den eksterne sona i brannmuren.\n"
 "Dette er farleg fordi det gjev tilgjenge til saned frå eksterne vertsmaskiner,\n"
 "og brannmuren gjev inkje vern for saned.\n"
 "Å gje tilgjenge frå det eksterne nettverket (dvs. frå ekstern sone)\n"
 "gir inga meining, fordi skanning  av dokument krev\n"
-"fysisk skannertilgang frå pålitelege brukarar.<br>"
-"\n"
+"fysisk skannertilgang frå pålitelege brukarar.<br>\n"
 "På den andre sida gjev standardinnstillingene for brannmuren\n"
 "fritt tilgjenge frå eit internt (dvs. påliteleg) nettverk.\n"
 "For å gje tilgjenge til saned på din servar frå eit internt nettverk,\n"
@@ -997,11 +962,9 @@
 "tilordnes til den interne brannmursonen.\n"
 "Bruk brannmurmodulen i YaST for å utføra dette grunnoppsettet.\n"
 "Då vil skanning via nettverket fungera sikkert og effektivt\n"
-"utan ytterlegare brannmurinnstillinger.<br>"
-"\n"
+"utan ytterlegare brannmurinnstillinger.<br>\n"
 "Du finn meir informasjon i openSUSE support database\n"
-"i artikkelen 'Anda til CUP SANE Firewall settings' på<br>"
-"\n"
+"i artikkelen 'Anda til CUP SANE Firewall settings' på<br>\n"
 "http://ein.opensuse.org/SDB:CUP sin_and_sANE_firewall_settings\n"
 "</p>"
 
@@ -1013,8 +976,7 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Client Settings</big></b><br>"
-"\n"
+"<b><big>Client Settings</big></b><br>\n"
 "If you want to access scanners connected to other hosts (servers) in the network,\n"
 "set up the net metadriver to access them via the daemon running on the servers.\n"
 "The saned and the firewall on the servers must permit the access.\n"
@@ -1024,8 +986,7 @@
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Klientinnstillinger</big></b><br>"
-"\n"
+"<b><big>Klientinnstillinger</big></b><br>\n"
 "Viss du vil ha tilgjenge til skannere som er koblet til andre maskiner (servera) på nettverket,\n"
 "må du konfigurera net-metadriveren for å få tilgjenge til dei via nissen som køyrar på serverne.\n"
 "saned-nissen og brannmuren på serverne må gje tilgjenge til klienten.\n"
@@ -1046,8 +1007,7 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b><big>Local Host Configuration</big></b><br>"
-"\n"
+"<b><big>Local Host Configuration</big></b><br>\n"
 "By using the loopback network, saned and the net metadriver\n"
 "can be used even on your local host.\n"
 "In this case, the server and client are the same machine (localhost).\n"
@@ -1057,8 +1017,7 @@
 "</p>"
 msgstr ""
 "<p>\n"
-"<b><big>Konfigurasjon av lokal vertsmaskin:</big></b><br>"
-"\n"
+"<b><big>Konfigurasjon av lokal vertsmaskin:</big></b><br>\n"
 "Ved hjelp av loopback-nettverket kan saned og net-metadriveren\n"
 "òg vert nytta på den lokale maskina di.\n"
 "I dette tilfellet er serveren og klienten same maskin (localhost).\n"

Modified: branches/plus-SLE12-SP2/yast/nn/po/security.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/security.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/security.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -133,235 +133,235 @@
 #. Authors:	Michal Svec 
 #.
 #. $Id$
-#: src/include/security/dialogs.rb:62
+#: src/include/security/dialogs.rb:64
 #, fuzzy
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: src/include/security/dialogs.rb:65
+#: src/include/security/dialogs.rb:67
 #, fuzzy
 msgid "Use magic SysRq keys"
 msgstr "Aktivar magiske SysRq-tastar"
 
-#: src/include/security/dialogs.rb:66
+#: src/include/security/dialogs.rb:68
 #, fuzzy
 msgid "Use secure file permissions"
 msgstr "Nytte sikre filrettigheter"
 
-#: src/include/security/dialogs.rb:69
+#: src/include/security/dialogs.rb:71
 #, fuzzy
 msgid "Remote access to the display manager"
 msgstr "Eksternt tilgjenge til grafisk innlogging"
 
-#: src/include/security/dialogs.rb:72
+#: src/include/security/dialogs.rb:74
 #, fuzzy
 msgid "Write back system time to the hardware clock"
 msgstr "Lagre systemtiden tilbake til maskinvareklokken"
 
-#: src/include/security/dialogs.rb:75
+#: src/include/security/dialogs.rb:77
 #, fuzzy
 msgid "Always generate syslog message for cron scripts"
 msgstr "Generer alltid syslog-melding for cron-skript"
 
-#: src/include/security/dialogs.rb:78
+#: src/include/security/dialogs.rb:80
 #, fuzzy
 msgid "Run the DHCP daemon in a chroot"
 msgstr "Køyr DHCP-nissen i chroot-varetekt"
 
-#: src/include/security/dialogs.rb:81
+#: src/include/security/dialogs.rb:83
 #, fuzzy
 msgid "Run the DHCP daemon as dhcp user"
 msgstr "Køyr DHCP-nissen som dhcp-brukar"
 
-#: src/include/security/dialogs.rb:84
+#: src/include/security/dialogs.rb:86
 #, fuzzy
 msgid "Remote root login in the display manager"
 msgstr "Ekstern grafisk innlogging for rotbruker"
 
-#: src/include/security/dialogs.rb:87
+#: src/include/security/dialogs.rb:89
 #, fuzzy
 msgid "Remote access to the X server"
 msgstr "Eksternt tilgjenge til X-servar"
 
-#: src/include/security/dialogs.rb:90
+#: src/include/security/dialogs.rb:92
 #, fuzzy
 msgid "Remote access to the email delivery subsystem"
 msgstr "Eksternt tilgjenge til systemet for e-posttransport"
 
-#: src/include/security/dialogs.rb:93
+#: src/include/security/dialogs.rb:95
 #, fuzzy
 msgid "Restart services on update"
 msgstr "Start tenester på nytt etter oppdatering"
 
-#: src/include/security/dialogs.rb:96
+#: src/include/security/dialogs.rb:98
 #, fuzzy
 msgid "Stop services on removal"
 msgstr "Deaktiver tenester når programvare vert fjerna"
 
-#: src/include/security/dialogs.rb:99
+#: src/include/security/dialogs.rb:101
 #, fuzzy
 msgid "Enable TCP syncookies"
 msgstr "Aktiver TCP-syncookies"
 
-#: src/include/security/dialogs.rb:102
+#: src/include/security/dialogs.rb:104
 #, fuzzy
 msgid "IPv4 forwarding"
 msgstr "IPv4-overføring"
 
-#: src/include/security/dialogs.rb:103
+#: src/include/security/dialogs.rb:105
 #, fuzzy
 msgid "IPv6 forwarding"
 msgstr "IPv6-overføring"
 
-#: src/include/security/dialogs.rb:104
+#: src/include/security/dialogs.rb:106
 #, fuzzy
 msgid "Enable basic system services"
 msgstr "<P>Berre grunnleggjande systemtjenester er aktiverte.</P>"
 
-#: src/include/security/dialogs.rb:107
+#: src/include/security/dialogs.rb:109
 #, fuzzy
 msgid "Disable extra services"
 msgstr "Aktiver ekstra tenester i kjørenivå 3"
 
 #. handle the special cases at first
-#: src/include/security/dialogs.rb:150
+#: src/include/security/dialogs.rb:152
 #, fuzzy
 msgid "Configure"
 msgstr "Konfigurer"
 
-#: src/include/security/dialogs.rb:152
+#: src/include/security/dialogs.rb:154
 #, fuzzy
 msgid "Enabled"
 msgstr "Aktivert"
 
-#: src/include/security/dialogs.rb:154
+#: src/include/security/dialogs.rb:156
 #, fuzzy
 msgid "Disabled"
 msgstr "Deaktivert"
 
 #. table header
 #. table header
-#: src/include/security/dialogs.rb:180 src/include/security/dialogs.rb:409
+#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
 #, fuzzy
 msgid "Security Setting"
 msgstr "Sikkerhetsinnstilling"
 
-#: src/include/security/dialogs.rb:181 src/include/security/dialogs.rb:410
+#: src/include/security/dialogs.rb:183 src/include/security/dialogs.rb:412
 #, fuzzy
 msgid "Status"
 msgstr "Status"
 
-#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
+#: src/include/security/dialogs.rb:184 src/include/security/dialogs.rb:413
 #, fuzzy
 msgid "Security Status"
 msgstr "Sikkerhetsstatus"
 
 #. add one line for each security setting
-#: src/include/security/dialogs.rb:318
+#: src/include/security/dialogs.rb:320
 #, fuzzy
 msgid "Help"
 msgstr "Hjelp"
 
 #. this is a separator between service names
 #. e.g.: "postfix" + " or " + "sendmail"
-#: src/include/security/dialogs.rb:361
+#: src/include/security/dialogs.rb:363
 #, fuzzy
 msgid " or "
 msgstr " eller "
 
 #. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services
-#: src/include/security/dialogs.rb:368
+#: src/include/security/dialogs.rb:370
 #, fuzzy
 msgid "<P>These basic system services are not enabled:<BR><B>%s</B></P>"
 msgstr "<P>Følgjande grunnleggjande systemtjenester er ikkje aktiverte i kjørenivå %1:<BR><B>%2</B></P>"
 
-#: src/include/security/dialogs.rb:370
+#: src/include/security/dialogs.rb:372
 #, fuzzy
 msgid "<P>All basic services are enabled.</P>"
 msgstr "<P>Alle grunnleggjande systemtjenester er aktiverte.</P>"
 
-#: src/include/security/dialogs.rb:378
+#: src/include/security/dialogs.rb:380
 #, fuzzy
 msgid "<P>These extra services are enabled:<BR><B>%s</B></P>"
 msgstr "<P>Følgjande tilleggstjenester er aktiverte i kjørenivå %1:<BR><B>%2</B></P>"
 
-#: src/include/security/dialogs.rb:379
+#: src/include/security/dialogs.rb:381
 #, fuzzy
 msgid "<P>Check the list of services and disable all unused services.</P>"
 msgstr "<P>Kontroller lista over tenester, og deaktiver alle ubrukte tenester.</P>"
 
-#: src/include/security/dialogs.rb:381
+#: src/include/security/dialogs.rb:383
 #, fuzzy
 msgid "<P>Only basic system services are enabled.</P>"
 msgstr "<P>Berre grunnleggjande systemtjenester er aktiverte.</P>"
 
-#: src/include/security/dialogs.rb:387
+#: src/include/security/dialogs.rb:389
 #, fuzzy
 msgid "Description"
 msgstr "Skildring"
 
 #. Overview dialog caption
 #. params: input tree, parent, label, id
-#: src/include/security/dialogs.rb:399 src/include/security/wizards.rb:49
+#: src/include/security/dialogs.rb:401 src/include/security/wizards.rb:49
 #, fuzzy
 msgid "Security Overview"
 msgstr "Sikkerhetsoversikt"
 
 #. push button label
-#: src/include/security/dialogs.rb:424
+#: src/include/security/dialogs.rb:426
 #, fuzzy
 msgid "Change &Status"
 msgstr "Endre &status"
 
 #. push button label
-#: src/include/security/dialogs.rb:427
+#: src/include/security/dialogs.rb:429
 #, fuzzy
 msgid "&Description"
 msgstr "&Skildring"
 
 #. update the current value
-#: src/include/security/dialogs.rb:521
+#: src/include/security/dialogs.rb:523
 msgid "Analyzing system"
 msgstr ""
 
 #. Boot dialog caption
-#: src/include/security/dialogs.rb:575 src/include/security/wizards.rb:57
+#: src/include/security/dialogs.rb:589 src/include/security/wizards.rb:57
 #, fuzzy
 msgid "Boot Settings"
 msgstr "Oppstartsinnstillinger"
 
 #. Frame label
-#: src/include/security/dialogs.rb:587
+#: src/include/security/dialogs.rb:601
 #, fuzzy
 msgid "Boot Permissions"
 msgstr "Oppstartsrettigheter"
 
 #. Misc dialog caption
-#: src/include/security/dialogs.rb:664 src/include/security/wizards.rb:60
+#: src/include/security/dialogs.rb:670 src/include/security/wizards.rb:60
 #, fuzzy
 msgid "Miscellaneous Settings"
 msgstr "Diverse innstillingar"
 
 #. Password dialog caption
-#: src/include/security/dialogs.rb:744 src/include/security/wizards.rb:56
+#: src/include/security/dialogs.rb:750 src/include/security/wizards.rb:56
 #, fuzzy
 msgid "Password Settings"
 msgstr "Passordinnstilliinger"
 
 #. Frame label
-#: src/include/security/dialogs.rb:753
+#: src/include/security/dialogs.rb:759
 #, fuzzy
 msgid "Checks"
 msgstr "Kontroller"
 
 #. Frame label
-#: src/include/security/dialogs.rb:768
+#: src/include/security/dialogs.rb:774
 #, fuzzy
 msgid "Password Age"
 msgstr "Passordvarighet"
 
 #. Popup text
-#: src/include/security/dialogs.rb:846
+#: src/include/security/dialogs.rb:852
 #, fuzzy
 msgid ""
 "The minimum number of days cannot be larger\n"
@@ -371,7 +371,7 @@
 "verd enn største mengd."
 
 #. Popup text, %1 is number
-#: src/include/security/dialogs.rb:863
+#: src/include/security/dialogs.rb:869
 #, fuzzy
 msgid ""
 "The minimum password length cannot be larger than the maximum.\n"
@@ -381,129 +381,61 @@
 "Maksimal passordlengde for den valde krypteringsmetoden er %1."
 
 #. Login dialog caption
-#: src/include/security/dialogs.rb:895 src/include/security/wizards.rb:58
+#: src/include/security/dialogs.rb:901 src/include/security/wizards.rb:58
 #, fuzzy
 msgid "Login Settings"
 msgstr "Innloggingsinnstillinger"
 
 #. Frame label
-#: src/include/security/dialogs.rb:904
+#: src/include/security/dialogs.rb:910
 #, fuzzy
 msgid "Login"
 msgstr "Innlogging"
 
 #. Read dialog help 1/2
-#: src/include/security/helps.rb:39
+#: src/include/security/helps.rb:41
 #, fuzzy
 msgid ""
 "<p><b><big>Initializing Security Configuration</big></b>\n"
-"<br>"
-"Please wait...<br>"
-"</p>"
+"<br>Please wait...<br></p>"
 msgstr ""
 "<p><b><big>Initialiserer sikkerhetskonfigurasjon</big></b>\n"
-"<br>"
-"Vent…<br>"
-"</p>"
+"<br>Vent…<br></p>"
 
 #. Read dialog help 2/2
-#: src/include/security/helps.rb:43
+#: src/include/security/helps.rb:45
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting the Initialization</big></b><br>"
-"\n"
+"<p><b><big>Aborting the Initialization</big></b><br>\n"
 "Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
 msgstr ""
-"<p><b><big>Avbryta initialiseringen</big></b><br>"
-"\n"
+"<p><b><big>Avbryta initialiseringen</big></b><br>\n"
 "Du kan trygt avslutta konfigurasjonsverktøyet ved å klikka <B>Avbryt</b> no.</p>"
 
 #. Write dialog help 1/2
-#: src/include/security/helps.rb:47
+#: src/include/security/helps.rb:49
 #, fuzzy
 msgid ""
 "<p><b><big>Saving Security Configuration</big></b>\n"
-"<br>"
-"Please wait...<br>"
-"</p>"
+"<br>Please wait...<br></p>"
 msgstr ""
 "<p><b><big>Lagrar sikkerhetskonfigurasjon</big></b>\n"
-"<br>"
-"Vent…<br>"
-"</p>"
+"<br>Vent…<br></p>"
 
 #. Write dialog help 2/2
-#: src/include/security/helps.rb:51
+#: src/include/security/helps.rb:53
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.</p>"
 msgstr ""
-"<p><b><big>Avbryta lagring</big></b><br>"
-"\n"
+"<p><b><big>Avbryta lagring</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.</p>"
 
-#. Boot dialog help 1/4
-#: src/include/security/helps.rb:55
-#, fuzzy
-msgid ""
-"<p><b><big>Boot Security</big></b></p>"
-"\n"
-"<p>In this dialog, change various boot settings related to security.</p>"
-msgstr ""
-"<p><b><big>Tryggleik ved oppstart</big></b></p>"
-"\n"
-"<p>Bruk denne dialogen for å endra ulike innstillingar for tryggleik ved oppstart.</p>"
-
-#. Boot dialog help 2/4
+#. Main dialog help 1/8
 #: src/include/security/helps.rb:59
 #, fuzzy
 msgid ""
-"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
-"Configure what the system should do in response to\n"
-"someone at the console pressing the CTRL + ALT + DEL key\n"
-"combination. Usually the system reboots. Sometimes it is desirable\n"
-"to ignore this event, for example, when the system serves as both\n"
-"workstation and server.</p>"
-msgstr ""
-"<p><b>Tolking av Ctrl + Alt + Del</b>:\n"
-"Vel korleis systemet skal reagera når nokon trykkjer\n"
-"CTRL + ALT + DEL i konsollmodus. Normalt vert systemet\n"
-"starta på nytt, men nokon gonger kan det vera gunstig\n"
-"å ignorera kommandoen, til dømes viss systemet både fungerer som\n"
-"arbeidsstasjon og servar.</p>"
-
-#. Boot dialog help 3/4
-#: src/include/security/helps.rb:68
-#, fuzzy
-msgid ""
-"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
-"Set who is allowed to shut down the machine from KDM.</p>"
-"\n"
-msgstr ""
-"<p><b>Slå av maskina frå innloggingsskjermen</b>\n"
-"Angje kven som kan slå av maskina frå KDM.</p>"
-"\n"
-
-#. Boot dialog help 4/4
-#: src/include/security/helps.rb:72
-#, fuzzy
-msgid ""
-"<p><b>Hibernate System</b>:\n"
-"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
-"Other options are allowing the action to any user or requiring authentication in all cases.</p>"
-"\n"
-msgstr ""
-"<p><b>Systemdvale</b>:\n"
-"Angje betingelsene for at brukarar skal kunna bruka dvalefunksjonen. Som standard har brukaren på den aktive konsollen slike rettar.\n"
-"Andre val er å la alle brukarar gjera dette, eller alltid krevja autentisering.</p>"
-"\n"
-
-#. Main dialog help 1/8
-#: src/include/security/helps.rb:78
-#, fuzzy
-msgid ""
 "<P><BIG><B>Configuring Local Security</B></BIG></P>\n"
 "<p>Using predefined defaults, change the local security settings, which include\n"
 "    booting, login, password, user creation, and file permissions. The default\n"
@@ -517,7 +449,7 @@
 "</p>"
 
 #. Main dialog help 5/8
-#: src/include/security/helps.rb:86
+#: src/include/security/helps.rb:67
 #, fuzzy
 msgid ""
 "<p><b>Workstation</b>: For a computer connected\n"
@@ -527,14 +459,14 @@
 "til eit lokalt nettverk eller til Internett.</p>"
 
 #. Main dialog help 6/8
-#: src/include/security/helps.rb:90
+#: src/include/security/helps.rb:71
 msgid ""
 "<p><b>Roaming Device</b>: For a laptop, tablet or similar device\n"
 "that connects to different networks.</p>"
 msgstr ""
 
 #. Main dialog help 7/8
-#: src/include/security/helps.rb:94
+#: src/include/security/helps.rb:75
 #, fuzzy
 msgid ""
 "<p><b>Network Server</b>: For a computer that provides\n"
@@ -544,27 +476,25 @@
 "servar for eikor teneste.</p>"
 
 #. Main dialog help 8/8
-#: src/include/security/helps.rb:98
+#: src/include/security/helps.rb:79
 #, fuzzy
 msgid "<p><b>Custom Settings</b>: Create your own configuration.</p>"
 msgstr "<p><b>Egendefinerte innstillingar</b>: Lag ditt eige oppsett.</p>"
 
 #. Login dialog help 1/4
-#: src/include/security/helps.rb:100
+#: src/include/security/helps.rb:81
 #, fuzzy
 msgid ""
-"<p><big><b>Login Security</b></big></p>"
-"\n"
+"<p><big><b>Login Security</b></big></p>\n"
 "<p>These login settings\n"
 "are mainly stored in the /etc/login.defs file.</p>"
 msgstr ""
-"<p><big><b>Tryggleik ved innlogging</b></big></p>"
-"\n"
+"<p><big><b>Tryggleik ved innlogging</b></big></p>\n"
 "<p>Disse innloggingsinnstillingene\n"
 "er hovudsakleg lagra i fila /etc/login.defs.</p>"
 
 #. Login dialog help 2/4
-#: src/include/security/helps.rb:106
+#: src/include/security/helps.rb:87
 #, fuzzy
 msgid ""
 "<p><b>Delay after Incorrect Login Attempt:</b>\n"
@@ -578,14 +508,13 @@
 "for lenge viss dei skriv inn feil passord. Tre sekund er eit fornuftig verd (<tt>3</tt>).</p>"
 
 #. Login dialog help 3/4
-#: src/include/security/helps.rb:113
+#: src/include/security/helps.rb:94
 #, fuzzy
 msgid ""
 "<p><b>Record Successful Login Attempts:</b> Logging successful login\n"
 "attempts is useful. It can warn you of unauthorized access to the\n"
 "system (for example, a user logging in from a different location than usual).\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p><b>Registrer vellukka innloggingsforsøk:</b> Logging av vellukka innloggingsforsøk\n"
 "er nyttig. Det kan bidra til å oppdaga uautorisert tilgjenge til\n"
@@ -593,7 +522,7 @@
 "</p>"
 
 #. Login dialog help 4/4
-#: src/include/security/helps.rb:120
+#: src/include/security/helps.rb:101
 #, fuzzy
 msgid ""
 "<p><b>Allow Remote Graphical Login:</b> Checking this allows access\n"
@@ -605,7 +534,7 @@
 "til maskina via ein innloggingshandsamar kan vera ein sikkerhetsrisiko.</p>"
 
 #. Password dialog help 1/8
-#: src/include/security/helps.rb:126
+#: src/include/security/helps.rb:107
 #, fuzzy
 msgid ""
 "<p>These password settings\n"
@@ -615,7 +544,7 @@
 "er hovudsakleg lagra i fila /etc/login.defs.</p>"
 
 #. Password dialog help 2/8
-#: src/include/security/helps.rb:130
+#: src/include/security/helps.rb:111
 #, fuzzy
 msgid ""
 "<p><b>Check New Passwords</b>: It is wise to choose a password that\n"
@@ -627,7 +556,7 @@
 "Viss du kryssar av i boksen, vert nye passord kontrollert mot desse reglene.</p>"
 
 #. Password dialog help
-#: src/include/security/helps.rb:136
+#: src/include/security/helps.rb:117
 #, fuzzy
 msgid ""
 "<p><b>Minimum Acceptable Password Length:</b>\n"
@@ -643,7 +572,7 @@
 "Dette valet kan berre endrast viss <b>Kontrollar nytt passord</b> er valt.</p>"
 
 #. Password dialog help 4/8
-#: src/include/security/helps.rb:144
+#: src/include/security/helps.rb:125
 #, fuzzy
 msgid ""
 "<p><b>Passwords to Remember</b>:\n"
@@ -655,13 +584,13 @@
 "Angje 0 dersom ingen passord skal lagrast.</p>"
 
 #. Password dialog help 5a/8
-#: src/include/security/helps.rb:150
+#: src/include/security/helps.rb:131
 #, fuzzy
 msgid "<p><b>Password Encryption Method:</b></p>"
 msgstr "<p><b>Krypteringsmetode for passord:</b></p>"
 
 #. Password dialog help 5b/8
-#: src/include/security/helps.rb:152
+#: src/include/security/helps.rb:133
 #, fuzzy
 msgid ""
 "<p><b>DES</b>, the Linux default method, works in all network environments,\n"
@@ -673,7 +602,7 @@
 "avhengig av kompatibilitet med andre system.</p>"
 
 #. Password dialog help 5c/8
-#: src/include/security/helps.rb:158
+#: src/include/security/helps.rb:139
 #, fuzzy
 msgid ""
 "<p><b>MD5</b> allows longer passwords and is supported by all current Linux \n"
@@ -683,13 +612,13 @@
 "distribusjonar, men ikkje av andre system eller eldre programvare.</p>"
 
 #. Password dialog help 5d/8
-#: src/include/security/helps.rb:162
+#: src/include/security/helps.rb:143
 #, fuzzy
 msgid "<p><b>SHA-512</b> is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.</p>"
 msgstr "<p><b>SHA-512</b> er standard hash-metode. Det vert ikkje rådt til å bruka andre algoritmar dersom det ikkje er naudsynt av kompatibilitetshensyn.</p>"
 
 #. Password dialog help 7/8
-#: src/include/security/helps.rb:166
+#: src/include/security/helps.rb:147
 #, fuzzy
 msgid ""
 "<p><b>Password Age:</b> Set the minimum and\n"
@@ -699,7 +628,7 @@
 "største mengd dagar som eit passord kan nyttast.</p>"
 
 #. Password dialog help 8/8
-#: src/include/security/helps.rb:170
+#: src/include/security/helps.rb:151
 #, fuzzy
 msgid ""
 "<p><b>Days before Password Expires Warning</b>: This entry sets the\n"
@@ -711,7 +640,7 @@
 "gjer det mindre sannsynleg at nokon kan gjetta eit passord.</p>"
 
 #. Adduser dialog help 1/2
-#: src/include/security/helps.rb:176
+#: src/include/security/helps.rb:157
 #, fuzzy
 msgid ""
 "<p><big><b>User Security</b></big></P>\n"
@@ -721,7 +650,7 @@
 "<p>I denne dialogen kan du endra ulike innstillingar i samband med oppretting av brukarar.</p>"
 
 #. Adduser dialog help 2/3
-#: src/include/security/helps.rb:180
+#: src/include/security/helps.rb:161
 #, fuzzy
 msgid ""
 "<p><b>User ID Limitations:</b>\n"
@@ -731,7 +660,7 @@
 "Definer minste og største mengd moglege brukernavn.</p>"
 
 #. Adduser dialog help 3/3
-#: src/include/security/helps.rb:184
+#: src/include/security/helps.rb:165
 #, fuzzy
 msgid ""
 "<p><b>Group ID Limitations</b>:\n"
@@ -741,7 +670,7 @@
 "Definer minste og største mengd moglege gruppenavn.</p>"
 
 #. Misc dialog help 1/14
-#: src/include/security/helps.rb:188
+#: src/include/security/helps.rb:169
 #, fuzzy
 msgid ""
 "<p><big><b>Other Security Settings</b></big></P>\n"
@@ -751,7 +680,7 @@
 "<p>I denne dialogen kan du endra diverse innstillingar i samband med lokal tryggleik.</p>"
 
 #. Misc dialog help 2/14
-#: src/include/security/helps.rb:192
+#: src/include/security/helps.rb:173
 #, fuzzy
 msgid ""
 "<p><b>File Permissions</b>: Settings for the permissions\n"
@@ -759,35 +688,31 @@
 "or /etc/permissions.easy. Which file is used depends on this selection.\n"
 "Launching SuSEconfig sets these permissions according to /etc/permissions.*.\n"
 "This fixes files with incorrect permissions, whether this occurred accidentally\n"
-"or by intruders.</p>"
-"<p>\n"
+"or by intruders.</p><p>\n"
 "With <b>Easy</b>, most of the system files that are only readable by root\n"
 "in Secure are modified so other users can also read these files.\n"
 "Using <b>Secure</b>, certain system files, such as /var/log/messages, can only\n"
 "be viewed by the user root. Some programs can only be launched by root or by\n"
 "daemons, not by ordinary users.\n"
 "The most secure setting is <b>Paranoid</B>. With it, you must\n"
-"decide which users are able to run X applications and setuid programs.</p>"
-"\n"
+"decide which users are able to run X applications and setuid programs.</p>\n"
 msgstr ""
 "<p><b>Filrettigheter</b>: Innstillingar for tilgjenge\n"
 "til spesielle systemfiler vert definert på grunnlag av informasjonen i /etc/permissions.secure\n"
 "eller /etc/permissions.easy. Kva for ei fil som vert brukt, avheng av dette valet.\n"
 "Når du køyrer SuSEconfig, vert definert desse rettane i samsvar med /etc/permissions.*.\n"
 "Dette reparerer feilkonfigurerte filrettigheter, anten desse er endra ved eit uhell\n"
-"eller av ein inntrenger.</p>"
-"<p>\n"
+"eller av ein inntrenger.</p><p>\n"
 "Med <b>Enkel</b> vert dei fleste systemfiler som berre kan lesast av rotbrukeren\n"
 "i secure-fila, endra slik at andre brukarar òg kan lesa desse filene.\n"
 "Med <b>Sikker</b> kan einskilde systemfiler, t.d. /var/log/messages, berre\n"
 "vert viste av rotbrukeren. Nokre program kan berre startast som rot eller av\n"
 "nissar, ikkje av vanlege brukarar.\n"
 "Den sikraste innstillinga er <b>Paranoid</B>. Med denne innstillinga må du\n"
-"definera kva for brukarar som kan køyra X- og setuid-program.</p>"
-"\n"
+"definera kva for brukarar som kan køyra X- og setuid-program.</p>\n"
 
 #. Misc dialog help 6/14
-#: src/include/security/helps.rb:208
+#: src/include/security/helps.rb:189
 #, fuzzy
 msgid ""
 "<p><b>User Launching updatedb</b>: The program updatedb runs \n"
@@ -803,7 +728,7 @@
 "    (nokon filer) eller <b>root</b> (alle filer).</p>"
 
 #. Misc dialog help 10/14
-#: src/include/security/helps.rb:216
+#: src/include/security/helps.rb:197
 #, fuzzy
 msgid ""
 "<p><b>Current Directory in root's Path</b> On a DOS system,\n"
@@ -817,23 +742,21 @@
 "derimot utelukkande søkestien (variabelen PATH).</p>"
 
 #. Misc dialog help 11/14
-#: src/include/security/helps.rb:223
+#: src/include/security/helps.rb:204
 #, fuzzy
 msgid ""
-"<p><b>Current Directory in the Path of Regular Users</b><br>"
-" A DOS\n"
+"<p><b>Current Directory in the Path of Regular Users</b><br> A DOS\n"
 "system first searches for executable files (programs) in the current directory\n"
 "then in the current path variable. In contrast, a UNIX-like system searches\n"
 "for them exclusively via the search path (variable PATH).</p>"
 msgstr ""
-"<p><b>Gjeldande katalog i søkesti for vanlege brukarar</b><br>"
-" I systemet til eit-\n"
+"<p><b>Gjeldande katalog i søkesti for vanlege brukarar</b><br> I systemet til eit-\n"
 "DO vil systemet først søkja etter kjørbare filer (program) i gjeldande katalog,\n"
 "og deretter i gjeldande søkesti. UNIX-liknande system brukar\n"
 "derimot utelukkande søkestien (variabelen PATH).</p>"
 
 #. Misc dialog help 12/14
-#: src/include/security/helps.rb:230
+#: src/include/security/helps.rb:211
 #, fuzzy
 msgid ""
 "<p>Some systems set up a work-around by adding the dot (\".\") to the\n"
@@ -851,7 +774,7 @@
 "i systemet.</p>"
 
 #. Misc dialog help 13/14
-#: src/include/security/helps.rb:239
+#: src/include/security/helps.rb:220
 #, fuzzy
 msgid ""
 "<p>\"yes\": the dot (\".\") is attached to the end of the search\n"
@@ -862,7 +785,7 @@
 "slik at denne vert gjennomsøkt sist.</p>"
 
 #. Misc dialog help 14/14
-#: src/include/security/helps.rb:243
+#: src/include/security/helps.rb:224
 #, fuzzy
 msgid ""
 "<p>\"no\": the user root always must launch programs in the\n"
@@ -872,45 +795,42 @@
 "gjeldande katalog ved å bruka prefikset \"./\". Døme: \"./configure\".</p>"
 
 #. Misc dialog help 14/14
-#: src/include/security/helps.rb:247
+#: src/include/security/helps.rb:228
 #, fuzzy
 msgid ""
-"<p><b>Enable Magic SysRq Keys</b><br>"
-" If you check this option, you\n"
+"<p><b>Enable Magic SysRq Keys</b><br> If you check this option, you\n"
 "will have some control over the system even if it crashes (for example, during kernel\n"
 "debugging). For details, see /usr/src/linux/Documentation/sysrq.txt</p>"
 msgstr ""
-"<p><b>Aktivar magiske SysRq-tastar</b><br>"
-" Viss du kryssar av for dette alternativet, vil du\n"
+"<p><b>Aktivar magiske SysRq-tastar</b><br> Viss du kryssar av for dette alternativet, vil du\n"
 "alltid ha ei viss grad av kontroll over systemet sjølv etter eit havari (t.d. under\n"
-"oppsett av kjernen). Du finn meir informasjon i /usr/src/linux/Documentation/sysrq.txt</p>"
-"."
+"oppsett av kjernen). Du finn meir informasjon i /usr/src/linux/Documentation/sysrq.txt</p>."
 
 #. help text: security overview dialog 1/
-#: src/include/security/helps.rb:253
+#: src/include/security/helps.rb:234
 #, fuzzy
 msgid "<P><B>Security Overview</B><BR>This overview shows the most important security settings.</P>"
 msgstr "<P><B>Sikkerhetsoversikt</B><BR>Dette er eit oversyn over dei viktigaste sikkerhetsinnstillingene.</P>"
 
 #. help text: security overview dialog 1/
-#: src/include/security/helps.rb:257
+#: src/include/security/helps.rb:238
 #, fuzzy
 msgid "<P>To change the current value, click the link associated to the option.</P>"
 msgstr "<P>Klikk på lenkjene for å endra gjeldande verd for eit val.</P>"
 
 #. help text: security overview dialog 1/
-#: src/include/security/helps.rb:261
+#: src/include/security/helps.rb:242
 #, fuzzy
 msgid "<P> A check mark in the <B>Security Status</B> column means that the current value of the option is secure.</P>"
 msgstr "<P>Ei hake i kolonnen <B>Sikkerhetsstatus</B> tyder at gjeldande verd for valet er sikker.</P>"
 
 #. an error message (rich text)
-#: src/include/security/helps.rb:265
+#: src/include/security/helps.rb:246
 #, fuzzy
 msgid "<P><B>The current value could not be read. The service is probably not installed or the option is missing on the system.</B></P>"
 msgstr "<P><B>Gjeldande verd kunne ikkje lesast. Tenesta er sannsynlegvis ikkje installert, eller valet manglar i systemet.</B></P>"
 
-#: src/include/security/helps.rb:271
+#: src/include/security/helps.rb:252
 #, fuzzy
 msgid ""
 "<P>A display manager provides a graphical login screen and can be accessed\n"
@@ -923,7 +843,7 @@
 "logins, then disable this option.</P>"
 msgstr "<P>Ein innloggingshandsamar presenterer ein grafisk innloggingsskjerm som er tilgjengeleg for heile nettverket, òg av ein X-servar som køyrer på ein anna maskin viss systemet er sett opp på den måten.</P><P>Vindauga som vert viste, vil då overføra data over heile nettverket. Viss dette nettverket ikkje er heilt påliteleg, kan ein åtakar laut på nettverkstrafikken og skaffa seg tilgjenge, ikkje berre til det grafiske innhaldet på skjermen, men òg til brukernavn og passord som vert nytta.</P><P>Viss du ikkje treng <EM>XDMCP</EM> for ekstern grafisk innlogging, bør du deaktivere dette valet.</P>"
 
-#: src/include/security/helps.rb:281
+#: src/include/security/helps.rb:262
 #, fuzzy
 msgid ""
 "<P>Upon startup, the system time is being set from the hardware clock of the\n"
@@ -932,27 +852,27 @@
 "correct log messages.</P>"
 msgstr "<P>Ved oppstart vert stilt systemtiden av datamaskina si maskinvareklokke. Difor må maskinvareklokken stillast før systemet vert slege av.</P><P>Konsistent systemtid er avgjerande for at systemet skal oppretta riktige loggmeldinger.</P>"
 
-#: src/include/security/helps.rb:287
+#: src/include/security/helps.rb:268
 #, fuzzy
 msgid "<P>Malfunctions in a system are usually detected by anomalies in its behaviour. Syslog messages about events that reoccur on a regular basis are important to find causes of problems. And the absence of a single record can tell more than the absence of all log records.</P><P>Therefore, syslog messages of system events are only useful if they are present.</P>"
 msgstr "<P>Funksjonsfeil kan vanlegvis påvisast av spesielle hendingar. Syslog-meldingar om hendingar som inntreffer regelmessig, er viktige for å finnar årsakene til problem, og ein manglande oppføring kan fortelja meir enn om heile systemloggen manglar.</P><P>Man kan difor seia at syslog-meldingar om systemhendelser berre er nyttige dersom dei finst.</P>"
 
-#: src/include/security/helps.rb:290
+#: src/include/security/helps.rb:271
 #, fuzzy
 msgid "<P>Chroot execution environments restrict a process to only access files that it needs by placing them in a separate subdirectory and running the process with a changed root (chroot) set to that directory.</P>"
 msgstr "<P>Chroot-miljø vert brukte for å avgrensa ein prosess berre til naudsynte filer og plassera desse i ein separat underkatalog. Deretter vert køyrde prosessen av ein endra rotbruker (chroot=changedroot) med tilgjenge til den katalogen.</P>"
 
-#: src/include/security/helps.rb:293
+#: src/include/security/helps.rb:274
 #, fuzzy
 msgid "<P>The DHCP client daemon should run as the user <EM>dhcpd</EM> to minimize a possible threat if the service is found vulnerable to a weakness in its program code.</P><P>Note that dhcpd must never run as <EM>root</EM> or with the <EM>CAP_SYS_CHROOT</EM> capability for the chroot execution confinement to be effective.</P>"
 msgstr "<P>DHCP-klientnissen bør køyrast som brukaren <EM>dhcpd</EM> for å minimera trusselen ved ein eventuell veikskap i programkoden.</P><P>Hugs at dhcpd ikkje må køyrast som <EM>rot</EM> eller med høve for <EM>CAP_sYS_cHROOT</EM> dersom chroot-varetekten skal vera effektiv.</P>"
 
-#: src/include/security/helps.rb:296
+#: src/include/security/helps.rb:277
 #, fuzzy
 msgid "<P>Administrators should never log on as <EM>root</EM> into an X Window session to minimize the usage of the root privileges.</P><P>This option does not help against careless administrators, but shall prevent attackers to be able to log on as <EM>root</EM> via the display manager if they guess or otherwise acquire the password.</P>"
 msgstr "<P>For å minimera nytta av rotprivilegier bør ikkje administratorar logga på ein X-vindusøkt som <EM>rot</EM>.</P><P>Dette valet hjelper ikkje mot uforsiktige administratorar, men vil hindra åtakarar i å logga inn som <EM>rot</EM> via den grafiske innloggingsskjermen dersom dei gjettar passordet eller får fatt i det på annan måte.</P>"
 
-#: src/include/security/helps.rb:299
+#: src/include/security/helps.rb:280
 #, fuzzy
 msgid ""
 "<P>X Window clients, e.g. programs that open a window on your display, connect\n"
@@ -965,14 +885,14 @@
 "Window clients across a network, we recommend the use of secure shell (<EM>ssh</EM>), which allows the X Window clients to connect to the X server through the encrypted ssh connection.</P>"
 msgstr "<P>X-vindusklienter, t.d. program som opnar eit vindauge på skjermen, kobler seg til X-serveren som køyrer på den fysiske maskina. Program kan òg køyra på eit anna system og visa innhald på X-serveren via nettverksforbindelser.</P><P>Når dette er aktivert, vil X-serveren lytta på port 6000 pluss skjermnummeret. Fordi nettverkstrafikk vert overførde ukryptert og difor er utsette for nettverkssniffing, og fordi ein port som vert halden open av eit program – i dette tilfellet X-serveren – gjev høve til angrep, er det sikrast å deaktivere dette valet.</P><P>For å vise X-vindusklienter via eit nettverk vert rådt til det å bruka eit sikkert skal (<EM>ssh</EM>), slik at X-vindusklienter kan koble til X-serveren via ein kryptert ssh-samband.</P>"
 
-#: src/include/security/helps.rb:309
+#: src/include/security/helps.rb:290
 #, fuzzy
 msgid ""
 "<P>The email delivery subsystem is always started. However, it does not expose\n"
 "itself outside the system by default, since it does not listen on the SMTP network port 25.</P><P>If you do not deliver emails to your system through the SMTP protocol, then disable this option.</P>"
 msgstr "<P>Systemet for e-postlevering køyrer alltid. Som standard er det likevel ikkje eksponert utanfor systemet, fordi det ikkje lyttar på SMTP-nettverksport 25.</P><P>Viss du ikkje leverer e-post til systemet vigde SMTP-protokollen, bør du deaktivere dette valet.</P>"
 
-#: src/include/security/helps.rb:312
+#: src/include/security/helps.rb:293
 #, fuzzy
 msgid ""
 "<P>If a package containing a service that is currently running is being\n"
@@ -985,7 +905,7 @@
 "reason to do so.</P>"
 msgstr "<P>Viss ei pakke som innholder ei aktivert teneste vert oppdatert, vil tenesta startast på nytt etter at filene i pakka er oppdatert.</P><P>Dette er som oftast fornuftig og trygt fordi mange tenester treng tilgjenge til kjøremiljøer eller oppsettfiler. Desse tenestene vil elles ha  framhalde å køyra til dei vart stoppa, t.d. ved at aktiverte nissar deaktiveres.</P><P>Denne innstillinga bør berre endrast viss det finst spesielle grunnar til dette.</P>"
 
-#: src/include/security/helps.rb:322
+#: src/include/security/helps.rb:303
 #, fuzzy
 msgid ""
 "<P>If a package containing a service that is currently running is being\n"
@@ -998,46 +918,125 @@
 "reason to do so.</P>"
 msgstr "<P>Viss ei pakke som innholder ei aktivert teneste avinstalleres, vil tenesta stoppast før filene i pakka vert fjerna.</P><P>Dette er som oftast fornuftig og trygt fordi mange tenester treng tilgjenge til kjøremiljøene eller oppsettfilene. Desse tenestene ville elles ha  framhalde å køyra til dei vart stoppa, t.d. ved at aktiverte nissar deaktiveres.</P><P>Denne innstillinga bør berre endrast viss det finst spesielle grunnar til dette.</P>"
 
-#: src/include/security/helps.rb:332
+#: src/include/security/helps.rb:313
 #, fuzzy
 msgid "<P>A system can be overwhelmed with numerous connection attempts so that the system runs out of memory, leading to a Denial of Service (DoS) vulnerability.</P><P>The use of syncookies is a method that can help in such situations. But in configurations with a very large number of legitimate connection attempts from one source, the <EM>Enabled</EM> setting can cause problems with denied TCP connections under high load.</P><P>Still, for most environments, syncookies are the first line of defense against SYN flood DoS attacks, so the secure setting is <EM>Enabled</EM>.</P>"
 msgstr "<P>Eit system kan overkøyrast av så mange tilkoblingsforsøk, at det ikkje er meir tilgjengeleg minne, noko som fører til ein DO sin-sårbarhet (Denial of Service).</P><P>Nytte av syncookies er ein metode som kan hjelpa i sånne situasjonar, men i oppsett med ei svært stort mengd legitime tilkoblingsforsøk frå same kjelde, kan ei <EM>Aktivert</EM>-innstilling føra til problem med at TCP-tilkoblinger avvisast ved høy belastning.</P><P>I dei fleste miljø er likevel syncookies første forsvarslinje mot Angrepet til-DO, så den sikre innstillinga er <EM>aktivert</EM>.</P>"
 
-#: src/include/security/helps.rb:335 src/include/security/helps.rb:339
+#: src/include/security/helps.rb:316 src/include/security/helps.rb:320
 #, fuzzy
 msgid "<P>IP forwarding means to pass on network packets that have been received, but that are not destined for one of the system's configured network interfaces, e.g. network interface addresses.</P><P>If a system forwards network traffic on ISO/OSI layer 3, it is called a router. If you do not need that routing functionality, then disable this option.</P>"
 msgstr "<P>IP-overføring tyder vidaresending av nettverkspakker som vert motteken, men som ikkje er berekna for nokon av systemet sitt eigne nettverksgrensesnitt, d.v.s. nettverkskortenes adresser.</P><P>Viss eit system vidaresender nettverkstrafikk via ISO/OSI 3, vert kalla det ein ruter. Viss du ikkje treng rutingfunksjonen, bør du deaktivere dette valet.</P>"
 
-#: src/include/security/helps.rb:338
+#: src/include/security/helps.rb:319
 #, fuzzy
 msgid "<P>This setting applies to <EM>IPv4</EM> only.</P>"
 msgstr "<P>Denne innstillinga gjeld berre for <EM>IPv4</EM>.</P>"
 
-#: src/include/security/helps.rb:342
+#: src/include/security/helps.rb:323
 #, fuzzy
 msgid "<P>This setting applies to <EM>IPv6</EM> only.</P>"
 msgstr "<P>Denne innstillinga gjeld berre for <EM>IPv6</EM>.</P>"
 
-#: src/include/security/helps.rb:343
+#: src/include/security/helps.rb:324
 #, fuzzy
 msgid "<P>Magic SysRq Keys enable some control over the system even if it crashes (e.g. during kernel debugging) or if the system does not respond.</P>"
 msgstr "<P>Med magiske SysRq-tastar har du ei viss grad av kontroll over systemet sjølv om det havarerer (t.d. under feilsøking av kjernen) eller viss systemet ikkje svarar.</P>"
 
-#: src/include/security/helps.rb:346
+#: src/include/security/helps.rb:327
 #, fuzzy
 msgid "<P>There are predefined file permissions in /etc/permissions.* files. The most restrictive file permissions are defined 'secure' or 'paranoid' file.</P>"
 msgstr "<P>Det er forhåndsdefinerte filrettigheter i /etc/permissions.*-filene. Dei mest restriktive filrettighetene er definerte som 'secure' eller 'paranoid'.</P>"
 
-#: src/include/security/helps.rb:349
+#: src/include/security/helps.rb:330
 #, fuzzy
 msgid "<P>Basic system services must be enabled to provide system consistency and to run the security-related services.</P>"
 msgstr "<P>Grunnleggjande systemtjenester må aktiverast for at systemet skal vera konsistent og kunne køyra sikkerhetsrelaterte tenester.</P>"
 
-#: src/include/security/helps.rb:352
+#: src/include/security/helps.rb:333
 #, fuzzy
 msgid "<P>Every running service is a potential target of a security attack. Therefore it is recommended to turn off all services which are not used by the system.</P>"
 msgstr "<P>Alle aktiverte tenester er ein potensiell sikkerhetsrisiko. Det vert difor rådt til å deaktivere alle tenester som ikkje vert brukte av systemet.</P>"
 
+#: src/include/security/helps.rb:341
+#, fuzzy
+msgid ""
+"<p><b><big>Boot Security</big></b></p>\n"
+"<p>In this dialog, change various boot settings related to security.</p>"
+msgstr ""
+"<p><b><big>Tryggleik ved oppstart</big></b></p>\n"
+"<p>Bruk denne dialogen for å endra ulike innstillingar for tryggleik ved oppstart.</p>"
+
+#. TRANSLATORS: part of help text - default action (the default is
+#. reboot)
+#: src/include/security/helps.rb:348
+#, fuzzy
+msgid ""
+"Usually the system reboots. Sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server."
+msgstr ""
+"<p><b>Tolking av Ctrl + Alt + Del</b>:\n"
+"Vel korleis systemet skal reagera når nokon trykkjer\n"
+"CTRL + ALT + DEL i konsollmodus. Normalt vert systemet\n"
+"starta på nytt, men nokon gonger kan det vera gunstig\n"
+"å ignorera kommandoen, til dømes viss systemet både fungerer som\n"
+"arbeidsstasjon og servar.</p>"
+
+#. TRANSLATORS: part of help text - default action (the default is halt)
+#: src/include/security/helps.rb:355
+#, fuzzy
+msgid ""
+"By default the system halts but sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server."
+msgstr ""
+"<p><b>Tolking av Ctrl + Alt + Del</b>:\n"
+"Vel korleis systemet skal reagera når nokon trykkjer\n"
+"CTRL + ALT + DEL i konsollmodus. Normalt vert systemet\n"
+"starta på nytt, men nokon gonger kan det vera gunstig\n"
+"å ignorera kommandoen, til dømes viss systemet både fungerer som\n"
+"arbeidsstasjon og servar.</p>"
+
+#. Boot dialog help 2/4
+#. TRANSLATORS: %s is help text - default action
+#: src/include/security/helps.rb:364
+#, fuzzy
+msgid ""
+"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+"Configure what the system should do in response to\n"
+"someone at the console pressing the CTRL + ALT + DEL key\n"
+"combination. %s</p>"
+msgstr ""
+"<p><b>Tolking av Ctrl + Alt + Del</b>:\n"
+"Vel korleis systemet skal reagera når nokon trykkjer\n"
+"CTRL + ALT + DEL i konsollmodus. Normalt vert systemet\n"
+"starta på nytt, men nokon gonger kan det vera gunstig\n"
+"å ignorera kommandoen, til dømes viss systemet både fungerer som\n"
+"arbeidsstasjon og servar.</p>"
+
+#. Boot dialog help 3/4
+#: src/include/security/helps.rb:373
+#, fuzzy
+msgid ""
+"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
+"Set who is allowed to shut down the machine from %s.</p>\n"
+msgstr ""
+"<p><b>Slå av maskina frå innloggingsskjermen</b>\n"
+"Angje kven som kan slå av maskina frå KDM.</p>\n"
+
+#. Boot dialog help 4/4
+#: src/include/security/helps.rb:377
+#, fuzzy
+msgid ""
+"<p><b>Hibernate System</b>:\n"
+"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
+"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
+msgstr ""
+"<p><b>Systemdvale</b>:\n"
+"Angje betingelsene for at brukarar skal kunna bruka dvalefunksjonen. Som standard har brukaren på den aktive konsollen slike rettar.\n"
+"Andre val er å la alle brukarar gjera dette, eller alltid krevja autentisering.</p>\n"
+
 #. level name
 #: src/include/security/levels.rb:54
 #, fuzzy
@@ -1106,194 +1105,267 @@
 "Minste mengd gruppenavn kan ikkje vera større enn det\n"
 "største."
 
-#. ComboBox label
-#: src/include/security/widgets.rb:100
+#. encoding: utf-8
+#. ------------------------------------------------------------------------------
+#. Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
+#.
+#.
+#. This program is free software; you can redistribute it and/or modify it under
+#. the terms of version 2 of the GNU General Public License as published by the
+#. Free Software Foundation.
+#.
+#. This program is distributed in the hope that it will be useful, but WITHOUT
+#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+#. FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#.
+#. You should have received a copy of the GNU General Public License along with
+#. this program; if not, contact Novell, Inc.
+#.
+#. To contact Novell about this file by physical or electronic mail, you may find
+#. current contact information at www.novell.com.
+#. ------------------------------------------------------------------------------
+#. * File:	include/security/widgets.ycp
+#. * Module:	Security configuration
+#. * Summary:	Security widgets definitions
+#. * Authors:	Michal Svec 
+#. *
+#. * $Id$
+#. *
+#. * This file contains the definitions of all widgets used by the
+#. * security module. They are all in one map (function) called
+#. * WIDGETS.
+#.
+#. <pre>
+#.
+#. The WIDGETS format:
+#. -------------------
+#.
+#. map WIDGETS = $[
+#. "Item unique ID" : $[
+#. "Widget" : "ComboBox",
+#. "Label" : "Item Label",
+#. "Options" : [ "option1", "option2", ... ],
+#. "Value" : "option2"
+#. ],
+#. ...
+#. ];
+#.
+#. The "Value" is the current value of this option and one from "Options".
+#.
+#. Particular "Options" can be either <string> or [ <string>, <string> ]. In the
+#. latter case, the first string is used as ID and the second is displayed. For
+#. example: [ "option1", ["option2",_("Option2 translation")], ... ].
+#.
+#. Possible "Widget" values so far: "ComboBox, CheckBox, TextEntry".
+#.
+#. Implementation:
+#. ---------------
+#.
+#. map2widget("ID")
+#. - look up the "ID" in the "WIDGETS" map
+#. - create the widget
+#.
+#. widget2value("ID")
+#. - query UI for the widget with `id(ID)
+#. - return its current value
+#.
+#. updatewidget("ID")
+#. - look up the "ID" and change its "Value" to the "val"
+#. - updates the WIDGETS map
+#. - called after start and after each subdialog [OK]
+#. - must check if the value is in "Options"! (TODO)
+#.
+#. processinput()
+#. - return true (OK) or false (abort, back, nil, help!, ...)
+#.
+#. </pre>
+#.
+#. *
+#. @return [Hash] all widgets
+#: src/include/security/widgets.rb:87
 #, fuzzy
-msgid "&Interpretation of Ctrl + Alt + Del"
-msgstr "&Tolking av Ctrl + Alt + Del"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:105
-#, fuzzy
 msgid "Ignore"
 msgstr "Ignorer"
 
-#. ComboBox value
-#: src/include/security/widgets.rb:107
+#: src/include/security/widgets.rb:88
 #, fuzzy
 msgid "Reboot"
 msgstr "Start på nytt"
 
-#. ComboBox value
-#: src/include/security/widgets.rb:109
+#: src/include/security/widgets.rb:89
 #, fuzzy
 msgid "Halt"
 msgstr "Slå av"
 
+#: src/include/security/widgets.rb:93
+#, fuzzy
+msgid "Only root"
+msgstr "Berre rotbruker"
+
+#: src/include/security/widgets.rb:94
+#, fuzzy
+msgid "All Users"
+msgstr "Alle brukarar"
+
+#: src/include/security/widgets.rb:95
+#, fuzzy
+msgid "Nobody"
+msgstr "Ingen"
+
+#. ComboBox label
+#: src/include/security/widgets.rb:117
+#, fuzzy
+msgid "&Interpretation of Ctrl + Alt + Del"
+msgstr "&Tolking av Ctrl + Alt + Del"
+
 #. CheckBox label
-#: src/include/security/widgets.rb:116
+#: src/include/security/widgets.rb:126
 #, fuzzy
 msgid "Allow Remote &Graphical Login"
 msgstr "Tillat ekstern &grafisk innlogging"
 
 #. CheckBox label
-#: src/include/security/widgets.rb:122
+#: src/include/security/widgets.rb:132
 #, fuzzy
 msgid "&Magic SysRq Keys"
 msgstr "&Magiske SysRq-tastar"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:125
+#: src/include/security/widgets.rb:135
 #, fuzzy
 msgid "Disable"
 msgstr "Deaktiver"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:127
+#: src/include/security/widgets.rb:137
 #, fuzzy
 msgid "Enable All Functions"
 msgstr "Aktiver alle funksjonar"
 
 #. IntField label
-#: src/include/security/widgets.rb:134
+#: src/include/security/widgets.rb:144
 #, fuzzy
 msgid "&Delay after Incorrect Login Attempt"
 msgstr "&Forseinking etter mislukka innloggingsforsøk"
 
 #. IntField label
 #. IntField label
-#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:205
+#: src/include/security/widgets.rb:152 src/include/security/widgets.rb:199
 #, fuzzy
 msgid "Maxim&um"
 msgstr "Teen til&stør"
 
 #. IntField label
 #. IntField label
-#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:218
+#: src/include/security/widgets.rb:158 src/include/security/widgets.rb:212
 #, fuzzy
 msgid "M&inimum"
 msgstr "M&inste"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:154
+#: src/include/security/widgets.rb:164
 #, fuzzy
-msgid "&Shutdown Behaviour of KDM Login Manager:"
-msgstr "&Slå av maskina frå KDM-innloggingsskjermen:"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:159
-#, fuzzy
-msgid "Only root"
-msgstr "Berre rotbruker"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:161
-#, fuzzy
-msgid "All Users"
-msgstr "Alle brukarar"
-
-#. ComboBox value
-#: src/include/security/widgets.rb:163
-#, fuzzy
-msgid "Nobody"
-msgstr "Ingen"
-
-#. ComboBox label
-#: src/include/security/widgets.rb:170
-#, fuzzy
 msgid "System Hybernation"
 msgstr "Systemdvale"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:173
+#: src/include/security/widgets.rb:167
 #, fuzzy
 msgid "User on the active console"
 msgstr "Nytter på aktiv konsoll"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:175
+#: src/include/security/widgets.rb:169
 #, fuzzy
 msgid "Anyone can hibernate"
 msgstr "Alle kan bruka dvalefunksjonen"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:177
+#: src/include/security/widgets.rb:171
 #, fuzzy
 msgid "Authentication always required"
 msgstr "Autentisering vert alltid kravde"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:184
+#: src/include/security/widgets.rb:178
 #, fuzzy
 msgid "P&assword Encryption Method"
 msgstr "Krypteringsmetode for p&assord"
 
 #. CheckBox label
-#: src/include/security/widgets.rb:198
+#: src/include/security/widgets.rb:192
 #, fuzzy
 msgid "&Check New Passwords"
 msgstr "&Kontroller nye passord"
 
 #. IntField label
-#: src/include/security/widgets.rb:211
+#: src/include/security/widgets.rb:205
 #, fuzzy
 msgid "Numb&er of Passwords to Remember"
 msgstr "Mengder passord som skal lagre&es"
 
 #. IntField label
-#: src/include/security/widgets.rb:224
+#: src/include/security/widgets.rb:218
 #, fuzzy
 msgid "&Minimum Acceptable Password Length"
 msgstr "&Minste godkjende passordlengde"
 
 #. IntField label
-#: src/include/security/widgets.rb:232
+#: src/include/security/widgets.rb:226
 #, fuzzy
 msgid "&Days before Password Expires Warning"
 msgstr "&Mengd dagar for varsel om utløp av passord"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:240
+#: src/include/security/widgets.rb:234
 #, fuzzy
 msgid "&File Permissions"
 msgstr "&Filrettigheter"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:243
+#: src/include/security/widgets.rb:237
 #, fuzzy
 msgid "Easy"
 msgstr "Enkel"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:245
+#: src/include/security/widgets.rb:239
 #, fuzzy
 msgid "Secure"
 msgstr "Sikker"
 
 #. ComboBox value
-#: src/include/security/widgets.rb:247
+#: src/include/security/widgets.rb:241
 #, fuzzy
 msgid "Paranoid"
 msgstr "Paranoid"
 
 #. ComboBox label
-#: src/include/security/widgets.rb:254
+#: src/include/security/widgets.rb:248
 #, fuzzy
 msgid "&User Launching updatedb"
 msgstr "&Brukarar som kan køyra updatedb"
 
 #. IntField label
-#: src/include/security/widgets.rb:261
+#: src/include/security/widgets.rb:255
 #, fuzzy
 msgid "Ma&ximum"
 msgstr "St&ørste"
 
 #. IntField label
-#: src/include/security/widgets.rb:267
+#: src/include/security/widgets.rb:261
 #, fuzzy
 msgid "&Minimum"
 msgstr "&Minste"
 
+#. ComboBox label
+#. TRANSLATORS: %s will be the configured display manager usually: GDM or KDM,
+#. but could be XDM,WDM,ENTRANCE,CONSOLE
+#: src/include/security/widgets.rb:277
+#, fuzzy
+msgid "&Shutdown Behaviour of %s Login Manager:"
+msgstr "&Slå av maskina frå KDM-innloggingsskjermen:"
+
 #: src/include/security/wizards.rb:53
 #, fuzzy
 msgid "Predefined Security Configurations"
@@ -1312,73 +1384,73 @@
 msgstr "Initialiserer …"
 
 #. Security read dialog caption
-#: src/modules/Security.rb:654
+#: src/modules/Security.rb:638
 #, fuzzy
 msgid "Saving Security Configuration"
 msgstr "Lagrar sikkerhetskonfigurasjon"
 
 #. Progress stage 1/4
-#: src/modules/Security.rb:663
+#: src/modules/Security.rb:647
 #, fuzzy
 msgid "Write security settings"
 msgstr "Lagre sikkerhetsinnstillinger"
 
 #. Progress stage 2/4
-#: src/modules/Security.rb:665
+#: src/modules/Security.rb:649
 #, fuzzy
 msgid "Write inittab settings"
 msgstr "Lagre inittab-innstillingar"
 
 #. Progress stage 3/4
-#: src/modules/Security.rb:667
+#: src/modules/Security.rb:651
 #, fuzzy
 msgid "Write PAM settings"
 msgstr "Lagre PAM-innstillingar"
 
 #. Progress stage 4/4
-#: src/modules/Security.rb:669
+#: src/modules/Security.rb:653
 #, fuzzy
 msgid "Update system settings"
 msgstr "Lagre sikkerhetsinnstillinger"
 
 #. Progress step 1/5
-#: src/modules/Security.rb:673
+#: src/modules/Security.rb:657
 #, fuzzy
 msgid "Writing security settings..."
 msgstr "Lagrar sikkerhetsinnstillinger …"
 
 #. Progress step 2/5
-#: src/modules/Security.rb:675
+#: src/modules/Security.rb:659
 #, fuzzy
 msgid "Writing inittab settings..."
 msgstr "Lagrar inittab-innstillingar …"
 
 #. Progress step 3/5
-#: src/modules/Security.rb:677
+#: src/modules/Security.rb:661
 #, fuzzy
 msgid "Writing PAM settings..."
 msgstr "Lagrar PAM-innstillingar …"
 
 #. Progress step 4/5
-#: src/modules/Security.rb:679
+#: src/modules/Security.rb:663
 #, fuzzy
 msgid "Updating system settings..."
 msgstr "Lagrar sikkerhetsinnstillinger …"
 
 #. Progress step 5/5
-#: src/modules/Security.rb:681
+#: src/modules/Security.rb:665
 #, fuzzy
 msgid "Finished"
 msgstr "Fullført"
 
 #. Summary text
-#: src/modules/Security.rb:791
+#: src/modules/Security.rb:754
 #, fuzzy
 msgid "Current Security Level: Custom settings"
 msgstr "Gjeldande sikkerhetsnivå: Brukerdefinerte innstillingar"
 
 #. Summary text
-#: src/modules/Security.rb:795
+#: src/modules/Security.rb:758
 #, fuzzy
 msgid "Current Security Level: %1"
 msgstr "Gjeldande sikkerhetsnivå: %1"

Modified: branches/plus-SLE12-SP2/yast/nn/po/services-manager.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/services-manager.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/services-manager.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 17:00+0200\n"
 "PO-Revision-Date: 2014-05-19 09:35+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -217,21 +217,17 @@
 
 #: src/clients/services_proposal.rb:116
 msgid ""
-"<p><big><b>Services</b></big><br>"
-"\n"
+"<p><big><b>Services</b></big><br>\n"
 "The current setup does not provide any functionality now.</p>"
 msgstr ""
 
 #: src/clients/services_proposal.rb:121
 msgid ""
-"<p><big><b>Services</b></big><br>"
-"\n"
+"<p><big><b>Services</b></big><br>\n"
 "This installation proposal allows you to start and enable a service  from the \n"
-" list of services.</p>"
-"\n"
+" list of services.</p>\n"
 "<p>It may also open ports in the firewall for a service if firewall is enabled\n"
-"and a particular service requires opening them.</p>"
-"\n"
+"and a particular service requires opening them.</p>\n"
 msgstr ""
 
 #: src/clients/services_proposal.rb:145

Modified: branches/plus-SLE12-SP2/yast/nn/po/slp-server.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/slp-server.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/slp-server.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -185,142 +185,102 @@
 #: src/include/slp-server/helps.rb:17
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing SLP Server Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Initializing SLP Server Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Initialiserer konfigurasjon for SLP-servar</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer konfigurasjon for SLP-servar</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/slp-server/helps.rb:21
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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 avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
+"Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/slp-server/helps.rb:25
 #, fuzzy
 msgid ""
-"<p><b><big>Saving SLP Server Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Saving SLP Server Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Lagrar konfigurasjon for SLP-servar</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar konfigurasjon for SLP-servar</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/slp-server/helps.rb:29
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryt lagring:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Ovreview dialog help 1/3
 #: src/include/slp-server/helps.rb:36
 #, fuzzy
 msgid ""
-"<p><b><big>SLP Server Configuration Overview</big></b><br>"
-"\n"
+"<p><b><big>SLP Server Configuration Overview</big></b><br>\n"
 "Obtain an overview of installed SLP servers. Additionally\n"
-"edit their configurations.<br>"
-"</p>"
-"\n"
+"edit their configurations.<br></p>\n"
 msgstr ""
-"<p><b><big>Oversyn over SLP-serverkonfigurasjon</big></b><br>"
-"\n"
+"<p><b><big>Oversyn over SLP-serverkonfigurasjon</big></b><br>\n"
 "Her finn du eit oversyn over installerte SLP-servera. Du kan òg\n"
-"redigera konfigurasjonane.<br>"
-"</p>"
-"\n"
+"redigera konfigurasjonane.<br></p>\n"
 
 #. Ovreview dialog help 2/3
 #: src/include/slp-server/helps.rb:42
 #, fuzzy
 msgid ""
-"<p><b><big>Adding an SLP Server</big></b><br>"
-"\n"
-"Press <b>Add</b> to configure an SLP server.</p>"
-"\n"
+"<p><b><big>Adding an SLP Server</big></b><br>\n"
+"Press <b>Add</b> to configure an SLP server.</p>\n"
 msgstr ""
-"<p><b><big>Leggja til ein SLP-servar:</big></b><br>"
-"\n"
-"Trykkar <b>Legg til</b> for å konfigurera ein SLP-servar.</p>"
-"\n"
+"<p><b><big>Leggja til ein SLP-servar:</big></b><br>\n"
+"Trykkar <b>Legg til</b> for å konfigurera ein SLP-servar.</p>\n"
 
 #. Ovreview dialog help 3/3
 #: src/include/slp-server/helps.rb:46
 #, fuzzy
 msgid ""
-"<p><b><big>Editing or Deleting</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting</big></b><br>\n"
 "Choose an SLP server to change or remove.\n"
-"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>"
-"\n"
+"Then press <b>Edit</b> or <b>Delete</b> as desired.</p>\n"
 msgstr ""
-"<p><b><big>Redigera eller slette:</big></b><br>"
-"\n"
+"<p><b><big>Redigera eller slette:</big></b><br>\n"
 "Vel ein SLP-servar du vil endra eller sletta.\n"
-"Trykk deretter <b>Rediger</b> eller <b>Slett</b> etter behov.</p>"
-"\n"
+"Trykk deretter <b>Rediger</b> eller <b>Slett</b> etter behov.</p>\n"
 
 #. Configure1 dialog help 1/2
 #: src/include/slp-server/helps.rb:52
 #, fuzzy
 msgid ""
-"<p><b><big>Configuration Part One</big></b><br>"
-"\n"
+"<p><b><big>Configuration Part One</big></b><br>\n"
 "Press <b>Next</b> to continue.\n"
-"<br>"
-"</p>"
+"<br></p>"
 msgstr ""
-"<p><b><big>Konfigurasjon, første del</big></b><br>"
-"\n"
+"<p><b><big>Konfigurasjon, første del</big></b><br>\n"
 "Trykk <b>Neste</b> for å halda fram.\n"
-"<br>"
-"</p>"
+"<br></p>"
 
 #. Configure1 dialog help 2/2
 #. Configure2 dialog help 2/2
 #: src/include/slp-server/helps.rb:58 src/include/slp-server/helps.rb:70
 #, fuzzy
 msgid ""
-"<p><b><big>Selecting Something</big></b><br>"
-"\n"
+"<p><b><big>Selecting Something</big></b><br>\n"
 "It is not possible. You must code it first. :-)\n"
 "</p>"
 msgstr ""
-"<p><b><big>Velja noko:</big></b><br>"
-"\n"
+"<p><b><big>Velja noko:</big></b><br>\n"
 "Du må hacke litt før du kan velja noko :-)\n"
 "</p>"
 
@@ -328,19 +288,13 @@
 #: src/include/slp-server/helps.rb:64
 #, fuzzy
 msgid ""
-"<p><b><big>Configuration Part Two</big></b><br>"
-"\n"
+"<p><b><big>Configuration Part Two</big></b><br>\n"
 "Press <b>Next</b> to continue.\n"
-"<br>"
-"</p>"
-"\n"
+"<br></p>\n"
 msgstr ""
-"<p><b><big>Konfigurasjon, andre del</big></b><br>"
-"\n"
+"<p><b><big>Konfigurasjon, andre del</big></b><br>\n"
 "Trykk <b>Neste</b> for å halda fram.\n"
-"<br>"
-"</p>"
-"\n"
+"<br></p>\n"
 
 #: src/include/slp-server/helps.rb:75
 #, fuzzy
@@ -354,15 +308,13 @@
 "In it, the SLP daemon answers all requests sent by broadcast. The next mode is <b>Multicast</b>. In it, the daemon answers queries\n"
 "sent by multicast in appropriate SCOPES. In the <b>DA Server</b> mode, it informs DA servers on the specified IP addresses\n"
 "about statically and dynamically registered services. The last options is <b>Becomes DA Server</b>. This is a cache server for service\n"
-"answers.</p>"
-"\n"
+"answers.</p>\n"
 msgstr ""
 "<p>Her kan du definera modusen for SLP-nissen. Den enklaste modusen er <b>Kringkasting</b>.\n"
 "Det inneber at SLP-nissen svarar på alle kringkasta førespurnader. Neste modus er <b>Multikast</b>. I denne modusen svarar nissen på forspørsler\n"
 "send via multikast i riktige OMRÅDE. I modusen <b>DÅ-servar</b> informerer nissen DÅ-servera med spesifiserte IP-adresser\n"
 "om statisk og dynamisk registrerte tenester. Det siste valet er <b>Vert DÅ-servar</b>. Dette er ein mellomlagringsserver for teneste-\n"
-"svar.</p>"
-"\n"
+"svar.</p>\n"
 
 #: src/include/slp-server/helps.rb:85
 #, fuzzy

Modified: branches/plus-SLE12-SP2/yast/nn/po/snapper.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/snapper.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/snapper.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 17:00+0200\n"
 "PO-Revision-Date: 2015-12-13 19:48+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"
@@ -19,300 +19,279 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 2.0\n"
 
-#. encoding: utf-8
-#. ------------------------------------------------------------------------------
-#. Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved.
-#.
-#.
-#. This program is free software; you can redistribute it and/or modify it under
-#. the terms of version 2 of the GNU General Public License as published by the
-#. Free Software Foundation.
-#.
-#. This program is distributed in the hope that it will be useful, but WITHOUT
-#. ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#. FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#.
-#. You should have received a copy of the GNU General Public License along with
-#. this program; if not, contact Novell, Inc.
-#.
-#. To contact Novell about this file by physical or electronic mail, you may find
-#. current contact information at www.novell.com.
-#. ------------------------------------------------------------------------------
-#. File:	clients/snapper.ycp
-#. Package:	Configuration of snapper
-#. Summary:	Main file
-#. Authors:	Jiri Suchomel 
-#.
-#. Main file for snapper configuration. Uses all other files.
-#: src/clients/snapper.rb:49
+#. The main ()
+#: src/clients/snapper.rb:53
 msgid "Configuration of system snapshots"
 msgstr "Oppsett av augneblinksbilete"
 
 #. text entry label
 #. text entry label
-#: src/include/snapper/dialogs.rb:123 src/include/snapper/dialogs.rb:244
-#: src/include/snapper/dialogs.rb:496
+#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:251
+#: src/include/snapper/dialogs.rb:490
 msgid "Description"
 msgstr "Skildring"
 
 #. text entry label
 #. text entry label
-#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:290
+#: src/include/snapper/dialogs.rb:136 src/include/snapper/dialogs.rb:297
 msgid "User data"
 msgstr "Brukardata"
 
 #. combo box label
 #. text entry label
-#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:295
+#: src/include/snapper/dialogs.rb:144 src/include/snapper/dialogs.rb:302
 msgid "Cleanup algorithm"
 msgstr "Oppryddingsalgoritme"
 
-#. popup label, %{num} is number
-#: src/include/snapper/dialogs.rb:153
-msgid "Modify Snapshot %{num}"
+#. popup label, %1 is number
+#: src/include/snapper/dialogs.rb:158
+#, fuzzy
+#| msgid "Modify Snapshot %{num}"
+msgid "Modify Snapshot %1"
 msgstr "Endra augneblinksbilete %{num}"
 
-#. popup label, %{pre} and %{post} are numbers
-#: src/include/snapper/dialogs.rb:159
-msgid "Modify Snapshot %{pre} and %{post}"
-msgstr "Endra augneblinksbilete %{pre} og %{post}"
+#. popup label, %1, %2 are numbers (range)
+#: src/include/snapper/dialogs.rb:166
+#, fuzzy
+#| msgid "Modify Snapshot %{num}"
+msgid "Modify Snapshots %1 - %2"
+msgstr "Endra augneblinksbilete %{num}"
 
 #. label
-#: src/include/snapper/dialogs.rb:161
-msgid "Pre (%{pre})"
+#: src/include/snapper/dialogs.rb:169
+#, fuzzy
+#| msgid "Pre (%{pre})"
+msgid "Pre (%1)"
 msgstr "Før (%{pre})"
 
 #. label
-#: src/include/snapper/dialogs.rb:165
-msgid "Post (%{post})"
+#: src/include/snapper/dialogs.rb:173
+#, fuzzy
+#| msgid "Post (%{post})"
+msgid "Post (%1)"
 msgstr "Etter (%{post})"
 
 #. popup label
-#: src/include/snapper/dialogs.rb:242
+#: src/include/snapper/dialogs.rb:249
 msgid "Create New Snapshot"
 msgstr "Lag nytt augneblinksbilete"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:255
+#: src/include/snapper/dialogs.rb:262
 msgid "Single snapshot"
 msgstr "Enkelt augneblinksbilete"
 
 #. radio button label
 #. 0 means there's no post
-#: src/include/snapper/dialogs.rb:264 src/include/snapper/dialogs.rb:442
+#: src/include/snapper/dialogs.rb:271 src/include/snapper/dialogs.rb:435
 msgid "Pre"
 msgstr "Før"
 
 #. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:274
+#: src/include/snapper/dialogs.rb:281
 msgid "Post, paired with:"
 msgstr "Etter, para med:"
 
 #. yes/no popup question
-#: src/include/snapper/dialogs.rb:350
+#: src/include/snapper/dialogs.rb:352
 #, fuzzy
 #| msgid ""
 #| "Failed to initialize snapper library:\n"
 #| "%1"
-msgid "Really delete snapshot %{num}?"
+msgid "Really delete snapshot '%1'?"
 msgstr ""
 "Klarte ikkje starta snapper-biblioteket:\n"
 "%1"
 
-#. yes/no popup question
-#: src/include/snapper/dialogs.rb:357
-msgid "Really delete snapshots %{pre} and %{post}?"
-msgstr ""
-
 #. summary dialog caption
-#: src/include/snapper/dialogs.rb:372
+#: src/include/snapper/dialogs.rb:365
 msgid "Snapshots"
 msgstr "Augneblinksbilete"
 
 #. generate list of snapshot table items
-#: src/include/snapper/dialogs.rb:401
+#: src/include/snapper/dialogs.rb:394
 msgid "Single"
 msgstr "Enkelt"
 
 #. pre canot be 0
-#: src/include/snapper/dialogs.rb:426
+#: src/include/snapper/dialogs.rb:419
 msgid "Pre & Post"
 msgstr "Før og etter"
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:461
+#: src/include/snapper/dialogs.rb:454
 msgid "Reading list of snapshots..."
 msgstr "Les oversikt over augneblinksbilete …"
 
 #. combo box label
-#: src/include/snapper/dialogs.rb:481
+#: src/include/snapper/dialogs.rb:475
 msgid "Current Configuration"
 msgstr "Gjeldande oppsett"
 
 #. table header
-#: src/include/snapper/dialogs.rb:492
+#: src/include/snapper/dialogs.rb:486
 msgid "ID"
 msgstr "ID"
 
-#: src/include/snapper/dialogs.rb:493
+#: src/include/snapper/dialogs.rb:487
 msgid "Type"
 msgstr "Type"
 
-#: src/include/snapper/dialogs.rb:494
+#: src/include/snapper/dialogs.rb:488
 msgid "Start Date"
 msgstr "Startdato"
 
-#: src/include/snapper/dialogs.rb:495
+#: src/include/snapper/dialogs.rb:489
 msgid "End Date"
 msgstr "Sluttdato"
 
-#: src/include/snapper/dialogs.rb:497
+#: src/include/snapper/dialogs.rb:491
 msgid "User Data"
 msgstr "Brukardata"
 
 #. button label
-#: src/include/snapper/dialogs.rb:503
+#: src/include/snapper/dialogs.rb:497
 msgid "Show Changes"
 msgstr "Vis endringar"
 
 #. button label
-#: src/include/snapper/dialogs.rb:506
+#: src/include/snapper/dialogs.rb:500
 msgid "Modify"
 msgstr "Endra"
 
 #. popup message
-#: src/include/snapper/dialogs.rb:549
+#: src/include/snapper/dialogs.rb:542
 msgid ""
 "This 'Pre' snapshot is not paired with any 'Post' one yet.\n"
 "Showing differences is not possible."
 msgstr ""
 
 #. dialog caption
-#: src/include/snapper/dialogs.rb:634
+#: src/include/snapper/dialogs.rb:588
 msgid "Selected Snapshot Overview"
 msgstr "Oversikt over valt augneblinksbilete"
 
 #. '%1: %2' means 'ID: description', adapt the order if necessary
-#: src/include/snapper/dialogs.rb:666
+#: src/include/snapper/dialogs.rb:626
 msgid "%1: %2"
 msgstr "%1: %2"
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:685
+#: src/include/snapper/dialogs.rb:645
 msgid "Calculating changed files..."
 msgstr "Finn endra filer …"
 
 #. busy popup message
-#: src/include/snapper/dialogs.rb:695
+#: src/include/snapper/dialogs.rb:742
 msgid "Calculating file modifications..."
 msgstr "Reknar ut filendringar …"
 
 #. label
-#: src/include/snapper/dialogs.rb:703
+#: src/include/snapper/dialogs.rb:750
 msgid "New file was created."
 msgstr "Ny fil vart oppretta."
 
 #. label
-#: src/include/snapper/dialogs.rb:707
+#: src/include/snapper/dialogs.rb:754
 msgid "File was removed."
 msgstr "Fila vert sletta."
 
 #. label
-#: src/include/snapper/dialogs.rb:712
+#: src/include/snapper/dialogs.rb:759
 msgid "File content was not changed."
 msgstr "Filinnhaldet vart ikkje endra."
 
 #. label
-#: src/include/snapper/dialogs.rb:718
+#: src/include/snapper/dialogs.rb:765
 msgid "File does not exist in either snapshot."
 msgstr "Fila finst ikkje i nokon av augneblinksbileta."
 
 #. label
-#: src/include/snapper/dialogs.rb:724
+#: src/include/snapper/dialogs.rb:771
 msgid "File content was modified."
 msgstr "Filinnhaldet vart endra."
 
 #. text label, %1, %2 are file modes (like '-rw-r--r--')
-#: src/include/snapper/dialogs.rb:734
+#: src/include/snapper/dialogs.rb:781
 msgid "File mode was changed from '%1' to '%2'."
 msgstr "Filmodusen vart endra frå «%1» til «%2»."
 
 #. text label, %1, %2 are user names
-#: src/include/snapper/dialogs.rb:749
+#: src/include/snapper/dialogs.rb:796
 msgid "File user ownership was changed from '%1' to '%2'."
 msgstr "Fileigarskapet vart endra frå «%1» til «%2»."
 
 #. text label, %1, %2 are group names
-#: src/include/snapper/dialogs.rb:765
+#: src/include/snapper/dialogs.rb:812
 msgid "File group ownership was changed from '%1' to '%2'."
 msgstr "Filgruppeeigarskapet vart endra frå «%1» til «%2»."
 
 #. button label
-#: src/include/snapper/dialogs.rb:782
+#: src/include/snapper/dialogs.rb:847
 msgid "R&estore from First"
 msgstr "&Gjenopprett frå første"
 
 #. button label
-#: src/include/snapper/dialogs.rb:784
+#: src/include/snapper/dialogs.rb:849
 msgid "Restore"
 msgstr "Gjenopprett"
 
-#: src/include/snapper/dialogs.rb:807
+#: src/include/snapper/dialogs.rb:872
 msgid "Res&tore from Second"
 msgstr "G&jenopprett frå andre"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:844
+#: src/include/snapper/dialogs.rb:909
 msgid "Show the difference between snapshot and current system"
 msgstr "Vis forskjellen mellom augneblinksbilete og gjeldande system"
 
 #. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:856
+#: src/include/snapper/dialogs.rb:921
 msgid "Show the difference between current and selected snapshot:"
 msgstr "Vis forskjellen mellom gjeldande system og augneblinksbilete:"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:903
+#: src/include/snapper/dialogs.rb:968
 msgid "Show the difference between first and second snapshot"
 msgstr "Vis forskjellar mellom første og andre augneblinksbilete"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:914
+#: src/include/snapper/dialogs.rb:979
 msgid "Show the difference between first snapshot and current system"
 msgstr "Vis forskjellar mellom første augneblinksbilete og gjeldande system"
 
 #. radio button label
-#: src/include/snapper/dialogs.rb:925
+#: src/include/snapper/dialogs.rb:990
 msgid "Show the difference between second snapshot and current system"
 msgstr "Vis forskjellar mellom andre augneblinksbilete og gjeldande system"
 
 #. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:954
-msgid "Time of taking the snapshot:"
-msgstr "Tidspunkt for augneblinksbilete:"
-
-#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:962
+#: src/include/snapper/dialogs.rb:1031
 msgid "Time of taking the first snapshot:"
 msgstr "Tidspunkt for første augneblinksbilete:"
 
 #. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:967
+#: src/include/snapper/dialogs.rb:1036
 msgid "Time of taking the second snapshot:"
 msgstr "Tidspunkt for andre augneblinksbilete:"
 
+#. label, date string will follow at the end of line
+#: src/include/snapper/dialogs.rb:1044
+msgid "Time of taking the snapshot:"
+msgstr "Tidspunkt for augneblinksbilete:"
+
 #. button label
-#: src/include/snapper/dialogs.rb:990
+#: src/include/snapper/dialogs.rb:1066
 msgid "&Open"
 msgstr "&Opna"
 
 #. button label
-#: src/include/snapper/dialogs.rb:1036
+#: src/include/snapper/dialogs.rb:1112
 msgid "Restore Selected"
 msgstr "Gjenopprett valt bilete"
 
 #. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1121
+#: src/include/snapper/dialogs.rb:1186
 msgid ""
 "Do you want to delete the file\n"
 "\n"
@@ -328,7 +307,7 @@
 
 #. yes/no question, %1 is file name, %2 is number
 #. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1142 src/include/snapper/dialogs.rb:1161
+#: src/include/snapper/dialogs.rb:1206 src/include/snapper/dialogs.rb:1224
 msgid ""
 "Do you want to copy the file\n"
 "\n"
@@ -343,335 +322,307 @@
 "frå augneblinksbiletet «%2» til gjeldande system?"
 
 #. popup message
-#: src/include/snapper/dialogs.rb:1187
-msgid "No file was selected for restoring."
+#: src/include/snapper/dialogs.rb:1259
+#, fuzzy
+#| msgid "No file was selected for restoring."
+msgid "No file was selected for restoring"
 msgstr "Inga fil valt for gjenoppretting."
 
 #. popup headline
-#: src/include/snapper/dialogs.rb:1197
+#: src/include/snapper/dialogs.rb:1264
 msgid "Restoring files"
 msgstr "Gjenopprettar filer"
 
 #. popup message, %1 is snapshot number, %2 list of files
-#: src/include/snapper/dialogs.rb:1200
+#: src/include/snapper/dialogs.rb:1267
 #, fuzzy
 msgid ""
-"<p>These files will be restored from snapshot '%1':</p>"
-"\n"
+"<p>These files will be restored from snapshot '%1':</p>\n"
 "<p>\n"
 "%2\n"
-"</p>"
-"\n"
-"<p>Files existing in original snapshot will be copied to current system.</p>"
-"\n"
-"<p>Files that did not exist in the snapshot will be deleted.</p>"
-"Are you sure?"
+"</p>\n"
+"<p>Files existing in original snapshot will be copied to current system.</p>\n"
+"<p>Files that did not exist in the snapshot will be deleted.</p>Are you sure?"
 msgstr ""
-"<p>Desse filene vil verta gjenopprettet frå øyeblikksbildet '%1':</p>"
-"\n"
+"<p>Desse filene vil verta gjenopprettet frå øyeblikksbildet '%1':</p>\n"
 "<p>\n"
 "%2\n"
-"</p>"
-"\n"
-"<p>Filer som finst i det originale øyeblikksbildet, vil kopierast til gjeldande system.</p>"
-"\n"
-"<p>Filer som ikkje finne sin i øyeblikksbildet, vil slettast.</p>"
-"Er du sikker på at du vil gjera dette?"
+"</p>\n"
+"<p>Filer som finst i det originale øyeblikksbildet, vil kopierast til gjeldande system.</p>\n"
+"<p>Filer som ikkje finne sin i øyeblikksbildet, vil slettast.</p>Er du sikker på at du vil gjera dette?"
 
 #. Read dialog help
-#: src/include/snapper/helps.rb:35
+#: src/include/snapper/helps.rb:36
 #, fuzzy
 #| msgid ""
-#| "<p><b><big>Reading the list of snapshots</big></b><br>"
-#| "\n"
-#| "Please wait...<br>"
-#| "</p>"
-#| "\n"
+#| "<p><b><big>Reading the list of snapshots</big></b><br>\n"
+#| "Please wait...<br></p>\n"
 msgid ""
-"<p><b><big>Reading the list of snapshots</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Reading the list of snapshots</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Les oversikt over augneblinksbilete</big></b><br>"
-"\n"
-"Vent litt …<br>"
-"</p>"
-"\n"
+"<p><b><big>Les oversikt over augneblinksbilete</big></b><br>\n"
+"Vent litt …<br></p>\n"
 
 #. Summary dialog help:
-#: src/include/snapper/helps.rb:39
+#: src/include/snapper/helps.rb:40
 #, fuzzy
 #| msgid ""
-#| "<p><b><big>Snapshots Configuration</big></b>"
-#| "<p>\n"
-#| "<p>The table shows a list of root filesystem snapshots. There are three types of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots are used for storing file system state in certain time, while Pre and Post are used to define the changes done by special operation proceeded between taking those two snapshots. Pre and Post snapshots are coupled together in the table.</p>"
-#| "\n"
-#| "<p>Select a snapshot or snapshot couple and click <b>Show Changes</b> to see the file system changes new in specified snapshot.</p>"
-#| "\n"
+#| "<p><b><big>Snapshots Configuration</big></b><p>\n"
+#| "<p>The table shows a list of root filesystem snapshots. There are three types of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots are used for storing file system state in certain time, while Pre and Post are used to define the changes done by special operation proceeded between taking those two snapshots. Pre and Post snapshots are coupled together in the table.</p>\n"
+#| "<p>Select a snapshot or snapshot couple and click <b>Show Changes</b> to see the file system changes new in specified snapshot.</p>\n"
 msgid ""
-"<p><b><big>Snapshots Configuration</big></b>"
-"<p>\n"
+"<p><b><big>Snapshots Configuration</big></b><p>\n"
 "<p>The table shows a list of root filesystem snapshots. There are three types\n"
 "of snapshots, <b>single</b>, <b>pre</b> and <b>post</b>. Single snapshots are\n"
-"used for storing the file system state in a certain time, while Pre and Post are used to define the changes done by special operation performed between taking those two snapshots. Pre and Post snapshots are paired together in the table.</p>"
-"\n"
-"<p>Select a snapshot or snapshot pair and click <b>Show Changes</b> to see the\n"
-"new file system changes in the specified snapshot.</p>"
-"\n"
+"used for storing the file system state in a certain time, while Pre and Post are used to define the changes done by special operation performed between taking those two snapshots. Pre and Post snapshots are coupled together in the table.</p>\n"
+"<p>Select a snapshot or snapshot couple and click <b>Show Changes</b> to see the\n"
+"new file system changes in the specified snapshot.</p>\n"
 msgstr ""
-"<p><b><big>Oppsett av augneblinksbilete</big></b>"
-"<p>\n"
-"<p>Tabellen viser ei liste over augneblinksbilete av rotfilsystemet. Det finst tre typar augneblinksbilete, <b>enkle</b>, <b>før</b> og <b>etter</b>. Enkle bilete vert brukte til lagring av filsystemstatusen på eit bestemt tidspunkt, mens før og etter vert brukte til å definera handlingar som er utførde mellom desse to augneblinksbileta. Før- og etter-bileta er oppførde parvis i tabellen.</p>"
-"\n"
-"<p>Vel eit augneblinksbilete eller eit augneblinksbiletepar og trykk <b>Vis endringar</b> for å vise endringane i filsystemet i det valde biletet.</p>"
-"\n"
+"<p><b><big>Oppsett av augneblinksbilete</big></b><p>\n"
+"<p>Tabellen viser ei liste over augneblinksbilete av rotfilsystemet. Det finst tre typar augneblinksbilete, <b>enkle</b>, <b>før</b> og <b>etter</b>. Enkle bilete vert brukte til lagring av filsystemstatusen på eit bestemt tidspunkt, mens før og etter vert brukte til å definera handlingar som er utførde mellom desse to augneblinksbileta. Før- og etter-bileta er oppførde parvis i tabellen.</p>\n"
+"<p>Vel eit augneblinksbilete eller eit augneblinksbiletepar og trykk <b>Vis endringar</b> for å vise endringane i filsystemet i det valde biletet.</p>\n"
 
 #. Show snapshot dialog help
-#: src/include/snapper/helps.rb:48
+#: src/include/snapper/helps.rb:49
 #, fuzzy
 #| msgid ""
-#| "<p><b><big>Snapshot Overview</big></b>"
+#| "<p><b><big>Snapshot Overview</big></b><p>\n"
 #| "<p>\n"
-#| "<p>\n"
 #| "The tree shows all the files that were modified between creating first ('pre') and second ('post') snapshot. On the right side, you can see the description generated when the first snapshot was created and the time of creation for both snapshots.\n"
-#| "</p>"
-#| "\n"
+#| "</p>\n"
 #| "<p>\n"
 #| "When file is selected in the tree, you can see the changes done to it. By default, changes between selected coupled snapshots are shown, but it is possible to compare the file with different versions.\n"
 #| "</p>"
 msgid ""
-"<p><b><big>Snapshot Overview</big></b>"
+"<p><b><big>Snapshot Overview</big></b><p>\n"
 "<p>\n"
-"<p>\n"
 "The tree shows all the files that were modified between creating the first ('pre') and second ('post') snapshot. On the right side, you see the description generated when the first snapshot was created and the time of creation for both snapshots.\n"
-"</p>"
-"\n"
+"</p>\n"
 "<p>\n"
-"When a file is selected in the tree, you see the changes done to it. By default, changes between selected paired snapshots are shown, but it is possible to compare the file with different versions.\n"
-"</p>"
-"\n"
+"When a file is selected in the tree, you see the changes done to it. By default, changes between selected coupled snapshots are shown, but it is possible to compare the file with different versions.\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Oversikt over augneblinksbilete</big></b>"
+"<p><b><big>Oversikt over augneblinksbilete</big></b><p>\n"
 "<p>\n"
-"<p>\n"
 "Filstrukturen viser alle filene som er endra mellom opprettinga av første («før») og andre («etter») augneblinksbilete. Til høgre ser du skildringa som vart generert då første augneblinksbilete vart oppretta og tidspunktet då dei to augneblinksbileta vart oppretta.\n"
-"</p>"
-"\n"
+"</p>\n"
 "<p>\n"
 "Når ei fil er vald i filstrukturen, ser du endringane som er gjorde i ho. Standardinnstillinga er at endringar mellom det valde augneblinksbiletparet vert vist, men du kan òg samanlikna fila med andre versjonar.\n"
 "</p>"
 
 #. Show snapshot dialog help, alternative for single snapshots
-#: src/include/snapper/helps.rb:58
+#: src/include/snapper/helps.rb:59
 #, fuzzy
 #| msgid ""
-#| "<p><b><big>Snapshot Overview</big></b>"
+#| "<p><b><big>Snapshot Overview</big></b><p>\n"
 #| "<p>\n"
-#| "<p>\n"
 #| "The tree shows all the files that are different between selected snapshot and current system. On the right side, you can see the snapshot description and time of its creation.\n"
-#| "</p>"
-#| "\n"
+#| "</p>\n"
 #| "<p>\n"
 #| "When file is selected in the tree, you can see the its difference between snapshot version and current system.\n"
 #| "</p>"
 msgid ""
-"<p><b><big>Snapshot Overview</big></b>"
+"<p><b><big>Snapshot Overview</big></b><p>\n"
 "<p>\n"
-"<p>\n"
 "The tree shows all the files that differ in a selected snapshot and the current system. On the right side, you see the snapshot description and time of its creation.\n"
-"</p>"
-"\n"
+"</p>\n"
 "<p>\n"
 "When a file is selected in the tree, you can see the its difference between snapshot version and current system.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Oversikt over augneblinksbilete</big></b>"
+"<p><b><big>Oversikt over augneblinksbilete</big></b><p>\n"
 "<p>\n"
-"<p>\n"
 "Filstrukturen viser alle filene som er ulike i det valde augneblinksbiletet og gjeldande system. Til høgre er det ei skildring av augneblinksbiletet og tidspunktet det vart oppretta.\n"
-"</p>"
-"\n"
+"</p>\n"
 "<p>\n"
 "Når ei fil er vald i filstrukturen, vert skilnaden mellom augneblinksbiletversjonen og versjonen i det gjeldande systemet vist.\n"
 "</p>"
 
-#. Return Tree of files modified between given snapshots
-#. Map is recursively describing the filesystem structure; helps to build Tree widget contents
-#: src/modules/Snapper.rb:108
-#, fuzzy
-#| msgid ""
-#| "Failed to initialize snapper library:\n"
-#| "%1"
-msgid "Failed to get config:\n"
+#. popup error
+#: src/modules/Snapper.rb:91
+msgid "Snapshot '%1' was not found."
+msgstr "Fann ikkje augneblinksbiletet «%1»."
+
+#. Initialize snapper agent
+#. Return true on success
+#. Delete existing snapshot
+#. Return true on success
+#. Modify existing snapshot
+#. Return true on success
+#. Create new snapshot
+#. Return true on success
+#: src/modules/Snapper.rb:236 src/modules/Snapper.rb:264
+#: src/modules/Snapper.rb:284 src/modules/Snapper.rb:303
+msgid "Reason not known."
+msgstr "Ukjend grunn."
+
+#: src/modules/Snapper.rb:238
+msgid "Configuration not found."
+msgstr "Fann ikkje oppsettet."
+
+#: src/modules/Snapper.rb:240
+msgid "Configuration is not valid."
+msgstr "Oppsettet er ikkje gyldig."
+
+#. error popup
+#: src/modules/Snapper.rb:247
+msgid ""
+"Failed to initialize snapper library:\n"
+"%1"
 msgstr ""
 "Klarte ikkje starta snapper-biblioteket:\n"
 "%1"
 
-#. Return the path to given snapshot
-#: src/modules/Snapper.rb:129
+#: src/modules/Snapper.rb:266
 #, fuzzy
-#| msgid ""
-#| "Failed to initialize snapper library:\n"
-#| "%1"
-msgid "Failed to get snapshot mount point:\n"
-msgstr ""
-"Klarte ikkje starta snapper-biblioteket:\n"
-"%1"
+#| msgid "Snapshot '%1' was not found."
+msgid "Snapshot was not found."
+msgstr "Fann ikkje augneblinksbiletet «%1»."
 
-#. Create new snapshot
-#. Return true on success
-#: src/modules/Snapper.rb:276
+#. error popup
+#: src/modules/Snapper.rb:271
 #, fuzzy
 #| msgid ""
 #| "Failed to initialize snapper library:\n"
 #| "%1"
-msgid "Failed to create new snapshot:\n"
+msgid ""
+"Failed to delete snapshot:\n"
+"%1"
 msgstr ""
 "Klarte ikkje starta snapper-biblioteket:\n"
 "%1"
 
-#. Modify existing snapshot
-#. Return true on success
-#: src/modules/Snapper.rb:291
+#. error popup
+#: src/modules/Snapper.rb:289
 #, fuzzy
 #| msgid ""
 #| "Failed to initialize snapper library:\n"
 #| "%1"
-msgid "Failed to modify snapshot:\n"
+msgid ""
+"Failed to modify snapshot:\n"
+"%1"
 msgstr ""
 "Klarte ikkje starta snapper-biblioteket:\n"
 "%1"
 
-#. Delete existing snapshot
-#. Return true on success
 #: src/modules/Snapper.rb:306
 #, fuzzy
+#| msgid "Snapshot '%1' was not found."
+msgid "Wrong snapshot type given."
+msgstr "Fann ikkje augneblinksbiletet «%1»."
+
+#: src/modules/Snapper.rb:308
+#, fuzzy
+#| msgid "Snapshot '%1' was not found."
+msgid "'Pre' snapshot was not given."
+msgstr "Fann ikkje augneblinksbiletet «%1»."
+
+#: src/modules/Snapper.rb:310
+#, fuzzy
+#| msgid "Snapshot '%1' was not found."
+msgid "Given 'Pre' snapshot was not found."
+msgstr "Fann ikkje augneblinksbiletet «%1»."
+
+#. error popup
+#: src/modules/Snapper.rb:316
+#, fuzzy
 #| msgid ""
 #| "Failed to initialize snapper library:\n"
 #| "%1"
-msgid "Failed to delete snapshot:\n"
+msgid ""
+"Failed to create new snapshot:\n"
+"%1"
 msgstr ""
 "Klarte ikkje starta snapper-biblioteket:\n"
 "%1"
 
 #. Snapper read dialog caption
-#: src/modules/Snapper.rb:319
+#: src/modules/Snapper.rb:326
 msgid "Initializing Snapper"
 msgstr "Startar Snapper"
 
-#. Progress stage 1/2
-#: src/modules/Snapper.rb:324
+#. Progress stage 1/3
+#: src/modules/Snapper.rb:337
 #, fuzzy
 #| msgid "Read the list of snapshots"
-msgid "Read list of configurations"
+msgid "Read the list of snapshots"
 msgstr "Les oversikt over augneblinksbilete"
 
-#. Progress stage 2/2
-#: src/modules/Snapper.rb:326
-#, fuzzy
-#| msgid "Read the list of snapshots"
-msgid "Read list of snapshots"
-msgstr "Les oversikt over augneblinksbilete"
+#. Progress step 1/3
+#: src/modules/Snapper.rb:341
+msgid "Reading the database..."
+msgstr "Leser databasen …"
 
-#. Progress step 1/2
-#: src/modules/Snapper.rb:330
-#, fuzzy
-#| msgid "Reading list of snapshots..."
-msgid "Reading list of configurations"
-msgstr "Les oversikt over augneblinksbilete …"
-
-#. Progress step 2/2
-#: src/modules/Snapper.rb:332
-#, fuzzy
-#| msgid "Reading list of snapshots..."
-msgid "Reading list of snapshots"
-msgstr "Les oversikt over augneblinksbilete …"
-
 #. Progress finished
-#: src/modules/Snapper.rb:334
+#: src/modules/Snapper.rb:343
 msgid "Finished"
 msgstr "Fullført"
 
-#: src/modules/Snapper.rb:344
-msgid "Querying snapper configurations failed:"
-msgstr ""
-
-#: src/modules/Snapper.rb:349
+#. error popup
+#: src/modules/Snapper.rb:352
 msgid ""
 "No snapper configurations exist. You have to create one or more\n"
 "configurations to use yast2-snapper. The snapper command line\n"
 "tool can be used to create configurations."
 msgstr ""
 
-#: src/modules/Snapper.rb:359
-msgid "Querying snapper snapshots failed:"
-msgstr ""
-
 #. label for log window
-#: src/modules/Snapper.rb:399
+#: src/modules/Snapper.rb:395
 msgid "Restoring Files..."
 msgstr "Gjenopprettar filer …"
 
 #. log entry (%1 is file name)
-#: src/modules/Snapper.rb:428
+#: src/modules/Snapper.rb:424
 #, fuzzy
 msgid "Deleted %1\n"
 msgstr "Slettet %1\n"
 
 #. log entry (%1 is file name)
-#: src/modules/Snapper.rb:481
+#: src/modules/Snapper.rb:477
 msgid "%1 skipped\n"
 msgstr "Hoppa over «%1»\n"
 
-#~ msgid "Snapshot '%1' was not found."
-#~ msgstr "Fann ikkje augneblinksbiletet «%1»."
+#~ msgid "Modify Snapshot %{pre} and %{post}"
+#~ msgstr "Endra augneblinksbilete %{pre} og %{post}"
 
-#~ msgid "Reason not known."
-#~ msgstr "Ukjend grunn."
-
-#~ msgid "Configuration not found."
-#~ msgstr "Fann ikkje oppsettet."
-
-#~ msgid "Configuration is not valid."
-#~ msgstr "Oppsettet er ikkje gyldig."
-
-#~ msgid ""
-#~ "Failed to initialize snapper library:\n"
+#, fuzzy
+#~| msgid ""
+#~| "Failed to initialize snapper library:\n"
+#~| "%1"
+#~ msgid "Failed to get config:\n"
+#~ msgstr ""
+#~ "Klarte ikkje starta snapper-biblioteket:\n"
 #~ "%1"
+
+#, fuzzy
+#~| msgid ""
+#~| "Failed to initialize snapper library:\n"
+#~| "%1"
+#~ msgid "Failed to get snapshot mount point:\n"
 #~ msgstr ""
 #~ "Klarte ikkje starta snapper-biblioteket:\n"
 #~ "%1"
 
 #, fuzzy
-#~| msgid "Snapshot '%1' was not found."
-#~ msgid "Snapshot was not found."
-#~ msgstr "Fann ikkje augneblinksbiletet «%1»."
+#~| msgid "Read the list of snapshots"
+#~ msgid "Read list of configurations"
+#~ msgstr "Les oversikt over augneblinksbilete"
 
 #, fuzzy
-#~| msgid "Snapshot '%1' was not found."
-#~ msgid "'Pre' snapshot was not given."
-#~ msgstr "Fann ikkje augneblinksbiletet «%1»."
+#~| msgid "Reading list of snapshots..."
+#~ msgid "Reading list of configurations"
+#~ msgstr "Les oversikt over augneblinksbilete …"
 
 #, fuzzy
-#~| msgid "Snapshot '%1' was not found."
-#~ msgid "Given 'Pre' snapshot was not found."
-#~ msgstr "Fann ikkje augneblinksbiletet «%1»."
+#~| msgid "Reading list of snapshots..."
+#~ msgid "Reading list of snapshots"
+#~ msgstr "Les oversikt over augneblinksbilete …"
 
-#~ msgid "Reading the database..."
-#~ msgstr "Leser databasen …"
-
 #, fuzzy
 #~| msgid "File /etc/sysconfig/snapper is not available"
 #~ msgid "File /etc/sysconfig/snapper is not available."
 #~ msgstr "Fila «/etc/sysconfig/snappar» er ikkje tilgjengeleg"
 
-#~ msgid ""
-#~ "These files will be copied from snapshot '%1' to current system: "
-#~ "<p>%2</p>"
-#~ "Are you sure?"
-#~ msgstr ""
-#~ "Desse filene vert kopierte frå augneblinksbiletet «%1» til det gjeldande systemet: "
-#~ "<p>%2</p>"
-#~ "Er du sikker på at du vil gjera dette?"
+#~ msgid "These files will be copied from snapshot '%1' to current system: <p>%2</p>Are you sure?"
+#~ msgstr "Desse filene vert kopierte frå augneblinksbiletet «%1» til det gjeldande systemet: <p>%2</p>Er du sikker på at du vil gjera dette?"

Modified: branches/plus-SLE12-SP2/yast/nn/po/sound.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/sound.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/sound.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -863,14 +863,12 @@
 "<p>\n"
 "To configure this sound card and adjust its \n"
 "volume, check <b>Normal setup</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "For å konfigurera dette lydkortet og justera \n"
 "lydstyrken, kryss av for <b>Normalt oppsett</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text - setup type selection 2/3
 #: src/include/sound/texts.rb:37
@@ -879,14 +877,12 @@
 "<p>To set a special option, \n"
 "check <b>Advanced setup</b>.\n"
 "Most users will not need this.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>For å velja eit spesielt alternativ, \n"
 "kryss av for <b>Avansert oppsett</b>.\n"
 "Dei fleste brukarar har ikkje behov for dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text - setup type selection 3/3
 #: src/include/sound/texts.rb:44
@@ -896,15 +892,13 @@
 "If you do not want to adjust volume or set options now, \n"
 "check <b>Quick automatic setup</b>. You can set the volume and \n"
 "change options later.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Viss du ikkje vil justera lydstyrke eller velja alternativ no, \n"
 "kryss av for <b>Raskt automatisk oppsett</b>. Du kan stilla inn lydstyrken og \n"
 "endra alternativ seinare.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text - quick configuration 2/3
 #: src/include/sound/texts.rb:60
@@ -914,15 +908,13 @@
 "If you do not want to adjust the volume now, check <b>Quick \n"
 "automatic setup</b>. You can set the volume and change options \n"
 "later.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Viss du ikkje vil justera lydstyrke no, kryss av for <b>Raskt \n"
 "automatisk oppsett</b>. Du kan stilla inn lydstyrken og endra alternativ \n"
 "seinare.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text - quick configuration 3/3
 #: src/include/sound/texts.rb:68
@@ -946,15 +938,13 @@
 "<b>Manually</b> choose the sound card  to \n"
 "configure. Search for a particular sound card by \n"
 "entering the name in the search box.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<P>\n"
 "<b></b>Vel lydkortetet  som skal konfigurerast \n"
 "manuelt. Søk etter eit spesielt lydkort ved å \n"
 "skriva namnet i søkefeltet.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text - sound card selection 2/2
 #: src/include/sound/texts.rb:84
@@ -963,14 +953,12 @@
 "<p>\n"
 "Select <b>All</b> to see the entire list of \n"
 "supported sound card models.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel <b>Alle</b> for å vise heile lista over\n"
 "lydkortmodeller som vert støtta.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text - which sound card to configure 1/2
 #: src/include/sound/texts.rb:92
@@ -978,13 +966,11 @@
 msgid ""
 "<p>\n"
 "Select the type of card to configure.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel kva for ein korttype som skal konfigurerast.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text - which sound card to configure 2/2
 #: src/include/sound/texts.rb:98
@@ -994,15 +980,13 @@
 "If the list contains <b>autodetected</b> cards not yet \n"
 "configured, select one and continue. Otherwise,\n"
 "use <b>manual selection</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Viss lista inneheld <b>automatisk detekterte</b> kort \n"
 "som ikkje er konfigurert enno, vel eit kort og hald fram. Viss ikkje,\n"
 "bruk <b>manuelt val</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. To reset the sound configuration these programs must be terminated
 #. (popup label message)
@@ -1027,15 +1011,13 @@
 "Here, modify options for the sound modules. \n"
 "If you are not <b>absolutely sure</b> what you are doing, \n"
 "leave this dialog untouched. \n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Her kan du endra alternativ for lydmodulene. \n"
 "Viss du ikkje er <b>heilt sikker</b> på kva du gjer, \n"
 "bør du ikkje gjera endringar i denne dialogen. \n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text - options dialog 2/2
 #: src/include/sound/texts.rb:130
@@ -1048,8 +1030,7 @@
 "<B>Possible value</B>. Reset all values \n"
 "by pressing <b>Reset</b>. Numeric values can be entered as \n"
 "decimal or hexadecimal (hexadecimal with a <b>0x</b> prefix).\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel alternativet som skal brukast, og klikk <b>Bruk</b> \n"
@@ -1058,8 +1039,7 @@
 "<B>Mogleg verd</B>. Tilbakestill alle verd \n"
 "ved å klikka <b>Tilbakestill</b>. Numeriske verd kan leggjast inn som \n"
 "desimalar eller heksadesimaler (heksadesimaler med eit<b>0x</b>-prefiks).\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text - mixer setting 1/4
 #: src/include/sound/texts.rb:142
@@ -1067,13 +1047,11 @@
 msgid ""
 "<p>\n"
 "Adjust the volume.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Juster lydstyrken.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text - mixer setting 2/4
 #: src/include/sound/texts.rb:144
@@ -1082,14 +1060,12 @@
 "<p>\n"
 "Test your sound card by pressing <b>Test</b>.\n"
 "\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Test lydkortet ved å klikka <b>Test</b>.\n"
 "\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text - mixer setting 3/4
 #: src/include/sound/texts.rb:151
@@ -1098,14 +1074,12 @@
 "<p>\n"
 "After configuration is complete, use <b>amixer</b> \n"
 "or any program of your choice to adjust the volume.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Når konfigurasjon er fullførd, kan du bruka <b>amixer</b> \n"
 "eller kva for eit som helst anna program for å justera lydstyrken.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text - mixer setting 4/4
 #: src/include/sound/texts.rb:158
@@ -1114,14 +1088,12 @@
 "<p><b>WARNING:</b> Start testing your\n"
 "sound card with <b>very</b> low volume settings to prevent \n"
 "damage.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p><b>ADVARSEL:</b> Start testen av\n"
 "lydkortet med <b>svært</b> lavd lydstyrkeinnstillinger for å unngå \n"
 "skadar.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. warning/question message
 #: src/include/sound/texts.rb:166
@@ -1345,15 +1317,13 @@
 "Use <b>Other</b> to set the volume of the selected card or configure\n"
 "the module loaded for playing MIDI files (<b>Start Sequencer</b>).\n"
 "Use <b>Play Test Sound</b> to test the selected card.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Nytte <b>Anna</b> for å stille inn volumet for det valde kortet eller velja\n"
 "ein modul som skal lastast for å spille av MIDI-filar (<b>Start sekvensar</b>).\n"
 "Bruk <b>Spill test-lydar</b> for å testa valt kort.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/sound/texts.rb:270
 #, fuzzy
@@ -1397,16 +1367,14 @@
 "<b>options</b> to the ALSA module. If your sound card still\n"
 "will not work, try <i>OSS/Free</i> or \n"
 "another module.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Viss problemet held fram, forsøk å velja ulike \n"
 "<b>alternativ</b> for ALSA-modulen. Viss lydkortet framleis\n"
 "ikkje verkar, forsøk <i>OSS/Free</i>  \n"
 "eller ein annan modul.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/sound/texts.rb:300
 #, fuzzy
@@ -1414,14 +1382,12 @@
 "<p>\n"
 "This is the complete sound card list. Use the <b>Finish</b> button \n"
 "to save sound card information.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Dette er heile lydkortlisten. Klikk på <b>Fullfør</b>-knappen \n"
 "for å lager lydkortinformasjonen.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/sound/texts.rb:306
 #, fuzzy
@@ -1429,14 +1395,12 @@
 "<p>\n"
 "Use <b>Delete</b> to remove a configured sound card. \n"
 "Use <b>Add sound card</b> to add a sound card.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Bruk <b>Slett</b> for å slette eit konfigurert lydkort. \n"
 "Bruk <b>Legg til lydkort</b> for å leggja til eit lydkort.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #: src/include/sound/texts.rb:317
 #, fuzzy
@@ -1666,13 +1630,11 @@
 #, fuzzy
 #~ msgid ""
 #~ "<P>In this dialog, specify your joystick type. If your\n"
-#~ "joystick type is not in the list, select <B>Generic Analog Joystick</B>.</p>"
-#~ "\n"
+#~ "joystick type is not in the list, select <B>Generic Analog Joystick</B>.</p>\n"
 #~ "<p>You will not find any USB joysticks here. If you have a USB device, just plug in the joystick and start using it.</P>\n"
 #~ msgstr ""
 #~ "<P>I denne dialogen kan du spesifisera styrespaktypen. Viss styrespaken\n"
-#~ "din ikkje finst i lista, vel <B>Generisk analog styrespak</B>.</p>"
-#~ "\n"
+#~ "din ikkje finst i lista, vel <B>Generisk analog styrespak</B>.</p>\n"
 #~ "<p>Du vil ikkje finna USB-styrespakar her. Viss du har ein USB-eining, kan du berre plugga inn styrespaken og byrja å bruka henne.</P>\n"
 
 #, fuzzy

Modified: branches/plus-SLE12-SP2/yast/nn/po/squid.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/squid.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/squid.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -581,105 +581,74 @@
 #: src/include/squid/helps.rb:34
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing Squid Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Initializing Squid Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Initialiserer squid-oppsett</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer squid-oppsett</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/squid/helps.rb:38
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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 avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
+"Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/squid/helps.rb:42
 #, fuzzy
 msgid ""
-"<p><b><big>Saving Squid Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Saving Squid Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Lagrar squid-oppsett</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar squid-oppsett</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/squid/helps.rb:46
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryt lagring:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Summary dialog help
 #: src/include/squid/helps.rb:53
 #, fuzzy
 msgid ""
-"<p><b><big>Squid Configuration</big></b><br>"
-"\n"
-"Configure Squid here.<br>"
-"</p>"
-"\n"
+"<p><b><big>Squid Configuration</big></b><br>\n"
+"Configure Squid here.<br></p>\n"
 msgstr ""
-"<p><b><big>Squid-oppsett</big></b><br>"
-"\n"
-"Sett opp squid her.<br>"
-"</p>"
-"\n"
+"<p><b><big>Squid-oppsett</big></b><br>\n"
+"Sett opp squid her.<br></p>\n"
 
 #. Ovreview dialog help
 #: src/include/squid/helps.rb:57
 #, fuzzy
 msgid ""
-"<p><b><big>Squid Configuration Overview</big></b><br>"
-"\n"
+"<p><b><big>Squid Configuration Overview</big></b><br>\n"
 "Obtain an overview of installed squids and\n"
-"edit their configurations if necessary.<br>"
-"</p>"
-"\n"
+"edit their configurations if necessary.<br></p>\n"
 msgstr ""
-"<p><b><big>Oversyn over squid-oppsett</big></b><br>"
-"\n"
+"<p><b><big>Oversyn over squid-oppsett</big></b><br>\n"
 "Her finn du eit oversyn over installerte squid-system. Du kan òg\n"
-"redigera oppsetta her.<br>"
-"</p>"
-"\n"
+"redigera oppsetta her.<br></p>\n"
 
 #. Http Ports Dialog
 #: src/include/squid/helps.rb:63
 #, fuzzy
 msgid ""
 "<p>Define all ports where Squid will\n"
-"listen for clients' http requests.</p>"
-"\n"
+"listen for clients' http requests.</p>\n"
 msgstr ""
 "<p>Her kan du definera alle portar der Squid skal\n"
 "lytta etter http-førespurnader frå klientar.</p>"
@@ -688,8 +657,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Host</b> can contain a hostname or IP address\n"
-"or remain empty.</p>"
-"\n"
+"or remain empty.</p>\n"
 msgstr ""
 "<p>Feltet <b>Vertsmaskin</b> kan innehalda vertsnavn eller IP-adress,\n"
 "eller vera tomt.</p>"
@@ -697,9 +665,7 @@
 #. Cache Dialog
 #: src/include/squid/helps.rb:70
 #, fuzzy
-msgid ""
-"<p><b>Refresh Patterns</b> define how Squid treats the objects in the cache.</p>"
-"\n"
+msgid "<p><b>Refresh Patterns</b> define how Squid treats the objects in the cache.</p>\n"
 msgstr ""
 "<p><b>Oppdateringsmønstre</b> angjev\n"
 "korleis Squid skal handtera objekt i mellomlageret.</p>"
@@ -708,8 +674,7 @@
 #, fuzzy
 msgid ""
 "<p>The refresh patterns are checked in the order listed here.\n"
-"The first matching entry is used.</p>"
-"\n"
+"The first matching entry is used.</p>\n"
 msgstr ""
 "<p>Oppdateringsmønstre vert brukt i den rekkjefølgda dei er angjevne her.\n"
 "Første samsvarande oppføring vert brukte.</p>"
@@ -728,8 +693,7 @@
 msgid ""
 "<p><b>Percent</b> is the percentage of the object's age (time since last\n"
 "modification). An object without explicit expiry time will be\n"
-"considered fresh.</p>"
-"\n"
+"considered fresh.</p>\n"
 msgstr ""
 "<p><b>Prosent</b> er prosentandelen av alderen (tid sidan siste\n"
 "endring) til eit objekt som gjer at objektet vurderast som nytt viss det\n"
@@ -739,8 +703,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Max</b> is the upper limit of how long objects without an explicit\n"
-"expiry time will be considered fresh.</p>"
-"\n"
+"expiry time will be considered fresh.</p>\n"
 msgstr ""
 "<p><b>Maks.</b> er den øvre grensa for kor lenge eit objekt utan definert\n"
 "utløpstid vil vurderast som nytt.</p>"
@@ -755,8 +718,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Max Object Size</b> defines the maximum size for objects to be stored\n"
-"on the disk. Objects larger than this size will not be saved on disk.</p>"
-"\n"
+"on the disk. Objects larger than this size will not be saved on disk.</p>\n"
 msgstr ""
 "<p><b>Maks. objektstørrelse</b> angjev maksimum storleik på objekt som vil lagrast\n"
 "på disken. Objekt som er større, vil ikkje lagrast på disken.</p>"
@@ -765,8 +727,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Min Object Size</b> specifies the minimum size for objects. Smaller \n"
-"objects will not be saved to the disk.</p>"
-"\n"
+"objects will not be saved to the disk.</p>\n"
 msgstr ""
 "<p><b>Min. objektstørresle</b> angjev den minste objektstørrelsen som\n"
 "vil lagrast på disken. Mindre objekt vil ikkje lagrast.</p>"
@@ -797,48 +758,23 @@
 "memory when space for new objects is not available.\n"
 "Policies could be:\n"
 "<table>\n"
-"    "
-"<tr>\n"
-"      "
-"<td>lru</td>"
-"\n"
-"      "
-"<td>least recently used</td>"
-"\n"
-"    </tr>"
-"\n"
-"    "
-"<tr>\n"
-"      "
-"<td>heap GDSF</td>"
-"\n"
-"      "
-"<td>Greedy-Dual Size Frequency</td>"
-"\n"
-"    </tr>"
-"\n"
-"    "
-"<tr>\n"
-"      "
-"<td>heap LFUDA</td>"
-"\n"
-"      "
-"<td>Least Frequently Used with Dynamic Aging</td>"
-"\n"
-"    "
-"<tr>\n"
-"    "
-"<tr>\n"
-"      "
-"<td>heap LRU</td>"
-"\n"
-"      "
-"<td>lru policy implemented using a heap</td>"
-"\n"
-"    </tr>"
-"\n"
-"</table>"
-"\n"
+"    <tr>\n"
+"      <td>lru</td>\n"
+"      <td>least recently used</td>\n"
+"    </tr>\n"
+"    <tr>\n"
+"      <td>heap GDSF</td>\n"
+"      <td>Greedy-Dual Size Frequency</td>\n"
+"    </tr>\n"
+"    <tr>\n"
+"      <td>heap LFUDA</td>\n"
+"      <td>Least Frequently Used with Dynamic Aging</td>\n"
+"    <tr>\n"
+"    <tr>\n"
+"      <td>heap LRU</td>\n"
+"      <td>lru policy implemented using a heap</td>\n"
+"    </tr>\n"
+"</table>\n"
 "</p>"
 msgstr ""
 "<p><b>Regel for mellomlagerutskifting</b> definerer kva for objekt som skal skiftast ut\n"
@@ -847,48 +783,23 @@
 "minnet når det ikkje lenger er plass til nye objekt.\n"
 "Reglene kan vera:\n"
 "<table>\n"
-"    "
-"<tr>\n"
-"      "
-"<td>lru</td>"
-"\n"
-"      "
-"<td>siste nyleg brukte</td>"
-"\n"
-"    </tr>"
-"\n"
-"    "
-"<tr>\n"
-"      "
-"<td>heap GDSF</td>"
-"\n"
-"      "
-"<td>aggressiv dobbelt storleik-frekvens</td>"
-"\n"
-"    </tr>"
-"\n"
-"    "
-"<tr>\n"
-"      "
-"<td>heap LFUDA</td>"
-"\n"
-"      "
-"<td>siste hyppig brukte med dynamisk foreldelse</td>"
-"\n"
-"    "
-"<tr>\n"
-"    "
-"<tr>\n"
-"      "
-"<td>heap LRU</td>"
-"\n"
-"      "
-"<td>lru-regel med samling</td>"
-"\n"
-"    </tr>"
-"\n"
-"</table>"
-"\n"
+"    <tr>\n"
+"      <td>lru</td>\n"
+"      <td>siste nyleg brukte</td>\n"
+"    </tr>\n"
+"    <tr>\n"
+"      <td>heap GDSF</td>\n"
+"      <td>aggressiv dobbelt storleik-frekvens</td>\n"
+"    </tr>\n"
+"    <tr>\n"
+"      <td>heap LFUDA</td>\n"
+"      <td>siste hyppig brukte med dynamisk foreldelse</td>\n"
+"    <tr>\n"
+"    <tr>\n"
+"      <td>heap LRU</td>\n"
+"      <td>lru-regel med samling</td>\n"
+"    </tr>\n"
+"</table>\n"
 "</p>"
 
 #. Cache Directory
@@ -906,8 +817,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Level 1 Directories</b> defines a number of first-level subdirectories, \n"
-"which will be created under the <b>Directory Name</b> directory.</p>"
-"\n"
+"which will be created under the <b>Directory Name</b> directory.</p>\n"
 msgstr ""
 "<p><b>Nivå 1-katalogar</b> angjev mengd underkataloger som\n"
 "vil opprettast under katalogen<b>Katalognavn</b>.</p>"
@@ -916,8 +826,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Level 2 Directories</b> defines a number of second-level subdirectories,\n"
-"which will be created under each first-level directory.</p>"
-"\n"
+"which will be created under each first-level directory.</p>\n"
 msgstr ""
 "<p><b>Nivå 2-katalogar</b> angjev mengd underkataloger som skal opprettast på 2. nivå\n"
 "under kvar 1 nivå-katalog.</p>"
@@ -932,8 +841,7 @@
 #, fuzzy
 msgid ""
 "<p><b>ACL Group</b> has various types and the description of ACL Group depends\n"
-"on the particular type.</p>"
-"\n"
+"on the particular type.</p>\n"
 msgstr ""
 "<p>Det er ulike typar <b>ACL-grupper</b>, og skildringa av ein ACL-gruppe avheng\n"
 "av typen.</p>"
@@ -943,8 +851,7 @@
 msgid ""
 "<p>In the <b>Access Control</b> table, access can be denied or allowed to ACL Groups.\n"
 "If there are more ACL Groups in one line, it means that access will be allowed\n"
-"or denied to members who belong to all ACL Groups at the same time.</p>"
-"\n"
+"or denied to members who belong to all ACL Groups at the same time.</p>\n"
 msgstr ""
 "<p>I tabellen <b>Tilgangskontroll</b> kan tilgjenge avvisast eller vert tillaten for ACL-grupper.\n"
 "Viss det er fleire ACL-grupper på same linje, tyder det at tilgjenge vil tillatast\n"
@@ -954,8 +861,7 @@
 #, fuzzy
 msgid ""
 "<p>The <b>Access Control</b> table is checked in the order listed here.\n"
-"The first matching entry is used.</p>"
-"\n"
+"The first matching entry is used.</p>\n"
 msgstr ""
 "<p>Oppføringene i <b>Tilgangskontroll</b>-tabellen vert kontrollert i den rekkjefølgda som er angjeven her.\n"
 "Første samsvarande oppføring vert brukt.</p>"
@@ -970,8 +876,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Cache Log</b> defines the file in which general information about your\n"
-"cache's behavior is logged.</p>"
-"\n"
+"cache's behavior is logged.</p>\n"
 msgstr ""
 "<p><b>Mellomlagerlogg</b> angjev fila der generell informasjon om\n"
 "mellomlageraktiviteten vert logga.</p>"
@@ -981,8 +886,7 @@
 msgid ""
 "<p><b>Cache Store Log</b> defines the location of the transaction log of all\n"
 "objects that are stored in the object store, as well as the time when an object\n"
-"gets deleted. This option can be left empty.</p>"
-"\n"
+"gets deleted. This option can be left empty.</p>\n"
 msgstr ""
 "<p><b>Detaljert mellomlagerlogg</b> angjev plasseringa av transaksjonsloggen for alle\n"
 "objekt som vert lagra i objektlageret,  og dessutan tidspunktet når objektet\n"
@@ -992,8 +896,7 @@
 #, fuzzy
 msgid ""
 "<p>With <b>Emulate httpd Log</b> specify that Squid writes its\n"
-"<b>Access Log</b> in HTTPD common log file format.</p>"
-"\n"
+"<b>Access Log</b> in HTTPD common log file format.</p>\n"
 msgstr ""
 "<p>med <b>Emuler Httpd-logg</b> kan du velja at Squid lagrar sin\n"
 "<b>Tilgangslogg</b> i vanleg HTTPD-loggfilformat.</p>"
@@ -1021,8 +924,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Administrator's email</b> is the address which will be added to any\n"
-"error pages that are displayed to clients. Defaults to webmaster.</p>"
-"\n"
+"error pages that are displayed to clients. Defaults to webmaster.</p>\n"
 msgstr ""
 "<p><b>Ea til administrator-postadresse</b> er adressa som vil visast på eventuelle\n"
 "feilmeldingssider som vert vist for klientane. Standardinnstillingen er webadministratorens adresse.</p>"

Modified: branches/plus-SLE12-SP2/yast/nn/po/sshd.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/sshd.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/sshd.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -302,57 +302,41 @@
 #: tutorials/tutorial-sources/clean-ycp/helps.ycp:18
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing sshd Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
+"<p><b><big>Initializing sshd Configuration</big></b><br>\n"
+"Please wait...<br></p>"
 msgstr ""
-"<p><b><big>Initialiserer sshd-konfigurasjon</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
+"<p><b><big>Initialiserer sshd-konfigurasjon</big></b><br>\n"
+"Vent…<br></p>"
 
 #. Write dialog help
 #: tutorials/tutorial-sources/clean-ycp/helps.ycp:22
 #, fuzzy
 msgid ""
-"<p><b><big>Saving sshd Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
+"<p><b><big>Saving sshd Configuration</big></b><br>\n"
+"Please wait...<br></p>"
 msgstr ""
-"<p><b><big>Lagrar sshd-konfigurasjon</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
+"<p><b><big>Lagrar sshd-konfigurasjon</big></b><br>\n"
+"Vent…<br></p>"
 
 #. Server Configuration dialog help
 #: tutorials/tutorial-sources/clean-ycp/helps.ycp:26
 #, fuzzy
 msgid ""
-"<p><b><big>Server Configuration</big></b><br>"
-"\n"
-"Configure SSHD here.<br>"
-"</p>"
+"<p><b><big>Server Configuration</big></b><br>\n"
+"Configure SSHD here.<br></p>"
 msgstr ""
-"<p><b><big>Serverkonfigurasjon</big></b><br>"
-"\n"
-"Konfigurer SSHD her.<br>"
-"</p>"
+"<p><b><big>Serverkonfigurasjon</big></b><br>\n"
+"Konfigurer SSHD her.<br></p>"
 
 #. Login Settings dialog help
 #: tutorials/tutorial-sources/clean-ycp/helps.ycp:30
 #, fuzzy
 msgid ""
-"<p><b><big>Login Settings</big></b><br>"
-"\n"
-"Configure SSHD login settings here.<br>"
-"</p>"
+"<p><b><big>Login Settings</big></b><br>\n"
+"Configure SSHD login settings here.<br></p>"
 msgstr ""
-"<p><b><big>Serverkonfigurasjon</big></b><br>"
-"\n"
-"Konfigurer SSHD her.<br>"
-"</p>"
+"<p><b><big>Serverkonfigurasjon</big></b><br>\n"
+"Konfigurer SSHD her.<br></p>"
 
 #. Command line help text for the Xsshd module
 #: tutorials/tutorial-sources/clean-ycp/sshd.ycp:32
@@ -418,13 +402,11 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Login Settings</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Login Settings</big></b><br>\n"
 #~ "Here you can configure the SSHD login and authentication settings.\n"
 #~ "Some apply to a particular protocol version only.</p>"
 #~ msgstr ""
-#~ "<p><b><big>Innloggingsinnstillinger</big></b><br>"
-#~ "\n"
+#~ "<p><b><big>Innloggingsinnstillinger</big></b><br>\n"
 #~ "Sett opp innloggings- og autentiseringsinnstillinger for SSHD her.\n"
 #~ "Nokre innstillingar gjeld berre for ein spesifikk protokoll.</p>"
 
@@ -439,62 +421,49 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b>Permit Root Login</b><br>"
-#~ "\n"
+#~ "<p><b>Permit Root Login</b><br>\n"
 #~ "Specifies whether root can log in using ssh.</p>"
 #~ msgstr ""
-#~ "<p><b>Tillat rotinnlogiing</b><br>"
-#~ "\n"
+#~ "<p><b>Tillat rotinnlogiing</b><br>\n"
 #~ "Angjev om root kan logga inn via ssh.</p>"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b>Maximum Authentication Tries</b><br>"
-#~ "\n"
+#~ "<p><b>Maximum Authentication Tries</b><br>\n"
 #~ "Specifies the maximum number of authentication attempts permitted per connection.\n"
 #~ "Once the number of failures reaches half this value, additional failures are logged.</p>"
 #~ msgstr ""
-#~ "<p><b>Maksimalt mengd innloggingsforsøk</b><br>"
-#~ "\n"
+#~ "<p><b>Maksimalt mengd innloggingsforsøk</b><br>\n"
 #~ "Angjev den maksimale mengda autentiseringsforsøk for kvar tilkobling.\n"
 #~ "Når mengder mislukka forsøk når dette verdet, vert ytterlegare mislukka forsøk logga.</p>"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b>RSA Authentication</b><br>"
-#~ "\n"
+#~ "<p><b>RSA Authentication</b><br>\n"
 #~ "Specifies whether pure RSA authentication is allowed.\n"
 #~ "This option applies to protocol version 1 only.</p>"
 #~ msgstr ""
-#~ "<p><b>RSA-autentisering</b><br>"
-#~ "\n"
+#~ "<p><b>RSA-autentisering</b><br>\n"
 #~ "Angjev om ren RSA-autentisering er tillaten.\n"
 #~ "Dette valet gjeld berre for protokollversjon 1.</p>"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b>Public Key Authentication</b><br>"
-#~ "\n"
+#~ "<p><b>Public Key Authentication</b><br>\n"
 #~ "Specifies whether public key authentication is allowed.\n"
 #~ "This option applies to protocol version 2 only.</p>"
 #~ msgstr ""
-#~ "<p><b>Autentisering med offentleg nøkkel</b><br>"
-#~ "\n"
+#~ "<p><b>Autentisering med offentleg nøkkel</b><br>\n"
 #~ "Angjev om autentisering med offentleg nøkkel er tillate.\n"
 #~ "Dette valet gjeld berre for protokollversjon 2.</p>"
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b><big>Protocol and Cipher Settings</big></b><br>"
-#~ "\n"
-#~ "Configure SSHD protocol version and cipher settings.<br>"
-#~ "</p>"
-#~ "\n"
+#~ "<p><b><big>Protocol and Cipher Settings</big></b><br>\n"
+#~ "Configure SSHD protocol version and cipher settings.<br></p>\n"
 #~ msgstr ""
-#~ "<p><b><big>Protokoll og kryptoinnstillinger</big></b><br>"
-#~ "\n"
-#~ "Konfigurer protokollversjon og kryptoinnstillinger for SSHD her.<br>"
-#~ "</p>"
+#~ "<p><b><big>Protokoll og kryptoinnstillinger</big></b><br>\n"
+#~ "Konfigurer protokollversjon og kryptoinnstillinger for SSHD her.<br></p>"
 
 #, fuzzy
 #~ msgid "SSH server is running"

Modified: branches/plus-SLE12-SP2/yast/nn/po/storage.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/storage.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/storage.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-05-06 16:58+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -102,7 +102,8 @@
 msgstr "&Opprett partisjonsoppsett …"
 
 #. popup text
-#: src/clients/inst_disk_proposal.rb:123 src/clients/partitions_proposal.rb:105
+#: src/clients/inst_disk_proposal.rb:123
+#: src/clients/partitions_proposal.rb:105
 #, fuzzy
 msgid ""
 "No automatic proposal possible.\n"
@@ -142,15 +143,13 @@
 "To make only small adjustments to the proposed\n"
 "setup (like changing filesystem types), choose\n"
 "<b>%1</b> and modify the settings in the expert\n"
-"partitioner dialog.</p>"
-"\n"
+"partitioner dialog.</p>\n"
 msgstr ""
 "<p>\n"
 "Viss du berre vil gjera små justeringer av det foreslegne\n"
 "oppsettet (t.d. endra filsystemtyper) vel\n"
 "<b>%1</b> og utfør desse endirngene i dialogen for\n"
-"avansert partisjonering.</p>"
-"\n"
+"avansert partisjonering.</p>\n"
 
 #. help text continued
 #: src/clients/inst_disk_proposal.rb:188
@@ -162,8 +161,7 @@
 "currently present on the disks. Select\n"
 "<b>%1</b>.\n"
 "This is also the option to choose for\n"
-"advanced configurations like RAID and encryption.</p>"
-"\n"
+"advanced configurations like RAID and encryption.</p>\n"
 msgstr ""
 "<p>\n"
 "Viss forslaget ikkje passar for deg, kan du oppretta\n"
@@ -171,8 +169,7 @@
 "på diskane som utgangspunkt. Vel i så fall \n"
 "<b>%1</b>.\n"
 "Bruk òg dette valet for avanserte alternativ\n"
-"som RAID og kryptering.</p>"
-"\n"
+"som RAID og kryptering.</p>\n"
 
 #. Attention! besides the testsuite, AutoYaST is using this to turn off
 #. the proposal screen too. See inst_autosetup.ycp
@@ -193,8 +190,13 @@
 msgid "Not enough space available to propose separate /home."
 msgstr "Det er ikkje nok ledig plass til å foreslå ein separat partisjon for /home."
 
-#: src/clients/inst_disk_proposal.rb:295
+#: src/clients/inst_disk_proposal.rb:283
 #, fuzzy
+msgid "Nothing assigned as root filesystem. Cannot continue."
+msgstr "Det er ikkje tilordnet noko rotfilsystem!"
+
+#: src/clients/inst_disk_proposal.rb:304
+#, fuzzy
 msgid ""
 "Computing this proposal will overwrite manual changes \n"
 "done so far. Continue with computing proposal?"
@@ -295,8 +297,7 @@
 "The actual resizing will not be performed until after you confirm all your\n"
 "settings in the last installation dialog. Until then your Windows\n"
 "partition will remain untouched.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "\n"
 "<p>\n"
@@ -314,15 +315,13 @@
 "<p>\n"
 "To skip resizing your Windows partition, press\n"
 "<b>Back</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "\n"
 "<p>\n"
 "Viss du ikkje vil endra storleiken på Windows-\n"
 "partisjonen, klikk<b>Tilbake</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Headline above bar graph that displays current windows partition size
 #. Headline above bar graph that displays current windows partition size
@@ -350,16 +349,14 @@
 "The upper bar graph displays the current situation.\n"
 "The lower bar graph displays the situation after the installation (after\n"
 "the partition resize).\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "\n"
 "<p>\n"
 "Det øvre stolpediagrammet viser gjeldande situasjon.\n"
 "Det nedre stolpediagrammet viser situasjonen etter installasjonen (etter\n"
 "at storleiken på partisjonene er endra).\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text (graphical mode), continued
 #. help text (graphical mode), continued
@@ -370,8 +367,7 @@
 "<p>\n"
 "Drag the slider or enter a numeric value in either\n"
 "input field to adjust the suggested values.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "\n"
 "<p>\n"
@@ -427,15 +423,13 @@
 "<p>Enter a value for the size of your <b>Linux</b> installation.\n"
 "The partitions will automatically be created within this range\n"
 "as required for &product;.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "\n"
 "<p>Angje eit verd for storleiken på <b>Linux</b>- installasjonen.\n"
 "Naudsynte partisjoner for &product; vil opprettast\n"
 "på dette området.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text (non-graphical mode), continued
 #. help text (non-graphical mode), continued
@@ -445,8 +439,7 @@
 "\n"
 "<p>\n"
 "<b>Windows Used</b> is the size of the space your Windows partition uses.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "\n"
 "<p>\n"
@@ -741,14 +734,12 @@
 "<p>\n"
 "All hard disks automatically detected on your system\n"
 "are shown here. Select the hard disk on which to install &product;.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Alle harddiskar som vart funne automatisk, er viste\n"
 "her. Vel den harddisken du vil installera &product; på.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help part 2 of 3
 #: src/clients/inst_target_selection.rb:193
@@ -756,13 +747,11 @@
 msgid ""
 "<p>\n"
 "You may select later which part of the disk is used for &product;.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Du kan venta med å velja kva for ein del av disken du vil installera &product; på.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help part 3 of 3
 #: src/clients/inst_target_selection.rb:202
@@ -773,15 +762,13 @@
 "The <b>Custom Partitioning</b> option for experts allows full\n"
 "control over partitioning the hard disks and assigning\n"
 "partitions to mount points when installing &product;.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "\n"
 "<p>\n"
 "Med alternativet <b>Egendefinert partisjonering</b> har avanserte brukarar\n"
 "full kontroll over partisjoneringen av diskane og tilordningen av monteringspunkter under installasjonen av &product;.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. first step of hd prepare, select a single disk or "expert" partitioning
 #. Information what to do, background information
@@ -965,13 +952,11 @@
 msgid ""
 "<p>\n"
 "Select where on your hard disk to install &product;.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel kor på harddisken du vil installera &product;.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. TRANSLATORS: helptext, part 2 of 4
 #: src/include/partitioning/auto_part_ui.rb:216
@@ -980,8 +965,7 @@
 "<p>\n"
 "Use either the <b>entire hard disk</b> or one or more of the\n"
 "partitions or free regions shown.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Du kan anten bruka <b>heile harddisken</b> eller éin eller fleire av\n"
@@ -1011,13 +995,11 @@
 "<p>\n"
 "<b><i>The marked regions will be deleted. All data there will be\n"
 "lost. </i></b> There will be no way to recover this data.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "<b><i>Dei merkte områda vil slettast, og alle data som er lagra her, vil slettast. </i></b> Desse dataa vil ikkje kunna gjenopprettes.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Frame title for installation target hard disk / partition(s)
 #. Frame title for installation target hard disk / partition(s)
@@ -1053,21 +1035,19 @@
 "lost</b> in the installation. When shrinking Windows, we <b>strongly\n"
 "recommend a data backup</b>, because the data must be reorganized.\n"
 "This may fail under rare circumstances.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Viss du slettar Windows, vil alle data på partisjonen <b>gå tapt\n"
 "og kan ikkje gjenopprettes</b>. Før du krympar Windows rår til vi på\n"
 "det <b>sterkaste\n"
 "at du sikkerhetskopierer viktige data</b>, fordi dataa må omorganiserast. I sjeldne tilfelle kan feil oppstå.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Label text
 #. TRANSLATORS: checkbox text
 #: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6245
+#: src/modules/StorageProposal.rb:6250
 #, fuzzy
 msgid "Propose Separate &Home Partition"
 msgstr "Foreslå separat partisjon for &hjemmekatalog"
@@ -1089,7 +1069,7 @@
 msgstr "Forslagstype"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:251
+#: src/include/partitioning/custom_part_check_generated.rb:244
 #, fuzzy
 msgid ""
 "You have not assigned a root partition for\n"
@@ -1105,7 +1085,7 @@
 "Vil du verkeleg bruka dette oppsettet?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:264
+#: src/include/partitioning/custom_part_check_generated.rb:257
 #, fuzzy
 msgid ""
 "You tried to mount a FAT partition to one of the following mount\n"
@@ -1122,7 +1102,7 @@
 "Vil du verkeleg bruka dette oppsettet?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:277
+#: src/include/partitioning/custom_part_check_generated.rb:270
 #, fuzzy
 msgid ""
 "You tried to mount a FAT partition to the\n"
@@ -1138,7 +1118,7 @@
 "Vil du verkeleg bruka dette oppsettet?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:291
+#: src/include/partitioning/custom_part_check_generated.rb:284
 #, fuzzy
 msgid ""
 "You have mounted a partition with Btrfs to the\n"
@@ -1155,7 +1135,7 @@
 
 #. A PReP/CHRP partition is not supposed to be mounted. So if we find any
 #. other /boot partition, we should warn the user.
-#: src/include/partitioning/custom_part_check_generated.rb:305
+#: src/include/partitioning/custom_part_check_generated.rb:298
 msgid ""
 "Warning:\n"
 "Your system needs a boot partition with type 0x41 PReP/CHRP.\n"
@@ -1165,7 +1145,7 @@
 msgstr ""
 
 #. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:320
+#: src/include/partitioning/custom_part_check_generated.rb:313
 #, fuzzy
 msgid ""
 "Warning:\n"
@@ -1187,7 +1167,7 @@
 "Vil du bruka dette oppsettet?\n"
 
 #. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:340
+#: src/include/partitioning/custom_part_check_generated.rb:333
 #, fuzzy
 msgid ""
 "Warning:\n"
@@ -1203,7 +1183,7 @@
 "Vil du verkeleg bruka denne storleiken på oppstartspartisjonen?\n"
 
 #. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:357
+#: src/include/partitioning/custom_part_check_generated.rb:350
 msgid ""
 "Warning: There is no partition of type bios_grub present.\n"
 "Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -1215,7 +1195,7 @@
 #. popup text
 #. If the user chooses 'no' here, the system will not be able to
 #. boot from the hard drive!
-#: src/include/partitioning/custom_part_check_generated.rb:377
+#: src/include/partitioning/custom_part_check_generated.rb:370
 #, fuzzy
 msgid ""
 "Warning: There is no partition mounted as /boot.\n"
@@ -1234,7 +1214,7 @@
 "Vil du verkeleg bruka dette oppsettet utan ein /boot-partisjon?\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:396
+#: src/include/partitioning/custom_part_check_generated.rb:389
 #, fuzzy
 msgid ""
 "Warning: According to your setup, you intend to\n"
@@ -1254,11 +1234,11 @@
 "\n"
 "Vil du verkeleg bruka dette oppsettet?\n"
 
-#: src/include/partitioning/custom_part_check_generated.rb:416
+#: src/include/partitioning/custom_part_check_generated.rb:415
 msgid ""
 "Warning: Some subvolumes of the root filesystem are shadowed by\n"
 "mount points of other filesystem. This could lead to problems.\n"
-"\n"
+"%s\n"
 "Really use this setup?\n"
 msgstr ""
 
@@ -1413,7 +1393,7 @@
 "Vil du verkeleg halda på partisjonen uformatert?\n"
 
 #. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:595
+#: src/include/partitioning/custom_part_check_generated.rb:601
 #, fuzzy
 msgid ""
 "The selected device belongs to the RAID (%1).\n"
@@ -1423,7 +1403,7 @@
 "Fjern henne frå RAID før du gjer endringar.\n"
 
 #. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:606
+#: src/include/partitioning/custom_part_check_generated.rb:612
 #, fuzzy
 msgid ""
 "The selected device belongs to a volume group (%1).\n"
@@ -1433,7 +1413,7 @@
 "Fjern henne frå volumgruppen før du gjer endringar.\n"
 
 #. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:616
+#: src/include/partitioning/custom_part_check_generated.rb:622
 #, fuzzy
 msgid ""
 "The selected device is used by volume (%1).\n"
@@ -1443,7 +1423,7 @@
 "Fjern henne frå volumet før du gjer endringar.\n"
 
 #. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:649
+#: src/include/partitioning/custom_part_check_generated.rb:655
 #, fuzzy
 msgid ""
 "The device (%2) belongs to the RAID (%1).\n"
@@ -1453,7 +1433,7 @@
 "Fjern henne frå RAID før du slettar henne.\n"
 
 #. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:660
+#: src/include/partitioning/custom_part_check_generated.rb:666
 #, fuzzy
 msgid ""
 "The device (%2) is used by %1.\n"
@@ -1462,13 +1442,13 @@
 "Eininga (%2) nyttast av %1.\n"
 "Fjern %1 før du slettar henne.\n"
 
-#: src/include/partitioning/custom_part_check_generated.rb:672
+#: src/include/partitioning/custom_part_check_generated.rb:678
 #, fuzzy
 msgid "It cannot be deleted while mounted."
 msgstr "Kan ikkje slettes medan han er montert."
 
 #. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:708
+#: src/include/partitioning/custom_part_check_generated.rb:714
 #, fuzzy
 msgid ""
 "The device (%1) cannot be removed since it is a logical partition and \n"
@@ -1479,7 +1459,7 @@
 " partisjon med høgare nummer er i bruk.\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:784
+#: src/include/partitioning/custom_part_check_generated.rb:790
 #, fuzzy
 msgid ""
 "The selected extended partition contains partitions which are currently mounted:\n"
@@ -1493,7 +1473,7 @@
 "Klikk Avbryt viss du ikkje veit nøyaktig kva du gjer.\n"
 
 #. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:802
+#: src/include/partitioning/custom_part_check_generated.rb:808
 #, fuzzy
 msgid ""
 "\n"
@@ -1509,7 +1489,7 @@
 "før du slettar den utvida partisjonen.\n"
 
 #. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:813
+#: src/include/partitioning/custom_part_check_generated.rb:819
 #, fuzzy
 msgid ""
 "\n"
@@ -1525,7 +1505,7 @@
 "den utvida partisjonen.\n"
 
 #. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:824
+#: src/include/partitioning/custom_part_check_generated.rb:830
 #, fuzzy
 msgid ""
 "\n"
@@ -1546,14 +1526,14 @@
 
 #. label text
 #: src/include/partitioning/custom_part_dialogs.rb:74
-#: src/include/partitioning/ep-dialogs.rb:768
-#: src/modules/StorageProposal.rb:6372
+#: src/include/partitioning/ep-dialogs.rb:806
+#: src/modules/StorageProposal.rb:6378
 #, fuzzy
 msgid "Do not forget what you enter here!"
 msgstr "Ikkje gløym kva du skriv inn her!"
 
 #: src/include/partitioning/custom_part_dialogs.rb:78
-#: src/include/partitioning/ep-dialogs.rb:771
+#: src/include/partitioning/ep-dialogs.rb:809
 #, fuzzy
 msgid "Empty password allowed."
 msgstr "Passord er ikkje naudsynt."
@@ -1586,7 +1566,7 @@
 #. Label: get password for user root
 #. Please use newline if label is longer than 40 characters
 #: src/include/partitioning/custom_part_dialogs.rb:136
-#: src/include/partitioning/ep-dialogs.rb:796
+#: src/include/partitioning/ep-dialogs.rb:834
 #, fuzzy
 msgid "&Enter a Password for your File System:"
 msgstr "&Skriv inn eit passord for filsystemet:"
@@ -1598,7 +1578,7 @@
 #. Label: get same password again for verification
 #. Please use newline if label is longer than 40 characters
 #: src/include/partitioning/custom_part_dialogs.rb:147
-#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002
+#: src/include/partitioning/ep-dialogs.rb:818 src/modules/Storage.rb:4006
 #, fuzzy
 msgid "Reenter the Password for &Verification:"
 msgstr "&Gjenta passordet:"
@@ -1624,7 +1604,7 @@
 #. popup text
 #. popup text
 #: src/include/partitioning/custom_part_dialogs.rb:196
-#: src/modules/Storage.rb:3958
+#: src/modules/Storage.rb:3962
 #, fuzzy
 msgid ""
 "You did not enter a password.\n"
@@ -1636,7 +1616,7 @@
 #. popup text
 #. popup text
 #: src/include/partitioning/custom_part_dialogs.rb:203
-#: src/modules/Storage.rb:3966
+#: src/modules/Storage.rb:3970
 #, fuzzy
 msgid ""
 "The password must have at least %1 characters.\n"
@@ -2004,9 +1984,7 @@
 #. help text, richtext format
 #: src/include/partitioning/custom_part_dialogs.rb:1543
 #, fuzzy
-msgid ""
-"<p>Create and remove subvolumes from a Btrfs filesystem.</p>"
-"\n"
+msgid "<p>Create and remove subvolumes from a Btrfs filesystem.</p>\n"
 msgstr ""
 "<p>\n"
 "Her kan du oppretta og fjerne undervolumer \n"
@@ -2045,7 +2023,7 @@
 #. TRANSLATOR: checkbox text
 #. TRANSLATORS: checkbox text
 #: src/include/partitioning/custom_part_dialogs.rb:1592
-#: src/modules/StorageProposal.rb:6226
+#: src/modules/StorageProposal.rb:6231
 msgid "Enable Snapshots"
 msgstr ""
 
@@ -2062,7 +2040,7 @@
 msgid "Empty subvolume name not allowed."
 msgstr "Du må angje eit namn på undervolumet."
 
-#: src/include/partitioning/custom_part_dialogs.rb:1670
+#: src/include/partitioning/custom_part_dialogs.rb:1671
 #, fuzzy
 msgid ""
 "Only subvolume names starting with \"%1\" currently allowed!\n"
@@ -2071,12 +2049,12 @@
 "Berre undervolumnavn som byrjar med «@/» er tillat!\n"
 "Legg automatisk til «@/» føre undervolumnavnet."
 
-#: src/include/partitioning/custom_part_dialogs.rb:1680
+#: src/include/partitioning/custom_part_dialogs.rb:1681
 #, fuzzy
 msgid "Subvolume name %1 already exists."
 msgstr "Undervolumnavnet %1 finst allereie."
 
-#: src/include/partitioning/custom_part_dialogs.rb:1709
+#: src/include/partitioning/custom_part_dialogs.rb:1711
 #, fuzzy
 msgid "Modifications done so far in this dialog will be lost."
 msgstr "Alle tidlegare endringar i dialogen vil gå tapt!"
@@ -2087,13 +2065,11 @@
 msgid ""
 "<p>\n"
 "Create an encrypted file system.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Opprett eit kryptert filsystem.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text for cryptofs
 #: src/include/partitioning/custom_part_helptexts.rb:63
@@ -2101,13 +2077,11 @@
 msgid ""
 "<p>\n"
 "Access an encrypted file system.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Tilgjenge til eit kryptert filsystem.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text for cryptofs
 #: src/include/partitioning/custom_part_helptexts.rb:73
@@ -2117,19 +2091,17 @@
 "Keep in mind that this file system is only protected when it is not\n"
 "mounted. Once it is mounted, it is as secure as every other\n"
 "Linux file system.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Hugs at filsystemet berre er verna når det ikkje\n"
 "er montert. Når det er montert, er det like sikkert som alle andre\n"
 "Linux-filsystemer.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. helptext
 #: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:708
+#: src/include/partitioning/ep-dialogs.rb:746
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -2137,21 +2109,19 @@
 "If you leave the encryption password empty, the system will create\n"
 "a random password at system startup for you. This means, you will lose all\n"
 "data on these filesystems at system shutdown.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Dette monteringspunktet tilsvarer eit mellombels filsystem som /tmp eller var/tmp.\n"
 "Du treng ikkje å angje noko krypteringspassord. I så fall vil systemet oppretta\n"
 "eit tilfeldig passord ved systemoppstart. Dette tyder at alle data på desse\n"
 "filsystemene går tapt når du slår av maskina.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text, continued
 #. helptext
 #: src/include/partitioning/custom_part_helptexts.rb:100
-#: src/include/partitioning/ep-dialogs.rb:723
+#: src/include/partitioning/ep-dialogs.rb:761
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -2159,36 +2129,32 @@
 "Choose your password carefully. A combination of letters and numbers\n"
 "is recommended. To ensure the password was entered correctly,\n"
 "enter it twice.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Viss du gløymer passordet ditt, vil du mista tilgjenge til alle data i filsystemet.\n"
 "Ver nøye med val av passord. Ein kombinasjon av bokstavar og tall\n"
 "vert rådd til. For å sikre at passordet vert skrive inn riktig, \n"
 "må det skrivast inn to gonger.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text, continued
 #. helptext, %1 is replaced by integer
 #: src/include/partitioning/custom_part_helptexts.rb:114
-#: src/include/partitioning/ep-dialogs.rb:737
+#: src/include/partitioning/ep-dialogs.rb:775
 #, fuzzy
 msgid ""
 "<p>\n"
 "You must distinguish between uppercase and lowercase. A password should have at\n"
 "least %1 characters and, as a rule, not contain any special characters\n"
 "(e.g., letters with accents or umlauts).\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Du må skilja mellom store og små bokstavar. Eit passord bør ha\n"
 "minst %1 teikn, og bør normalt ikkje innehalda spesialtegn\n"
 "(t.d. bokstavar med aksent).\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text, continued
 #: src/include/partitioning/custom_part_helptexts.rb:129
@@ -2198,20 +2164,18 @@
 "Possible characters are\n"
 "<tt>%1</tt>, blanks, uppercase and lowercase\n"
 "letters (<tt>A-Za-Z</tt>), and digits <tt>0</tt> to <tt>9</tt>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Moglege teikn er\n"
 "<tt>%1</tt>, mellomrom, små og store\n"
 "bokstavar (<tt>A-Za-Z</tt>) og tall <tt>0</tt> til <tt>9</tt>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text, continued
 #. helptext
 #: src/include/partitioning/custom_part_helptexts.rb:142
-#: src/include/partitioning/ep-dialogs.rb:749
+#: src/include/partitioning/ep-dialogs.rb:787
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -2228,8 +2192,7 @@
 msgid ""
 "<p>\n"
 "You will need to enter your encryption password.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Du vil bedast om å skriva inn krypteringspassordet.\n"
@@ -2243,14 +2206,12 @@
 "If the encrypted file system does not contain any system file and therefore is\n"
 "not needed for the update, you may select <b>Skip</b>. In this case, the\n"
 "file system is not accessed during update.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Viss det krypterte filsystemet ikkje inneheld nokon systemfil og difor ikkje vert kravde for oppdateringa, kan du velja <b>Hopp over</b>. I dette tilfellet\n"
 " finn det ikkje stad noko tilgjenge til filsystemet under oppdatering.\n"
-" </p>"
-"\n"
+" </p>\n"
 
 #: src/include/partitioning/custom_part_helptexts.rb:173
 #, fuzzy
@@ -2445,7 +2406,7 @@
 "til einingar som manglar eller ha ukjent filsystem."
 
 #. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:491
+#: src/include/partitioning/custom_part_lib.rb:482
 #, fuzzy
 msgid ""
 "\n"
@@ -2470,13 +2431,13 @@
 
 #. //////////////////////////////////////////////
 #. modify map new
-#: src/include/partitioning/custom_part_lib.rb:919
-#: src/include/partitioning/custom_part_lib.rb:946
+#: src/include/partitioning/custom_part_lib.rb:924
+#: src/include/partitioning/custom_part_lib.rb:951
 #, fuzzy
 msgid "The file system is currently mounted on %1."
 msgstr "Filsystemet er montert på %1."
 
-#: src/include/partitioning/custom_part_lib.rb:924
+#: src/include/partitioning/custom_part_lib.rb:929
 #, fuzzy
 msgid ""
 "You can try to unmount it now, continue without unmounting or cancel.\n"
@@ -2487,13 +2448,13 @@
 
 #. button text
 #. button text
-#: src/include/partitioning/custom_part_lib.rb:935
-#: src/include/partitioning/custom_part_lib.rb:960
+#: src/include/partitioning/custom_part_lib.rb:940
+#: src/include/partitioning/custom_part_lib.rb:965
 #, fuzzy
 msgid "Unmount"
 msgstr "Avmonter"
 
-#: src/include/partitioning/custom_part_lib.rb:951
+#: src/include/partitioning/custom_part_lib.rb:956
 #, fuzzy
 msgid ""
 "You can try to unmount it now or cancel.\n"
@@ -2502,17 +2463,17 @@
 "Du kan freista avmontera det no eller avbryta.\n"
 "Klikk på Avbryt viss du ikkje veit nøyaktig kva du held på med."
 
-#: src/include/partitioning/custom_part_lib.rb:997
+#: src/include/partitioning/custom_part_lib.rb:1002
 #, fuzzy
 msgid "It is not possible to shrink the file system while it is mounted."
 msgstr "Det er ikkje mogleg å oppretta ein partisjon på %1."
 
-#: src/include/partitioning/custom_part_lib.rb:1010
+#: src/include/partitioning/custom_part_lib.rb:1015
 #, fuzzy
 msgid "It is not possible to extend the file system while it is mounted."
 msgstr "Det er ikkje mogleg å oppretta ein partisjon på %1."
 
-#: src/include/partitioning/custom_part_lib.rb:1021
+#: src/include/partitioning/custom_part_lib.rb:1026
 #, fuzzy
 msgid "It is not possible to resize the file system while it is mounted."
 msgstr "Det er ikkje mogleg å oppretta ein partisjon på %1."
@@ -2599,8 +2560,7 @@
 msgid ""
 "<p>By double clicking a table entry,\n"
 "you navigate to the view with detailed information about the\n"
-"device.</p>"
-"\n"
+"device.</p>\n"
 msgstr ""
 "<p>Dobbeltklikk på ein oppføring i tabellen\n"
 "for å gå til eit vindauge med detaljert informasjon om den aktuelle\n"
@@ -2828,7 +2788,8 @@
 #: src/include/partitioning/ep-btrfs.rb:40
 #: src/include/partitioning/ep-dm.rb:36 src/include/partitioning/ep-hd.rb:61
 #: src/include/partitioning/ep-loop.rb:37
-#: src/include/partitioning/ep-lvm.rb:64 src/include/partitioning/ep-raid.rb:38
+#: src/include/partitioning/ep-lvm.rb:64
+#: src/include/partitioning/ep-raid.rb:38
 #, fuzzy
 msgid "Edit"
 msgstr "Rediger"
@@ -2887,7 +2848,8 @@
 #: src/include/partitioning/ep-btrfs.rb:205
 #: src/include/partitioning/ep-dm.rb:153 src/include/partitioning/ep-hd.rb:86
 #: src/include/partitioning/ep-loop.rb:54
-#: src/include/partitioning/ep-lvm.rb:86 src/include/partitioning/ep-raid.rb:59
+#: src/include/partitioning/ep-lvm.rb:86
+#: src/include/partitioning/ep-raid.rb:59
 #, fuzzy
 msgid "Edit..."
 msgstr "Rediger …"
@@ -2923,8 +2885,7 @@
 #, fuzzy
 msgid ""
 "<p>This view shows detailed information about the\n"
-"selected Btrfs volume.</p>"
-"\n"
+"selected Btrfs volume.</p>\n"
 msgstr ""
 "<p>Her vert viste detaljert informasjon om\n"
 "valde BTRFS-volum.</p>"
@@ -2934,8 +2895,7 @@
 #, fuzzy
 msgid ""
 "<p>This view shows all devices used by the\n"
-"selected Btrfs volume.</p>"
-"\n"
+"selected Btrfs volume.</p>\n"
 msgstr ""
 "<p>Her vert viste alle einingar som vert brukte av\n"
 "valt BTRFS-volum.</p>"
@@ -2979,33 +2939,39 @@
 msgstr "<p>Vel storleiken på den nye partisjonen.</p>"
 
 #. radio button text
-#: src/include/partitioning/ep-dialogs.rb:55
+#: src/include/partitioning/ep-dialogs.rb:56
 #, fuzzy
+msgid "EFI Boot Partition"
+msgstr "Formater partisjon"
+
+#. radio button text
+#: src/include/partitioning/ep-dialogs.rb:64
+#, fuzzy
 msgid "Operating System"
 msgstr "Standard filsystem"
 
 #. radio button text
-#: src/include/partitioning/ep-dialogs.rb:60
+#: src/include/partitioning/ep-dialogs.rb:69
 msgid "Data and ISV Applications"
 msgstr ""
 
 #. radio button text
-#: src/include/partitioning/ep-dialogs.rb:65
+#: src/include/partitioning/ep-dialogs.rb:75
 msgid "Swap"
 msgstr ""
 
 #. radio button text
-#: src/include/partitioning/ep-dialogs.rb:70
+#: src/include/partitioning/ep-dialogs.rb:80
 msgid "Raw Volume (unformatted)"
 msgstr ""
 
 #. heading for a frame in a dialog
-#: src/include/partitioning/ep-dialogs.rb:78
+#: src/include/partitioning/ep-dialogs.rb:88
 msgid "Role"
 msgstr ""
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:107
+#: src/include/partitioning/ep-dialogs.rb:120
 #, fuzzy
 msgid ""
 "<p>First, choose whether the partition should be\n"
@@ -3015,20 +2981,19 @@
 "og ynskte filsystemtype.</p>"
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:114
+#: src/include/partitioning/ep-dialogs.rb:127
 #, fuzzy
 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"
-"volume will delete all data on it.</p>"
-"\n"
+"volume will delete all data on it.</p>\n"
 msgstr ""
 "<p>For å kryptera alle data på\n"
 "volumet, vel <b>Krypter eining</b>. Viss du endrar krypteringen på eit eksisterande\n"
 "volum, vil alle data på volumet slettast.</p>"
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:124
+#: src/include/partitioning/ep-dialogs.rb:137
 #, fuzzy
 msgid ""
 "<p>Then, choose whether the partition should\n"
@@ -3038,56 +3003,56 @@
 " og monteringspunktet ( /, /boot, /usr, /var osb.).</p>"
 
 #. set globals
-#: src/include/partitioning/ep-dialogs.rb:309
+#: src/include/partitioning/ep-dialogs.rb:337
 #, fuzzy
 msgid "Formatting Options"
 msgstr "Formateringsvalg"
 
-#: src/include/partitioning/ep-dialogs.rb:317
+#: src/include/partitioning/ep-dialogs.rb:345
 #, fuzzy
 msgid "Format partition"
 msgstr "Formater partisjon"
 
-#: src/include/partitioning/ep-dialogs.rb:328
+#: src/include/partitioning/ep-dialogs.rb:356
 #, fuzzy
 msgid "Do not format partition"
 msgstr "Ikkje formater partisjon"
 
-#: src/include/partitioning/ep-dialogs.rb:344
+#: src/include/partitioning/ep-dialogs.rb:372
 #, fuzzy
 msgid "Do not mount partition"
 msgstr "Ikkje monter partisjonen"
 
-#: src/include/partitioning/ep-dialogs.rb:363
+#: src/include/partitioning/ep-dialogs.rb:391
 #, fuzzy
 msgid "Mounting Options"
 msgstr "Monteringsvalg"
 
-#: src/include/partitioning/ep-dialogs.rb:371
+#: src/include/partitioning/ep-dialogs.rb:399
 #, fuzzy
 msgid "Mount partition"
 msgstr "Monter partisjonen"
 
 #. Column header
-#: src/include/partitioning/ep-dialogs.rb:377 src/modules/StorageFields.rb:144
+#: src/include/partitioning/ep-dialogs.rb:405 src/modules/StorageFields.rb:144
 #, fuzzy
 msgid "Mount Point"
 msgstr "Monteringspunkt"
 
 #. button text
-#: src/include/partitioning/ep-dialogs.rb:384
+#: src/include/partitioning/ep-dialogs.rb:412
 #, fuzzy
 msgid "Fs&tab Options..."
 msgstr "Fs&tab-val …"
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:558
+#: src/include/partitioning/ep-dialogs.rb:596
 #, fuzzy
 msgid "Crypt files must be encrypted."
 msgstr "Kryptofiler må krypterast."
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:569
+#: src/include/partitioning/ep-dialogs.rb:607
 #, fuzzy
 msgid ""
 "You chose to create the crypt file, but did not specify\n"
@@ -3101,19 +3066,19 @@
 "Kryss av for formatering òg.\n"
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:585
+#: src/include/partitioning/ep-dialogs.rb:623
 #, fuzzy
 msgid "Crypt files require a mount point."
 msgstr "Krypteringsfiler må ha eit monteringspunkt."
 
 #. error popup
-#: src/include/partitioning/ep-dialogs.rb:599
+#: src/include/partitioning/ep-dialogs.rb:637
 #, fuzzy
 msgid "Tmpfs requires a mount point."
 msgstr "Tmpfs må ha eit monteringspunkt."
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:683
+#: src/include/partitioning/ep-dialogs.rb:721
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -3129,40 +3094,38 @@
 "</p>"
 
 #. helptext
-#: src/include/partitioning/ep-dialogs.rb:696
+#: src/include/partitioning/ep-dialogs.rb:734
 #, fuzzy
 msgid ""
 "<p>\n"
 "The file system used for this volume is swap. You can leave the encryption \n"
 "password empty, but then the swap device cannot be used for hibernating\n"
 "(suspend to disk).\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Filsystemet swap er brukte for dette volumet. Du treng ikkje å angje noko krypteringspassord,\n"
 "men swap-eininga vil i så fall ikkje kunne verta til brukt dvalefunksjoner\n"
 "(diskdvale).\n"
-"</p>"
-"\n"
+"</p>\n"
 
-#: src/include/partitioning/ep-dialogs.rb:766
+#: src/include/partitioning/ep-dialogs.rb:804
 #, fuzzy
 msgid "All data stored on the volume will be lost!"
 msgstr "Alle data som er lagra på volumet, vil gåt tapt!"
 
-#: src/include/partitioning/ep-dialogs.rb:789
+#: src/include/partitioning/ep-dialogs.rb:827
 #, fuzzy
 msgid "Password"
 msgstr "Passord"
 
 #. popup text
-#: src/include/partitioning/ep-dialogs.rb:886
+#: src/include/partitioning/ep-dialogs.rb:924
 msgid "Resize not supported by underlying device."
 msgstr ""
 
 #. popup text
-#: src/include/partitioning/ep-dialogs.rb:891
+#: src/include/partitioning/ep-dialogs.rb:929
 #, fuzzy
 msgid ""
 "\n"
@@ -3173,7 +3136,7 @@
 "Du kan ikkje endra storleik på den valde partisjonen fordi filsystemet\n"
 "på denne partisjonen ikkje støttar endring av storleik.\n"
 
-#: src/include/partitioning/ep-dialogs.rb:915
+#: src/include/partitioning/ep-dialogs.rb:953
 #, fuzzy
 msgid ""
 "It is not possible to check whether a NTFS\n"
@@ -3181,7 +3144,7 @@
 msgstr "Det er ikkje mogleg å oppretta ein partisjon på %1."
 
 #. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:934
+#: src/include/partitioning/ep-dialogs.rb:972
 #, fuzzy
 msgid ""
 "Partition %1 cannot be resized\n"
@@ -3191,24 +3154,24 @@
 "fordi filsystemet ser ut til å vera inkonsistent."
 
 #. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:961
+#: src/include/partitioning/ep-dialogs.rb:999
 #, fuzzy
 msgid "Resize Partition %1"
 msgstr "Endre storleik på partisjon %1"
 
 #. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:982
+#: src/include/partitioning/ep-dialogs.rb:1020
 #, fuzzy
 msgid "Resize Logical Volume %1"
 msgstr "Endre storleik på logisk volum %1"
 
 #. size_k + min_size_k could be > max_size_k
-#: src/include/partitioning/ep-dialogs.rb:1014
+#: src/include/partitioning/ep-dialogs.rb:1052
 #, fuzzy
 msgid "Current size: %1"
 msgstr "Gjeldande storleik: %1"
 
-#: src/include/partitioning/ep-dialogs.rb:1026
+#: src/include/partitioning/ep-dialogs.rb:1064
 #, fuzzy
 msgid "Currently used: %1"
 msgstr "Brukt storleik: %1"
@@ -3217,8 +3180,8 @@
 #. input field label
 #. combo box label
 #. Column header
-#: src/include/partitioning/ep-dialogs.rb:1039
-#: src/include/partitioning/ep-dialogs.rb:1076
+#: src/include/partitioning/ep-dialogs.rb:1077
+#: src/include/partitioning/ep-dialogs.rb:1114
 #: src/include/partitioning/ep-hd-dialogs.rb:256
 #: src/include/partitioning/ep-loop-dialogs.rb:118
 #: src/include/partitioning/ep-lvm-dialogs.rb:559
@@ -3231,7 +3194,7 @@
 
 #. radio button text, %1 is replaced by size
 #. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1049
+#: src/include/partitioning/ep-dialogs.rb:1087
 #: src/include/partitioning/ep-hd-dialogs.rb:242
 #: src/include/partitioning/ep-lvm-dialogs.rb:535
 #, fuzzy
@@ -3239,14 +3202,14 @@
 msgstr "Maksimal storleik (%1)"
 
 #. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1059
+#: src/include/partitioning/ep-dialogs.rb:1097
 #, fuzzy
 msgid "Minimum Size (%1)"
 msgstr "Minimum storleik (%1)"
 
 #. radio button text
 #. radio button text
-#: src/include/partitioning/ep-dialogs.rb:1068
+#: src/include/partitioning/ep-dialogs.rb:1106
 #: src/include/partitioning/ep-hd-dialogs.rb:251
 #: src/include/partitioning/ep-lvm-dialogs.rb:568
 #, fuzzy
@@ -3254,14 +3217,14 @@
 msgstr "Egendefinert storleik"
 
 #. help text
-#: src/include/partitioning/ep-dialogs.rb:1102
+#: src/include/partitioning/ep-dialogs.rb:1140
 #, fuzzy
 msgid "<p>Choose new size.</p>"
 msgstr "<p>Vel ein ny storleik.</p>"
 
 #. error popup, %1 and %2 are replaced by sizes
 #. error popup, %1 and %2 are replaced by sizes
-#: src/include/partitioning/ep-dialogs.rb:1153
+#: src/include/partitioning/ep-dialogs.rb:1191
 #: src/include/partitioning/ep-hd-dialogs.rb:359
 #: src/include/partitioning/ep-lvm-dialogs.rb:692
 #, fuzzy
@@ -3272,7 +3235,7 @@
 #. after user tries to do that is stupid - in some cases
 #. we can tell beforehand, thus user should never get to this
 #. point (e.g. when the partition is mounted)
-#: src/include/partitioning/ep-dialogs.rb:1196
+#: src/include/partitioning/ep-dialogs.rb:1234
 #, fuzzy
 msgid ""
 "You are extending a mounted filesystem by %1 Gigabyte. \n"
@@ -3286,13 +3249,13 @@
 "endra storleiken."
 
 #. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1272
+#: src/include/partitioning/ep-dialogs.rb:1310
 #, fuzzy
 msgid "Output of %1"
 msgstr "Resultat frå %1"
 
 #. popup text
-#: src/include/partitioning/ep-dialogs.rb:1299
+#: src/include/partitioning/ep-dialogs.rb:1337
 #, fuzzy
 msgid "Rescanning disks..."
 msgstr "Skannar diskar på nytt …"
@@ -3331,8 +3294,7 @@
 msgid ""
 "<p>This view shows all Device Mapper devices except for those already \n"
 "included in some other view. Therefore multipath disks,\n"
-"BIOS RAIDs and LVM logical volumes are not shown here.</p>"
-"\n"
+"BIOS RAIDs and LVM logical volumes are not shown here.</p>\n"
 msgstr ""
 "<p>Her vert vist alle enhetstilordnere\n"
 "som ikkje allereie er med i ein annan visning. Multipath-diskar,\n"
@@ -3514,59 +3476,59 @@
 msgstr "Det angjevne området er ugyldig."
 
 #. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:548
+#: src/include/partitioning/ep-hd-dialogs.rb:549
 #, fuzzy
 msgid "Add Partition on %1"
 msgstr "Legg til partisjon på %1"
 
 #. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:594
+#: src/include/partitioning/ep-hd-dialogs.rb:595
 #, fuzzy
 msgid "Edit Partition %1"
 msgstr "Rediger partisjonen %1"
 
 #. error popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:627
+#: src/include/partitioning/ep-hd-dialogs.rb:628
 #, fuzzy
 msgid "No space to moved partition %1."
 msgstr "Ingen ledig plass på den flytte partisjonen %1."
 
 #. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:637
+#: src/include/partitioning/ep-hd-dialogs.rb:638
 #, fuzzy
 msgid "Move partition %1 forward?"
 msgstr "Vil du flytta partisjonen %1 framover?"
 
 #. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:646
+#: src/include/partitioning/ep-hd-dialogs.rb:647
 #, fuzzy
 msgid "Move partition %1 backward?"
 msgstr "Vil du flytta partisjonen %1 bakover?"
 
 #. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:665
+#: src/include/partitioning/ep-hd-dialogs.rb:666
 #, fuzzy
 msgid "Move partition %1?"
 msgstr "Vil du flytta partisjonen %1?"
 
 #. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:667
+#: src/include/partitioning/ep-hd-dialogs.rb:668
 #, fuzzy
 msgid "Forward"
 msgstr "Framover"
 
 #. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:669
+#: src/include/partitioning/ep-hd-dialogs.rb:670
 #, fuzzy
 msgid "Backward"
 msgstr "Bakover"
 
-#: src/include/partitioning/ep-hd-dialogs.rb:725
+#: src/include/partitioning/ep-hd-dialogs.rb:726
 #, fuzzy
 msgid "Confirm Deleting of All Partitions"
 msgstr "Stadfest sletting av alle partisjoner"
 
-#: src/include/partitioning/ep-hd-dialogs.rb:727
+#: src/include/partitioning/ep-hd-dialogs.rb:728
 #, fuzzy
 msgid ""
 "The disk \"%1\" contains at least one partition.\n"
@@ -3575,7 +3537,7 @@
 "Disken «%1» inneheld minst éin partisjon.\n"
 "Viss du held fram, vil følgjande partisjoner slettast:"
 
-#: src/include/partitioning/ep-hd-dialogs.rb:732
+#: src/include/partitioning/ep-hd-dialogs.rb:733
 #, fuzzy
 msgid "Really delete all partitions on \"%1\"?"
 msgstr "Vil du verkeleg slette alle partisjoner på «%1»?"
@@ -3583,26 +3545,31 @@
 #. error popup
 #. error popup
 #: src/include/partitioning/ep-hd-lib.rb:42
-#: src/include/partitioning/ep-hd-lib.rb:245
+#: src/include/partitioning/ep-hd-lib.rb:251
 #, fuzzy
 msgid "No hard disk selected."
 msgstr "Ingen harddisk valt."
 
 #. error popup
+#: src/include/partitioning/ep-hd-lib.rb:51
+msgid "Cannot create partition table on LDL formatted DASD."
+msgstr ""
+
+#. error popup
 #. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5240
+#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5250
 #, fuzzy
 msgid "The disk is in use and cannot be modified."
 msgstr "Disken er i bruk, og kan ikkje endrast."
 
 #. dialog heading
-#: src/include/partitioning/ep-hd-lib.rb:86
+#: src/include/partitioning/ep-hd-lib.rb:92
 #, fuzzy
 msgid "Select new partition table type for %1."
 msgstr "Vel ny partisjonstabelltype for %1."
 
 #. popup text, %1 is be replaced by disk name e.g. /dev/sda
-#: src/include/partitioning/ep-hd-lib.rb:111
+#: src/include/partitioning/ep-hd-lib.rb:117
 #, fuzzy
 msgid ""
 "Really create new partition table on %1? This will delete all data\n"
@@ -3612,33 +3579,33 @@
 "på %1, og alle RAID-einingar og volumgrupper som brukar partisjoner på %1."
 
 #. error popup
-#: src/include/partitioning/ep-hd-lib.rb:131
+#: src/include/partitioning/ep-hd-lib.rb:137
 #, fuzzy
 msgid "No disk selected."
 msgstr "Ingen disk valt."
 
 #. popup text
 #. Must be called before removing device.
-#: src/include/partitioning/ep-hd-lib.rb:145
-#: src/include/partitioning/ep-lib.rb:199
+#: src/include/partitioning/ep-hd-lib.rb:151
+#: src/include/partitioning/ep-lib.rb:202
 #, fuzzy
 msgid "Really delete BIOS RAID %1?"
 msgstr "Vil du verkeleg slette BIOS RAID %1?"
 
 #. popup text
-#: src/include/partitioning/ep-hd-lib.rb:159
+#: src/include/partitioning/ep-hd-lib.rb:165
 #, fuzzy
 msgid "Really delete Partitioned RAID %1?"
 msgstr "Er du sikker på at du vil sletta partisjonert RAID %1?"
 
 #. error ppup
-#: src/include/partitioning/ep-hd-lib.rb:176
+#: src/include/partitioning/ep-hd-lib.rb:182
 #, fuzzy
 msgid "There are no partitions to delete on this disk."
 msgstr "Denne disken inneheld ingen partisjoner som kan slettes."
 
 #. error popup
-#: src/include/partitioning/ep-hd-lib.rb:229
+#: src/include/partitioning/ep-hd-lib.rb:235
 #, fuzzy
 msgid "It is not possible to create a partition on %1."
 msgstr "Det er ikkje mogleg å oppretta ein partisjon på %1."
@@ -3647,16 +3614,16 @@
 #. error popup
 #. error popup
 #. error popup
-#: src/include/partitioning/ep-hd-lib.rb:321
-#: src/include/partitioning/ep-hd-lib.rb:370
-#: src/include/partitioning/ep-hd-lib.rb:426
-#: src/include/partitioning/ep-hd-lib.rb:483
+#: src/include/partitioning/ep-hd-lib.rb:327
+#: src/include/partitioning/ep-hd-lib.rb:376
+#: src/include/partitioning/ep-hd-lib.rb:432
+#: src/include/partitioning/ep-hd-lib.rb:489
 #, fuzzy
 msgid "No partition selected."
 msgstr "Ingen partisjon er valde."
 
 #. error popup, %1 is replace by partition device name e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:334
+#: src/include/partitioning/ep-hd-lib.rb:340
 #, fuzzy
 msgid ""
 "The partition %1 is in use. It cannot be\n"
@@ -3666,13 +3633,13 @@
 "redigerast. For å redigera henne %1, sørg for at han ikkje er i bruk."
 
 #. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:345
+#: src/include/partitioning/ep-hd-lib.rb:351
 #, fuzzy
 msgid "An extended partition cannot be edited."
 msgstr "Ein utvida partisjon kan ikkje vert redigert."
 
 #. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:387
+#: src/include/partitioning/ep-hd-lib.rb:393
 #, fuzzy
 msgid ""
 "The partition %1 is already created on disk\n"
@@ -3682,13 +3649,13 @@
 "og kan ikkje flyttast."
 
 #. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:398
+#: src/include/partitioning/ep-hd-lib.rb:404
 #, fuzzy
 msgid "An extended partition cannot be moved."
 msgstr "Ein utvida partisjon kan ikkje vert flytt."
 
 #. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:443
+#: src/include/partitioning/ep-hd-lib.rb:449
 #, fuzzy
 msgid ""
 "The partition %1 is in use. It cannot be\n"
@@ -3698,33 +3665,30 @@
 "vert endra. For å endra storleik på %1, sørg for at han ikkje er i bruk."
 
 #. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:454
+#: src/include/partitioning/ep-hd-lib.rb:460
 #, fuzzy
 msgid "An extended partition cannot be resized."
 msgstr "Du kan ikkje endra storleiken på ein utvida partisjon."
 
 #. helptext
-#: src/include/partitioning/ep-hd-lib.rb:527
+#: src/include/partitioning/ep-hd-lib.rb:533
 #, fuzzy
 msgid ""
 "<p>Select one or more (if available) hard disks\n"
 "that will have the same partition layout as\n"
-"this disk.</p>"
-"\n"
+"this disk.</p>\n"
 "<p>Disks marked with the sign '*' contain one or\n"
 "more partitions. After cloning, these\n"
-"partitions will be deleted.</p>"
-"\n"
+"partitions will be deleted.</p>\n"
 msgstr ""
 "<p>Vel éin eller fleire (viss tilgjengelege) harddiskar\n"
 "som skal ha same partisjonsoppsett som\n"
-"denne disken.</p>"
-"\n"
+"denne disken.</p>\n"
 "<p>Diskar merket med '*' inneheld éin eller\n"
 "fleire partisjoner. Etter kloning vil desse\n"
 "partisjonene slettast.</p>"
 
-#: src/include/partitioning/ep-hd-lib.rb:573
+#: src/include/partitioning/ep-hd-lib.rb:579
 #, fuzzy
 msgid ""
 "The following partitions will be deleted\n"
@@ -3733,12 +3697,12 @@
 "Følgjande partisjoner vil slettast\n"
 "og alle data på dei vil gå tapt:"
 
-#: src/include/partitioning/ep-hd-lib.rb:580
+#: src/include/partitioning/ep-hd-lib.rb:586
 #, fuzzy
 msgid "Really delete these partitions?"
 msgstr "Er du sikker på at du vil sletta desse partisjonene?"
 
-#: src/include/partitioning/ep-hd-lib.rb:596
+#: src/include/partitioning/ep-hd-lib.rb:602
 #, fuzzy
 msgid ""
 "There are no partitions on this disk, but a clonable\n"
@@ -3749,7 +3713,7 @@
 "disk må ha minst éin partisjon).\n"
 "Opprett nokon partisjoner før du klonar disken."
 
-#: src/include/partitioning/ep-hd-lib.rb:609
+#: src/include/partitioning/ep-hd-lib.rb:615
 #, fuzzy
 msgid ""
 "This disk cannot be cloned. There are no suitable\n"
@@ -3758,23 +3722,23 @@
 "Denne disken kan ikkje klonast. Det finst ingen eigna\n"
 "diskar som kan ha same partisjonsoppsett."
 
-#: src/include/partitioning/ep-hd-lib.rb:638
+#: src/include/partitioning/ep-hd-lib.rb:644
 #, fuzzy
 msgid "Clone partition layout of %1"
 msgstr "Klon partisjonsoppsettet for %1"
 
-#: src/include/partitioning/ep-hd-lib.rb:642
+#: src/include/partitioning/ep-hd-lib.rb:648
 #, fuzzy
 msgid "Available target disks:"
 msgstr "Tilgjengelege måldisker:"
 
-#: src/include/partitioning/ep-hd-lib.rb:670
+#: src/include/partitioning/ep-hd-lib.rb:676
 #, fuzzy
 msgid "Select a target disk for creating a clone"
 msgstr "Vel ein måldisk for å oppretta ein klona."
 
 #. popup text, %1 is replaced by a dasd name e.g. /dev/dasda
-#: src/include/partitioning/ep-hd-lib.rb:751
+#: src/include/partitioning/ep-hd-lib.rb:757
 #, fuzzy
 msgid ""
 "Running dasdfmt deletes all data on the disk.\n"
@@ -3784,7 +3748,7 @@
 "Vil du verkeleg køyra dasdfmt for disken %1?\n"
 
 #. popup text
-#: src/include/partitioning/ep-hd-lib.rb:762
+#: src/include/partitioning/ep-hd-lib.rb:768
 #, fuzzy
 msgid ""
 "The disk is no longer marked for dasdfmt.\n"
@@ -3831,7 +3795,8 @@
 msgstr "Flytt"
 
 #: src/include/partitioning/ep-hd.rb:63 src/include/partitioning/ep-lvm.rb:43
-#: src/include/partitioning/ep-lvm.rb:65 src/include/partitioning/ep-raid.rb:39
+#: src/include/partitioning/ep-lvm.rb:65
+#: src/include/partitioning/ep-raid.rb:39
 #, fuzzy
 msgid "Resize"
 msgstr "Endre storleik"
@@ -3889,8 +3854,7 @@
 #, fuzzy
 msgid ""
 "<p>This view shows all hard disks including\n"
-"iSCSI disks, BIOS RAIDs and multipath disks and their partitions.</p>"
-"\n"
+"iSCSI disks, BIOS RAIDs and multipath disks and their partitions.</p>\n"
 msgstr ""
 "<p>Her vert vist alle harddiskar, inkludert\n"
 "iSCSI-diskar, BIOS RAID-einingar og Multipath-diskar med sine partisjoner.</p>"
@@ -3967,8 +3931,7 @@
 msgid ""
 "<p>This view shows all partitions of the selected\n"
 "hard disk. If the hard disk is used by e.g. BIOS RAID or multipath, no\n"
-"partitions are shown here.</p>"
-"\n"
+"partitions are shown here.</p>\n"
 msgstr ""
 "<p>Her vert vist alle partisjoner på den valde\n"
 "harddisken. Viss harddisken vert brukt av t.d. BIOS RAID eller Multipath, vil\n"
@@ -3980,8 +3943,7 @@
 msgid ""
 "<p>This view shows all devices used by the\n"
 "selected hard disk. The view is only available for BIOS RAIDs, partitioned\n"
-"software RAIDs and multipath disks.</p>"
-"\n"
+"software RAIDs and multipath disks.</p>\n"
 msgstr ""
 "<p>Her vert viste alle einingar som vert brukte av den\n"
 "valde harddisken. Visningen er berre tilgjengeleg for BIOS RAID, partisjonert\n"
@@ -4021,8 +3983,7 @@
 msgid ""
 "<p>YaST has scanned your hard disks and found one or several existing \n"
 "Linux systems with mount points. The old mount points are shown in \n"
-"the table.</p>"
-"\n"
+"the table.</p>\n"
 msgstr ""
 "<p>YaST2 har gjennomsøkt harddiskane og funne\n"
 "eit gammalt Linux-system med monteringspunkter. Til høgre ser du ei liste over monteringspunktene som vart funnen. Dei gamle monteringspunktene\n"
@@ -4086,12 +4047,12 @@
 msgstr "Feil passord."
 
 #. Must be called before removing device.
-#: src/include/partitioning/ep-lib.rb:107
+#: src/include/partitioning/ep-lib.rb:110
 #, fuzzy
 msgid "Confirm Deleting Partition Used by LVM"
 msgstr "Stadfest sletting av partisjon som vert brukt av LVM"
 
-#: src/include/partitioning/ep-lib.rb:109
+#: src/include/partitioning/ep-lib.rb:112
 #, fuzzy
 msgid ""
 "The selected partition is used by volume group \"%1\".\n"
@@ -4102,17 +4063,17 @@
 "For at systemet skal vera konsistent vil følgjande volumgruppe\n"
 "med tilhøyrande logiske volum verta sletter:"
 
-#: src/include/partitioning/ep-lib.rb:117
+#: src/include/partitioning/ep-lib.rb:120
 #, fuzzy
 msgid "Delete partition \"%1\" and volume group \"%2\" now?"
 msgstr "Vil du sletta partisjonen «%1» og volumgruppen «%2» no?"
 
-#: src/include/partitioning/ep-lib.rb:127
+#: src/include/partitioning/ep-lib.rb:130
 #, fuzzy
 msgid "Confirm Deleting Partition Used by RAID"
 msgstr "Stadfest sletting av partisjonen som vert brukte av RAID"
 
-#: src/include/partitioning/ep-lib.rb:129
+#: src/include/partitioning/ep-lib.rb:132
 #, fuzzy
 msgid ""
 "The selected partition belongs to RAID  \"%1\".\n"
@@ -4123,13 +4084,13 @@
 "For at systemet skal vera konsistent, vil følgjande\n"
 "RAID-eining slettast:"
 
-#: src/include/partitioning/ep-lib.rb:137
+#: src/include/partitioning/ep-lib.rb:140
 #, fuzzy
 msgid "Delete partition \"%1\" and RAID \"%2\" now?"
 msgstr "Vil du sletta partisjonen «%1» og RAID «%2» no?"
 
 #. YesNo popup text %1 is replaced by a disk name e.g. /dev/hda
-#: src/include/partitioning/ep-lib.rb:207
+#: src/include/partitioning/ep-lib.rb:210
 #, fuzzy
 msgid "Really delete all partitions on %1?"
 msgstr "Er du sikker på at du vil sletta alle partisjonene på %1?"
@@ -4137,13 +4098,13 @@
 #. ///////////////////////////////////////////////////
 #. now delete partition!!
 #. YesNo popup text, %1 is replaced by a device name e.g. /dev/hda1
-#: src/include/partitioning/ep-lib.rb:259
+#: src/include/partitioning/ep-lib.rb:262
 #, fuzzy
 msgid "Really delete %1?"
 msgstr "Vil du verkeleg slette %1?"
 
 #. YesNo popup.  %1 is path to a file
-#: src/include/partitioning/ep-lib.rb:273
+#: src/include/partitioning/ep-lib.rb:276
 #, fuzzy
 msgid ""
 "\n"
@@ -4154,7 +4115,7 @@
 
 #. Guarantee some minimal share (1%) of total graph width to the segment.
 #. Prevents small partitions e.g. swaps from disappearing completely.
-#: src/include/partitioning/ep-lib.rb:340
+#: src/include/partitioning/ep-lib.rb:358
 #, fuzzy
 msgid "Unpartitioned"
 msgstr "Ikkje partisjonert"
@@ -4163,37 +4124,37 @@
 #. or the end of the disk if
 #. 1. end +1th cyl is not the next one
 #. 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder)
-#: src/include/partitioning/ep-lib.rb:443
+#: src/include/partitioning/ep-lib.rb:461
 #, fuzzy
 msgid "Unallocated"
 msgstr "Ikkje tilordnet"
 
-#: src/include/partitioning/ep-lib.rb:482
+#: src/include/partitioning/ep-lib.rb:500
 #, fuzzy
 msgid "<p>No changes to partitioning.</p>"
 msgstr "<p>Ingen endringar i partisjoneringen.</p>"
 
-#: src/include/partitioning/ep-lib.rb:484
+#: src/include/partitioning/ep-lib.rb:502
 #, fuzzy
 msgid "<p>Changes to partitioning:</p>"
 msgstr "<p>Endringar i partisjoneringen:</p>"
 
-#: src/include/partitioning/ep-lib.rb:487
+#: src/include/partitioning/ep-lib.rb:505
 #, fuzzy
 msgid "<p>No changes to storage settings.</p>"
 msgstr "<p>Ingen endringar i lagringsinnstillingene.</p>"
 
-#: src/include/partitioning/ep-lib.rb:489
+#: src/include/partitioning/ep-lib.rb:507
 #, fuzzy
 msgid "<p>Storage settings:</p>"
 msgstr "<p>Lagringsinnstillinger:</p>"
 
-#: src/include/partitioning/ep-lib.rb:498
+#: src/include/partitioning/ep-lib.rb:516
 #, fuzzy
 msgid "<p>Packages to install:</p>"
 msgstr "<p>Lagringsinnstillinger:</p>"
 
-#: src/include/partitioning/ep-lib.rb:500
+#: src/include/partitioning/ep-lib.rb:518
 #, fuzzy
 msgid "<p>No packages need to be installed.</p>"
 msgstr "<p>Ingen endringar i lagringsinnstillingene.</p>"
@@ -4230,49 +4191,37 @@
 #, fuzzy
 msgid ""
 "\n"
-"<p><b>Path Name of Loop File:</b><br>"
-"This must be an absolute path to the file\n"
-"containing the data for the encrypted loop device to set up.</p>"
-"\n"
+"<p><b>Path Name of Loop File:</b><br>This must be an absolute path to the file\n"
+"containing the data for the encrypted loop device to set up.</p>\n"
 msgstr ""
 "\n"
-"<p><b>Stig til loop-fil</b><br>"
-"Dette må vera den absolutte stigen til fila\n"
-"som inneheld datum for for han krypterte loop-eininga som skal verta opp sett.</p>"
-"\n"
+"<p><b>Stig til loop-fil</b><br>Dette må vera den absolutte stigen til fila\n"
+"som inneheld datum for for han krypterte loop-eininga som skal verta opp sett.</p>\n"
 
 #. helptext
 #: src/include/partitioning/ep-loop-dialogs.rb:45
 #, fuzzy
 msgid ""
 "\n"
-"<p><b>Create Loop File:</b><br>"
-"If this is checked, the file will be created\n"
+"<p><b>Create Loop File:</b><br>If this is checked, the file will be created\n"
 "with the size given in the next field. <b>NOTE:</b> If the file already\n"
-"exists, all data in it is lost.</p>"
-"\n"
+"exists, all data in it is lost.</p>\n"
 msgstr ""
 "\n"
-"<p><b>Opprett loop-fil:</b><br>"
-"Viss dette er avkrysset, vil fila opprettast med storleiken som vert angjeven i neste felt. <b>MERK:</b> Viss fila \n"
-"finst allereie, vil alle data i han gå tapt.</p>"
-"\n"
+"<p><b>Opprett loop-fil:</b><br>Viss dette er avkrysset, vil fila opprettast med storleiken som vert angjeven i neste felt. <b>MERK:</b> Viss fila \n"
+"finst allereie, vil alle data i han gå tapt.</p>\n"
 
 #. helptext
 #: src/include/partitioning/ep-loop-dialogs.rb:56
 #, fuzzy
 msgid ""
 "\n"
-"<p><b>Size:</b><br>"
-"This is the size of the loop file.  The file system\n"
-"created in the encrypted loop device will have this size.</p>"
-"\n"
+"<p><b>Size:</b><br>This is the size of the loop file.  The file system\n"
+"created in the encrypted loop device will have this size.</p>\n"
 msgstr ""
 "\n"
-"<p><b>Storleik:</b><br>"
-"Dette er storleiken på loop-fila. Filsystemet\n"
-"som skal opprettast i han krypterte loop-eininga, vil ha denne storleiken.</p>"
-"\n"
+"<p><b>Storleik:</b><br>Dette er storleiken på loop-fila. Filsystemet\n"
+"som skal opprettast i han krypterte loop-eininga, vil ha denne storleiken.</p>\n"
 
 #. helptext
 #: src/include/partitioning/ep-loop-dialogs.rb:66
@@ -4282,15 +4231,13 @@
 "<p><b>NOTE:</b> During installation, YaST cannot carry out consistency\n"
 "checks of file size and path names because the file system is not\n"
 "accessible. It will be created at the end of the installation. Be\n"
-"careful when providing the size and path name.</p>"
-"\n"
+"careful when providing the size and path name.</p>\n"
 msgstr ""
 "\n"
 "<p><b>MERK:</b>Under installasjon vil det ikkje utførast nokon\n"
 "konsistenskontroller med omsyn til filstørrelser og filstier fordi filsystemet ikkje er \n"
 "tilgjengeleg. Dette vil opprettast når installasjonen vert fullførd. Vêr \n"
-"nøye med storleiken og filstien du angjev.</p>"
-"\n"
+"nøye med storleiken og filstien du angjev.</p>\n"
 
 #. input field label
 #: src/include/partitioning/ep-loop-dialogs.rb:96
@@ -4339,13 +4286,13 @@
 "å oppretta ei fil."
 
 #. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:281
+#: src/include/partitioning/ep-loop-dialogs.rb:282
 #, fuzzy
 msgid "Add Crypt File"
 msgstr "Legg til krypteringsfil"
 
 #. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:325
+#: src/include/partitioning/ep-loop-dialogs.rb:326
 #, fuzzy
 msgid "Edit Crypt File %1"
 msgstr "Rediger krypteringsfilen %1"
@@ -4701,13 +4648,13 @@
 msgstr "Brukast av"
 
 #. dialog title, %1 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1028
+#: src/include/partitioning/ep-lvm-dialogs.rb:1029
 #, fuzzy
 msgid "Add Logical Volume on %1"
 msgstr "Legg til logisk volum på %1"
 
 #. dialog title - %1 is a logical volume name, %2 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1075
+#: src/include/partitioning/ep-lvm-dialogs.rb:1076
 #, fuzzy
 msgid "Edit Logical Volume %1 on %2"
 msgstr "Rediger det logiske volumet %1 på %2"
@@ -4750,9 +4697,9 @@
 #. error popup
 #. error popup
 #: src/include/partitioning/ep-lvm-lib.rb:214
-#: src/include/partitioning/ep-lvm-lib.rb:315
-#: src/include/partitioning/ep-lvm-lib.rb:367
-#: src/include/partitioning/ep-lvm-lib.rb:402
+#: src/include/partitioning/ep-lvm-lib.rb:316
+#: src/include/partitioning/ep-lvm-lib.rb:368
+#: src/include/partitioning/ep-lvm-lib.rb:403
 #, fuzzy
 msgid "No logical volume selected."
 msgstr "Ingen logiske volum er valde."
@@ -4764,7 +4711,7 @@
 msgstr "Det er ingen ledig plass i volumgruppen \"%1\"."
 
 #. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:326
+#: src/include/partitioning/ep-lvm-lib.rb:327
 #, fuzzy
 msgid ""
 "The volume %1 is a thin pool.\n"
@@ -4774,7 +4721,7 @@
 "redigerast. For å redigera %1, sørg for at det ikkje er i bruk."
 
 #. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:337
+#: src/include/partitioning/ep-lvm-lib.rb:338
 #, fuzzy
 msgid ""
 "The volume %1 is in use. It cannot be\n"
@@ -5024,54 +4971,43 @@
 #, fuzzy
 msgid ""
 "<p><b>RAID 0:</b> This level increases your disk performance.\n"
-"There is <b>NO</b> redundancy in this mode. If one of the drives crashes, data recovery will not be possible.</p>"
-"\n"
+"There is <b>NO</b> redundancy in this mode. If one of the drives crashes, data recovery will not be possible.</p>\n"
 msgstr ""
 "<p><b>RAID 0:</b> Dette nivået aukar ytinga til disken.\n"
-"Det er <b>INGEN</b> redundans i denne modusen. Viss ein av diskane havarerer, vil det ikkje vera mogleg å gjenopprette datum.</p>"
-"\n"
+"Det er <b>INGEN</b> redundans i denne modusen. Viss ein av diskane havarerer, vil det ikkje vera mogleg å gjenopprette datum.</p>\n"
 
 #. helptext
 #: src/include/partitioning/ep-raid-dialogs.rb:95
 #, fuzzy
 msgid ""
-"<p><b>RAID 1:</b> <br>"
-"This mode has the best redundancy. It can be\n"
+"<p><b>RAID 1:</b> <br>This mode has the best redundancy. It can be\n"
 "used with two or more disks. This mode maintains an exact copy of all data on all\n"
 "disks. As long as at least one disk is still working, no data is lost. The partitions\n"
-"used for this type of RAID should have approximately the same size.</p>"
-"\n"
+"used for this type of RAID should have approximately the same size.</p>\n"
 msgstr ""
-"<p><b>RAID 1:</b> <br>"
-"Denne modusen har best redundans. Han kan brukast\n"
+"<p><b>RAID 1:</b> <br>Denne modusen har best redundans. Han kan brukast\n"
 "med to eller fleire diskar. Modusen lagar ein nøyaktig kopi av alle data på alle\n"
 "diskar. Så lenge éin av diskane fungerer, vil ingen datum gå tapt. Partisjonene\n"
-"som vert brukte for dette RAIDET-typen, bør ha omtrent same storleik.</p>"
-"\n"
+"som vert brukte for dette RAIDET-typen, bør ha omtrent same storleik.</p>\n"
 
 #. helptext
 #: src/include/partitioning/ep-raid-dialogs.rb:106
 #, fuzzy
 msgid ""
-"<p><b>RAID 5:</b> <br>"
-"This mode combines management of a larger number\n"
+"<p><b>RAID 5:</b> <br>This mode combines management of a larger number\n"
 "of disks and still maintains some redundancy. This mode can be used on three disks or more.\n"
-"If one disk fails, all data is still intact. If two disks fail simultaneously, all data is lost</p>"
-"\n"
+"If one disk fails, all data is still intact. If two disks fail simultaneously, all data is lost</p>\n"
 msgstr ""
-"<p><b>RAID 5:</b> <br>"
-"Denne modusen kan handtera ei større mengd \n"
+"<p><b>RAID 5:</b> <br>Denne modusen kan handtera ei større mengd \n"
 "diskar, og har likevel noko redundans. Modusen kan brukast for tre eller fleire diskar.\n"
-"Viss éin disk havarerer, er alle data framleis intakt. Viss to diskar havarerer samstundes, går alle data tapt.</p>"
-"\n"
+"Viss éin disk havarerer, er alle data framleis intakt. Viss to diskar havarerer samstundes, går alle data tapt.</p>\n"
 
 #. helptext
 #: src/include/partitioning/ep-raid-dialogs.rb:116
 msgid ""
 "<p><b>Raid Name</b> gives you the possibility to provide a meaningful\n"
 "name for the raid. This is optional. If name is provided, the device is\n"
-"available as <tt>/dev/md/<name></tt>.</p>"
-"\n"
+"available as <tt>/dev/md/<name></tt>.</p>\n"
 msgstr ""
 
 #. helptext
@@ -5080,25 +5016,21 @@
 msgid ""
 "<p>Add partitions to your RAID. According to\n"
 "the RAID type, the usable disk size is the sum of these partitions (RAID0), the size\n"
-"of the smallest partition (RAID 1), or (N-1)*smallest partition (RAID 5).</p>"
-"\n"
+"of the smallest partition (RAID 1), or (N-1)*smallest partition (RAID 5).</p>\n"
 msgstr ""
 "<p><b>Legg til partisjoner i RAID.</b> Avhengig av\n"
 "RAID-type, vil ledig diskplass tilsvara summen av desse partisjonene (RAID0), storleiken på\n"
-"den minste partisjonen (RAID 1) eller (N-1)*minste partisjon (RAID 5).</p>"
-"\n"
+"den minste partisjonen (RAID 1) eller (N-1)*minste partisjon (RAID 5).</p>\n"
 
 #. helptext
 #: src/include/partitioning/ep-raid-dialogs.rb:136
 #, fuzzy
 msgid ""
 "<p>Generally, the partitions should be on different drives,\n"
-"to get the redundancy and performance you want.</p>"
-"\n"
+"to get the redundancy and performance you want.</p>\n"
 msgstr ""
 "<p> Generelt bør partisjonene liggja på ulike diskar,\n"
-"for oppnå optimal redundans og yting.</p>"
-"\n"
+"for oppnå optimal redundans og yting.</p>\n"
 
 #. heading
 #. Column header
@@ -5159,17 +5091,13 @@
 #: src/include/partitioning/ep-raid-dialogs.rb:338
 #, fuzzy
 msgid ""
-"<p><b>Chunk Size:</b><br>"
-"It is the smallest \"atomic\" mass\n"
+"<p><b>Chunk Size:</b><br>It is the smallest \"atomic\" mass\n"
 "of data that can be written to the devices. A reasonable chunk size for RAID 5 is 128 kB. For RAID 0,\n"
-"32 kB is a good starting point. For RAID 1, the chunk size does not affect the array very much.</p>"
-"\n"
+"32 kB is a good starting point. For RAID 1, the chunk size does not affect the array very much.</p>\n"
 msgstr ""
-"<p><b>Datapakkestørrelse:</b><br>"
-"Dette er den samlinga\n"
+"<p><b>Datapakkestørrelse:</b><br>Dette er den samlinga\n"
 "av datum som kan lagrast på einingane. Ein fornuftig datapakkestørrelse for RAID 5 er 128 kB. For RAID 0\n"
-"er 32 kB eit godt utgangspunkt. For RAID 1 tyder ikkje datapakkestørrelsen så mye.</p>"
-"\n"
+"er 32 kB eit godt utgangspunkt. For RAID 1 tyder ikkje datapakkestørrelsen så mye.</p>\n"
 
 #: src/include/partitioning/ep-raid-dialogs.rb:346
 #, fuzzy
@@ -5183,10 +5111,8 @@
 "The parity algorithm to use with RAID5/6.\n"
 "Left-symmetric is the one that offers maximum performance on typical disks with rotating platters.\n"
 msgstr ""
-"<p><b>Paritetsalgoritme:</b><br>"
-"Paritetsalgoritmen som skal brukast for RAID5/6.\n"
-"Venstresymetrisk gjev best yting på vanlege roterande diskar.</p>"
-"\n"
+"<p><b>Paritetsalgoritme:</b><br>Paritetsalgoritmen som skal brukast for RAID5/6.\n"
+"Venstresymetrisk gjev best yting på vanlege roterande diskar.</p>\n"
 
 #. helptext
 #: src/include/partitioning/ep-raid-dialogs.rb:361
@@ -5221,19 +5147,19 @@
 msgstr "<p>Endre einingane som vert brukte for RAID.</p>"
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:642
+#: src/include/partitioning/ep-raid-dialogs.rb:643
 #, fuzzy
 msgid "Add RAID %1"
 msgstr "Legg til RAID %1"
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:676
+#: src/include/partitioning/ep-raid-dialogs.rb:677
 #, fuzzy
 msgid "Resize RAID %1"
 msgstr "Endre storleik på RAID %1"
 
 #. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:722
+#: src/include/partitioning/ep-raid-dialogs.rb:723
 #, fuzzy
 msgid "Edit RAID %1"
 msgstr "Rediger RAID %1"
@@ -5500,8 +5426,7 @@
 "device name, which is not persistent. <i>Device ID</i> and <i>Device Path</i>\n"
 "use names generated by udev from hardware information. These should be\n"
 "persistent but unfortunately this is not always true. Finally <i>UUID</i> and\n"
-"<i>Volume Label</i> use the file systems UUID and label.</p>"
-"\n"
+"<i>Volume Label</i> use the file systems UUID and label.</p>\n"
 msgstr ""
 "<p><b>Standardmontering med</b> angjev monteringsmetoden\n"
 "for nyopprettet filsystemer. <i>Enhetsavn</i> brukar kjernen sin\n"
@@ -5515,8 +5440,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Default File System</b> gives the file\n"
-"system type for newly created file systems.</p>"
-"\n"
+"system type for newly created file systems.</p>\n"
 msgstr ""
 "<p><b>Standard filsystem</b> angjev\n"
 "filsystemtypen for nyopprettede filsystemer.</p>"
@@ -5528,8 +5452,7 @@
 "<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"
 "partitions for best performance according to hints provided by the Linux \n"
-"kernel or tries to be compatible with Windows Vista and Win 7.</p>"
-"\n"
+"kernel or tries to be compatible with Windows Vista and Win 7.</p>\n"
 msgstr ""
 "<p><b>Ordning av nyopprettede partisjoner</b>\n"
 "angjev korleis opprettedepartisjoner skal ordnast. <b>sylinder</b> angjev tradisjonell ordning ved sylindergrenser på disken. <b>optimal</b> ordnar \n"
@@ -5563,7 +5486,7 @@
 msgstr "<p>Dette er eit installasjonssammendrag.</p>"
 
 #. dialog title
-#: src/include/partitioning/ep-tmpfs-dialogs.rb:49
+#: src/include/partitioning/ep-tmpfs-dialogs.rb:50
 #, fuzzy
 msgid "Add tmpfs Mount"
 msgstr "Legg til Tmpfs-monteringspunkt"
@@ -5601,8 +5524,7 @@
 #, fuzzy
 msgid ""
 "<p>This view shows detailed information about the\n"
-"selected tmpfs volume.</p>"
-"\n"
+"selected tmpfs volume.</p>\n"
 msgstr ""
 "<p>Her vert viste detaljert informasjon om\n"
 "valde BTRFS-volum.</p>"
@@ -5935,12 +5857,10 @@
 #, fuzzy
 msgid ""
 "<p><b>Swap Priority:</b>\n"
-"Enter the swap priority. Higher numbers mean higher priority.</p>"
-"\n"
+"Enter the swap priority. Higher numbers mean higher priority.</p>\n"
 msgstr ""
 "<p><b>Veksleminneprioritet:</b>\n"
-"Angje veksleminneprioriteten. Eit høgare tal gjev høgare prioritet.</p>"
-"\n"
+"Angje veksleminneprioriteten. Eit høgare tal gjev høgare prioritet.</p>\n"
 
 #. button text
 #: src/modules/FileSystems.rb:481
@@ -5957,8 +5877,7 @@
 "the file system is always mounted read-write.</p>"
 msgstr ""
 "<p><b>Monter som skrivebeskyttet:</b>\n"
-"Ingen data kan verta til skrive filsystemet. Standardverdien er 'nei'.</p>"
-"\n"
+"Ingen data kan verta til skrive filsystemet. Standardverdien er 'nei'.</p>\n"
 
 #. button text
 #: src/modules/FileSystems.rb:497
@@ -5971,8 +5890,7 @@
 #, fuzzy
 msgid ""
 "<p><b>No Access Time:</b>\n"
-"Access times are not updated when a file is read. Default is false.</p>"
-"\n"
+"Access times are not updated when a file is read. Default is false.</p>\n"
 msgstr ""
 "<p><b>Ingen tilgangstid:</b>\n"
 "Tilgangstidene vert ikkje oppdaterte når ei fil vert lesen. Standardverdien er \"Nei\".</p>"
@@ -5988,12 +5906,10 @@
 #, fuzzy
 msgid ""
 "<p><b>Mountable by User:</b>\n"
-"The file system may be mounted by an ordinary user. Default is false.</p>"
-"\n"
+"The file system may be mounted by an ordinary user. Default is false.</p>\n"
 msgstr ""
 "<p><b>Kan monterast av brukar:</b>\n"
-"Filsystemet kan monterast av vanleg brukar. Standardverdien er \"Nei\".</p>"
-"\n"
+"Filsystemet kan monterast av vanleg brukar. Standardverdien er \"Nei\".</p>\n"
 
 #. button text
 #: src/modules/FileSystems.rb:528
@@ -6009,16 +5925,14 @@
 "The file system is not automatically mounted when the system starts.\n"
 "An entry in /etc/fstab is created and the file system is mounted\n"
 "with the appropriate options when the command <tt>mount <mount point></tt>\n"
-"is entered (<mount point> is the directory to which the file system is mounted). Default is false.</p>"
-"\n"
+"is entered (<mount point> is the directory to which the file system is mounted). Default is false.</p>\n"
 msgstr ""
 "<p><b>Ikkje monter ved oppstart:</b>\n"
 "Filsystemet vert montert ikkje automatisk under oppstart av systemet.\n"
 "Ein oppføring i /etc/fstab vert oppretta, og filsystemet verta med\n"
 "montert tilhøyrande val med kommandoen <tt>mount <monteringspunktt></tt>\n"
 "(<monteringspunkt> er katalogen som filsystemet vert montert i).\n"
-"Standardverdien er 'nei'.</p>"
-"\n"
+"Standardverdien er 'nei'.</p>\n"
 
 #. button text
 #: src/modules/FileSystems.rb:551
@@ -6032,13 +5946,11 @@
 msgid ""
 "<p><b>Enable Quota Support:</b>\n"
 "The file system is mounted with user quotas enabled.\n"
-"Default is false.</p>"
-"\n"
+"Default is false.</p>\n"
 msgstr ""
 "<p><b>Aktivar diskkvoter:</b>\n"
 "Filsystemet verta med montert aktiverte diskkvoter for brukarar.\n"
-"Standard er deaktivert.</p>"
-"\n"
+"Standard er deaktivert.</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:576
@@ -6053,13 +5965,10 @@
 "<p><b>Data Journaling Mode:</b>\n"
 "Specifies the journaling mode for file data.\n"
 "<tt>journal</tt> -- All data is committed to the journal prior to being\n"
-"written into the main file system. Highest performance impact.<br>"
-"\n"
+"written into the main file system. Highest performance impact.<br>\n"
 "<tt>ordered</tt> -- All data is forced directly out to the main file system\n"
-"prior to its metadata being committed to the journal. Medium performance impact.<br>"
-"\n"
-"<tt>writeback</tt> -- Data ordering is not preserved. No performance impact.</p>"
-"\n"
+"prior to its metadata being committed to the journal. Medium performance impact.<br>\n"
+"<tt>writeback</tt> -- Data ordering is not preserved. No performance impact.</p>\n"
 msgstr ""
 "<p><b>Dataindekseringsmodus:</b>\n"
 "Spesifiserer indekseringsmodus for fildata.\n"
@@ -6067,8 +5976,7 @@
 "vert lagra i hovedfilsystemet. Høg ytelsespåvirkning.\n"
 "<tt>ordered</tt> -- Alle data vert sende automatisk til hovedfilsystemet\n"
 "før metadata sendast til indeksen. Medium ytelsespåvirkning.\n"
-"<tt>writeback</tt> -- Datarekkefølgen vert ikkje oppretthalden. Ingen ytelsespåvirkning.</p>"
-"\n"
+"<tt>writeback</tt> -- Datarekkefølgen vert ikkje oppretthalden. Ingen ytelsespåvirkning.</p>\n"
 
 #. button text
 #: src/modules/FileSystems.rb:606
@@ -6081,12 +5989,10 @@
 #, fuzzy
 msgid ""
 "<p><b>Access Control Lists (ACL):</b>\n"
-"Enable access control lists on the file system.</p>"
-"\n"
+"Enable access control lists on the file system.</p>\n"
 msgstr ""
 "<p><b>Tilgangskontrollister  (ACL):</b>\n"
-"Aktivar tilgangskontrollister for filsystemet.</p>"
-"\n"
+"Aktivar tilgangskontrollister for filsystemet.</p>\n"
 
 #. button text
 #: src/modules/FileSystems.rb:621
@@ -6099,12 +6005,10 @@
 #, fuzzy
 msgid ""
 "<p><b>Extended User Attributes:</b>\n"
-"Allow extended user attributes on the file system.</p>"
-"\n"
+"Allow extended user attributes on the file system.</p>\n"
 msgstr ""
 "<p><b>Utvida brukerattributter:</b>\n"
-"Tillat utvida brukerattributter for filsystemet.</p>"
-"\n"
+"Tillat utvida brukerattributter for filsystemet.</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:642
@@ -6123,13 +6027,11 @@
 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"
-"Multiple options are separated by commas.</p>"
-"\n"
+"Multiple options are separated by commas.</p>\n"
 msgstr ""
 "<p><b>Tilfeldig valgverdi:</b>\n"
 "I dette feltet kan du leggja inn gyldige monteringsalternativer for fjerde felt i /etc/fstab.\n"
-"Ulike val må vera adskilt av komene.</p>"
-"\n"
+"Ulike val må vera adskilt av komene.</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:668
@@ -6142,12 +6044,10 @@
 #, fuzzy
 msgid ""
 "<p><b>Charset for File Names:</b>\n"
-"Set the charset used for display of file names in Windows partitions.</p>"
-"\n"
+"Set the charset used for display of file names in Windows partitions.</p>\n"
 msgstr ""
 "<p><b>Tegnsett for filnavn:</b>\n"
-"Vel kva for eit tegnsett som skal brukast ved visning av filnavn på Windows-partisjoner.</p>"
-"\n"
+"Vel kva for eit tegnsett som skal brukast ved visning av filnavn på Windows-partisjoner.</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:700
@@ -6160,12 +6060,10 @@
 #, fuzzy
 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"
+"This codepage is used for converting to shortname characters on FAT file systems.</p>\n"
 msgstr ""
 "<p><b>Tegnsett for korte FAT-namn:</b>\n"
-"Dette tegnsettes vert brukt ved konvertering til korte filnavn i FAT-filsystemer.</p>"
-"\n"
+"Dette tegnsettes vert brukt ved konvertering til korte filnavn i FAT-filsystemer.</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:720
@@ -6194,12 +6092,10 @@
 #, fuzzy
 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"
+"Specifies the type of file allocation tables used (12, 16, or 32-bit). If auto is specified, YaST will automatically select the value most suitable for the file system size.</p>\n"
 msgstr ""
 "<p><b>FAT-storleik:</b>\n"
-"Angjev kva for ein type allokeringstabeller som vert nytta (12-, 16-, eller  32-bitar). Viss auto vert valde, vil YaST2 automatisk velja det verdet som passar best til storleiken på filsystemet.</p>"
-"\n"
+"Angjev kva for ein type allokeringstabeller som vert nytta (12-, 16-, eller  32-bitar). Viss auto vert valde, vil YaST2 automatisk velja det verdet som passar best til storleiken på filsystemet.</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:755
@@ -6218,8 +6114,7 @@
 #, fuzzy
 msgid ""
 "<p><b>Root Dir Entries:</b>\n"
-"Select the number of entries available in the root directory.</p>"
-"\n"
+"Select the number of entries available in the root directory.</p>\n"
 msgstr ""
 "<p><b>Underkat. i rot:</b>\n"
 "Vel maksimalt mengd underkataloger i rot-katalogen.</p>"
@@ -6235,8 +6130,7 @@
 #, fuzzy
 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"
+"This specifies the name of the hash function to use to sort the file names in directories.</p>\n"
 msgstr ""
 "<p><b>Sorteringsfunksjon:</b>\n"
 "Spesifiser namnet på sorteringsfunksjonen som skal brukast for å svartare filnavn i katalogar. Vel eit alternativ ovanfor.</p>"
@@ -6252,12 +6146,10 @@
 #, fuzzy
 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"
+"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"
 msgstr ""
 "<p><b>FS-revisjon:</b>\n"
-"Dette alternativet definerer kva for ein formatrevisjon som skal verta for brukt reiserfs. '3.5' står for bakoverkompatibilitet med kjernar frå 2.2.x serien. '3.6' er nyare, men kan berre verta med brukte kjerneversjoner frå og med 2.4.</p>"
-"\n"
+"Dette alternativet definerer kva for ein formatrevisjon som skal verta for brukt reiserfs. '3.5' står for bakoverkompatibilitet med kjernar frå 2.2.x serien. '3.6' er nyare, men kan berre verta med brukte kjerneversjoner frå og med 2.4.</p>\n"
 
 #. label text
 #. label text
@@ -6271,12 +6163,10 @@
 #, fuzzy
 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"
+"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"
 msgstr ""
 "<p><b>Blokkstørrelse:</b>\n"
-"Spesifiser blokkstørrelsen i byte. Gyldige verd er 512, 1024, 2048 og 4096 byte per blokk. Viss auto er valde, vert ein standardblokkstørrelse på 4096 nytta.</p>"
-"\n"
+"Spesifiser blokkstørrelsen i byte. Gyldige verd er 512, 1024, 2048 og 4096 byte per blokk. Viss auto er valde, vert ein standardblokkstørrelse på 4096 nytta.</p>\n"
 
 #. label text
 #. label text
@@ -6291,12 +6181,10 @@
 #, fuzzy
 msgid ""
 "<p><b>Inode Size:</b>\n"
-"This option specifies the inode size of the file system.</p>"
-"\n"
+"This option specifies the inode size of the file system.</p>\n"
 msgstr ""
 "<p><b>Inode-storleik:</b>\n"
-"Spesifiser inode storleiken for filsystemet.</p>"
-"\n"
+"Spesifiser inode storleiken for filsystemet.</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:847
@@ -6309,12 +6197,10 @@
 #, fuzzy
 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"
+"The option \"Percentage of Inode Space\" specifies the maximum percentage of space in the file system that can be allocated to inodes.</p>\n"
 msgstr ""
 "<p><b>Prosentandel for inode-storleik:</b>\n"
-"\"Prosentandel for inode-storleik\" spesifiserer den maksimale prosentandelen av filsystemet som kan tilordnes inoder.</p>"
-"\n"
+"\"Prosentandel for inode-storleik\" spesifiserer den maksimale prosentandelen av filsystemet som kan tilordnes inoder.</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:884
@@ -6329,14 +6215,12 @@
 "<p><b>Inode Aligned:</b>\n"
 "The option \"Inode Aligned\" is used to specify whether inode allocation is or\n"
 "is not aligned. By default inodes are aligned, which\n"
-"is usually more efficient than unaligned access.</p>"
-"\n"
+"is usually more efficient than unaligned access.</p>\n"
 msgstr ""
 "<p><b>Inode-justert:</b>\n"
 "\"Inode-justert\" spesifiserer om inode-tilordningen skal justerast eller \n"
 "ikkje. Standardverdien er \"justert\". Justert inode-tilgjenge\n"
-"er vanlegvis meir effektivt enn ujustert tilgjenge.</p>"
-"\n"
+"er vanlegvis meir effektivt enn ujustert tilgjenge.</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:920
@@ -6360,8 +6244,7 @@
 #, fuzzy
 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"
+"Set the log size (in megabytes). If auto, the default is 40% of the aggregate size.</p>\n"
 msgstr ""
 "<p><b>Loggstørrelse</b>\n"
 "Definer loggstørrelsen (i megabyte). Viss auto er valt, vil standardverdien vera 40 % av samla storleik.</p>"
@@ -6395,26 +6278,22 @@
 "<p><b>Stride Length in Blocks:</b>\n"
 "Set RAID-related options for the file system. Currently, the only supported\n"
 "argument is 'stride', which takes the number of blocks in a\n"
-"RAID stripe as its argument.</p>"
-"\n"
+"RAID stripe as its argument.</p>\n"
 msgstr ""
 "<p><b>'Stride-lengd i blokker:</b>  \n"
 "Vel RAID-relaterte alternativ for filsystemet. Førebels er berre 'stride' \n"
 "støtta, ein funksjon som brukar mengd blokker i eit RAID- 'stripe' som\n"
-"argument.</p>"
-"\n"
+"argument.</p>\n"
 
 #. help text, richtext format
 #: src/modules/FileSystems.rb:987
 #, fuzzy
 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"
+"Specify the size of blocks in bytes. Valid block size values are 1024, 2048, and 4096 bytes per block. If auto is selected, the block size is determined by the file system size and the expected use of the file system.</p>\n"
 msgstr ""
 "<p><b>Blokkstørrelse:</b>\n"
-"Spesifiser blokkstørrelsen i byte. Gyldige verd er 1024, 2048 og 4096 byte per blokk. Dersom auto er valde, vil blokkstørrelsen avgjerast av filsystemstørrelsen og kva filsystemet vert forventa å verta brukt til.</p>"
-"\n"
+"Spesifiser blokkstørrelsen i byte. Gyldige verd er 1024, 2048 og 4096 byte per blokk. Dersom auto er valde, vil blokkstørrelsen avgjerast av filsystemstørrelsen og kva filsystemet vert forventa å verta brukt til.</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:996
@@ -6433,14 +6312,12 @@
 "value should not be smaller than the block size of the file system, or else\n"
 "too many inodes will be created. It is not possible to expand the number of\n"
 "inodes on a file system after its creation. So be sure to enter a reasonable\n"
-"value for this parameter.</p>"
-"\n"
+"value for this parameter.</p>\n"
 msgstr ""
 "<p><b>Byte per inode:</b>\n"
 "Spesifiser tilhøvet mellom byte og inode. YaST2 opprettar ein inode for peren <til kvar-byte-inode> byte diskplass. Jo større byte per inode-verdet er, dess fleire inoder vil opprettast.\n"
 "Dette verdet bør generelt ikkje vera mindre enn blokkstørrelsen i filsystemet for å unngå at for mange inoder vert oppretta. Det er ikkje mogleg å utvida \n"
-"mengd inoder etter at filsystemet er laget, så det er viktig å velja eit fornuftig verd her.</p>"
-"\n"
+"mengd inoder etter at filsystemet er laget, så det er viktig å velja eit fornuftig verd her.</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:1018
@@ -6476,12 +6353,10 @@
 #, fuzzy
 msgid ""
 "<p><b>Disable Regular Checks:</b>\n"
-"Disable regular file system check at booting.</p>"
-"\n"
+"Disable regular file system check at booting.</p>\n"
 msgstr ""
 "<p><b>Deaktiver regelmessige kontrollar:</b>\n"
-"Deaktiver regelmessig kontroll av filsystemet ved oppstart.</p>"
-"\n"
+"Deaktiver regelmessig kontroll av filsystemet ved oppstart.</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:1077
@@ -6494,12 +6369,10 @@
 #, fuzzy
 msgid ""
 "<p><b>Directory Index:</b>\n"
-"Enables use of hashed b-trees to speed up lookups in large directories.</p>"
-"\n"
+"Enables use of hashed b-trees to speed up lookups in large directories.</p>\n"
 msgstr ""
 "<p><b>Katalogindeks:</b>\n"
-"Her kan du bruka hash-b-strukturar for raskare søk i store katalogar.</p>"
-"\n"
+"Her kan du bruka hash-b-strukturar for raskare søk i store katalogar.</p>\n"
 
 #. label text
 #: src/modules/FileSystems.rb:1096
@@ -6513,29 +6386,50 @@
 msgid ""
 "<p><b>No Journal:</b>\n"
 "Suppressed use of journaling on filesystem. Only activate this when you really\n"
-"know what you are doing.</p>"
-"\n"
+"know what you are doing.</p>\n"
 msgstr ""
 "<p><b>Ingen journal:</b>\n"
 "Journalfunksjonen deaktiveres for filsystemet. Bruk dette valet berre viss\n"
-"du veit kva du gjer.</p>"
-"\n"
+"du veit kva du gjer.</p>\n"
 
 #. this version makes some problems with interpreter, above lookup/add is OK
-#: src/modules/Partitions.rb:930
-msgid "Operation not permitted on disk %1.\n"
+#: src/modules/Partitions.rb:936
+msgid "Operation not permitted on disk %{device}.\n"
 msgstr ""
 
-#. popup text %1 is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:940
+#. popup text %{device} is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:941
 #, fuzzy
 msgid ""
 "\n"
-"The partitioning on your disk %1 is either not readable or not \n"
+"It's not supported by the partitioning tool parted to change\n"
+"the partition table on your disk %{device}\n"
+"(the disk is LDL formatted).\n"
+"\n"
+"You can use the partitions on disk %{device} as they are or\n"
+"format them and assign mount points, but you cannot add,\n"
+"resize, or remove partitions from that disk here.\n"
+msgstr ""
+"\n"
+"Partisjoneringen på disken %1 kan anten ikkje lesast av\n"
+"partisjoneringsverktøyet parted, som vert nytta for å endra\n"
+"partisjonstabellen eller verta ikkje støtta av dette verktøyet.\n"
+"\n"
+"Du kan bruka partisjonene på disken %1 som dei er eller\n"
+"formatera dei og tilordne monteringspunkter til dei, men du\n"
+"kan ikkje leggja til, redigera, endra storleikar eller sletta partisjoner frå denne\n"
+"disken her.\n"
+
+#. popup text %{device} is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:953
+#, fuzzy
+msgid ""
+"\n"
+"The partitioning on your disk %{device} is either not readable or not \n"
 "supported by the partitioning tool parted used to change the\n"
 "partition table.\n"
 "\n"
-"You can use the partitions on disk %1 as they are or\n"
+"You can use the partitions on disk %{device} as they are or\n"
 "format them and assign mount points, but you cannot add, edit, \n"
 "resize, or remove partitions from that disk here.\n"
 msgstr ""
@@ -6549,16 +6443,16 @@
 "kan ikkje leggja til, redigera, endra storleikar eller sletta partisjoner frå denne\n"
 "disken her.\n"
 
-#. popup text %1 is replaced by disk name e.g. /dev/dasda
-#: src/modules/Partitions.rb:958
+#. popup text %{device} is replaced by disk name e.g. /dev/dasda
+#: src/modules/Partitions.rb:965
 #, fuzzy
 msgid ""
 "\n"
-"The disk %1 does not contain a partition table but for\n"
+"The disk %{device} does not contain a partition table but for\n"
 "compatibility the kernel has automatically generated a\n"
 "partition spanning almost the entire disk.\n"
 "\n"
-"You can use the partition on disk %1 as it is or\n"
+"You can use the partition on disk %{device} as it is or\n"
 "format it and assign a mount point, but you cannot resize\n"
 "or remove the partition from that disk here.\n"
 msgstr ""
@@ -6573,7 +6467,7 @@
 "disken her.\n"
 
 #. popup text
-#: src/modules/Partitions.rb:977
+#: src/modules/Partitions.rb:981
 #, fuzzy
 msgid ""
 "\n"
@@ -6589,7 +6483,7 @@
 "disken.\n"
 
 #. popup text
-#: src/modules/Partitions.rb:989
+#: src/modules/Partitions.rb:991
 #, fuzzy
 msgid ""
 "\n"
@@ -6608,7 +6502,7 @@
 #. @param integer testsize
 #. @param [Symbol] used_fs
 #. @param [Boolean] verbose
-#: src/modules/Storage.rb:992
+#: src/modules/Storage.rb:993
 #, fuzzy
 msgid "Resize Not Possible:"
 msgstr "Storleiken kunne ikkje endrast:"
@@ -6622,7 +6516,7 @@
 #. mark swap-partitions with pseudo Mountpoint swap in targetMap
 #. @param [Hash{String => map}] target Disk map
 #. @return [Hash{String => map}] modified target
-#: src/modules/Storage.rb:2692 src/modules/Storage.rb:3915
+#: src/modules/Storage.rb:2696 src/modules/Storage.rb:3919
 #, fuzzy
 msgid ""
 "Could not set encryption.\n"
@@ -6636,7 +6530,7 @@
 "Eit ugyldig krypteringspassord er kanskje angjeve.\n"
 
 #. popup text
-#: src/modules/Storage.rb:3946
+#: src/modules/Storage.rb:3950
 #, fuzzy
 msgid ""
 "The first and the second version\n"
@@ -6648,7 +6542,7 @@
 "Prøv igjen."
 
 #. popup text
-#: src/modules/Storage.rb:3977
+#: src/modules/Storage.rb:3981
 #, fuzzy
 msgid ""
 "The password may only contain the following characters:\n"
@@ -6661,28 +6555,28 @@
 
 #. Label: get password for encrypted volume
 #. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4031
+#: src/modules/Storage.rb:4035
 #, fuzzy
 msgid "&Enter Encryption Password:"
 msgstr "Angje krypteringspassord"
 
 #. Clear password fields on every round.
-#: src/modules/Storage.rb:4090
+#: src/modules/Storage.rb:4094
 #, fuzzy
 msgid "Provide Password"
 msgstr "Angje eit passord"
 
-#: src/modules/Storage.rb:4109
+#: src/modules/Storage.rb:4113
 #, fuzzy
 msgid "The following encrypted volumes are already available."
 msgstr "Følgjande krypterte volum er allereie tilgjengelege."
 
-#: src/modules/Storage.rb:4124
+#: src/modules/Storage.rb:4128
 #, fuzzy
 msgid "Encrypted Volume Activation"
 msgstr "Aktivering av krypterte volum"
 
-#: src/modules/Storage.rb:4128
+#: src/modules/Storage.rb:4132
 #, fuzzy
 msgid ""
 "The following volumes contain an encryption signature but the \n"
@@ -6695,13 +6589,13 @@
 "Passorda må kjennast viss det er behov for voluma, anten \n"
 "under ei oppdatering eller viss dei inneheld eit fysisk kryptert LVM-volum."
 
-#: src/modules/Storage.rb:4140
+#: src/modules/Storage.rb:4144
 #, fuzzy
 msgid "Do you want to provide encryption passwords?"
 msgstr "Vil du angje eit krypteringspassord?"
 
 #. text in help field
-#: src/modules/Storage.rb:4197
+#: src/modules/Storage.rb:4201
 #, fuzzy
 msgid ""
 "Enter encryption password for any of the\n"
@@ -6713,59 +6607,59 @@
 "Passordet vil freistast for alle einingane."
 
 #. header text
-#: src/modules/Storage.rb:4203
+#: src/modules/Storage.rb:4207
 #, fuzzy
 msgid "Enter Encryption Password"
 msgstr "Angje krypteringspassord"
 
-#: src/modules/Storage.rb:4206
+#: src/modules/Storage.rb:4210
 #, fuzzy
 msgid "There are no encrypted volume to unlock."
 msgstr "Det finst ingen krypterte volum å låsa opp."
 
 #. label text, multiple device names follow
-#: src/modules/Storage.rb:4219
+#: src/modules/Storage.rb:4223
 #, fuzzy
 msgid "Provide password for any of the following devices:"
 msgstr "Angje passordet for ein av følgjande einingar:"
 
 #. label text, one device name follows
-#: src/modules/Storage.rb:4222
+#: src/modules/Storage.rb:4226
 #, fuzzy
 msgid "Provide password for the following device:"
 msgstr "Angje passordet for følgjande eining:"
 
-#: src/modules/Storage.rb:4235
+#: src/modules/Storage.rb:4239
 #, fuzzy
 msgid "Trying to unlock encrypted volumes..."
 msgstr "Freistar å låsa opp krypterte volum …"
 
-#: src/modules/Storage.rb:4259
+#: src/modules/Storage.rb:4263
 #, fuzzy
 msgid "Password did not unlock any volume."
 msgstr "Passordet låste ikkje opp noko volum."
 
-#: src/modules/Storage.rb:4345
+#: src/modules/Storage.rb:4349
 #, fuzzy
 msgid "IDE Disk"
 msgstr "IDE-disk"
 
-#: src/modules/Storage.rb:4351
+#: src/modules/Storage.rb:4355
 #, fuzzy
 msgid "SCSI Disk"
 msgstr "SCSI-disk"
 
-#: src/modules/Storage.rb:4357
+#: src/modules/Storage.rb:4361
 #, fuzzy
 msgid "Disk"
 msgstr "Disk"
 
-#: src/modules/Storage.rb:4385
+#: src/modules/Storage.rb:4389
 #, fuzzy
 msgid "DM RAID"
 msgstr "DM RAID"
 
-#: src/modules/Storage.rb:4398
+#: src/modules/Storage.rb:4402
 #, fuzzy
 msgid "MD RAID"
 msgstr "MD RAID"
@@ -6773,17 +6667,17 @@
 #. TODO: more informative error message, but the Package module does
 #. not provide anything
 #. TRANSLATORS: error popup
-#: src/modules/Storage.rb:4893
+#: src/modules/Storage.rb:4897
 msgid "Installing required packages failed."
 msgstr ""
 
-#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
+#: src/modules/Storage.rb:4898 src/modules/StorageClients.rb:159
 #, fuzzy
 msgid "Continue despite the error?"
 msgstr "Vil du halda fram til trass for feilen?"
 
 #. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5252
+#: src/modules/Storage.rb:5262
 #, fuzzy
 msgid "Partitions cannot be created since other partitions on the disk are used."
 msgstr ""
@@ -6791,7 +6685,7 @@
 "Partisjonen %1 kan ikkje fjernast fordi andre partisjoner på\n"
 "disken %2 er i bruk."
 
-#: src/modules/Storage.rb:5278
+#: src/modules/Storage.rb:5288
 #, fuzzy
 msgid ""
 "\n"
@@ -6802,7 +6696,7 @@
 "Eininga %1 kan ikkje endrast fordi han vert nytta som vekselminne,\n"
 "og er naudsynt for å køyra installasjonen.\n"
 
-#: src/modules/Storage.rb:5292
+#: src/modules/Storage.rb:5302
 #, fuzzy
 msgid ""
 "\n"
@@ -6813,7 +6707,7 @@
 "Eininga %1 kan ikkje endrast fordi han inneheld installasjonsdata\n"
 "som er naudsynt for installasjonen.\n"
 
-#: src/modules/Storage.rb:5321
+#: src/modules/Storage.rb:5331
 #, fuzzy
 msgid ""
 "\n"
@@ -6824,7 +6718,7 @@
 "Eininga %1 kan ikkje fjernast fordi han vert nytta som vekselminne,\n"
 "og er naudsynt for å køyra installasjonen.\n"
 
-#: src/modules/Storage.rb:5330
+#: src/modules/Storage.rb:5340
 #, fuzzy
 msgid ""
 "\n"
@@ -6835,7 +6729,7 @@
 "Eininga %1 kan ikkje fjernast fordi han inneheld installasjonsdata\n"
 "som er naudsynt for installasjonen.\n"
 
-#: src/modules/Storage.rb:5359
+#: src/modules/Storage.rb:5369
 #, fuzzy
 msgid ""
 "\n"
@@ -6848,7 +6742,7 @@
 "%2, som vert nytta som vekselminne, og er naudsynt for å køyra\n"
 "installasjonen.\n"
 
-#: src/modules/Storage.rb:5370
+#: src/modules/Storage.rb:5380
 #, fuzzy
 msgid ""
 "\n"
@@ -6861,7 +6755,7 @@
 "installasjonen.\n"
 
 #. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5392
+#: src/modules/Storage.rb:5402
 #, fuzzy
 msgid ""
 "\n"
@@ -6873,12 +6767,12 @@
 "disken %2 er i bruk."
 
 #. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5481
+#: src/modules/Storage.rb:5491
 #, fuzzy
 msgid "Nothing assigned as root filesystem!"
 msgstr "Det er ikkje tilordnet noko rotfilsystem!"
 
-#: src/modules/Storage.rb:5482
+#: src/modules/Storage.rb:5492
 #, fuzzy
 msgid "Installation will most certainly fail fatally!"
 msgstr "Installasjonen vil mislukkast!"
@@ -6886,7 +6780,7 @@
 #. Set rather than Add, there might be some packs left over
 #. from previous 'MakeProposal' we don't need now
 #. This also covers the case when AddPackagesList returns [] or nil
-#: src/modules/Storage.rb:6032
+#: src/modules/Storage.rb:6042
 #, fuzzy
 msgid "Adding the following resolvables failed: %1"
 msgstr "Følgjande kunne ikkje verta til lagde: %1"
@@ -7641,59 +7535,43 @@
 
 #. enable snapshots for root volume if desired
 #. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4560 src/modules/StorageProposal.rb:5683
+#: src/modules/StorageProposal.rb:4579 src/modules/StorageProposal.rb:5702
 #, fuzzy
 msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows."
 msgstr "Det er ikkje mogleg å endra storleik på grunn av inkonistent fs. Freist å kontrollera fs frå Windows."
 
-#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6179
-#, fuzzy
-msgid "Create &LVM-based Proposal"
-msgstr "Opprett &LVM-basert forslag"
-
-#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6194
-#, fuzzy
-msgid "Encr&ypt Volume Group"
-msgstr "Kr&ypter volumgruppen"
-
 #. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6212
+#: src/modules/StorageProposal.rb:6217
 #, fuzzy
 msgid "File System for Root Partition"
 msgstr "Alternativ for filsystem:"
 
 #. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6259
+#: src/modules/StorageProposal.rb:6264
 #, fuzzy
 msgid "File System for Home Partition"
 msgstr "Foreslå separat partisjon for &hjemmekatalog"
 
 #. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6277
+#: src/modules/StorageProposal.rb:6282
 msgid "Enlarge &Swap for Suspend"
 msgstr ""
 
-#: src/modules/StorageProposal.rb:6287
+#: src/modules/StorageProposal.rb:6292
 #, fuzzy
 msgid "Proposal Settings"
 msgstr "Forslag til innstillingar"
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6302
-#, fuzzy
+#: src/modules/StorageProposal.rb:6307
 msgid ""
-"<p>To create an LVM-based proposal, choose the corresponding button. The\n"
-"LVM-based proposal can be encrypted.</p>"
-"\n"
+"<p>Choose <b>Partition-based Proposal</b> if you don't want to use LVM.\n"
+"Choose <b>LVM-based Proposal</b> for plain LVM and <b>Encrypted LVM-based\n"
+"Proposal</b> if you want your system to be encrypted.</p>"
 msgstr ""
-"<p>\n"
-"For å oppretta eitt LVM-basert forslag, vel den aktuelle knappen.</p>"
-"\n"
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6309
+#: src/modules/StorageProposal.rb:6315
 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"
@@ -7702,38 +7580,54 @@
 msgstr ""
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6318
+#: src/modules/StorageProposal.rb:6324
 msgid ""
 "<p>The proposal can create a separate home partition. The filesystem for\n"
 "the home partition can be selected with the corresponding combo box.</p>"
 msgstr ""
 
 #. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6325
+#: src/modules/StorageProposal.rb:6331
 msgid ""
 "<p>The swap partition can be made large enough to be used to suspend\n"
 "the system to disk in most cases.</p>"
 msgstr ""
 
-#: src/modules/StorageProposal.rb:6350
+#: src/modules/StorageProposal.rb:6356
 #, fuzzy
 msgid "Enter your password for the proposal encryption."
 msgstr "Angje passordet for det den foreslegne krypteringen."
 
 #. Label: get password for user root
 #. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6357
+#: src/modules/StorageProposal.rb:6363
 #, fuzzy
 msgid "Password:"
 msgstr "Passord:"
 
 #. Label: get same password again for verification
 #. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6368
+#: src/modules/StorageProposal.rb:6374
 #, fuzzy
 msgid "Reenter the password for verification:"
 msgstr "Gjenta passordet for å stadfesta:"
 
+#. Clear password fields on every round.
+#: src/modules/StorageProposal.rb:6572
+#, fuzzy
+msgid "&Partition-based Proposal"
+msgstr "Opprett &LVM-basert forslag"
+
+#: src/modules/StorageProposal.rb:6574
+#, fuzzy
+msgid "&LVM-based Proposal"
+msgstr "Opprett &LVM-basert forslag"
+
+#: src/modules/StorageProposal.rb:6576
+#, fuzzy
+msgid "&Encrypted LVM-based Proposal"
+msgstr "Opprett &LVM-basert forslag"
+
 #. encoding: utf-8
 #. Copyright (c) 2012 Novell, Inc.
 #.
@@ -7783,6 +7677,18 @@
 msgstr "Synleg informasjon om lagringsenheter:"
 
 #, fuzzy
+#~ msgid "Encr&ypt Volume Group"
+#~ msgstr "Kr&ypter volumgruppen"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>To create an LVM-based proposal, choose the corresponding button. The\n"
+#~ "LVM-based proposal can be encrypted.</p>\n"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "For å oppretta eitt LVM-basert forslag, vel den aktuelle knappen.</p>\n"
+
+#, fuzzy
 #~ msgid "Creating root filesystem snapshot..."
 #~ msgstr "Lagrar filsystemoppsett …"
 
@@ -7837,14 +7743,12 @@
 #~ "<p>\n"
 #~ "To import the mount points from an existing Linux\n"
 #~ "system choose <b>%1</b>. You can still make modification\n"
-#~ "afterwards in the expert partitioner dialog.</p>"
-#~ "\n"
+#~ "afterwards in the expert partitioner dialog.</p>\n"
 #~ msgstr ""
 #~ "<p>\n"
 #~ "For å importera monteringspunkter frå eit eksisterande Linux-\n"
 #~ "system, vel <b>%1</b>. Du kan framleis justera oppsettet\n"
-#~ "etterpå i den avanserte partisjoneringsdialogen.</p>"
-#~ "\n"
+#~ "etterpå i den avanserte partisjoneringsdialogen.</p>\n"
 
 #, fuzzy
 #~ msgid "Use &Btrfs as Default File System"
@@ -7953,16 +7857,14 @@
 #~ "You may leave the crypt password empty. If you do this, the system will create \n"
 #~ "a random password at system startup for you. This means, you will lose all \n"
 #~ "data on these filesystems at system shutdown.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 #~ msgstr ""
 #~ "<p>\n"
 #~ "Dette monteringspunktet tilsvarer eit mellombels filsystem som /tmp eller var/tmp.\n"
 #~ "Du treng ikkje å angje noko krypteringspassord. I så fall vil systemet oppretta \n"
 #~ "eit tilfeldig passord ved systemoppstart. Dette tyder at alle data på desse \n"
 #~ "filsystemene går tapt når du slår av maskina.\n"
-#~ "</p>"
-#~ "\n"
+#~ "</p>\n"
 
 #, fuzzy
 #~ msgid "No BTRFS device selected."

Modified: branches/plus-SLE12-SP2/yast/nn/po/sudo.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/sudo.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/sudo.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -424,88 +424,66 @@
 #: src/include/sudo/helps.rb:36
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing sudo Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Initializing sudo Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Initialiserer sudo-konfigurasjon</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer sudo-konfigurasjon</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Read dialog help 2/2
 #: src/include/sudo/helps.rb:40
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<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 avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>"
-"\n"
+"<p><b><big>Avbryt initialisering:</big></b><br>\n"
+"Du kan trygt avbryta konfigurasjonsverktøyet ved å klikka <b>Avbryt</b> no.</p>\n"
 
 #. Write dialog help 1/2
 #: src/include/sudo/helps.rb:44
 #, fuzzy
 msgid ""
-"<p><b><big>Saving sudo Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Saving sudo Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Lagrar sudo-konfigurasjon</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Lagrar sudo-konfigurasjon</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help 2/2
 #: src/include/sudo/helps.rb:48
 #, fuzzy
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
-"<p><b><big>Avbryt lagring:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagring:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein ny dialog fortel deg om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. User Specification help 1/6
 #: src/include/sudo/helps.rb:55
 #, fuzzy
 msgid ""
-"<p><b><big>Rules for sudo</big></b><br>"
-"\n"
+"<p><b><big>Rules for sudo</big></b><br>\n"
 "\tRules for sudo basically determine which commands an user may run \n"
 "\ton specified hosts (optionally also as what user). Each rule\n"
 "\tis a tuple consisting of user, host and list of commands, with optional \n"
 "\tRunAs specification and additional tags. These are summarized \n"
 "\tin the following table. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
-"<p><b><big>Regler for sudo</big></b><br>"
-"\n"
+"<p><b><big>Regler for sudo</big></b><br>\n"
 "\tRegler for sudo avgjer kva for kommandoar ein nytter kan køyra \n"
 "\tpå spesifiserte vertsmaskiner (eventuelt òg som kva for ein brukar). Kvar regel\n"
 "\ter eit sett som består av brukar, vertsmaskin og ein kommandoliste, og eventuelt med ein \n"
 "\t'Køyr som'-definisjon og fleire tilleggsattributter. Tabellen nedanfor inneheld eit \n"
 "\toversyn over dette. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. User Specification help 2/6
@@ -515,15 +493,13 @@
 "<p><b>Users</b> column denotes local or system user or user alias. \n"
 "\t<b>Hosts</b> column determines, on which hosts, or group \n"
 "\tof hosts referred to by host alias an user may run specified commands.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p>Kolonnen <b>Brukarar</b> viser lokale brukarar, systembrukere eller brukeraliaser. \n"
 "\tKolonnen <b>Vertsmaskiner</b> viser vertsmaskiner eller grupper \n"
 "\tav vertsmaskiner, der brukaren kan køyra spesifiserte kommandoar via eit vertsalias.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. User Specification help 3/6
@@ -534,16 +510,14 @@
 "\toptional parameter, containing user name (or alias) whose access privileges\n"
 "\twill be used to run commands. <b>NOPASSWD</b> is a tag, determining whether\n"
 "\tusers need to authorize themselves before running commands.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "Kolonnen <b>Køyr som</b> inneheld ein\n"
 "\tvalfritt parameter, som består av eit brukernavn (eller alias). Denne brukaren sin tilgangsrettigheter\n"
 "\tvil brukast for å køyra kommandoar. <b>NOPASSWD</b> er eit attributt som avgjer om\n"
 "\tbrukarar må autentisere seg sjølv før dei køyrer kommandoar.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. User Specification help 4/6
@@ -552,14 +526,12 @@
 msgid ""
 "<p>A set of commands that user can run on specified hosts is summarized \n"
 "\tin <b>Commands</b> column.  \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p>Eit sett kommandoar som brukaren kan køyra på spesifiserte vertsmaskiner, er angjeven \n"
 "\ti kolonnen <b>Kommandoar</b>.  \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. User Specification help 5/6
@@ -568,14 +540,12 @@
 msgid ""
 "<p> To add a new rule, click on <b>Add</b> button and fill in appropriate \n"
 "\tentries. User name, hostname and command list must not be empty.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p> For å leggja til ein ny regel, klikk på <b>Legg til</b>-knappen og fyll ut aktuelle \n"
 "\tfelt. Brukernavn, vertsnavn og kommandoliste må alltid angjevast.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. User Specification help 5/6
@@ -584,14 +554,12 @@
 msgid ""
 "<p>To edit existing rule, select an entry from the table and click on \n"
 "\t<b>Edit</b> button. To delete selected entry, click on <b>Delete</b> button.\n"
-"\t</p>"
-" \n"
+"\t</p> \n"
 "\t"
 msgstr ""
 "<p>For å redigera ein eksisterande regel, vel ein oppføring i tabellen og klikk på \n"
 "\t<b>Rediger</b>-knappen. Klikk <b>Slett</b> for å slette han valde oppføringen.\n"
-"\t</p>"
-" \n"
+"\t</p> \n"
 "\t"
 
 #. Single User Specification help 1/4
@@ -602,16 +570,14 @@
 "\twith '%' (e.g. %bar), or user alias name. If \n"
 "\tkeyword 'ALL' is used, it stands for any user. Select from existing users, groups and aliases \n"
 "\tin drop-down menu, or enter your own value. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p><b>Brukernavn eller alias</b> kan angjevast som eit enkelt brukernavn (t.d. foo), eit gruppenavn med prefikset\n"
 "\t'%' (t.d. %bar) eller eit brukeraliasnavn. \n"
 "\tNøkkelordet 'ALL' står for kva for ein som helst brukar. Vel eksisterande brukarar, grupper og aliaser \n"
 "\tfrå nedtrekksmenyen, eller angje ein eige verd. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #: src/include/sudo/helps.rb:112
@@ -622,8 +588,7 @@
 "\trun on any host, use keyword 'ALL'. Hostname or IP address is matched against your own hostname\n"
 "\tor IP address, so if you don't intend to share one /etc/sudoers file between multiple machines, \n"
 "\t'ALL' or 'localhost' entry will be sufficient for almost all purposes. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p><b>Vertsnavn eller alias</b> kan anten vera eit vertsnavn (t.d. www.døme.com), ein enkel IP-\n"
@@ -631,8 +596,7 @@
 "\tkøyrast på alle vertsmaskiner, bruk nøkkelordet 'ALL'. Vertsnavn eller IP-adresser vert samanlikna med ditt eige vertsmaskinnavn\n"
 "\teller IP-adresse, såg viss du ikkje vil bruka same /etc/sudoers-fil på fleire maskiner, er det tilstrekkeleg med éin \n"
 "\t'ALL'- eller 'localhost'-oppføring for nesten alle føremål. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Single User Specification help 2/4
@@ -644,8 +608,7 @@
 "\twill be used to execute particular command. If empty, user <b>root</b> is the default\n"
 "\tone. It can be again single username, groupname prefixed with '%' or run_as alias name\n"
 "\tSelect from existing users, groups and aliases in drop-down menu, or enter your own value.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p><b>'Køyr som'-brukernavn eller -alias</b> er ein valfri parameter som angjev ein nytter, \n"
@@ -653,8 +616,7 @@
 "\tvil brukast for å køyra ein spesiell kommando. Viss feltet er tomt, vil <b>root</b> vera\n"
 "\tstandardbrukeren. Òg her kan eit enkelt brukernavn, eit gruppenavn med prefikset '%' eller eit 'Køyr som'-alias angjevast.\n"
 "\tVel eksisterande brukarar, grupper og aliaser frå nedtrekksmenyen, eller angje ein eige verd.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Single User Specification help 3/4
@@ -665,16 +627,14 @@
 "\tthemselves (i.e. supply their own password, not root's one) before running particular \n"
 "\tcommand. Set No Password tag to 'Yes' if you want to\n"
 "\tdisable this authentication\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p><b>Ikkje passord</b> er eit valfritt attributt. Brukarar må vanlegvis autentisere\n"
 "\tseg sjølv (dvs. angje sitt eige passord, ikkje rotpassordet) før spesielle kommandoar \n"
 "\tvert køyrt. Vel 'Ja' under Passord viss du vil\n"
 "\tdeaktivere denne autentiseringen.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Single User Specification help 4/4
@@ -685,16 +645,14 @@
 "\tparameters), directories and command aliases that particular user will be allowed \n"
 "\tto run. If a directory name is used, any command in that directory can be run. \n"
 "\tAgain, keyword 'ALL' stands for any command, so use it with care.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p><b>Kommandoar som skal køyrast</b> er ei liste over kommandoar (eventuelt kombinert med\n"
 "\tparametrar), katalogar og kommandoaliaser som ein bestemd brukar er autorisert \n"
 "\tfor å køyra. Viss eit katalognavn vert angjeve, kan alle kommandoar i den aktuelle katalogen køyrast. \n"
 "\tNøkkelordet 'ALL' står for alle kommandoar her òg, såg vêr forsiktig.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #: src/include/sudo/helps.rb:149
@@ -714,20 +672,16 @@
 #: src/include/sudo/helps.rb:156
 #, fuzzy
 msgid ""
-"<p><b><big>User Aliases</big></b><br>"
-"\n"
+"<p><b><big>User Aliases</big></b><br>\n"
 "\tIn this dialog, you can configure user aliases. User alias is a set of users that is given\n"
 "\tan unique name. This name is later used to refer to all users in this set in sudo configuration. \n"
-"\t</p>"
-" \n"
+"\t</p> \n"
 "\t"
 msgstr ""
-"<p><b><big>Brukeraliaser</big></b><br>"
-"\n"
+"<p><b><big>Brukeraliaser</big></b><br>\n"
 "\tI denne dialogen kan du konfigurera brukeraliaser. Eit brukeralias er eit sett brukarar med eit definert\n"
 "\tunikt namn. Dette namnet vil seinare brukast for alle brukarar i dette settet i sudo-konfigurasjonen. \n"
-"\t</p>"
-" \n"
+"\t</p> \n"
 "\t"
 
 #. User Aliases help 2/3
@@ -736,14 +690,12 @@
 msgid ""
 "<p>To add a new user alias, click on <b>Add</b> button and fill in appropriate entries. \n"
 "\tAlias name and list of users in the alias must not be empty. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p>For å leggja til eit nytt brukeralias, klikk på <b>Legg til</b>-knappen og fyll ut aktuelle felt. \n"
 "\tAliasnavn og ein brukerliste for aliaset må alltid angjevast. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. User Aliases help 3/3
@@ -752,34 +704,28 @@
 msgid ""
 "<p>To edit existing user alias, select an entry from the table and click on <b>Edit</b>\n"
 "\tbutton. To delete selected entry, click on <b>Delete</b> button. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p>For å redigera eit eksisterande brukeralias, vel ein oppføring i tabellen og klikk på <b>Rediger-</b>\n"
 "\tknappen. For å slette ein oppføring, klikk på <b>Slette</b>-knappen. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Host Aliases help 1/3
 #: src/include/sudo/helps.rb:178
 #, fuzzy
 msgid ""
-"<p><b><big>Host Aliases</big></b><br>"
-"\n"
+"<p><b><big>Host Aliases</big></b><br>\n"
 "\tIn this dialog, you can configure host aliases. Host alias is a set of hosts that is given\n"
 "\tan unique name. This name is later used to refer to all hosts in this set in sudo configuration. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
-"<p><b><big>Vertsaliaser</big></b><br>"
-"\n"
+"<p><b><big>Vertsaliaser</big></b><br>\n"
 "\tI denne dialogen kan du konfigurera vertsaliaser. Eit vertsalias er eit sett vertsmaskiner med eit definert\n"
 "\tunikt namn. Dette namnet vil seinare brukast for alle vertsmaskiner i dette settet i sudo-konfigurasjonen. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Host Aliases help 2/3
@@ -788,14 +734,12 @@
 msgid ""
 "<p>To add a new host alias, click on <b>Add</b> button and fill in appropriate entries. \n"
 "\tAlias name and list of hosts in the alias must not be empty. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p>For å leggja til eit nytt vertsalias, klikk på <b>Legg til</b>-knappen og fyll ut aktuelle felt. \n"
 "\tAliasnavn og ein vertsmaskinliste for aliaset må alltid angjevast. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Host Aliases help 3/3
@@ -804,34 +748,28 @@
 msgid ""
 "<p>To edit existing host alias, select an entry from the table and click on <b>Edit</b>\n"
 "\tbutton. To delete selected entry, click on <b>Delete</b> button. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p>For å redigera eit eksisterande vertsalias, vel ein oppføring i tabellen og klikk på <b>Rediger-</b>\n"
 "\tknappen. For å slette ein oppføring, klikk på <b>Slette</b>-knappen. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. RunAs Aliases help 1/3
 #: src/include/sudo/helps.rb:200
 #, fuzzy
 msgid ""
-"<p><b><big>RunAs Aliases</big></b><br>"
-"\n"
+"<p><b><big>RunAs Aliases</big></b><br>\n"
 "\tIn this dialog, you can configure RunAs aliases. RunAs alias is a set of users that is given\n"
 "\tan unique name. This name is later used to refer to all users in this set in sudo configuration. \n"
-"\t</p>"
-" \n"
+"\t</p> \n"
 "\t"
 msgstr ""
-"<p><b><big>'Køyr som'-aliaser</big></b><br>"
-"\n"
+"<p><b><big>'Køyr som'-aliaser</big></b><br>\n"
 "\tI denne dialogen kan du konfigurera 'Køyr som'-aliaser. Eit 'Køyr som'-alias er eit sett brukarar med eit definert\n"
 "\tunikt namn. Dette namnet vil seinare brukast for alle brukarar i dette settet i sudo-konfigurasjonen. \n"
-"\t</p>"
-" \n"
+"\t</p> \n"
 "\t"
 
 #. RunAs Aliases help 2/3
@@ -840,14 +778,12 @@
 msgid ""
 "<p>To add a new RunAs alias, click on <b>Add</b> button and fill in appropriate entries. \n"
 "\tAlias name and list of users in the alias must not be empty. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p>For å leggja til eit nytt 'Køyr som'-alias, klikk på <b>Legg til</b>-knappen og fyll ut aktuelle felt. \n"
 "\tAliasnavn og ein brukerliste for aliaset må alltid angjevast. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. RunAs Aliases help 3/3
@@ -856,36 +792,30 @@
 msgid ""
 "<p>To edit existing RunAs alias, select an entry from the table and click on <b>Edit</b>\n"
 "\tbutton. To delete selected entry, click on <b>Delete</b> button. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p>For å redigera eit eksisterande 'Køyr som'-alias, vel ein oppføring i tabellen og klikk på <b>Rediger-</b>\n"
 "\tknappen. For å slette ein oppføring, klikk på <b>Slette</b>-knappen. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Command Aliases help 1/3
 #: src/include/sudo/helps.rb:222
 #, fuzzy
 msgid ""
-"<p><b><big>Command Aliases</big></b><br>"
-"\n"
+"<p><b><big>Command Aliases</big></b><br>\n"
 "\tIn this dialog, you can configure command aliases. Command alias is a set of commands \n"
 "\t(optionally with parameters) that is given an unique name. This name is then used to refer\n"
 "\tto all commands in this set in sudo configuration. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
-"<p><b><big>Kommandoaliaser</big></b><br>"
-"\n"
+"<p><b><big>Kommandoaliaser</big></b><br>\n"
 "\tI denne dialogen kan du konfigurera kommandoaliaser. Eit kommandoalias er eit sett kommandoar \n"
 "\t(eventuelt med parametrar) som har eit definert unikt namn. Dette namnet vil deretter brukast for\n"
 "\talle kommandoar i dette settet i sudo-konfigurasjonen. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Command Aliases help 2/3
@@ -894,14 +824,12 @@
 msgid ""
 "<p>To add a new command alias, click on <b>Add</b> button and fill in appropriate entries. \n"
 "\tAlias name and list of commands in the alias must not be empty. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p>For å leggja til eit nytt kommandoalias, klikk på <b>Legg til</b>-knappen og fyll ut aktuelle felt. \n"
 "\tAliasnavn og ein kommandoliste for aliaset må alltid angjevast. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Command Aliases help 3/3
@@ -910,34 +838,28 @@
 msgid ""
 "<p>To edit existing command alias, select an entry from the table and click on <b>Edit</b>\n"
 "\tbutton. To delete selected entry, click on <b>Delete</b> button. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p>For å redigera eit eksisterande kommandoalias, vel ein oppføring i tabellen og klikk på <b>Rediger-</b>\n"
 "\tknappen. For å slette ein oppføring, klikk på <b>Slette</b>-knappen. \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Single User Alias Help 1/2
 #: src/include/sudo/helps.rb:245
 #, fuzzy
 msgid ""
-"<p><b><big>User Alias</big></b><br>"
-"\n"
+"<p><b><big>User Alias</big></b><br>\n"
 "\tUser alias consists of one or more users, system groups (prefixed with '%') or other\n"
 "\tuser aliases. It is given single name (must contain uppercase letters, numbers and underscore\tonly), which is then used to refer to all users in this alias.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
-"<p><b><big>Brukeralias</big></b><br>"
-"\n"
+"<p><b><big>Brukeralias</big></b><br>\n"
 "\tEit brukeralias består av éin eller fleire brukarar, systemgrupper (med prefikset '%') eller andre\n"
 "\tbrukeraliaser. Det må ha eit enkelt namn (kan berre innehalda store bokstavar, tall og understrek),\tog vil deretter nyttast for alle brukarar i dette aliaset.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Single User Alias Help 2/3
@@ -949,16 +871,14 @@
 "\talias, select user or group name from the drop-down menu and click on <b>Add</b> button.\n"
 "\tTo remove user from the alias, select appropriate entry from the table, and click on\n"
 "\t<b>Remove</b> button. To finish the configuration, click <b>OK</b>.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "<p>Angje eit unikt namn under <b>Aliasnavn</b>. For å leggja til brukarar eller grupper for\n"
 "\taliaset, vel brukar- eller gruppenavn frå nedtrekksmenyen, og klikk på <b>Legg til</b>-knappen.\n"
 "\tFor å fjerne ein brukar frå aliaset, vel den aktuelle oppføringen i tabellen, og klikk på\n"
 "\t<b>Fjerne</b>-knappen. Klikk <b>OK</b> for å fullføra konfigurasjonen.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Single User Alias Help 3/3
@@ -979,26 +899,22 @@
 #: src/include/sudo/helps.rb:266
 #, fuzzy
 msgid ""
-"<p><b><big>Host Alias</big></b><br>"
-"\n"
+"<p><b><big>Host Alias</big></b><br>\n"
 "\tHost alias consists of one or more hostnames, single IP addresses, IP addresses\n"
 "\tcombined with netmask id dotted quad notation (e.g. 192.168.0.0/255.255.255.0) or\n"
 "\tCIDR number of bits notation (e.g. 192.168.0.0/24), or other host aliases. It is \n"
 "\tgiven single name (must contain uppercase letters, numbers and underscore only), which \n"
 "\tis then used to refer to all hosts in this alias.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
-"<p><b><big>Vertsalias</big></b><br>"
-"\n"
+"<p><b><big>Vertsalias</big></b><br>\n"
 "\tEit vertsalias består av eit eller fleire vertsnavn, enkle IP-adresser, IP-adresser\n"
 "\tkombinert med ein nettverksmaske i form av grupper av fire tal adskilt av punktum (t.d. 192.168.0.0/255.255.255.0), \n"
 "\tein CIDR-verd (t.d. 192.168.0.0/24), eller andre vertsaliaser. Eit \n"
 "\tenkelt namn må angjevast (kan berre innehalda store bokstavar, tall og understrek). Dette namnet \n"
 "\tvil deretter brukast for alle vertsmaskiner i dette aliaset.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Single Host Alias Help 2/4
@@ -1008,16 +924,14 @@
 "<p>Enter unique name into <b>Alias Name</b> text entry. To add hosts to the\n"
 "\talias, click on <b>Add</b> button. A pop-up window will appear, where you can enter\n"
 "\tvalid hostname or IP address and then click <b>OK</b>.\n"
+"\t<p>\n"
 "\t"
-"<p>\n"
-"\t"
 msgstr ""
 "<p>Angje eit unikt namn under <b>Aliasnavn</b>. For å leggja til vetsmaskiner for\n"
 "\taliaset, klikk på <b>Legg til</b>-knappen. Det kjem opp ein dialog der du kan angje eit\n"
 "\tgyldig vertsnavn eller ein IP adresse. Klikk deretter <b>OK</b>.\n"
+"\t<p>\n"
 "\t"
-"<p>\n"
-"\t"
 
 #. Single Host Alias Help 3/4
 #: src/include/sudo/helps.rb:285
@@ -1025,66 +939,56 @@
 msgid ""
 "To remove host from the alias, select appropriate entry from the table, and click on\n"
 "\t<b>Remove</b> button. To finish the configuration, click <b>OK</b>.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "For å fjerne ein vertsmaskin frå aliaset, vel den aktuelle oppføringen i tabellen, og klikk på\n"
 "\t<b>Fjerne</b>-knappen. Klikk <b>OK</b> for å fullføra konfigurasjonen.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Single RunAs Alias Help 1/2
 #: src/include/sudo/helps.rb:296
 #, fuzzy
 msgid ""
-"<p><b><big>RunAs Alias</big></b><br>"
-"\n"
+"<p><b><big>RunAs Alias</big></b><br>\n"
 "\tRunAs alias is very similar to User Alias. It consists of one or more users, system groups \n"
 "\t(prefixed with '%') or other RunAs aliases. It is given single name (must contain \n"
 "\tuppercase letters, numbers and underscore only), which is then used to refer to all users \n"
 "\tin this alias.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
-"<p><b><big>'Køyr som'-alias</big></b><br>"
-"\n"
+"<p><b><big>'Køyr som'-alias</big></b><br>\n"
 "\tEit 'Køyr som'-alias fungerer på liknande måte som eit brukeralias. Det består av éin eller fleire brukarar, systemgrupper \n"
 "\t(med prefikset '%') eller andre 'Køyr som''aliaser. Det må ha eit enkelt namn (kan berre innehalda \n"
 "\tstore bokstavar, tall og understrek), og vil deretter nyttast for alle brukarar \n"
 "\ti dette aliaset.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Single Command Alias Help 1/4
 #: src/include/sudo/helps.rb:319
 #, fuzzy
 msgid ""
-"<p><b><big>Command Alias</big></b><br>"
-"\n"
+"<p><b><big>Command Alias</big></b><br>\n"
 "\tCommand Alias is a list of one or more commands (with optional parameters), directories, or\n"
 "\tother command aliases. It is given single name (must contain uppercase letters, numbers and\n"
 "\tunderscore only), which is \n"
 "\tthen used to refer to all commands in this alias. A command can optionally have one or more\n"
 "\tparameters specified. If so, users can run the command with these parameters only. If a \n"
 "\tdirectory name is used, any command in that directory can be run.  \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
-"<p><b><big>Kommandoalias</big></b><br>"
-"\n"
+"<p><b><big>Kommandoalias</big></b><br>\n"
 "\tEit kommandoalias er ei liste over éin eller fleire kommandoar (eventuelt med parametrar), katalogar eller\n"
 "\tandre kommandoaliaser. Det må ha eit enkelt namn (kan berre innehalda store bokstavar, tall og\n"
 "\tunderstrek), og vil \n"
 "\tderetter brukast for alle kommandoar i dette aliaset. Ein kommando kan eventuelt ha éin eller fleire\n"
 "\tparametrar. I så fall kan brukarar berre køyra kommandoen med desse parametrane. Viss eit \n"
 "\tkatalognavn vert angjeve, kan alle kommandoar i denne katalogen køyrast.  \n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. Single Command Alias Help 2/4
@@ -1109,14 +1013,12 @@
 msgid ""
 "To remove command from the alias, select appropriate entry from the table, and click on\n"
 "\t<b>Remove</b> button. To finish the configuration, click <b>OK</b>.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 msgstr ""
 "For å fjerne ein kommando frå aliaset, vel den aktuelle oppføringen i tabellen, og klikk på\n"
 "\t<b>Fjerne</b>-knappen. Klikk <b>OK</b> for å fullføra konfigurasjonen.\n"
-"\t</p>"
-"\n"
+"\t</p>\n"
 "\t"
 
 #. if(issubstring(line[3]:"","NOPASSWD:")) {

Modified: branches/plus-SLE12-SP2/yast/nn/po/support.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/support.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/support.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: opensuse-i 18n\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 17:00+0200\n"
 "PO-Revision-Date: 2014-05-19 09:35+0200\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -34,52 +34,52 @@
 msgstr ""
 
 #. Command line parameters dialog caption
-#: src/include/support/dialogs.rb:50
+#: src/include/support/dialogs.rb:46
 msgid "Supportconfig Overview Dialog"
 msgstr ""
 
 #. Support configure1 dialog contents
-#: src/include/support/dialogs.rb:57
+#: src/include/support/dialogs.rb:53
 msgid "Open SUSE Support Center"
 msgstr ""
 
-#: src/include/support/dialogs.rb:62
+#: src/include/support/dialogs.rb:58
 msgid "This will start a browser connecting to the SUSE Support Center Portal."
 msgstr ""
 
-#: src/include/support/dialogs.rb:72
+#: src/include/support/dialogs.rb:68
 msgid "Open"
 msgstr ""
 
-#: src/include/support/dialogs.rb:83
+#: src/include/support/dialogs.rb:79
 msgid "Collect Data"
 msgstr ""
 
-#: src/include/support/dialogs.rb:88
+#: src/include/support/dialogs.rb:84
 msgid "This will create a tarball containing the collected log files."
 msgstr ""
 
-#: src/include/support/dialogs.rb:100
+#: src/include/support/dialogs.rb:96
 msgid "Create report tarball"
 msgstr ""
 
-#: src/include/support/dialogs.rb:112
+#: src/include/support/dialogs.rb:108
 msgid "Upload Data"
 msgstr ""
 
-#: src/include/support/dialogs.rb:116
+#: src/include/support/dialogs.rb:112
 msgid "This will upload the collected logs to the specified URL."
 msgstr ""
 
-#: src/include/support/dialogs.rb:123
+#: src/include/support/dialogs.rb:119
 msgid "Upload"
 msgstr ""
 
-#: src/include/support/dialogs.rb:153
+#: src/include/support/dialogs.rb:149
 msgid "Could not find any installed browser."
 msgstr ""
 
-#: src/include/support/dialogs.rb:163
+#: src/include/support/dialogs.rb:159
 msgid ""
 "YaST will run a Web browser as superuser. Consider\n"
 "running it as a non-provileged user and entering the URL\n"
@@ -87,281 +87,261 @@
 "Start Web browser?\n"
 msgstr ""
 
-#: src/include/support/dialogs.rb:205
+#: src/include/support/dialogs.rb:201
 msgid "Supportconfig Upload Dialog"
 msgstr ""
 
 #. Support configure1 dialog contents
-#: src/include/support/dialogs.rb:230
+#: src/include/support/dialogs.rb:226
 msgid "Save as"
 msgstr ""
 
-#: src/include/support/dialogs.rb:233
+#: src/include/support/dialogs.rb:229
 msgid "Directory to Save"
 msgstr ""
 
-#: src/include/support/dialogs.rb:243
+#: src/include/support/dialogs.rb:239
 msgid "Package with log files"
 msgstr ""
 
-#: src/include/support/dialogs.rb:257
+#: src/include/support/dialogs.rb:253
 msgid "Upload log files tarball to URL"
 msgstr ""
 
-#: src/include/support/dialogs.rb:259 src/include/support/dialogs.rb:760
+#: src/include/support/dialogs.rb:255 src/include/support/dialogs.rb:756
 msgid "Upload Target"
 msgstr ""
 
 #. }
-#: src/include/support/dialogs.rb:331
+#: src/include/support/dialogs.rb:327
 msgid "Cannot write settings"
 msgstr ""
 
-#: src/include/support/dialogs.rb:347
+#: src/include/support/dialogs.rb:343
 msgid "Cannot write settings."
 msgstr ""
 
-#: src/include/support/dialogs.rb:393
+#: src/include/support/dialogs.rb:389
 msgid "Choose Directory Where to Save Tarball"
 msgstr ""
 
 #. Support::log_files["tmp_dir"]=save_dir;
-#: src/include/support/dialogs.rb:405
+#: src/include/support/dialogs.rb:401
 msgid "Choose Log Files Tarball File"
 msgstr ""
 
 #. Command line parameters dialog caption
-#: src/include/support/dialogs.rb:425
+#: src/include/support/dialogs.rb:421
 msgid "Supportconfig Parameters Configuration"
 msgstr ""
 
-#: src/include/support/dialogs.rb:430
+#: src/include/support/dialogs.rb:426
 msgid "Create a full file listing from '/'"
 msgstr ""
 
-#: src/include/support/dialogs.rb:435
+#: src/include/support/dialogs.rb:431
 msgid "Exclude detailed disk info and scans"
 msgstr ""
 
-#: src/include/support/dialogs.rb:440
+#: src/include/support/dialogs.rb:436
 msgid "Search root filesystem for eDirectory instances"
 msgstr ""
 
-#: src/include/support/dialogs.rb:445
+#: src/include/support/dialogs.rb:441
 msgid "Include full SLP service lists"
 msgstr ""
 
-#: src/include/support/dialogs.rb:450
+#: src/include/support/dialogs.rb:446
 msgid "Performs an rpm -V for each installed rpm"
 msgstr ""
 
-#: src/include/support/dialogs.rb:455
+#: src/include/support/dialogs.rb:451
 msgid "Include all log file lines, gather additional rotated logs"
 msgstr ""
 
 #. Support configure1 dialog contents
-#: src/include/support/dialogs.rb:469
+#: src/include/support/dialogs.rb:465
 msgid "Use Defaults (ignore /etc/supportconfig.conf)"
 msgstr ""
 
-#: src/include/support/dialogs.rb:476
+#: src/include/support/dialogs.rb:472
 msgid "Activates all support functions"
 msgstr ""
 
-#: src/include/support/dialogs.rb:483
+#: src/include/support/dialogs.rb:479
 msgid "Only gather a minimum amount of info"
 msgstr ""
 
-#: src/include/support/dialogs.rb:491
+#: src/include/support/dialogs.rb:487
 msgid "Use Custom (Expert) Settings"
 msgstr ""
 
-#: src/include/support/dialogs.rb:493
+#: src/include/support/dialogs.rb:489
 msgid "Expert Settings"
 msgstr ""
 
-#: src/include/support/dialogs.rb:499
+#: src/include/support/dialogs.rb:495
 msgid "Options"
 msgstr ""
 
 #. Support overview dialog caption
-#: src/include/support/dialogs.rb:588
+#: src/include/support/dialogs.rb:584
 msgid "Supportconfig Expert Configuration"
 msgstr ""
 
 #. FIXME table header
-#: src/include/support/dialogs.rb:618
+#: src/include/support/dialogs.rb:614
 msgid "Default Options"
 msgstr ""
 
 #. Support configure2 dialog caption
-#: src/include/support/dialogs.rb:684
+#: src/include/support/dialogs.rb:680
 msgid "Supportconfig Contact Configuration"
 msgstr ""
 
 #. Support configure2 dialog contents
-#: src/include/support/dialogs.rb:689
+#: src/include/support/dialogs.rb:685
 msgid "Contact Information"
 msgstr ""
 
-#: src/include/support/dialogs.rb:694
+#: src/include/support/dialogs.rb:690
 msgid "Company"
 msgstr ""
 
-#: src/include/support/dialogs.rb:705
+#: src/include/support/dialogs.rb:701
 msgid "Email Address"
 msgstr ""
 
-#: src/include/support/dialogs.rb:712
+#: src/include/support/dialogs.rb:708
 msgid "Name"
 msgstr ""
 
-#: src/include/support/dialogs.rb:719
+#: src/include/support/dialogs.rb:715
 msgid "Phone Number"
 msgstr ""
 
-#: src/include/support/dialogs.rb:726
+#: src/include/support/dialogs.rb:722
 msgid "Store ID"
 msgstr ""
 
-#: src/include/support/dialogs.rb:737
+#: src/include/support/dialogs.rb:733
 msgid "Terminal ID"
 msgstr ""
 
-#: src/include/support/dialogs.rb:748
+#: src/include/support/dialogs.rb:744
 msgid "GPG UID"
 msgstr ""
 
-#: src/include/support/dialogs.rb:755
+#: src/include/support/dialogs.rb:751
 msgid "Upload Information"
 msgstr ""
 
-#: src/include/support/dialogs.rb:774
+#: src/include/support/dialogs.rb:770
 msgid "11-digit service request number"
 msgstr ""
 
 #. abort?
-#: src/include/support/dialogs.rb:851
+#: src/include/support/dialogs.rb:847
 msgid "The SR number must be 11 digits"
 msgstr ""
 
-#: src/include/support/dialogs.rb:869
+#: src/include/support/dialogs.rb:865
 msgid "Collecting Data"
 msgstr ""
 
-#: src/include/support/dialogs.rb:870
+#: src/include/support/dialogs.rb:866
 msgid "Progress"
 msgstr ""
 
-#. Remove ANSI escape codes for cursor movement (bnc#921233)
-#: src/include/support/dialogs.rb:939
+#: src/include/support/dialogs.rb:931
 msgid "Collected Data Review"
 msgstr ""
 
 #. FIXME use list of generated files, as well as directory prefix
 #. `MultiLineEdit (`id (`file), `opt (`read_only), _("File Contents"))
-#: src/include/support/dialogs.rb:986 src/include/support/dialogs.rb:1034
+#: src/include/support/dialogs.rb:978 src/include/support/dialogs.rb:1026
 msgid "File Name"
 msgstr ""
 
-#: src/include/support/dialogs.rb:992
+#: src/include/support/dialogs.rb:984
 msgid "Remove from Data"
 msgstr ""
 
 #. Read dialog help 1/2
 #: src/include/support/helps.rb:36
 msgid ""
-"<p><b><big>Initializing Support Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Initializing Support Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
 
 #. Read dialog help 2/2
 #: src/include/support/helps.rb:40
 msgid ""
-"<p><b><big>Aborting Initialization:</big></b><br>"
-"\n"
-"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
-"\n"
+"<p><b><big>Aborting Initialization:</big></b><br>\n"
+"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>\n"
 msgstr ""
 
 #. Write dialog help 1/2
 #: src/include/support/helps.rb:44
 msgid ""
-"<p><b><big>Saving Support Configuration</big></b><br>"
-"\n"
-"</p>"
-"\n"
+"<p><b><big>Saving Support Configuration</big></b><br>\n"
+"</p>\n"
 msgstr ""
 
 #. Write dialog help 2/2
 #: src/include/support/helps.rb:48
 msgid ""
-"<p><b><big>Aborting Saving:</big></b><br>"
-"\n"
+"<p><b><big>Aborting Saving:</big></b><br>\n"
 "Abort the save procedure by pressing <b>Abort</b>.\n"
 "An additional dialog informs whether it is safe to do so.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 
 #. Summary dialog help 1/3
 #: src/include/support/helps.rb:55
 msgid ""
-"<p><b><big>Support Configuration</big></b><br>"
-"\n"
-"Configure support here.<br>"
-"</p>"
-"\n"
+"<p><b><big>Support Configuration</big></b><br>\n"
+"Configure support here.<br></p>\n"
 msgstr ""
 
 #. Summary dialog help 2/3
 #: src/include/support/helps.rb:59
 msgid ""
-"<p><b><big>Adding a support:</big></b><br>"
-"\n"
+"<p><b><big>Adding a support:</big></b><br>\n"
 "Choose a support from the list of detected supports.\n"
 "If your support was not detected, use <b>Other (not detected)</b>.\n"
-"Then press <b>Configure</b>.</p>"
-"\n"
+"Then press <b>Configure</b>.</p>\n"
 msgstr ""
 
 #. Summary dialog help 3/3
 #: src/include/support/helps.rb:66
 msgid ""
-"<p><b><big>Editing or Deleting:</big></b><br>"
-"\n"
+"<p><b><big>Editing or Deleting:</big></b><br>\n"
 "If you press <b>Edit</b>, an additional dialog in which to change\n"
-"the configuration opens.</p>"
-"\n"
+"the configuration opens.</p>\n"
 msgstr ""
 
 #. Ovreview dialog help 1/3
 #: src/include/support/helps.rb:72
 msgid ""
 "\n"
-"<p><b><big>Opening SUSE Support Center</big></b><br>"
-"\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"
+"the Service Request number to include in the supportconfig data upload.</p>\n"
 msgstr ""
 
 #. Ovreview dialog help 2/3
 #: src/include/support/helps.rb:80
 msgid ""
-"<p><b><big>Collecting Data</big></b><br>"
-"\n"
+"<p><b><big>Collecting Data</big></b><br>\n"
 "To run the supportconfig data collection tool, use <b>Collect Data</b></p>"
 msgstr ""
 
 #. Ovreview dialog help 3/3
 #: src/include/support/helps.rb:84
 msgid ""
-"<p><b><big>Uploading Collected Data</big></b><br>"
-"\n"
+"<p><b><big>Uploading Collected Data</big></b><br>\n"
 "To upload the data already collected to a server, use <b>Upload Data</b>.\n"
 "The server may or may not be Global Technical Support.</p>"
 msgstr ""
@@ -369,8 +349,7 @@
 #. Configure1 dialog help 1/3
 #: src/include/support/helps.rb:90
 msgid ""
-"<p><b><big>Supportconfig Options</big></b><br>"
-"\n"
+"<p><b><big>Supportconfig Options</big></b><br>\n"
 "Select an option to override the defaults. You can use the default settings,\n"
 "gather the most data or only gather a minimum amount of data."
 msgstr ""
@@ -378,36 +357,30 @@
 #. Configure1 dialog help 2/3
 #: src/include/support/helps.rb:96
 msgid ""
-"<p><b><big>Expert Settings</big></b><br>"
-"\n"
+"<p><b><big>Expert Settings</big></b><br>\n"
 "Select <b>Use Custom</b> and click the <b>Expert Settings</b> button\n"
-"to select specific data sets to collect.</p>"
-"\n"
+"to select specific data sets to collect.</p>\n"
 msgstr ""
 
 #. Configure1 dialog help 3/3
 #: src/include/support/helps.rb:102
 msgid ""
-"<p><b><big>Options</big></b><br>"
-"\n"
+"<p><b><big>Options</big></b><br>\n"
 "Collect additional information. Usually these options are not\n"
-"necessary, but can be included if circumstances require more information.</p>"
-"\n"
+"necessary, but can be included if circumstances require more information.</p>\n"
 msgstr ""
 
 #. Expert dialog help 1/1
 #: src/include/support/helps.rb:108
 msgid ""
-"<p><big><b>Default Options</b></big><br>"
-"\n"
+"<p><big><b>Default Options</b></big><br>\n"
 "Select or deselect each of the data sets you would like to include in the supportconfig tarball.</p>"
 msgstr ""
 
 #. Contact dialog help 1/4
 #: src/include/support/helps.rb:112
 msgid ""
-"<p><big><b>Contact Information</b></big><br>"
-"\n"
+"<p><big><b>Contact Information</b></big><br>\n"
 "Fill in each of the contact information fields that you would like to include\n"
 "in the supportconfig tarball. The fields are saved in the basic-environment.txt file.</p>"
 msgstr ""
@@ -415,8 +388,7 @@
 #. Contact dialog help 2/4
 #: src/include/support/helps.rb:118
 msgid ""
-"<p><b><big>Upload Information</big></b><br>"
-"\n"
+"<p><b><big>Upload Information</big></b><br>\n"
 "The upload target is the supportconfig tarball's destination URI. Supported upload services include\n"
 "ftp, http, https, scp. If you need to include the supportconfig tarball filename in your upload target,\n"
 "use the <i>tarball</i> keyword. This will get replaced with the actual tarball filename.\n"
@@ -426,12 +398,9 @@
 #. Contact dialog help 3/4
 #: src/include/support/helps.rb:126
 msgid ""
-"<p><b><big>Upload Target Examples</big></b><br>"
-"\n"
-"https://secure-www.novell.com/upload?appname=supportconfig&file=<i>tarball</i><br>"
-"\n"
-"ftp://ftp.novell.com/incoming<br>"
-"\n"
+"<p><b><big>Upload Target Examples</big></b><br>\n"
+"https://secure-www.novell.com/upload?appname=supportconfig&file=<i>tarball</i><br>\n"
+"ftp://ftp.novell.com/incoming<br>\n"
 "scp://central.server.foo.com/supportconfig/archives</p>"
 msgstr ""
 
@@ -445,85 +414,67 @@
 #. Collecting data dialkog help 1/1
 #: src/include/support/helps.rb:137
 msgid ""
-"<p><b><big>Collecting Data</big></b>><br>"
-"\n"
-"Data is being collected.</p>"
-"\n"
+"<p><b><big>Collecting Data</big></b>><br>\n"
+"Data is being collected.</p>\n"
 msgstr ""
 
 #. Data review dialog help 1/1
 #: src/include/support/helps.rb:141
 msgid ""
-"<p><b><big>Collected Data Review</big></b><br>"
-"\n"
+"<p><b><big>Collected Data Review</big></b><br>\n"
 "Review the data collected by supportconfig. If you do not want to share some of the collected data,\n"
-"use <b>Remove from Data</b> and the selected file will be removed.</p>"
-"\n"
+"use <b>Remove from Data</b> and the selected file will be removed.</p>\n"
 msgstr ""
 
 #. Configure1 dialog help 1/3
 #: src/include/support/helps.rb:148
 msgid ""
-"<p><b><big>Upload supportconfig tarball to Global Technical Support</big></b><br>"
-"\n"
+"<p><b><big>Upload supportconfig tarball to Global Technical Support</big></b><br>\n"
 "If you want to store a copy of the supportconfig tarball, select the target\n"
 "directory and make sure that this option is checked.\n"
-"<br>"
-"</p>"
-"\n"
+"<br></p>\n"
 msgstr ""
 
 #. Configure1 dialog help 2/3
 #. Configure1 dialog help 2/3
 #: src/include/support/helps.rb:155 src/include/support/helps.rb:180
 msgid ""
-"<p><b><big>Upload URL</big></b><br>"
-"\n"
+"<p><b><big>Upload URL</big></b><br>\n"
 "This option has the location to which the supportconfig tarball will be uploaded\n"
 "as default value.\n"
 "Change this value only in special cases.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 
 #. Configure1 dialog help 3/3, %1 is a URL
 #. Configure1 dialog help 3/3
 #: src/include/support/helps.rb:164 src/include/support/helps.rb:189
 msgid ""
-"<p><b><big>Privacy Policy</big></b><br>"
-"\n"
+"<p><b><big>Privacy Policy</big></b><br>\n"
 "Find SUSE's privacy policy at\n"
-"<i>%1</i>.</p>"
-"\n"
+"<i>%1</i>.</p>\n"
 msgstr ""
 
 #: src/include/support/helps.rb:173
 msgid ""
-"<p><b><big>Upload supportconfig tarball to Global Technical Support</big></b><br>"
-"\n"
+"<p><b><big>Upload supportconfig tarball to Global Technical Support</big></b><br>\n"
 "If you have already created the supportconfig tarball, write the full path\n"
 "into the <i>Package with log files</i> field.\n"
-"<br>"
-"</p>"
-"\n"
+"<br></p>\n"
 msgstr ""
 
 #. Configure2 dialog help 1/2
 #: src/include/support/helps.rb:198
 msgid ""
-"<p><b><big>Configuration Part Two</big></b><br>"
-"\n"
+"<p><b><big>Configuration Part Two</big></b><br>\n"
 "Press <b>Next</b> to continue.\n"
-"<br>"
-"</p>"
-"\n"
+"<br></p>\n"
 msgstr ""
 
 #. Configure2 dialog help 2/2
 #: src/include/support/helps.rb:204
 msgid ""
-"<p><b><big>Selecting Something</big></b><br>"
-"\n"
+"<p><b><big>Selecting Something</big></b><br>\n"
 "It is not possible. You must code it first. :-)\n"
 "</p>"
 msgstr ""

Modified: branches/plus-SLE12-SP2/yast/nn/po/sysconfig.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/sysconfig.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/sysconfig.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -363,13 +363,11 @@
 msgid ""
 "<p>After you save your changes, this editor changes the variables in the\n"
 "corresponding sysconfig file. Then it starts activation commands, which changes the underlying configuration files, stops and starts daemons,\n"
-"and runs low-level configuration tools so your configuration in sysconfig takes effect.</p>"
-"\n"
+"and runs low-level configuration tools so your configuration in sysconfig takes effect.</p>\n"
 msgstr ""
 "<p>Når du lagrar endringane, vil redigeringsverktøyet endra variablane i den \n"
 "tilhøyrande rc.config-fila. Deretter vert køyrd aktiveringskommandoene som endrar dei underliggande konfigurasjonsfilene, stoppar og startar nissar\n"
-"og køyrer grunnleggjande konfigurasjonsverktøy slik at konfigurasjonen i sysconfig vert teken i bruk.</p>"
-"\n"
+"og køyrer grunnleggjande konfigurasjonsverktøy slik at konfigurasjonen i sysconfig vert teken i bruk.</p>\n"
 
 #. helptext for popup - part 2/2
 #: src/include/sysconfig/complex.rb:825
@@ -556,35 +554,23 @@
 #: src/include/sysconfig/helps.rb:17
 #, fuzzy
 msgid ""
-"<p><b><big>Initializing sysconfig Configuration</big></b><br>"
-"\n"
-"Please wait...<br>"
-"</p>"
-"\n"
+"<p><b><big>Initializing sysconfig Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 msgstr ""
-"<p><b><big>Initialiserer sysconfig-konfigurasjon</big></b><br>"
-"\n"
-"Vent…<br>"
-"</p>"
-"\n"
+"<p><b><big>Initialiserer sysconfig-konfigurasjon</big></b><br>\n"
+"Vent…<br></p>\n"
 
 #. Write dialog help
 #: src/include/sysconfig/helps.rb:21
 #, fuzzy
 msgid ""
-"<p><b><big>Saving sysconfig Configuration</big></b><br>"
+"<p><b><big>Saving sysconfig Configuration</big></b><br>\n"
+"Please wait...<br></p>\n"
 "\n"
-"Please wait...<br>"
-"</p>"
-"\n"
-"\n"
 msgstr ""
-"<p><b><big>Lagrar sysconfig-konfigurasjon</big></b><br>"
+"<p><b><big>Lagrar sysconfig-konfigurasjon</big></b><br>\n"
+"Vent…<br></p>\n"
 "\n"
-"Vent…<br>"
-"</p>"
-"\n"
-"\n"
 
 #. Translation: Progress bar label
 #: src/modules/Sysconfig.rb:162
@@ -716,13 +702,11 @@
 #~ 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"
+#~ " it will not touch it.</p>\n"
 #~ msgstr ""
 #~ "<p> SuSEconfig lagrar ein kontrollsum for kvar konfigurasjonsfil for å kunne sjå om \n"
 #~ "du har endra nokon av dei manuelt.  Viss du har endra ein konfigurasjonsfil manuelt,\n"
-#~ "vil han ikkje endrast.</p>"
-#~ "\n"
+#~ "vil han ikkje endrast.</p>\n"
 
 #, fuzzy
 #~ msgid "All configuration scripts will be started."

Modified: branches/plus-SLE12-SP2/yast/nn/po/tftp-server.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/tftp-server.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/tftp-server.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -3,7 +3,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2015-09-09 16:26+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"
@@ -94,14 +94,12 @@
 "<p><b>Boot Image Directory</b>:\n"
 "Specify the directory where served files are located. The usual value is\n"
 "<tt>/tftpboot</tt>. The directory will be created if it does not exist. \n"
-"The server uses this as its root directory (using the <tt>-s</tt> option).</p>"
-"\n"
+"The server uses this as its root directory (using the <tt>-s</tt> option).</p>\n"
 msgstr ""
 "<p><b>Mappe for oppstartsdiskbilete</b>:\n"
 "Vel mappa som inneheld tenarfilene. Dette er vanlegvis\n"
 "<tt>/tftpboot</tt>. Ho vert oppretta dersom ho ikke alt finst. \n"
-"Tenaren vil bruka mappa som rotmappe (<tt>-s</tt>-valet).</p>"
-"\n"
+"Tenaren vil bruka mappa som rotmappe (<tt>-s</tt>-valet).</p>\n"
 
 #. Radio button label, disable TFTP server
 #: src/include/tftp-server/dialogs.rb:115

Modified: branches/plus-SLE12-SP2/yast/nn/po/timezone_db.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/timezone_db.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/timezone_db.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -305,19 +305,22 @@
 msgstr "Kroatia"
 
 #. time zone
-#: timezone/src/data/timezone_raw.ycp:93 timezone/src/data/timezone_raw.ycp:882
+#: timezone/src/data/timezone_raw.ycp:93
+#: timezone/src/data/timezone_raw.ycp:882
 #, fuzzy
 msgid "Iceland"
 msgstr "Island"
 
 #. time zone
-#: timezone/src/data/timezone_raw.ycp:95 timezone/src/data/timezone_raw.ycp:878
+#: timezone/src/data/timezone_raw.ycp:95
+#: timezone/src/data/timezone_raw.ycp:878
 #, fuzzy
 msgid "Azores"
 msgstr "Azorene"
 
 #. time zone
-#: timezone/src/data/timezone_raw.ycp:97 timezone/src/data/timezone_raw.ycp:880
+#: timezone/src/data/timezone_raw.ycp:97
+#: timezone/src/data/timezone_raw.ycp:880
 #, fuzzy
 msgid "Canary Islands"
 msgstr "Kanariøyene"

Modified: branches/plus-SLE12-SP2/yast/nn/po/tune.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/tune.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/tune.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -59,12 +59,10 @@
 #, fuzzy
 msgid ""
 "<P>The <B>Hardware Information</B> module displays the hardware\n"
-"details of your computer. Click any node for more information.</p>"
-"\n"
+"details of your computer. Click any node for more information.</p>\n"
 msgstr ""
 "<P>Modulen <B>Maskinvareinformasjon</B> viser informasjon om \n"
-"maskinvaren i systemet. Klikk på ein oppføring for å få meir informasjon.</p>"
-"\n"
+"maskinvaren i systemet. Klikk på ein oppføring for å få meir informasjon.</p>\n"
 
 #: src/clients/hwinfo.rb:338
 #, fuzzy
@@ -1254,23 +1252,19 @@
 #: src/include/hwinfo/system_settings_dialogs.rb:118
 #, fuzzy
 msgid ""
-"<p><b><big>Global I/O Scheduler</big></b><br>"
-"\n"
+"<p><b><big>Global I/O Scheduler</big></b><br>\n"
 "Select the algorithm which orders and sends commands to disk\n"
 "devices. This is a global option, it will be used for all disk devices in the\n"
 "system. If the option is not configured, the default scheduler (usually 'cfq')\n"
 "will be used. See the documentation in the /usr/src/linux/Documentation/block\n"
-"directory (package kernel-source) for more information.</p>"
-"\n"
+"directory (package kernel-source) for more information.</p>\n"
 msgstr ""
-"<p><b><big>Globalt I/O-skjema</big></b><br>"
-"\n"
+"<p><b><big>Globalt I/O-skjema</big></b><br>\n"
 "Det er mogleg å velja algoritmen som sorterer og sender kommandoar til diskenheter.\n"
 "Dette er eit globalt val, og vil brukast for alle diskenheter i\n"
 "systemet. Viss valet ikkje er konfigurert, vil standardskjemaet (normalt 'cfq')\n"
 "brukast. Dokumentasjonen i katalogen /usr/src/linux/Documentation/block\n"
-"(pakka kernel-source) inneheld meir informasjon.</p>"
-"\n"
+"(pakka kernel-source) inneheld meir informasjon.</p>\n"
 
 #. .sysconfig.sysctl
 #: src/include/hwinfo/system_settings_dialogs.rb:130
@@ -1282,23 +1276,19 @@
 #: src/include/hwinfo/system_settings_dialogs.rb:134
 #, fuzzy
 msgid ""
-"<p><b><big>Enable SysRq Keys</big></b><br>"
-"\n"
+"<p><b><big>Enable SysRq Keys</big></b><br>\n"
 "If you enable SysRq keys, you will have some control over the system even if it\n"
 "crashes (such as during kernel debugging). If it is enabled, the key combination\n"
 "Alt-SysRq- will start the respective command (e.g. reboot the\n"
 "computer, dump kernel information). For further information, see\n"
-"<tt>/usr/src/linux/Documentation/sysrq.txt</tt> (package kernel-source).</p>"
-"\n"
+"<tt>/usr/src/linux/Documentation/sysrq.txt</tt> (package kernel-source).</p>\n"
 msgstr ""
-"<p><b><big>Aktivar SysRq-tastar</big></b><br>"
-"\n"
+"<p><b><big>Aktivar SysRq-tastar</big></b><br>\n"
 "Viss du aktiverer SysRq-tastar, vil du ha ei viss grad av kontroll over systemet sjølv\n"
 "etter eit havari (t.d. under feilsøking av kjernen). Viss dette valet er aktivert, vil tastekombinasjonen\n"
 "Alt-SysRq-<kommandotast> starta den aktuelle kommandoen (t.d. omstart av\n"
 "datamaskina eller dumping av kjerneinformasjon). Du finn meir informasjon i\n"
-"<tt>/usr/src/linux/Documentation/sysrq.txt</tt> (pakka kernel-source).</p>"
-"\n"
+"<tt>/usr/src/linux/Documentation/sysrq.txt</tt> (pakka kernel-source).</p>\n"
 
 #. Short sleep between reads or writes
 #: src/include/hwinfo/system_settings_ui.rb:29
@@ -1336,12 +1326,10 @@
 #: src/include/hwinfo/system_settings_ui.rb:42
 #, fuzzy
 msgid ""
-"<p><b><big>Reading the Configuration</big></b><br>"
-"\n"
+"<p><b><big>Reading the Configuration</big></b><br>\n"
 "Please wait...</p>"
 msgstr ""
-"<p><b><big>Les konfigurasjon</big></b><br>"
-"\n"
+"<p><b><big>Les konfigurasjon</big></b><br>\n"
 "Vent…</p>"
 
 #. I have to admit that this is very ugly but it is here
@@ -1376,12 +1364,10 @@
 #: src/include/hwinfo/system_settings_ui.rb:82
 #, fuzzy
 msgid ""
-"<p><b><big>Saving the Configuration</big></b><br>"
-"\n"
+"<p><b><big>Saving the Configuration</big></b><br>\n"
 "Please wait...</p>"
 msgstr ""
-"<p><b><big>Lagrar konfigurasjon</big></b><br>"
-"\n"
+"<p><b><big>Lagrar konfigurasjon</big></b><br>\n"
 "Vent…</p>"
 
 #. group by CPU names, strip possible white space (see bnc#803000)

Modified: branches/plus-SLE12-SP2/yast/nn/po/update.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/update.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/update.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 17:00+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -83,46 +83,36 @@
 #, fuzzy
 msgid ""
 "<p>To avoid any loss of information during update,\n"
-"create a <b>backup</b> prior to updating.</p>"
-"\n"
+"create a <b>backup</b> prior to updating.</p>\n"
 msgstr ""
 "<p>For å unngå tap av data under oppgradering\n"
-"kan du oppretta ein <b>sikkerhetskopi</b> før oppgraderingen.</p>"
-"\n"
+"kan du oppretta ein <b>sikkerhetskopi</b> før oppgraderingen.</p>\n"
 
 #. help text for backup dialog during update 2/7
 #: src/clients/inst_backup.rb:98
 #, fuzzy
 msgid ""
 "<p><b>Warning:</b> This will not be a complete\n"
-"backup. Only modified files will be saved.</p>"
-"\n"
+"backup. Only modified files will be saved.</p>\n"
 msgstr ""
 "<p><b>Advarsel:</b> Dette er ikkje ein fullt\n"
-"sikkerhetskopi. Berre endra filer vil lagrast.</p>"
-"\n"
+"sikkerhetskopi. Berre endra filer vil lagrast.</p>\n"
 
 #. help text for backup dialog during update 3/7
 #: src/clients/inst_backup.rb:106
 #, fuzzy
-msgid ""
-"<p>Select the desired options.</p>"
-"\n"
-msgstr ""
-"<p>Vel alternativ.</p>"
-"\n"
+msgid "<p>Select the desired options.</p>\n"
+msgstr "<p>Vel alternativ.</p>\n"
 
 #. help text for backup dialog during update 4/7
 #: src/clients/inst_backup.rb:112
 #, fuzzy
 msgid ""
 "<p><b>Create a Backup of Modified Files:</b>\n"
-"Stores only those modified files that will be replaced during update.</p>"
-"\n"
+"Stores only those modified files that will be replaced during update.</p>\n"
 msgstr ""
 "<p><b>Opprett ein sikkerhetskopi av endra filer:</b>\n"
-"Lagrar endra filer som vert erstatta under oppgraderingen.</p>"
-"\n"
+"Lagrar endra filer som vert erstatta under oppgraderingen.</p>\n"
 
 #. help text for backup dialog during update 5/7
 #: src/clients/inst_backup.rb:120
@@ -130,13 +120,11 @@
 msgid ""
 "<p><b>Create a Complete Backup of\n"
 "/etc/sysconfig:</b> This covers all configuration files that are part of the\n"
-"sysconfig mechanism, even those that will not be replaced.</p>"
-"\n"
+"sysconfig mechanism, even those that will not be replaced.</p>\n"
 msgstr ""
 "<p><b>Opprett ein fullt sikkerhetskopi av\n"
 "/etc/sysconfig:</b> Dette dekker alle konfigurasjonsfiler som er ein del av\n"
-"sysconfig-systemet, òg filer som ikkje vert erstatta.</p>"
-"\n"
+"sysconfig-systemet, òg filer som ikkje vert erstatta.</p>\n"
 
 #. help text for backup dialog during update 6/7
 #: src/clients/inst_backup.rb:130
@@ -145,14 +133,12 @@
 "<p><b>Remove Old Backups from the Backup\n"
 "Directory:</b> If your current system already is the result of an earlier\n"
 "update, there may be old configuration file backups. Select this option to\n"
-"remove them.</p>"
-"\n"
+"remove them.</p>\n"
 msgstr ""
 "<p><b>Slett gamle sikkerhetskopier frå\n"
 "sikkerhetskopieringskatalogen:</b> Viss dette systemet er oppgradert tidlegare,\n"
 "kan det finnast sikkerhetskopier av konfigurasjonsfilene. Vel dette alternativet for å\n"
-"slette desse.</p>"
-"\n"
+"slette desse.</p>\n"
 
 #. help text for backup dialog during update 7/7
 #: src/clients/inst_backup.rb:142
@@ -253,12 +239,10 @@
 #, fuzzy
 msgid ""
 "<p>The update option offers two different modes. In\n"
-"either case, we recommend to make a backup of your personal data.</p>"
-"\n"
+"either case, we recommend to make a backup of your personal data.</p>\n"
 msgstr ""
 "<p>Oppgraderingsalternativet har to moduser.\n"
-"Uansett rår til vi å sikkerhetskopiere personlege data.</p>"
-"\n"
+"Uansett rår til vi å sikkerhetskopiere personlege data.</p>\n"
 
 #. help text for dialog "update options" 2/4, %1 is a product name
 #: src/clients/inst_update.rb:151
@@ -267,13 +251,11 @@
 "<p><b>With New Software:</b> This default setting\n"
 "updates the existing software and installs all new features and benefits of\n"
 "the new <tt>%1</tt> version. The selection is based on the former predefined\n"
-"software selection.</p>"
-"\n"
+"software selection.</p>\n"
 msgstr ""
 "<p><b>Med ny programvare:</b> Denne standardinnstillingen \n"
 "oppgraderer den eksisterande programvara og installerer alle nye funksjonar og fordeler i den nye <tt>%1</tt> versjonen. Utvalet er basert på det forrige forhåndsdefinerte\n"
-" programvarevalget.</p>"
-"\n"
+" programvarevalget.</p>\n"
 
 #. help text for dialog "update options" 3/4
 #: src/clients/inst_update.rb:164
@@ -282,14 +264,12 @@
 "<p><b>Only Installed Packages:</b> This selection\n"
 "only updates the packages already installed on your system. <i>Note:</i>\n"
 "New software in the predefined software selection, such as new YaST modules, is\n"
-"not available after the update. You might miss new features.</p>"
-"\n"
+"not available after the update. You might miss new features.</p>\n"
 msgstr ""
 "<p><b>Berre installerte pakker:</b> Med dette valet\n"
 "vert berre oppgradert pakker som allereie er installert i systemet. <i>Merk:</i>\n"
 "Ny programvare i det forhåndsdefinerte programvareutvalget, til dømes nye YaST-modular, vil\n"
-"ikkje vera tilgjengelege etter oppgraderingen. Du kan gå glipp av nye funksjonar.</p>"
-"\n"
+"ikkje vera tilgjengelege etter oppgraderingen. Du kan gå glipp av nye funksjonar.</p>\n"
 
 #. help text for dialog "update options" 4/4
 #: src/clients/inst_update.rb:175
@@ -297,13 +277,11 @@
 msgid ""
 "<p>After the update, some software might not\n"
 "function anymore. Activate <b>Delete Unmaintained Packages</b> to delete those\n"
-"packages during the update.</p>"
-"\n"
+"packages during the update.</p>\n"
 msgstr ""
 "<p>Etter oppgraderingen kan det henda at einskilde program\n"
 "ikkje fungerer lengjer. Vel <b>Slett pakkar som ikkje vedlikeholdes</b> for å slette slike\n"
-"pakkar under oppgraderingen.</p>"
-"\n"
+"pakkar under oppgraderingen.</p>\n"
 
 #. warning / question
 #: src/clients/inst_update.rb:231
@@ -446,13 +424,11 @@
 #: src/clients/update_proposal.rb:146
 #, fuzzy
 msgid ""
-"Updating system to another version (%1 -> %2) is not supported on the running system.<br>"
-"\n"
+"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"
 "or disable software repositories of products with different versions.\n"
 msgstr ""
-"Oppgradering til ny versjon (%1 → %2) medan systemet køyrer, vert ikkje støtta.<br>"
-"\n"
+"Oppgradering til ny versjon (%1 → %2) medan systemet køyrer, vert ikkje støtta.<br>\n"
 "Start systemet på nytt frå installasjonsmediumet og val normal oppgradering\n"
 "eller deaktiver pakkebrønner for produkt med andre versjonar."
 
@@ -481,8 +457,7 @@
 "<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"
 "installed as well (default). Decide whether unmaintained packages should be\n"
-"deleted.</p>"
-"\n"
+"deleted.</p>\n"
 msgstr ""
 "<p><b><big>Oppgraderingsvalg</big></b>\n"
 "Her vel du korleis systemet skal oppgraderast.\n"
@@ -545,13 +520,11 @@
 msgid ""
 "<p>\n"
 "Select the partition or system to boot.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel partisjonen eller systemet som skal startast.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. label for selection of root partition (for update)
 #: src/include/update/rootpart.rb:196
@@ -565,13 +538,11 @@
 msgid ""
 "<p>\n"
 "Select the partition or system to update.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel partisjonen eller systemet som skal oppgraderast.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. headline for dialog "Select for update"
 #: src/include/update/rootpart.rb:207
@@ -586,14 +557,12 @@
 "<p>\n"
 "<b>Show All Partitions</b> expands the list to a\n"
 "general overview of your system's partitions.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "<b>Vis alle partisjoner</b> utvidar lista til eit\n"
 "generelt oversyn partisjonene i systemet.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. table header
 #: src/include/update/rootpart.rb:234
@@ -875,20 +844,14 @@
 #: src/modules/RootPart.rb:1428
 #, fuzzy
 msgid ""
-"<b>File system:</b> %1, <b>Type:</b> %2,<br>"
-"\n"
-"<b>Label:</b> %3, <b>Size:</b> %4,<br>"
-"\n"
-"<b>udev IDs:</b> %5,<br>"
-"\n"
+"<b>File system:</b> %1, <b>Type:</b> %2,<br>\n"
+"<b>Label:</b> %3, <b>Size:</b> %4,<br>\n"
+"<b>udev IDs:</b> %5,<br>\n"
 "<b>udev path:</b> %6"
 msgstr ""
-"<b>Filsystem:</b> %1, <b>Type:</b> %2,<br>"
-"\n"
-"<b>Nemning:</b> %3, <b>Storleik:</b> %4,<br>"
-"\n"
-"<b>udev-ID-er:</b> %5,<br>"
-"\n"
+"<b>Filsystem:</b> %1, <b>Type:</b> %2,<br>\n"
+"<b>Nemning:</b> %3, <b>Storleik:</b> %4,<br>\n"
+"<b>udev-ID-er:</b> %5,<br>\n"
 "<b>udev-filsti:</b> %6"
 
 #: src/modules/RootPart.rb:1442

Modified: branches/plus-SLE12-SP2/yast/nn/po/users.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/users.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/users.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -149,719 +149,6 @@
 msgid "Do not ask for missing data; return error instead."
 msgstr "Ikkje be om manglande informasjon; vis feilmelding i staden."
 
-#. caption for dialog "User Authentication Method"
-#. dialog caption
-#: src/clients/inst_auth.rb:115 src/clients/inst_user.rb:137
-#, fuzzy
-msgid "User Authentication Method"
-msgstr "Metode for brukerautentisering"
-
-#. help text for dialog "User Authentication Method" 1/3
-#: src/clients/inst_auth.rb:118
-#, fuzzy
-msgid ""
-"<p>\n"
-"<b>Authentication</b><br>"
-"\n"
-"Select the authentication method to use for users on your system.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"<b>Autentisering</b><br>"
-"\n"
-"Her du kan du velja autentiseringsmetode for brukarar i systemet.\n"
-"</p>"
-
-#. helptext 2/3
-#. help text for dialog "User Authentication Method" 2/2
-#: src/clients/inst_auth.rb:125 src/clients/inst_user_first.rb:164
-#, fuzzy
-msgid "<p>Select <b>Local</b> to authenticate users only by using the local files <i>/etc/passwd</i> and <i>/etc/shadow</i>.</p>"
-msgstr "<p>Vel <b>Lokal</b> viss du vil autentisere brukarar bara ved hjelp av lokale filer <i>/etc/passwd</i> og <i>/etc/shadow</i>.</p>"
-
-#. optional helptext 2.5/3 (local users continued)
-#: src/clients/inst_auth.rb:133
-#, fuzzy
-msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
-msgstr "Viss du har ein annan installasjon eller eit anna system, kan du oppretta brukarar basert på denne kjelda. Vel <b>Les brukerinformasjon frå tidlegare installasjon</b> for å gjera dette. Med dette valet kan du bruka ein eksisterande eller oppretta ein ny hjemmekatalog for kvar brukar på den spesifiserte staden for denne installasjonen."
-
-#. radiobutton to select ldap user auth.
-#: src/clients/inst_auth.rb:141
-#, fuzzy
-msgid "&LDAP"
-msgstr "&LDAP"
-
-#. radiobutton to select nis user auth.
-#: src/clients/inst_auth.rb:143
-#, fuzzy
-msgid "N&IS"
-msgstr "N&IS"
-
-#. radiobutton to select samba user auth.
-#. menubutton label
-#: src/clients/inst_auth.rb:145 src/include/users/widgets.rb:159
-#, fuzzy
-msgid "&Samba"
-msgstr "&Samba"
-
-#. radiobutton to select samba user auth.
-#: src/clients/inst_auth.rb:147
-#, fuzzy
-msgid "&Windows Domain"
-msgstr "&Windows-domane"
-
-#. radiobutton to select local user auth.
-#. radiobutton label
-#: src/clients/inst_auth.rb:151 src/clients/inst_user_first.rb:85
-#, fuzzy
-msgid "L&ocal (/etc/passwd)"
-msgstr "L&okal (/etc/passwd)"
-
-#. radiobutton to select local user auth.
-#. authentication type
-#: src/clients/inst_auth.rb:155 src/clients/users_proposal.rb:48
-#, fuzzy
-msgid "eDirectory LDAP"
-msgstr "eDirectory LDAP"
-
-#. helptext 3/3 -- nis & samba & ldap avialable
-#: src/clients/inst_auth.rb:185
-#, fuzzy
-msgid ""
-"<p>If you are using a NIS or LDAP server to store user data or if you want\n"
-"to authenticate users against an NT server, choose the appropriate value. Then\n"
-"press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Viss du brukar ein NIS- eller LDAP-servar til lagring av brukerdata eller viss du vil\n"
-"autentisere brukarar mot ein NT-servar, vel det aktuelle verdet. Trykk deretter\n"
-"<b>Neste</b>, og hald med fram klientkonfigurasjonen.</p>"
-
-#. helptext 3/3 -- nis & ldap avialable
-#: src/clients/inst_auth.rb:195
-#, fuzzy
-msgid ""
-"<p>If you are using a NIS or LDAP server to store user data, choose the\n"
-"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Viss du brukar ein NIS- eller LDAP-servar til lagring av brukerdata, vel det\n"
-"aktuelle verdet. Trykk deretter <b>Neste</b>, og hald med fram klientkonfigurasjonen.</p>"
-
-#. helptext 3/3 -- samba &ldap available
-#: src/clients/inst_auth.rb:205
-#, fuzzy
-msgid ""
-"<p>If you are using an LDAP server to store user data or if you want to\n"
-"authenticate users against an NT server, choose the appropriate value. Then\n"
-"press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Viss du brukar ein LDAP-servar til lagring av brukerdata eller viss du vil\n"
-"autentisere brukarar mot ein NT-servar, vel det aktuelle verdet. Trykk deretter\n"
-"<b>Neste</b>, og hald med fram klientkonfigurasjonen.</p>"
-
-#. helptext 3/3 -- only ldap available
-#: src/clients/inst_auth.rb:215
-#, fuzzy
-msgid ""
-"<p>If you are using an LDAP server to store user data, choose the\n"
-"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-msgstr ""
-"<p>Viss du brukar ein LDAP-servar til lagring av brukerdata, vel det\n"
-"aktuelle verdet. Trykk deretter <b>Neste</b>, og hald med fram klientkonfigurasjonen.</p>"
-
-#. helptext: additional kerberos support
-#: src/clients/inst_auth.rb:225
-#, fuzzy
-msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
-msgstr "<p>Kryss av for <b>Sett opp Kerberos-autentisering</b> for å konfigurera Kerberos etter at du har valt brukerinformasjonskilde.</p>"
-
-#. check box label
-#. check box label
-#: src/clients/inst_auth.rb:240 src/clients/inst_user_first.rb:102
-#, fuzzy
-msgid "&Read User Data from a Previous Installation"
-msgstr "Les b&rukerinformasjon frå ein tidlegare installasjon"
-
-#. button label
-#. button label
-#: src/clients/inst_auth.rb:245 src/clients/inst_user_first.rb:107
-#, fuzzy
-msgid "&Choose"
-msgstr "&Vel"
-
-#. frame title for authentication methods
-#: src/clients/inst_auth.rb:295 src/clients/inst_user_first.rb:136
-#, fuzzy
-msgid "Authentication Method"
-msgstr "Metode for brukerautentisering"
-
-#. check box label
-#: src/clients/inst_auth.rb:303
-#, fuzzy
-msgid "Set Up &Kerberos Authentication"
-msgstr "Sett opp &Kerberos-autentisering"
-
-#. selection box label
-#. selection box label
-#: src/clients/inst_auth.rb:428 src/clients/inst_user_first.rb:507
-#, fuzzy
-msgid "&Select Users to Read"
-msgstr "Vel brukarar som skal le&sjåast"
-
-#. check box label
-#. check box label
-#: src/clients/inst_auth.rb:434 src/clients/inst_user_first.rb:515
-#, fuzzy
-msgid "Select or Deselect &All"
-msgstr "Vel eller vel bort &alle"
-
-#. Title for root-password dialogue
-#. Title for root-password dialogue
-#: src/clients/inst_root.rb:88 src/clients/inst_root_first.rb:57
-#, fuzzy
-msgid "Password for the System Administrator \"root\""
-msgstr "Passord for systemadministratoren \"root\","
-
-#. advise user to remember his new password
-#. advise users to remember their new password
-#: src/clients/inst_root.rb:95 src/clients/inst_root_first.rb:67
-#, fuzzy
-msgid "Do not forget what you enter here."
-msgstr "Ikkje gløym kva du skriv inn her."
-
-#. Label: get password for user root
-#. Label: get password for user root
-#: src/clients/inst_root.rb:101 src/clients/inst_root_first.rb:73
-#, fuzzy
-msgid "&Password for root User"
-msgstr "&Passord for rotbruker"
-
-#. Label: get same password again for verification
-#. Label: get same password again for verification
-#: src/clients/inst_root.rb:109 src/clients/inst_root_first.rb:81
-#, fuzzy
-msgid "Con&firm Password"
-msgstr "B&ekreft passord"
-
-#. text entry label
-#. text entry label
-#: src/clients/inst_root.rb:114 src/clients/inst_root_first.rb:86
-#, fuzzy
-msgid "&Test Keyboard Layout"
-msgstr "&Test tastaturoppsett"
-
-#. push button
-#: src/clients/inst_root.rb:119
-#, fuzzy
-msgid "E&xpert Options..."
-msgstr "A&vanserte alternativ …"
-
-#. help text ( explain what the user "root" is and does ) 1/5
-#. help text ( explain what the user "root" is and does ) 1/5
-#: src/clients/inst_root.rb:124 src/clients/inst_root_first.rb:93
-#, fuzzy
-msgid ""
-"<p>\n"
-"Unlike normal users of the system, who write texts, create\n"
-"graphics, or browse the Internet, the user \"root\" exists on\n"
-"every system and is called into action whenever\n"
-"administrative tasks need to be performed. Only log in as root\n"
-"when you need to be the system administrator.\n"
-"</p>"
-"\n"
-msgstr ""
-"<p>\n"
-"Til skilnad frå vanlege brukarar, som til dømes jobbar med tekst og\n"
-"grafikk eller surfar på nettet, finst brukaren \"root\" i\n"
-"alle system, og må aktiverast kvar gong ei administrativ\n"
-"oppgåve skal utførast. Logg inn som rot når\n"
-"du har behov for å vera systemadministrator, aldri elles.\n"
-"</p>"
-"\n"
-
-#. help text, continued 2/5
-#. help text, continued 2/5
-#: src/clients/inst_root.rb:137 src/clients/inst_root_first.rb:106
-#, fuzzy
-msgid ""
-"<p>\n"
-"Because the root user is equipped with extensive permissions, the password\n"
-"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
-"is recommended. To ensure that the password was entered correctly,\n"
-"reenter it in a second field.\n"
-"</p>"
-"\n"
-msgstr ""
-"<p>\n"
-"Fordi rotbrukeren har omfattande rettar, bør passordet \n"
-"for \"root\" verta med valt omhu. Ein kombinasjon av bokstavar og tall\n"
-"vert rådd til. For å sikre at passordet vart skrive riktig, må det skrivast inn\n"
-"på nytt i det andre feltet.\n"
-"</p>"
-"\n"
-
-#. help text, continued 3/5
-#. help text, continued 3/5
-#: src/clients/inst_root.rb:150 src/clients/inst_root_first.rb:119
-#, fuzzy
-msgid ""
-"<p>\n"
-"All the rules for user passwords apply to the \"root\" password:\n"
-"Distinguish between uppercase and lowercase. A password should have at\n"
-"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
-"</p>"
-"\n"
-msgstr ""
-"<p>\n"
-"Alle regler for brukerpassord gjeld for rotpassordet òg:\n"
-"Skil mellom store og små bokstavar. Eit passord bør bestå av minst 5 teikn,\n"
-"og bør normalt ikkje innehalda bokstavar med aksentar eller tødlar.\n"
-"</p>"
-"\n"
-
-#. help text, continued 5/5
-#. help text, continued 5/5
-#: src/clients/inst_root.rb:164 src/clients/inst_root_first.rb:133
-#, fuzzy
-msgid ""
-"<p>\n"
-"Do not forget this \"root\" password.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"Ikkje gløym dette rotpassordet\n"
-"</p>"
-
-#. additional help text about password
-#. additional help text about password
-#: src/clients/inst_root.rb:176 src/clients/inst_root_first.rb:145
-#, fuzzy
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %1 characters long.</p>"
-msgstr ""
-"<p>Viss du har til føremål å bruka dette passordet til å oppretta sertifikat,\n"
-"må det har ei lengd på minst %1 teikn.</p>"
-
-#. help text for 'test keyboard layout' entry'
-#: src/clients/inst_root.rb:187
-#, fuzzy
-msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
-msgstr "<p>Kontrollar om gjeldande tastaturoppsett er riktig ved å skriva inn tekst i feltet <b>Test tastaturoppsett</b>.</p>"
-
-#. report misspellings of the password
-#. report misspellings of the password
-#. The two group password information do not match
-#. error popup
-#. The two user password information do not match
-#. error popup
-#. The two group password information do not match
-#. error popup
-#: src/clients/inst_root.rb:233 src/clients/inst_root_first.rb:185
-#: src/clients/inst_user_first.rb:688 src/include/users/dialogs.rb:146
-#: src/include/users/dialogs.rb:1247 src/include/users/dialogs.rb:2364
-#, fuzzy
-msgid ""
-"The passwords do not match.\n"
-"Try again."
-msgstr ""
-"Passorda er ikkje identiske.\n"
-"Prøv igjen."
-
-#. #-#-#-#-#  users.rxgettext.pot (PACKAGE VERSION)  #-#-#-#-#
-#. report if user forgot to enter a password
-#. #-#-#-#-#  users.xgettext.pot  #-#-#-#-#
-#. error popup
-#: src/clients/inst_root.rb:243 src/clients/inst_root_first.rb:191
-#: src/modules/UsersSimple.pm:749
-#, fuzzy
-msgid ""
-"No password entered.\n"
-"Try again."
-msgstr ""
-"Passord vart ikkje angjeve.\n"
-"Prøv igjen."
-
-#. yes/no popup question, %1 is a number
-#. yes/no popup question, %1 is a number
-#: src/clients/inst_root.rb:270 src/clients/inst_root_first.rb:224
-#, fuzzy
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %1 characters."
-msgstr ""
-"Viss du har til føremål å oppretta sertifikat,\n"
-"bør passordet ha minst %1 teikn."
-
-#. last part of message popup
-#. last part of message popup
-#. last part of message popup
-#. last part of message popup
-#: src/clients/inst_root.rb:285 src/clients/inst_root_first.rb:239
-#: src/clients/inst_user_first.rb:714 src/include/users/dialogs.rb:1269
-#: src/include/users/dialogs.rb:2391
-#, fuzzy
-msgid "Really use this password?"
-msgstr "Vil du verkeleg bruka dette passordet?"
-
-#. Error msg (yes/no)
-#: src/clients/inst_root.rb:301
-#, fuzzy
-msgid ""
-"The root password could not be set.\n"
-"You might not be able to log in.\n"
-"Try setting it again?\n"
-msgstr ""
-"Eit rotpassord kunne ikkje definerast.\n"
-"Du vil kanskje ikkje kunna logga inn.\n"
-"Vil du freista igjen?\n"
-
-#. help text (shown in the 'busy' situation)
-#: src/clients/inst_user.rb:144
-#, fuzzy
-msgid "Initialization of module for configuration of authentication..."
-msgstr "Initialisering av modul for konfigurasjon av autentisering …"
-
-#. popup label (%1 is package to install)
-#. popup label (%1 is package to install)
-#. popup label (%1 is package to install)
-#: src/clients/inst_user.rb:171 src/clients/inst_user.rb:195
-#: src/include/users/widgets.rb:2450
-#, fuzzy
-msgid ""
-"Package %1 is not installed.\n"
-"Install it now?\n"
-msgstr ""
-"Pakka %1 er ikkje installert.\n"
-"Vil du installera han no?\n"
-
-#. encryption type
-#. encryption type
-#. encryption type
-#. encryption type
-#: src/clients/inst_user_first.rb:89 src/clients/users_proposal.rb:53
-#: src/include/users/helps.rb:52 src/include/users/helps.rb:54
-#, fuzzy
-msgid "DES"
-msgstr "DEI sine"
-
-#. encryption type
-#. encryption type
-#. encryption type
-#: src/clients/inst_user_first.rb:91 src/clients/users_proposal.rb:55
-#: src/include/users/helps.rb:56
-#, fuzzy
-msgid "MD5"
-msgstr "MD5"
-
-#. encryption type
-#. encryption type
-#: src/clients/inst_user_first.rb:93 src/clients/users_proposal.rb:57
-#, fuzzy
-msgid "SHA-256"
-msgstr "SHA-256"
-
-#. encryption type
-#. encryption type
-#: src/clients/inst_user_first.rb:95 src/clients/users_proposal.rb:59
-#, fuzzy
-msgid "SHA-512"
-msgstr "SHA-512"
-
-#. frame label
-#: src/clients/inst_user_first.rb:143
-#, fuzzy
-msgid "Password Encryption Type"
-msgstr "Passordkrypteringstype"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: DES-crypt
-#: src/clients/inst_user_first.rb:149 src/include/users/widgets.rb:513
-#, fuzzy
-msgid "&DES"
-msgstr "&DEI sine"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: MD5-crypt
-#: src/clients/inst_user_first.rb:151 src/include/users/widgets.rb:515
-#, fuzzy
-msgid "&MD5"
-msgstr "&MD5"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: sha256 crypt
-#: src/clients/inst_user_first.rb:153 src/include/users/widgets.rb:520
-#, fuzzy
-msgid "SHA-&256"
-msgstr "SHA-&256"
-
-#. Radio button label: password encryption type
-#. Radio buttons for password encryption: sha512 crypt
-#: src/clients/inst_user_first.rb:155 src/include/users/widgets.rb:528
-#, fuzzy
-msgid "SHA-&512"
-msgstr "SHA-&512"
-
-#. help text for dialog "User Authentication Method" 1/2
-#: src/clients/inst_user_first.rb:162
-#, fuzzy
-msgid ""
-"<p><b>Authentication</b><br>"
-"</p>"
-msgstr "<p><b>Innloggingsinnstillinger</b></p>"
-
-#. Help text for password expert dialog
-#: src/clients/inst_user_first.rb:168
-#, fuzzy
-msgid "<p>Choose a password encryption method for local and system users.</p>"
-msgstr "Krypteringsmetode for passord er %1."
-
-#. Help text for password expert dialog
-#. Help text for password expert dialog 4/5
-#: src/clients/inst_user_first.rb:170 src/include/users/widgets.rb:491
-#, fuzzy
-msgid "<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
-msgstr "<p><b>SHA-512</b> er standard hash-metode. Det vert ikkje rådt til å bruka andre algoritmar dersom det ikkje er naudsynt av kompatibilitetshensyn.</p>"
-
-#. text entry
-#. text entry
-#: src/clients/inst_user_first.rb:223 src/include/users/dialogs.rb:403
-#, fuzzy
-msgid "User's &Full Name"
-msgstr "Det fulle namnet til &brukaren"
-
-#. input field for login name
-#. input field for login name
-#: src/clients/inst_user_first.rb:230 src/include/users/dialogs.rb:433
-#, fuzzy
-msgid "&Username"
-msgstr "&Brukernavn"
-
-#. checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:252 src/include/users/dialogs.rb:470
-#, fuzzy
-msgid "U&se this password for system administrator"
-msgstr "Bru&k dette passordet for systemadministrator"
-
-#. checkbox label
-#. checkbox label
-#: src/clients/inst_user_first.rb:258 src/include/users/dialogs.rb:446
-#, fuzzy
-msgid "Receive S&ystem Mail"
-msgstr "Motta s&ystemmeldinger"
-
-#. checkbox label
-#: src/clients/inst_user_first.rb:261
-#, fuzzy
-msgid "&Automatic Login"
-msgstr "&Automatisk innlogging"
-
-#. dialog caption
-#: src/clients/inst_user_first.rb:283
-#, fuzzy
-msgid "Create New User"
-msgstr "Opprett ny brukar"
-
-#. yes-no popup headline
-#. The user login field is empty, this is allowed if the
-#. system is part of a network with (e.g.) NIS user management.
-#. yes-no popup headline
-#: src/clients/inst_user_first.rb:342 src/include/users/dialogs.rb:1112
-#, fuzzy
-msgid "Empty User Login"
-msgstr "Brukernavn ikkje angjeven"
-
-#. yes-no popup contents
-#. yes-no popup contents
-#: src/clients/inst_user_first.rb:344 src/include/users/dialogs.rb:1114
-#, fuzzy
-msgid ""
-"Leaving the user name empty only makes sense\n"
-"in a network environment with an authentication server.\n"
-"Leave it empty?"
-msgstr ""
-"Å la brukernavnfeltet vera tomt er berre føremålstenleg\n"
-"i nettverksmiljøer som brukar ein autentiseringsserver.\n"
-"Skal feltet vera tomt?"
-
-#. help text for main add user dialog
-#. alternative help text 1/7
-#: src/clients/inst_user_first.rb:450 src/include/users/helps.rb:212
-#, fuzzy
-msgid ""
-"<p>\n"
-"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n"
-"assign to this user account.\n"
-"</p>"
-"\n"
-msgstr ""
-"<p>\n"
-"Angje <b>Det fulle namnet til brukaren</b>, <b>Brukernavn</b> og <b>Passord</b> for\n"
-"denne brukerkontoen.\n"
-"</p>"
-"\n"
-
-#. help text for main add user dialog
-#: src/clients/inst_user_first.rb:453
-#, fuzzy
-msgid ""
-"<p>\n"
-"When entering a password, distinguish between uppercase and\n"
-"lowercase. Passwords should not contain any accented characters or umlauts.\n"
-"</p>"
-"\n"
-msgstr ""
-"<p>\n"
-"Skil mellom store og små bokstavar når du vel passord.\n"
-"Passord må ikkje innehalda bokstavar med aksentar eller tødlar.\n"
-"</p>"
-"\n"
-
-#. help text %1 is encryption type, %2,%3 numbers
-#. help text 2/4 %1 is encryption type, %2,%3 numbers
-#: src/clients/inst_user_first.rb:457 src/include/users/helps.rb:73
-#, fuzzy
-msgid ""
-"<p>\n"
-"With the current password encryption (%1), the password length should be between\n"
-" %2 and %3 characters.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"Med gjeldande passordkryptering (%1) må lengda til passordet vera mellom\n"
-"%2 og %3 teikn.\n"
-"</p>"
-
-#. additional help text about password
-#: src/clients/inst_user_first.rb:467
-#, fuzzy
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %s characters long.</p>"
-msgstr ""
-"<p>Viss du har til føremål å bruka dette passordet til å oppretta sertifikat,\n"
-"må det har ei lengd på minst %1 teikn.</p>"
-
-#. help text for main add user dialog
-#. help text 4/4
-#: src/clients/inst_user_first.rb:472 src/include/users/helps.rb:90
-#, fuzzy
-msgid ""
-"<p>\n"
-"To ensure that the password was entered correctly,\n"
-"repeat it exactly in a second field. Do not forget your password.\n"
-"</p>"
-"\n"
-msgstr ""
-"<p>\n"
-"For å sikre at passordet vart skrive riktig inn\n"
-"må det skrivast inn ein gong til i det andre feltet. Ikkje gløym passordet.\n"
-"</p>"
-"\n"
-
-#. help text for main add user dialog
-#: src/clients/inst_user_first.rb:476
-#, fuzzy
-msgid ""
-"<p>\n"
-"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
-"Do not use uppercase letters in this entry unless you know what you are doing.\n"
-"Usernames have stricter restrictions than passwords. You can redefine the\n"
-"restrictions in the /etc/login.defs file. Read its man page for information.\n"
-"</p>"
-"\n"
-msgstr ""
-"<p>\n"
-"For <b>Brukernavn</b> må bara bokstavar (ingen teikn med aksentar), tall og teiknet <tt>._-</tt> nyttast.\n"
-"Ikkje bruk store bokstavar her viss du ikkje veit nøyaktig kva du gjer.\n"
-"Brukernavn har fleire avgrensingar enn passord. Du kan omdefinera\n"
-"avgrensingane i fila /etc/login.defs. Du finn meir informasjon på manualsiden for fila.\n"
-"</p>"
-"\n"
-
-#. help text for main add user dialog
-#: src/clients/inst_user_first.rb:482
-#, fuzzy
-msgid "<p>Check <b>Use this password for system administrator</b> if the same password as entered for the first user should be used for root.</p>"
-msgstr "   Kryss av for    Bruk dette passordet                             viss same passord som vart angjeve for første brukar, skal verta for nytta rotbrukeren"
-
-#. help text for main add user dialog
-#. these are used only during installation time
-#. help text 4/7 (only during installation)
-#: src/clients/inst_user_first.rb:485 src/include/users/helps.rb:259
-#, fuzzy
-msgid ""
-"<p>\n"
-"The username and password created here are needed to log in and work with your Linux system. With <b>Automatic Login</b> enabled, the login procedure is skipped. This user is logged in automatically.</p>"
-"\n"
-msgstr ""
-"<p>\n"
-"Brukernavnet og passordet som vert her oppretta, vert kravt for å logga på og arbeid med Linux-systemet. Viss <b>Automatisk innlogging</b> vert aktivert, vert Innloggingsprosedyren sløyfa, og denne brukaren vert logga inn automatisk.</p>"
-"\n"
-
-#. help text for main add user dialog
-#. help text 5/7 (only during installation)
-#: src/clients/inst_user_first.rb:489 src/include/users/helps.rb:264
-#, fuzzy
-msgid ""
-"<p>\n"
-"Have mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>"
-"\n"
-msgstr ""
-"<p>\n"
-"E-post til rotbrukeren vil vidaresendast til denne brukaren viss du kryssar av for <b>Motta systemmeldinger</b>.</p>"
-"\n"
-
-#. Dialog for expert user settings: authentication method as well
-#. as password encryption (see fate 302980)
-#. @return true if user accepted expert settings
-#: src/clients/inst_user_first.rb:573
-#, fuzzy
-msgid "Expert Settings"
-msgstr "Avanserte innstillingar"
-
-#. summary label
-#: src/clients/inst_user_first.rb:625
-#, fuzzy
-msgid "The authentication method is local /etc/passwd."
-msgstr "Autentiseringsmetoden er lokal"
-
-#. summary label
-#: src/clients/inst_user_first.rb:628
-#, fuzzy
-msgid "The password encryption method is %s."
-msgstr "Krypteringsmetode for passord er %1."
-
-#. summary label, %s is a single user name or multiple usernames (comma separated)
-#: src/clients/inst_user_first.rb:635
-#, fuzzy
-msgid "User %s will be imported."
-msgid_plural "Users %s will be imported."
-msgstr[0] "Brukaren %1 vil importerast."
-msgstr[1] "Brukaren %1 vil importerast."
-
-#. pushbutton label
-#: src/clients/inst_user_first.rb:650
-#, fuzzy
-msgid "&Change..."
-msgstr "&Endre …"
-
-#. frame label
-#: src/clients/inst_user_first.rb:657
-#, fuzzy
-msgid "Summary"
-msgstr "Sammendrag"
-
-#. yes/no popup question, %s is a number
-#: src/clients/inst_user_first.rb:709
-#, fuzzy
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %s characters."
-msgstr ""
-"Viss du har til føremål å oppretta sertifikat,\n"
-"bør passordet ha minst %1 teikn."
-
 #. translators: command line help text for Users module
 #: src/clients/users.rb:102
 #, fuzzy
@@ -1007,12 +294,6 @@
 msgid "New UID of the user"
 msgstr "Ny UID for brukaren"
 
-#. progress step title
-#: src/clients/users_finish.rb:63
-#, fuzzy
-msgid "Writing Users Configuration..."
-msgstr "Lagrar brukeroppsett …"
-
 #. helptext 1/3
 #: src/clients/users_plugin_ldap_all.rb:105
 #, fuzzy
@@ -1031,18 +312,14 @@
 "<p>\n"
 "The list of attributes is given by the value of \"objectClass\"\n"
 "(which is currently:\n"
-"<br>"
-"%1).\n"
-"</p>"
-"\n"
+"<br>%1).\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Lista over attributt er generert ut frå verdet for \"objectClass\"\n"
 "(som er:\n"
-"<br>"
-"%1).\n"
-"</p>"
-"\n"
+"<br>%1).\n"
+"</p>\n"
 
 #. helptext 3/3
 #: src/clients/users_plugin_ldap_all.rb:122
@@ -1050,13 +327,11 @@
 msgid ""
 "<p>\n"
 "Edit each attribute using <b>Edit</b>. Some attributes \n"
-"could be required, as defined in the user template in the <b>LDAP Client Module</b>.</p>"
-"\n"
+"could be required, as defined in the user template in the <b>LDAP Client Module</b>.</p>\n"
 msgstr ""
 "<p>\n"
 "Rediger kvart enkelt attributt ved å bruka <b>Rediger</b>. Nokre attributt \n"
-"kan vera obligatoriske i samsvar med brukermalen i <b>LDAP-klientmodulen</b>.</p>"
-"\n"
+"kan vera obligatoriske i samsvar med brukermalen i <b>LDAP-klientmodulen</b>.</p>\n"
 
 #. table header 1/2
 #: src/clients/users_plugin_ldap_all.rb:235
@@ -1198,12 +473,10 @@
 #, fuzzy
 msgid ""
 "<p>Define a size limit by specifying the number of 1 KB blocks the\n"
-"user may have on this file system. Additionally, you can define an inode limit specifying the number of inodes the user may have on the file system.</p>"
-"\n"
+"user may have on this file system. Additionally, you can define an inode limit specifying the number of inodes the user may have on the file system.</p>\n"
 msgstr ""
 "<p>Angje ein størrelsesgrense ved å definera mengd 1 kB-blokkar som\n"
-"brukaren kan ha i sitt filsystem. Du kan òg angje ein inode-grense som definerer mengd inoder som brukaren kan nytta i sitt filsystem.</p>"
-"\n"
+"brukaren kan ha i sitt filsystem. Du kan òg angje ein inode-grense som definerer mengd inoder som brukaren kan nytta i sitt filsystem.</p>\n"
 
 #. helptext for quota, cont.
 #: src/clients/users_plugin_quota.rb:105
@@ -1228,12 +501,10 @@
 #, fuzzy
 msgid ""
 "<p>Define a size limit by specifying the number of 1 kB blocks the\n"
-"group may use on this file system. Additionally, you can define an inode limit specifying the number of inodes the group may use on the file system.</p>"
-"\n"
+"group may use on this file system. Additionally, you can define an inode limit specifying the number of inodes the group may use on the file system.</p>\n"
 msgstr ""
 "<p>Angje ein størrelsesgrense ved å definera ei mengd 1 kB-blokkar som\n"
-"gruppa kan bruka på dette filsystemet. Du kan òg definera ein inode-grense i form av ei mengd inoder som gruppa kan bruka på filsystemet.</p>"
-"\n"
+"gruppa kan bruka på dette filsystemet. Du kan òg definera ein inode-grense i form av ei mengd inoder som gruppa kan bruka på filsystemet.</p>\n"
 
 #. helptext for quota, cont.
 #: src/clients/users_plugin_quota.rb:123
@@ -1318,109 +589,6 @@
 msgid "Seconds"
 msgstr "Sekunder"
 
-#. authentication type
-#. type of user/group
-#. (item of list with the headline 'Choose the type of user to add')
-#: src/clients/users_proposal.rb:42 src/include/users/widgets.rb:1365
-#, fuzzy
-msgid "LDAP"
-msgstr "LDAP"
-
-#. authentication type
-#. richtext label
-#: src/clients/users_proposal.rb:44 src/include/users/widgets.rb:136
-#, fuzzy
-msgid "NIS"
-msgstr "NIS"
-
-#. authentication type
-#: src/clients/users_proposal.rb:46
-#, fuzzy
-msgid "Samba (Windows Domain)"
-msgstr "              -domane"
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/clients/users_proposal.rb:69
-#, fuzzy
-msgid "<%1>Root Password<%2> set"
-msgstr "<%1>Rotpassord<%2> definert"
-
-#: src/clients/users_proposal.rb:74
-#, fuzzy
-msgid "<%1>Root Password<%2> not set"
-msgstr "<%1>Rotpassord<%2> ikkje definert"
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/clients/users_proposal.rb:81
-#, fuzzy
-msgid "No <%1>user<%2> configured"
-msgstr "Ingen <%1>nytter<%2> sat opp"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. % is LDAP/NIS etc.
-#: src/clients/users_proposal.rb:93
-#, fuzzy
-msgid "<%1>Authentication method<%2>: %3"
-msgstr "<%1>Autentiseringsmetode<%2>: %3"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. % is LDAP/NIS etc.
-#: src/clients/users_proposal.rb:102
-#, fuzzy
-msgid "<%1>Authentication method<%2>: %3 and Kerberos."
-msgstr "<%1>Autentiseringsmetode<<%2>: %3 og Kerberos."
-
-#. summary line, %3 are user names (comma separated)
-#. <%1>,<%2> are HTML tags, leave untouched,
-#: src/clients/users_proposal.rb:116
-#, fuzzy
-msgid "<%1>Users<%2> %3 selected for import"
-msgstr "<%1>Brukarane<%2> %3 valt for import"
-
-#. summary line,  <%1>,<%2> are HTML tags, %3 user name
-#: src/clients/users_proposal.rb:124
-#, fuzzy
-msgid "<%1>User<%2> %3 will be imported."
-msgstr "<%1>Brukaren<%2> %3 vil importerast."
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is login name
-#: src/clients/users_proposal.rb:134
-#, fuzzy
-msgid "<%1>User<%2> %3 configured"
-msgstr "<%1>Brukaren<%2> %3 definert"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is full name, %4 login name
-#: src/clients/users_proposal.rb:143
-#, fuzzy
-msgid "<%1>User<%2> %3 (%4) configured"
-msgstr "<%1>Brukaren<%2> %3 (%4) definert"
-
-#. summary line
-#: src/clients/users_proposal.rb:156
-#, fuzzy
-msgid "Password Encryption Method: %1"
-msgstr "Passordkrypteringsmetode: %1"
-
-#. rich text label
-#: src/clients/users_proposal.rb:170
-#, fuzzy
-msgid "User Settings"
-msgstr "Brukerinnstillinger"
-
-#. menu button label
-#: src/clients/users_proposal.rb:173
-#, fuzzy
-msgid "&User"
-msgstr "&Brukar"
-
-#. menu button label
-#: src/clients/users_proposal.rb:175
-#, fuzzy
-msgid "&Root Password"
-msgstr "&Rotpassord"
-
 #. password entering label
 #: src/include/users/cmdline.rb:55
 #, fuzzy
@@ -1582,17 +750,13 @@
 msgid ""
 "<p>This could cause problems with delivering mail\n"
 "to this user, because mail systems generally do not\n"
-"support case-sensitive names.<br>"
-"\n"
-"You could solve this problem by editing the alias table.</p>"
-"\n"
+"support case-sensitive names.<br>\n"
+"You could solve this problem by editing the alias table.</p>\n"
 msgstr ""
 "<p>Dette kan forårsaka problem ved levering av e-post\n"
 "til denne brukaren fordi e-postsystemer normalt ikkje\n"
-"støttar at det skilst mellom små og store bokstavar.<br>"
-"\n"
-"Du kan løysa dette problemet ved å redigera alias-tabellen.</p>"
-"\n"
+"støttar at det skilst mellom små og store bokstavar.<br>\n"
+"Du kan løysa dette problemet ved å redigera alias-tabellen.</p>\n"
 
 #. The login name contains uppercase 3/3
 #: src/include/users/dialogs.rb:80
@@ -1612,6 +776,25 @@
 "krypteringsinnstillingene for denne brukaren,\n"
 "må du skriva inn det gjeldande passordet til brukaren."
 
+#. The two user password information do not match
+#. error popup
+#. The two group password information do not match
+#. error popup
+#. report misspellings of the password
+#. The two group password information do not match
+#. error popup
+#: src/include/users/dialogs.rb:146 src/include/users/dialogs.rb:1247
+#: src/include/users/dialogs.rb:2364
+#: src/lib/users/dialogs/inst_root_first.rb:193
+#: src/lib/users/dialogs/inst_user_first.rb:470
+#, fuzzy
+msgid ""
+"The passwords do not match.\n"
+"Try again."
+msgstr ""
+"Passorda er ikkje identiske.\n"
+"Prøv igjen."
+
 #. yes/no popup label, %1,%2 are file paths
 #: src/include/users/dialogs.rb:344
 #, fuzzy
@@ -1645,6 +828,14 @@
 msgstr "&Endre hjemmekatalogeier"
 
 #. text entry
+#. text entry
+#: src/include/users/dialogs.rb:403
+#: src/lib/users/dialogs/inst_user_first.rb:582
+#, fuzzy
+msgid "User's &Full Name"
+msgstr "Det fulle namnet til &brukaren"
+
+#. text entry
 #: src/include/users/dialogs.rb:411
 #, fuzzy
 msgid "&First Name"
@@ -1662,12 +853,34 @@
 msgid "For remote users, only additional group memberships can be changed."
 msgstr "Bara medlemskap i tilleggsgrupper kan endrast for eksterne brukarar."
 
+#. input field for login name
+#. input field for login name
+#: src/include/users/dialogs.rb:433
+#: src/lib/users/dialogs/inst_user_first.rb:589
+#, fuzzy
+msgid "&Username"
+msgstr "&Brukernavn"
+
 #. checkbox label
+#: src/include/users/dialogs.rb:446
+#, fuzzy
+msgid "Receive S&ystem Mail"
+msgstr "Motta s&ystemmeldinger"
+
+#. checkbox label
 #: src/include/users/dialogs.rb:456
 #, fuzzy
 msgid "A&utomatic Login"
 msgstr "A&utomatisk innlogging"
 
+#. checkbox label
+#. checkbox label
+#: src/include/users/dialogs.rb:470
+#: src/lib/users/dialogs/inst_user_first.rb:613
+#, fuzzy
+msgid "U&se this password for system administrator"
+msgstr "Bru&k dette passordet for systemadministrator"
+
 #. check box label
 #: src/include/users/dialogs.rb:480
 #, fuzzy
@@ -1869,6 +1082,36 @@
 msgid "Plu&g-Ins"
 msgstr "Pro&gramtillegg"
 
+#. The user login field is empty, this is allowed if the
+#. system is part of a network with (e.g.) NIS user management.
+#. yes-no popup headline
+#: src/include/users/dialogs.rb:1112
+#, fuzzy
+msgid "Empty User Login"
+msgstr "Brukernavn ikkje angjeven"
+
+#. yes-no popup contents
+#: src/include/users/dialogs.rb:1114
+#, fuzzy
+msgid ""
+"Leaving the user name empty only makes sense\n"
+"in a network environment with an authentication server.\n"
+"Leave it empty?"
+msgstr ""
+"Å la brukernavnfeltet vera tomt er berre føremålstenleg\n"
+"i nettverksmiljøer som brukar ein autentiseringsserver.\n"
+"Skal feltet vera tomt?"
+
+#. last part of message popup
+#. last part of message popup
+#. User can confirm using "invalid" password confirming all the errors
+#: src/include/users/dialogs.rb:1269 src/include/users/dialogs.rb:2391
+#: src/lib/users/dialogs/inst_root_first.rb:212
+#: src/lib/users/dialogs/inst_user_first.rb:482
+#, fuzzy
+msgid "Really use this password?"
+msgstr "Vil du verkeleg bruka dette passordet?"
+
 #. popup question
 #: src/include/users/dialogs.rb:1308
 #, fuzzy
@@ -1975,6 +1218,22 @@
 msgid "Group &Data"
 msgstr "Gruppe&informasjon"
 
+#. encryption type
+#. encryption type
+#. TRANSLATORS: encryption type
+#: src/include/users/helps.rb:52 src/include/users/helps.rb:54
+#: src/lib/users/encryption_method.rb:51
+#, fuzzy
+msgid "DES"
+msgstr "DEI sine"
+
+#. encryption type
+#. TRANSLATORS: encryption type
+#: src/include/users/helps.rb:56 src/lib/users/encryption_method.rb:53
+#, fuzzy
+msgid "MD5"
+msgstr "MD5"
+
 #. help text 1/4
 #: src/include/users/helps.rb:62
 #, fuzzy
@@ -1982,89 +1241,101 @@
 "<p>\n"
 "When entering a password, distinguish between uppercase and\n"
 "lowercase. Passwords should not contain any accented characters or umlauts. \n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Skil mellom store og små bokstavar når du vel passord.\n"
 "Passord må ikkje innehalda bokstavar med aksentar eller tødlar.\n"
+"</p>\n"
+
+#. help text 2/4 %1 is encryption type, %2,%3 numbers
+#: src/include/users/helps.rb:73
+#, fuzzy
+msgid ""
+"<p>\n"
+"With the current password encryption (%1), the password length should be between\n"
+" %2 and %3 characters.\n"
 "</p>"
-"\n"
+msgstr ""
+"<p>\n"
+"Med gjeldande passordkryptering (%1) må lengda til passordet vera mellom\n"
+"%2 og %3 teikn.\n"
+"</p>"
 
+#. help text 4/4
+#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:159
+#, fuzzy
+msgid ""
+"<p>\n"
+"To ensure that the password was entered correctly,\n"
+"repeat it exactly in a second field. Do not forget your password.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"For å sikre at passordet vart skrive riktig inn\n"
+"må det skrivast inn ein gong til i det andre feltet. Ikkje gløym passordet.\n"
+"</p>\n"
+
 #. Help text 0/6
 #: src/include/users/helps.rb:103
 #, fuzzy
 msgid ""
 "<p>\n"
 "Here, set default values to use when creating new local or system users.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Her definerer du standardverdier som kal vert brukt når nye lokale brukarar eller systembrukere vert oppretta.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Help text 1/6
 #: src/include/users/helps.rb:109
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b>Default Group</b><br>"
-"\n"
+"<b>Default Group</b><br>\n"
 "The group name of a new user's primary group.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b>Standardgruppe/b><br>"
-"\n"
+"<b>Standardgruppe/b><br>\n"
 "Namnet på primærgruppen for ein ny brukar.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Help text 1.5/6
 #: src/include/users/helps.rb:116
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b>Secondary Groups</b><br>"
-"\n"
+"<b>Secondary Groups</b><br>\n"
 "Names of additional groups to which to assign new users.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b>Sekundære grupper</b><br>"
-"\n"
+"<b>Sekundære grupper</b><br>\n"
 "Namnet på fleire grupper som nye brukarar skal tilordnes.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Help text 2/6
 #: src/include/users/helps.rb:123
 #, fuzzy
 msgid ""
-"<p><b>Default Login Shell</b><br>"
-"\n"
+"<p><b>Default Login Shell</b><br>\n"
 "The name of the new user's login shell. Select one from the list or enter your own path to the shell.</P>\n"
 msgstr ""
-"<p><b>Standard innloggingsskall</b><br>"
-"\n"
+"<p><b>Standard innloggingsskall</b><br>\n"
 "Namnet på den nye brukaren sin innloggingsskall. Vel eit frå lista eller angje stigen til skalla.</P>\n"
 
 #. Help text 3/6
 #: src/include/users/helps.rb:127
 #, fuzzy
 msgid ""
-"<p><b>Default Home</b><br>"
-"\n"
+"<p><b>Default Home</b><br>\n"
 "The initial path prefix for a new user's home directory. The username is added\n"
 "to the end of this value to create the default name of the home directory.\n"
 "</P>\n"
 msgstr ""
-"<p><b>Standard hjemmekatalog</b><br>"
-"\n"
+"<p><b>Standard hjemmekatalog</b><br>\n"
 "Søkestiprefikset til ein ny brukar sin hjemmekatalog. Brukernavnet vil leggjast til\n"
 "etter denne stigen for å oppretta standarnavnet på brukaren sin hjemmekatalog.\n"
 "</P>\n"
@@ -2073,42 +1344,32 @@
 #: src/include/users/helps.rb:134
 #, fuzzy
 msgid ""
-"<p><b>Skeleton Directory</b><br>"
-"\n"
-"The contents of this directory are copied to a user's home directory when a new user is added. </p>"
-"\n"
+"<p><b>Skeleton Directory</b><br>\n"
+"The contents of this directory are copied to a user's home directory when a new user is added. </p>\n"
 msgstr ""
-"<p><b>Hjemmekatalogmal</b><br>"
-"\n"
-"Innhaldet i denne katalogen vil kopierast til brukaren sin hjemmekatalog når ein ny brukar vert til lagd. </p>"
-"\n"
+"<p><b>Hjemmekatalogmal</b><br>\n"
+"Innhaldet i denne katalogen vil kopierast til brukaren sin hjemmekatalog når ein ny brukar vert til lagd. </p>\n"
 
 #. Help text 4.5/6
 #: src/include/users/helps.rb:138
 #, fuzzy
 msgid ""
-"<p><b>Umask for Home Directory</b><br>"
-"\n"
-"Umask to use for creating new home directories.</p>"
-"\n"
+"<p><b>Umask for Home Directory</b><br>\n"
+"Umask to use for creating new home directories.</p>\n"
 msgstr ""
-"<p><b>Umask for hjemmekatalog</b><br>"
-"\n"
-"Umask som skal nyttast når nye hjemmekataloger vert oppretta.</p>"
-"\n"
+"<p><b>Umask for hjemmekatalog</b><br>\n"
+"Umask som skal nyttast når nye hjemmekataloger vert oppretta.</p>\n"
 
 #. Help text 5/6:
 #. Don't reorder letters YYYY-MM-DD, date must be set in this format
 #: src/include/users/helps.rb:143
 #, fuzzy
 msgid ""
-"<p><b>Expiration Date</b><br>"
-"\n"
+"<p><b>Expiration Date</b><br>\n"
 "The date on which the user account is disabled. The date must be in the format\n"
 "YYYY-MM-DD. Leave it empty if this account never expires.</P>\n"
 msgstr ""
-"<p><b>Utløpsdato</b><br>"
-"\n"
+"<p><b>Utløpsdato</b><br>\n"
 "Datoen når kontoen til brukaren skal deaktiveres. Datoen må angjevast i formatet\n"
 "ÅÅÅÅ-MM-DD. La feltet vera tomt viss kontoen aldri skal utløpe.</P>\n"
 
@@ -2173,12 +1434,10 @@
 "An additional dialog will inform you whether it is safe to do so.\n"
 "</P>\n"
 msgstr ""
-"<p><b><big>Avbryt lagringsprosessen:</big></b><br>"
-"\n"
+"<p><b><big>Avbryt lagringsprosessen:</big></b><br>\n"
 "Avbryt lagringen ved å klikka <b>Avbryt</b>.\n"
 "Ein annan dialog vil gje deg melding om det er trygt å gjera dette.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 1/7
 #: src/include/users/helps.rb:203
@@ -2188,16 +1447,28 @@
 "Enter the <b>First Name</b>, <b>Last Name</b>, \n"
 "<b>Username</b>, and\n"
 "<b>Password</b> to assign to this user.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Angje <b>Førenamn</b>, <b>Etternamn</b>,\n"
 "<b>Brukernavn</b> og\n"
 "<b>Passord</b> for brukaren.\n"
-"</p>"
-"\n"
+"</p>\n"
 
+#. alternative help text 1/7
+#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:138
+#, fuzzy
+msgid ""
+"<p>\n"
+"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n"
+"assign to this user account.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Angje <b>Det fulle namnet til brukaren</b>, <b>Brukernavn</b> og <b>Passord</b> for\n"
+"denne brukerkontoen.\n"
+"</p>\n"
+
 #. help text 2/7
 #: src/include/users/helps.rb:226
 #, fuzzy
@@ -2209,8 +1480,7 @@
 "Do not use uppercase letters in this entry unless you know what you are doing.\n"
 "Usernames have stricter restrictions than passwords. You can redefine the\n"
 "restrictions in the /etc/login.defs file. Read its man page for information.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "<b>Brukernavnet</b> kan generers på grunnlag av det fulle namnet ved å\n"
@@ -2219,8 +1489,7 @@
 "Ikkje bruk store bokstavar her viss du ikkje veit nøyaktig kva du gjer.\n"
 "Brukernavn har fleire avgrensingar enn passord. Du kan omdefinera\n"
 "avgrensingane i fila /etc/login.defs. Du finn meir informasjon på manualsiden for fila.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. alternative help text 2/7
 #: src/include/users/helps.rb:241
@@ -2232,8 +1501,7 @@
 "Do not use uppercase letters in this entry unless you know what you are doing.\n"
 "Usernames have stricter restrictions than passwords. You can redefine the\n"
 "restrictions in the /etc/login.defs file.  Read its man page for information.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "For <b>Brukernavn</b> må bara\n"
@@ -2241,9 +1509,29 @@
 "Ikkje bruk store bokstavar her viss du ikkje veit nøyaktig kva du gjer.\n"
 "Brukernavn har fleire avgrensingar enn passord. Du kan omdefinera\n"
 "avgrensingane i fila /etc/login.defs. Du finn meir informasjon på manualsiden for fila.\n"
-"</p>"
-"\n"
+"</p>\n"
 
+#. these are used only during installation time
+#. help text 4/7 (only during installation)
+#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:175
+#, fuzzy
+msgid ""
+"<p>\n"
+"The username and password created here are needed to log in and work with your Linux system. With <b>Automatic Login</b> enabled, the login procedure is skipped. This user is logged in automatically.</p>\n"
+msgstr ""
+"<p>\n"
+"Brukernavnet og passordet som vert her oppretta, vert kravt for å logga på og arbeid med Linux-systemet. Viss <b>Automatisk innlogging</b> vert aktivert, vert Innloggingsprosedyren sløyfa, og denne brukaren vert logga inn automatisk.</p>\n"
+
+#. help text 5/7 (only during installation)
+#: src/include/users/helps.rb:264
+#, fuzzy
+msgid ""
+"<p>\n"
+"Have mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>\n"
+msgstr ""
+"<p>\n"
+"E-post til rotbrukeren vil vidaresendast til denne brukaren viss du kryssar av for <b>Motta systemmeldinger</b>.</p>\n"
+
 #. help text 6/7 (only during installation)
 #: src/include/users/helps.rb:269
 #, fuzzy
@@ -2257,26 +1545,22 @@
 "<p>\n"
 "To see more details, such as the home directory or the user ID, click\n"
 "<b>Details</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "For å vise meir informasjon, t.d. hjemmekatalog eller brukar-ID, klikk\n"
 "<b>Detaljar</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. alternative help text 5/7
 #: src/include/users/helps.rb:286
 #, fuzzy
 msgid ""
 "<p>\n"
-"To edit various password settings of this user, such as expiration date, click <b>Password Settings</b>.</p>"
-"\n"
+"To edit various password settings of this user, such as expiration date, click <b>Password Settings</b>.</p>\n"
 msgstr ""
 "<p>\n"
-"For å redigera diverse passordinnstilliinger for denne brukaren (t.d. utløpsdato), klikk <b>Passordinnstilliinger</b>.</p>"
-"\n"
+"For å redigera diverse passordinnstilliinger for denne brukaren (t.d. utløpsdato), klikk <b>Passordinnstilliinger</b>.</p>\n"
 
 #. help text 7/7
 #: src/include/users/helps.rb:296
@@ -2294,13 +1578,11 @@
 msgid ""
 "<p>\n"
 "Enter the group data here.   \n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Angje gruppeinformasjonen her.   \n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 2/6
 #: src/include/users/helps.rb:318
@@ -2312,8 +1594,7 @@
 "two and eight characters.  \n"
 "You can redefine the list of characters allowed for group names in\n"
 "the /etc/login.defs file. Read its man page for information.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "<b>Gruppenavn:</b>\n"
@@ -2321,8 +1602,7 @@
 "to og åtte teikn.\n"
 "Du kan omdefinera avgrensingane for teikn i gruppenavn i\n"
 "fila /etc/login.defs. Du finn meir informasjon på manualsiden for fila.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 3/6, %1 is number
 #: src/include/users/helps.rb:329
@@ -2334,8 +1614,7 @@
 "internal representation. These values are between 0 and\n"
 "%1. Some of the IDs are already assigned during installation. You will be\n"
 "warned if you try to use an already set one.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "<b>Gruppe-ID (gjev):</b>\n"
@@ -2343,8 +1622,7 @@
 "til internt bruk. Desse verda er mellom 0 og %1.\n"
 "Nokre av Idene vert tildelte under installasjonen. Du får ein\n"
 "advarsel dersom du freistar å bruka ei ID som er i bruk.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 4/6
 #: src/include/users/helps.rb:342
@@ -2356,8 +1634,7 @@
 "switching to this group (see the man page of <tt>newgrp</tt>), assign a\n"
 "password to this group. For security reasons, this password is not shown\n"
 "here. This entry is not required.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "<b>Passord:</b>\n"
@@ -2365,8 +1642,7 @@
 "byter til denne nye gruppa (sjå manualsiden for <tt>newgrp</tt>), kan du tildela \n"
 "eit passord til gruppa. Av sikkerhetsgrunner vert ikkje passordet vist\n"
 "her. Dette er ikkje obligatorisk.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 5/6
 #: src/include/users/helps.rb:353
@@ -2375,14 +1651,12 @@
 "<p>\n"
 "<b>Confirm Password:</b>\n"
 "Enter the password a second time to avoid typing errors.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "<b>Gjenta passordet:</b>\n"
 "Passordet må stadfestast for å unngå skrivefeil.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 6/6
 #: src/include/users/helps.rb:361
@@ -2391,14 +1665,12 @@
 "<p>\n"
 "<b>Group Members:</b>\n"
 "Here, select which users should be members of this group.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "<b>Gruppemedlemmer:</b>\n"
 "Her vel du kva for brukarar som skal vera medlemmar i denne gruppa.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. additional helptext for EditFroup dialog
 #: src/include/users/helps.rb:373
@@ -2432,8 +1704,7 @@
 "the user ID. For normal users, you should use\n"
 "a UID larger than %1 because the smaller UIDs are used\n"
 "by the system for special purposes and pseudo logins.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "<b>Brukar-ID (uid):</b>\n"
@@ -2441,8 +1712,7 @@
 "For vanlege brukarar bør du bruka\n"
 "ein UID som er større enn %1, fordi lågare UID-er brukast\n"
 "av systemet til spesielle føremål og til pseudoinnlogginger.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 3/8
 #: src/include/users/helps.rb:408
@@ -2452,15 +1722,13 @@
 "If you change the UID of an existing user, the rights of the files\n"
 "this user owns must be changed. This is done automatically\n"
 "for the files in the user's home directory, but not for files \n"
-"located elsewhere.</p>"
-"\n"
+"located elsewhere.</p>\n"
 msgstr ""
 "<p>\n"
 "Viss du endrar UID for ein eksisterande brukar, må rettane til filene\n"
 "som denne brukaren eige, vert endra. Dette vert utført automatisk\n"
 "for filene i brukaren sin hjemmekatalog, men ikkje for filer \n"
-"som er lagra andre stadar.</p>"
-"\n"
+"som er lagra andre stadar.</p>\n"
 
 #. help text 4/8
 #: src/include/users/helps.rb:417
@@ -2471,16 +1739,14 @@
 "The home directory of the user. Normally this is\n"
 "/home/username. \n"
 "To select an existing directory, click <b>Browse</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "<b>Hjemmekatalog:</b>\n"
 "Brukaren sin hjemmekatalog. Dette er vanlegvis\n"
 "/home/brukernavn. \n"
 "Klikk <b>Bla gjennom</b> for å velja ein eksisterande katalog.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text for user's home directory mode
 #: src/include/users/helps.rb:430
@@ -2494,13 +1760,11 @@
 msgid ""
 "<p>To create only an empty home directory,\n"
 "check <b>Empty Home</b>. Otherwise, the new home directory\n"
-"is created from the default skeleton (%1).</p>"
-"\n"
+"is created from the default skeleton (%1).</p>\n"
 msgstr ""
 "<p>For berre å oppretta ein tom hjemmekatalog,\n"
 "kryss av for <b>Tom hjemmekatalog</b>. Viss ikkje, vert den nye hjemmekatalogen\n"
-"opprettast frå standardmalen (%1).</p>"
-"\n"
+"opprettast frå standardmalen (%1).</p>\n"
 
 #. help text for Move to new location checkbox
 #: src/include/users/helps.rb:452
@@ -2545,15 +1809,13 @@
 "Some additional user data could be set here. This field may contain up to\n"
 "three parts, separated by commas. The standard usage is to write\n"
 "<i>office</i>,<i>work phone</i>,<i>home phone</i>. This information is \n"
-"shown when you use the <i>finger</i> command on this user.</p>"
-"\n"
+"shown when you use the <i>finger</i> command on this user.</p>\n"
 msgstr ""
 "<p><b>Meir informasjon</b>\n"
 "Ytterlegare brukerinformasjon kan verta her definert. Dette feltet kan innehalda inntil\n"
 "tre deler adskilt av komene. Det er vanleg å skriva inn\n"
 "<i>kontor</i>,<i>telefon arbeid</i>,<i>telefon heime</i>. Denne informasjonen vil\n"
-"visast når du brukar kommandoen <i>finger</i> for denne brukaren.</p>"
-"\n"
+"visast når du brukar kommandoen <i>finger</i> for denne brukaren.</p>\n"
 
 #. help text 6/8
 #: src/include/users/helps.rb:512
@@ -2596,26 +1858,22 @@
 "<p>\n"
 "<b>Additional Groups:</b>\n"
 "Select additional groups in which the user should be a member.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "<b>Tilleggsgrupper</b>\n"
 "Vel tilleggsgrupper som brukaren skal vera medlem av.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. helptxt for plugin dialog 1/2
 #: src/include/users/helps.rb:544
 #, fuzzy
 msgid ""
 "<p>Here, see the list of plug-ins, the\n"
-"extensions of user and group configuration.</p>"
-"\n"
+"extensions of user and group configuration.</p>\n"
 msgstr ""
 "<p>Dette er ei liste over programtillegg, fleire \n"
-"konfigurasjonsmuligheter for brukarar og grupper.</p>"
-"\n"
+"konfigurasjonsmuligheter for brukarar og grupper.</p>\n"
 
 #. helptext for plugin dialog 2/3
 #: src/include/users/helps.rb:548
@@ -2663,16 +1921,14 @@
 "Users can be warned before their passwords expire. Set \n"
 "how long before expiration the warning should be issued. Set -1 to disable\n"
 "the warning. \n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "<b>Advarsel før utløp av passord</B><BR>\n"
 "Brukarane kan varslast før passordet utløper. Definer \n"
 "kor mange dagar før passordet utløper, brukaren skal varslast. Bruk verdet -1 for å deaktivere\n"
 "varslingen. \n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Help text 3/6
 #: src/include/users/helps.rb:588
@@ -2725,38 +1981,30 @@
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b>Configuration Overview</b><br>"
-"\n"
+"<b>Configuration Overview</b><br>\n"
 "Here, see a summary of modules that could affect sources\n"
 "of user accounts or authentication type.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b>Konfigurasjonsoversikt</b><br>"
-"\n"
+"<b>Konfigurasjonsoversikt</b><br>\n"
 "Her får du eit sammendrag over modular som kan påverka kor informasjon om\n"
 "brukerkontoer eller autentiseringstyper skal verta frå henta.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 2/2
 #: src/include/users/helps.rb:621
 #, fuzzy
 msgid ""
 "<p>\n"
-"<b>Changing the Values</b><br>"
-"\n"
+"<b>Changing the Values</b><br>\n"
 "You can configure these settings by running appropriate modules. Select the module with <b>Configure</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
-"<b>Endre verd</b><br>"
-"\n"
+"<b>Endre verd</b><br>\n"
 "Du kan konfigurer desse innstillingane ved å aktivera aktuelle modular. Vel modul med <b>Konfigurer</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text for Password Policy Dialog
 #: src/include/users/ldap_dialogs.rb:62
@@ -2792,9 +2040,7 @@
 #: src/include/users/ldap_dialogs.rb:86
 #, fuzzy
 msgid "<p>Select whether the password quality should be verified while passwords are modified or added. Select <b>No Checking</b> if passwords should not be checked at all. With <b>Accept Uncheckable Passwords</b>, passwords are accepted even if the check cannot be performed, for example, if the user has provided an encrypted password. With <b>Only Accept Checked Passwords</b> passwords are refused if the quality test fails or the password cannot be checked.</p>"
-msgstr ""
-"<p>Vel om passordkvaliteten skal kontrollerast når passord vert endra eller vert oppretta. Vel <b>Ingen kontroll</b> viss det ikkje skal gjerast kontroll av passord. Med <b>Godta passord som ikkje kan kontrollerast</b> godtakast passord sjølv om kontrollen ikkje kan utførast, til dømes viss brukaren har angjeve eit kryptert passord. Med <b>Godta berre kontrollerte passord</b> avvisast passord viss kvalitetskontrollen mislukkast eller passordet ikkje kan kontrollerast."
-"<p>"
+msgstr "<p>Vel om passordkvaliteten skal kontrollerast når passord vert endra eller vert oppretta. Vel <b>Ingen kontroll</b> viss det ikkje skal gjerast kontroll av passord. Med <b>Godta passord som ikkje kan kontrollerast</b> godtakast passord sjølv om kontrollen ikkje kan utførast, til dømes viss brukaren har angjeve eit kryptert passord. Med <b>Godta berre kontrollerte passord</b> avvisast passord viss kvalitetskontrollen mislukkast eller passordet ikkje kan kontrollerast.<p>"
 
 #. help text for pwdMinLength attribute
 #: src/include/users/ldap_dialogs.rb:90
@@ -2824,8 +2070,7 @@
 "Brukarane kan varslast før passordet utløper. Definer \n"
 "kor mange dagar før passordet utløper, brukaren skal varslast. Bruk verdet -1 for å deaktivere\n"
 "varslingen. \n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text for pwdGraceAuthNLimit attribute
 #: src/include/users/ldap_dialogs.rb:106
@@ -3003,14 +2248,12 @@
 "<p>If home directories of LDAP users should be stored on this machine,\n"
 "check the appropriate option. Changing this value does not cause any direct\n"
 "action.  It is only information for the YaST users module, which can manage\n"
-"user home directories.</p>"
-"\n"
+"user home directories.</p>\n"
 msgstr ""
 "<p>Kryss av for aktuelt val viss LDAP-katalogane til brukarar skal lagrast\n"
 "på denne maskina. Det har ingen direkte konsekvensar å endra dette verdet.\n"
 "Han tener berre som informasjon for brukermodulen i YaST, der brukarane sine hjemmekataloger\n"
-"kan administrerast.</p>"
-"\n"
+"kan administrerast.</p>\n"
 
 #. help text caption
 #. help text
@@ -3019,13 +2262,11 @@
 msgid ""
 "<p>Press <b>Configure</b> to configure settings stored on the\n"
 "LDAP server. You will be asked for the password if you are not connected yet or\n"
-"have changed your configuration.</p>"
-"\n"
+"have changed your configuration.</p>\n"
 msgstr ""
 "<p>Klikk <b>Konfigurer</b> for å konfigurera innstellingar som er lagra på\n"
 "LDAP-serveren. Du vil vart beden om passord viss du ikkje er tilkoplet enno,\n"
-"eller viss konfigurasjonen din er endra.</p>"
-"\n"
+"eller viss konfigurasjonen din er endra.</p>\n"
 
 #. password policy help text caption
 #: src/include/users/ldap_dialogs.rb:681
@@ -3143,7 +2384,9 @@
 msgstr "Systembrukere"
 
 #. the type of user set
+#. New user is the default option
 #: src/include/users/widgets.rb:79
+#: src/lib/users/dialogs/inst_user_first.rb:274
 #, fuzzy
 msgid "Local Users"
 msgstr "Lokale brukarar"
@@ -3234,6 +2477,12 @@
 msgstr "Samba-grupper"
 
 #. richtext label
+#: src/include/users/widgets.rb:136
+#, fuzzy
+msgid "NIS"
+msgstr "NIS"
+
+#. richtext label
 #: src/include/users/widgets.rb:138
 msgid "SSSD"
 msgstr ""
@@ -3255,6 +2504,12 @@
 msgid "&SSSD"
 msgstr ""
 
+#. menubutton label
+#: src/include/users/widgets.rb:159
+#, fuzzy
+msgid "&Samba"
+msgstr "&Samba"
+
 #. tab header
 #: src/include/users/widgets.rb:168
 #, fuzzy
@@ -3380,15 +2635,13 @@
 "Choose a password encryption method for local and system users.\n"
 "<b>DES</b>, the Linux default method, works in all network environments, but it\n"
 "restricts passwords to eight characters or less.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel ein passordkrypteringsmetode for lokale brukarar og systembrukere.\n"
 "<b>DEI sine</b>, standardmetoden i Linux, fungerer i alle nettverksmiljøer, men\n"
 "passorda kan ikkje innehalda meir enn åtte teikn.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. Help text for password expert dialog 3/5
 #: src/include/users/widgets.rb:480
@@ -3404,6 +2657,12 @@
 "nettverksprotokoller støttar ikkje dette, og det kan oppstå problem i samband med NIS.\n"
 "</p>"
 
+#. Help text for password expert dialog 4/5
+#: src/include/users/widgets.rb:491
+#, fuzzy
+msgid "<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgstr "<p><b>SHA-512</b> er standard hash-metode. Det vert ikkje rådt til å bruka andre algoritmar dersom det ikkje er naudsynt av kompatibilitetshensyn.</p>"
+
 #. Label
 #: src/include/users/widgets.rb:499
 #, fuzzy
@@ -3416,6 +2675,30 @@
 msgid "Encryption Type"
 msgstr "Krypteringstype"
 
+#. Radio buttons for password encryption: DES-crypt
+#: src/include/users/widgets.rb:513
+#, fuzzy
+msgid "&DES"
+msgstr "&DEI sine"
+
+#. Radio buttons for password encryption: MD5-crypt
+#: src/include/users/widgets.rb:515
+#, fuzzy
+msgid "&MD5"
+msgstr "&MD5"
+
+#. Radio buttons for password encryption: sha256 crypt
+#: src/include/users/widgets.rb:520
+#, fuzzy
+msgid "SHA-&256"
+msgstr "SHA-&256"
+
+#. Radio buttons for password encryption: sha512 crypt
+#: src/include/users/widgets.rb:528
+#, fuzzy
+msgid "SHA-&512"
+msgstr "SHA-&512"
+
 #. help text 1/3
 #: src/include/users/widgets.rb:582
 #, fuzzy
@@ -3434,14 +2717,12 @@
 "<p>It seems that you are running a NIS server. In some network environments,\n"
 "you might be unable to log in to a NIS client when a user password is\n"
 "encrypted with a method other than DES.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>Det ser ut som om du køyrer ein NIS-servar. I nokon nettverksmiljøer\n"
 "vil du kanskje ikkje kunna logga inn på ein NIS-klient dersom eit brukerpassord er\n"
 "kryptert med ein annan metode enn DEI sine.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 3/3
 #: src/include/users/widgets.rb:593
@@ -3479,39 +2760,29 @@
 msgid ""
 "<p>With <b>Default</b>, load the default filter from the user and group\n"
 "configuration modules saved on the LDAP server (values of 'suseSearchFilter' attributes).\n"
-"If you are not connected yet, you are prompted for the password.</p>"
-"\n"
+"If you are not connected yet, you are prompted for the password.</p>\n"
 msgstr ""
 "<p>Med<b>Standard</b> kan du lasta standardfilteret frå oppsettmodulene\n"
 "for brukarar og grupper som er lagra på LDAP-serveren (verd for 'susesearchFilter'-attributt).\n"
-"Viss du ikkje er tilkoblet enno, vil du vart beden om å angje passord.</p>"
-"\n"
+"Viss du ikkje er tilkoblet enno, vil du vart beden om å angje passord.</p>\n"
 
 #. helptext 4/4 (do not translate the value (written as <tt> font))
 #: src/include/users/widgets.rb:740
 #, fuzzy
 msgid ""
 "<p><b>Example:</b>\n"
-"<br>"
-"With the user filter\n"
-"<br>"
-"\n"
+"<br>With the user filter\n"
+"<br>\n"
 "<tt>(&(objectClass=posixAccount)(uid=u*))</tt>\n"
-"<br>"
-"\n"
-"only obtain users with a username beginning with 'u'.</p>"
-"\n"
+"<br>\n"
+"only obtain users with a username beginning with 'u'.</p>\n"
 msgstr ""
 "<p><b>Døme:</b>\n"
-"<br>"
-"Med brukerfilteret\n"
-"<br>"
-"\n"
+"<br>Med brukerfilteret\n"
+"<br>\n"
 "<tt>(&(objectClass=posixAccount)(uid=u*))</tt>\n"
-"<br>"
-"\n"
-"finn du berre brukarar med brukernavn som byrjar på 'u'.</p>"
-"\n"
+"<br>\n"
+"finn du berre brukarar med brukernavn som byrjar på 'u'.</p>\n"
 
 #. radiobutton label
 #: src/include/users/widgets.rb:763
@@ -3606,43 +2877,33 @@
 msgid ""
 "<p>\n"
 "The features described below are only available if you are using KDM or GDM as the login manager.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Funksjonane som er skildra nedanfor, er tilgjengelege berre viss du brukar KDM som innloggingshandsamar.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. helptext 2/3
 #: src/include/users/widgets.rb:975
 #, fuzzy
 msgid ""
-"<p><b>Auto Login</b><br>"
-"\n"
-"By setting <b>Auto Login</b>, skip the login procedure. The user chosen from the list is logged in automatically.</p>"
-"\n"
+"<p><b>Auto Login</b><br>\n"
+"By setting <b>Auto Login</b>, skip the login procedure. The user chosen from the list is logged in automatically.</p>\n"
 msgstr ""
-"<p><b>Automatisk innlogging</b><br>"
-"\n"
-"<b>Innloggingsprosedyren</b> kan sløyfast ved å velja <b>Automatisk innlogging</b>. I så fall vert brukaren som er vald i lista, logga automatisk inn.</p>"
-"\n"
+"<p><b>Automatisk innlogging</b><br>\n"
+"<b>Innloggingsprosedyren</b> kan sløyfast ved å velja <b>Automatisk innlogging</b>. I så fall vert brukaren som er vald i lista, logga automatisk inn.</p>\n"
 
 #. helptext 3/3
 #: src/include/users/widgets.rb:979
 #, fuzzy
 msgid ""
-"<p><b>Passwordless Logins</b><br>"
-"\n"
+"<p><b>Passwordless Logins</b><br>\n"
 "If this option is checked, all users are allowed to log in without entering\n"
-"passwords. Otherwise, you are asked for the password even if you set a user to log in automatically.</p>"
-"\n"
+"passwords. Otherwise, you are asked for the password even if you set a user to log in automatically.</p>\n"
 msgstr ""
-"<p><b>Innlogging utan passord</b><br>"
-"\n"
+"<p><b>Innlogging utan passord</b><br>\n"
 "Viss dette alternativet er avkrysset, kan alle brukarar logga inn utan å skriva inn\n"
-"passord. Viss ikkje, vil brukaren bedast om passord sjølv om du har valt automatisk innlogging for vedkomande.</p>"
-"\n"
+"passord. Viss ikkje, vil brukaren bedast om passord sjølv om du har valt automatisk innlogging for vedkomande.</p>\n"
 
 #. dialog label
 #: src/include/users/widgets.rb:1004
@@ -3774,6 +3035,13 @@
 
 #. type of user/group
 #. (item of list with the headline 'Choose the type of user to add')
+#: src/include/users/widgets.rb:1365
+#, fuzzy
+msgid "LDAP"
+msgstr "LDAP"
+
+#. type of user/group
+#. (item of list with the headline 'Choose the type of user to add')
 #: src/include/users/widgets.rb:1370
 #, fuzzy
 msgid "System"
@@ -3836,15 +3104,13 @@
 "Linux is a multiuser system. Several different users can be logged in to the\n"
 "system at the same time.  To avoid confusion, each user must have\n"
 "a unique identity. Additionally, every user belongs to at least one group.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Linux er eit flerbrukersystem. Fleire ulike brukarar kan loggast\n"
 "inn på systemet samstundes.  For å unngå forvirring må kvar brukar ha ein unik \n"
 "identitet. Dessutan må kvar brukar tilhøyra minst éi gruppe.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 1/3
 #: src/include/users/widgets.rb:1535
@@ -3852,13 +3118,11 @@
 msgid ""
 "<p>\n"
 "Users and groups are arranged in various sets. Change the set currently shown in the table with <b>Set Filter</b>.\n"
-"Customize your view with <b>Customize Filter</b>.</p>"
-"\n"
+"Customize your view with <b>Customize Filter</b>.</p>\n"
 msgstr ""
 "<p>\n"
 "Brukarar og grupper er ordna i ulike sett. Du kan endra settet som vert vist i tabellen med <b>Bruk filter</b>.\n"
-"Tilpass visningen med <b>Tilpass filter</b>.</p>"
-"\n"
+"Tilpass visningen med <b>Tilpass filter</b>.</p>\n"
 
 #. help text 2/3
 #: src/include/users/widgets.rb:1541
@@ -3868,15 +3132,13 @@
 "Click <b>Expert Options</b> to edit various expert settings, such as\n"
 "password encryption type, user authentication method, default values for new\n"
 "users, or login settings. With <b>Write Changes Now</b>, save\n"
-"all changes made so far without exiting the configuration module.</p>"
-"\n"
+"all changes made so far without exiting the configuration module.</p>\n"
 msgstr ""
 "<p>\n"
 "Klikk <b>Avanserte alternativ</b> for å redigera diverse avanserte innstillingar, t.d.\n"
 "passordkrypteringstype, metode for brukerautentisering, standardverdier for nye\n"
 "brukarar eller innloggingsinnstillinger. Med <b>Lager endringar no</b>\n"
-"kan du lagra alle endringar du har gjort så langt utan å avslutta konfigurasjonsmodulen.</p>"
-"\n"
+"kan du lagra alle endringar du har gjort så langt utan å avslutta konfigurasjonsmodulen.</p>\n"
 
 #. help text 3/3, %1 is translated button label
 #: src/include/users/widgets.rb:1550
@@ -3885,14 +3147,12 @@
 "<p>\n"
 "To save the modified user and group settings to your system, press\n"
 "<b>%1</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "For å lagra endra nytter- og gruppeinnstillinger i systemet, klikk\n"
 "<b>%1</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 1/4
 #: src/include/users/widgets.rb:1571
@@ -3902,16 +3162,14 @@
 "<p>\n"
 "Use this dialog to get information about existing users and add or modify\n"
 "users.  \n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "\n"
 "<p>\n"
 "I denne dialogen kan du finna informasjon om eksisterande brukarar og dessutan leggja til eller endra\n"
 "\n"
 "brukarar.  \n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 2/4
 #: src/include/users/widgets.rb:1580
@@ -3919,13 +3177,11 @@
 msgid ""
 "<p>\n"
 "To shift to the group dialog, select <b>Groups</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "For å byte til gruppedialogen, vel <b>Grupper</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 3/4
 #: src/include/users/widgets.rb:1587
@@ -3934,14 +3190,12 @@
 "\n"
 "<p>\n"
 "To create a new user, click <b>Add</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "\n"
 "<p>\n"
 "For å oppretta ein ny brukar, klikk <b>Legg til</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 4/4
 #: src/include/users/widgets.rb:1595
@@ -3950,14 +3204,12 @@
 "<p>\n"
 "To edit or delete an existing user, select one user from the list and\n"
 "click <b>Edit</b> or <b>Delete</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "For å redigera eller slette ein eksisterande brukar, vel ein brukar frå lista og\n"
 "klikk <b>Rediger</b> eller <b>Slett</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 1/4
 #: src/include/users/widgets.rb:1616
@@ -3966,14 +3218,12 @@
 "\n"
 "<p>\n"
 "Use this dialog to get information about existing groups and add or modify groups.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "\n"
 "<p>\n"
 "I denne dialogen kan du visa informasjon om eksisterande grupper og dessutan leggja til eller endra grupper.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 2/4
 #: src/include/users/widgets.rb:1624
@@ -3981,13 +3231,11 @@
 msgid ""
 "<p>\n"
 "To shift to the user dialog, select <b>Users</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "Vel <b>Brukarar</b> for å byte til brukerdialogen.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 3/4
 #: src/include/users/widgets.rb:1631
@@ -3996,14 +3244,12 @@
 "\n"
 "<p>\n"
 "To create a new group, click <b>Add</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "\n"
 "<p>\n"
 "Klikk <b>Legg til</b> for å oppretta ei ny gruppe.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. help text 4/4
 #: src/include/users/widgets.rb:1639
@@ -4012,14 +3258,12 @@
 "<p>\n"
 "To edit or delete an existing group, select one group from the list and\n"
 "click <b>Edit</b> or <b>Delete</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 msgstr ""
 "<p>\n"
 "For å redigera eller slette ei eksisterande gruppe, vel ei gruppe frå lista og\n"
 "klikk <b>Rediger</b> eller <b>Slett</b>.\n"
-"</p>"
-"\n"
+"</p>\n"
 
 #. popup error label
 #: src/include/users/widgets.rb:1679
@@ -4176,6 +3420,16 @@
 msgid "Package %1 is not available for installation."
 msgstr "Pakka %1 er ikkje tilgjengeleg for installasjon."
 
+#. popup label (%1 is package to install)
+#: src/include/users/widgets.rb:2450
+#, fuzzy
+msgid ""
+"Package %1 is not installed.\n"
+"Install it now?\n"
+msgstr ""
+"Pakka %1 er ikkje installert.\n"
+"Vil du installera han no?\n"
+
 #. dialog caption
 #: src/include/users/wizards.rb:102
 #, fuzzy
@@ -4196,6 +3450,433 @@
 msgid "Initializing..."
 msgstr "Initialiserer …"
 
+#. List of errors found for a given password
+#.
+#. The errors are localized and ready to be displayed to the user
+#.
+#. @param passwd [String] password to check
+#. @return [Array<String>] errors or empty array if no errors are found or
+#. validation is disabled
+#: src/lib/users/ca_password_validator.rb:56
+#, fuzzy
+msgid ""
+"If you intend to create certificates,\n"
+"the password should have at least %s characters."
+msgstr ""
+"Viss du har til føremål å oppretta sertifikat,\n"
+"bør passordet ha minst %1 teikn."
+
+#. Localized help text about CA constraints
+#.
+#. @return [String] html text or empty string if validation is disabled
+#: src/lib/users/ca_password_validator.rb:69
+#, fuzzy
+msgid ""
+"<p>If you intend to use this password for creating certificates,\n"
+"it has to be at least %s characters long.</p>"
+msgstr ""
+"<p>Viss du har til føremål å bruka dette passordet til å oppretta sertifikat,\n"
+"må det har ei lengd på minst %1 teikn.</p>"
+
+#. @see Implements ::Installation::FinishClient#title
+#: src/lib/users/clients/users_finish.rb:55
+#, fuzzy
+msgid "Writing Users Configuration..."
+msgstr "Lagrar brukeroppsett …"
+
+#. Copyright (c) 2016 SUSE LLC.
+#. All Rights Reserved.
+#. This program is free software; you can redistribute it and/or
+#. modify it under the terms of version 2 or 3 of the GNU General
+#. Public License as published by the Free Software Foundation.
+#. This program is distributed in the hope that it will be useful,
+#. but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.   See the
+#. GNU General Public License for more details.
+#. You should have received a copy of the GNU General Public License
+#. along with this program; if not, contact SUSE LLC.
+#. To contact SUSE about this file by physical or electronic mail,
+#. you may find current contact information at www.suse.com
+#: src/lib/users/dialogs/encryption_method.rb:39
+#, fuzzy
+msgid "<p>Choose a password encryption method for local and system users.</p>"
+msgstr "Krypteringsmetode for passord er %1."
+
+#. TRANSLATORS: %s is the name of the recommended encryption method
+#: src/lib/users/dialogs/encryption_method.rb:41
+#, fuzzy
+msgid "<p><b>%s</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgstr "<p><b>SHA-512</b> er standard hash-metode. Det vert ikkje rådt til å bruka andre algoritmar dersom det ikkje er naudsynt av kompatibilitetshensyn.</p>"
+
+#. Let's add some vertical space after each widget
+#. TRANSLATORS: rich text label
+#: src/lib/users/dialogs/encryption_method.rb:72
+#: src/lib/users/encryption_proposal.rb:63
+#, fuzzy
+msgid "Password Encryption Type"
+msgstr "Passordkrypteringstype"
+
+#. advise users to remember their new password
+#: src/lib/users/dialogs/inst_root_first.rb:70
+#, fuzzy
+msgid "Do not forget what you enter here."
+msgstr "Ikkje gløym kva du skriv inn her."
+
+#. Label: get password for user root
+#: src/lib/users/dialogs/inst_root_first.rb:76
+#, fuzzy
+msgid "&Password for root User"
+msgstr "&Passord for rotbruker"
+
+#. Label: get same password again for verification
+#: src/lib/users/dialogs/inst_root_first.rb:84
+#, fuzzy
+msgid "Con&firm Password"
+msgstr "B&ekreft passord"
+
+#. text entry label
+#: src/lib/users/dialogs/inst_root_first.rb:89
+#, fuzzy
+msgid "&Test Keyboard Layout"
+msgstr "&Test tastaturoppsett"
+
+#. help text ( explain what the user "root" is and does ) 1
+#: src/lib/users/dialogs/inst_root_first.rb:99
+#, fuzzy
+msgid ""
+"<p>\n"
+"Unlike normal users of the system, who write texts, create\n"
+"graphics, or browse the Internet, the user \"root\" exists on\n"
+"every system and is called into action whenever\n"
+"administrative tasks need to be performed. Only log in as root\n"
+"when you need to be the system administrator.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Til skilnad frå vanlege brukarar, som til dømes jobbar med tekst og\n"
+"grafikk eller surfar på nettet, finst brukaren \"root\" i\n"
+"alle system, og må aktiverast kvar gong ei administrativ\n"
+"oppgåve skal utførast. Logg inn som rot når\n"
+"du har behov for å vera systemadministrator, aldri elles.\n"
+"</p>\n"
+
+#. help text, continued 2
+#: src/lib/users/dialogs/inst_root_first.rb:110
+#, fuzzy
+msgid ""
+"<p>\n"
+"Because the root user is equipped with extensive permissions, the password\n"
+"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
+"is recommended. To ensure that the password was entered correctly,\n"
+"reenter it in a second field.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Fordi rotbrukeren har omfattande rettar, bør passordet \n"
+"for \"root\" verta med valt omhu. Ein kombinasjon av bokstavar og tall\n"
+"vert rådd til. For å sikre at passordet vart skrive riktig, må det skrivast inn\n"
+"på nytt i det andre feltet.\n"
+"</p>\n"
+
+#. help text, continued 3
+#: src/lib/users/dialogs/inst_root_first.rb:120
+#, fuzzy
+msgid ""
+"<p>\n"
+"All the rules for user passwords apply to the \"root\" password:\n"
+"Distinguish between uppercase and lowercase. A password should have at\n"
+"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Alle regler for brukerpassord gjeld for rotpassordet òg:\n"
+"Skil mellom store og små bokstavar. Eit passord bør bestå av minst 5 teikn,\n"
+"og bør normalt ikkje innehalda bokstavar med aksentar eller tødlar.\n"
+"</p>\n"
+
+#. help text, continued 4
+#: src/lib/users/dialogs/inst_root_first.rb:131
+#, fuzzy
+msgid ""
+"<p>\n"
+"Do not forget this \"root\" password.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"Ikkje gløym dette rotpassordet\n"
+"</p>"
+
+#. Title for root-password dialogue
+#: src/lib/users/dialogs/inst_root_first.rb:148
+#, fuzzy
+msgid "Password for the System Administrator \"root\""
+msgstr "Passord for systemadministratoren \"root\","
+
+#. #-#-#-#-#  users.xgettext.pot  #-#-#-#-#
+#. error popup
+#: src/lib/users/dialogs/inst_root_first.rb:198 src/modules/UsersSimple.pm:623
+#, fuzzy
+msgid ""
+"No password entered.\n"
+"Try again."
+msgstr ""
+"Passord vart ikkje angjeve.\n"
+"Prøv igjen."
+
+#. reenable suggestion
+#: src/lib/users/dialogs/inst_user_first.rb:133
+#, fuzzy
+msgid ""
+"<p>\n"
+"Use one of the available options to add local users to the system.\n"
+"Local users are stored in <i>/etc/passwd</i> and <i>/etc/shadow</i>.\n"
+"</p>\n"
+msgstr "<p>Vel <b>Lokal</b> viss du vil autentisere brukarar bara ved hjelp av lokale filer <i>/etc/passwd</i> og <i>/etc/shadow</i>.</p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:137
+#, fuzzy
+msgid "Create new user"
+msgstr "Opprett ny brukar"
+
+#: src/lib/users/dialogs/inst_user_first.rb:141
+#, fuzzy
+msgid ""
+"<p>\n"
+"When entering a password, distinguish between uppercase and\n"
+"lowercase. Passwords should not contain any accented characters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Skil mellom store og små bokstavar når du vel passord.\n"
+"Passord må ikkje innehalda bokstavar med aksentar eller tødlar.\n"
+"</p>\n"
+
+#. TRANSLATORS: %{min} and %{max} will be replaced by numbers
+#: src/lib/users/dialogs/inst_user_first.rb:148
+#, fuzzy
+msgid ""
+"<p>\n"
+"The password length should be between %{min}\n"
+" and %{max} characters.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Med gjeldande passordkryptering (%1) må lengda til passordet vera mellom\n"
+"%2 og %3 teikn.\n"
+"</p>"
+
+#: src/lib/users/dialogs/inst_user_first.rb:164
+#, fuzzy
+msgid ""
+"<p>\n"
+"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
+"Do not use uppercase letters in this entry unless you know what you are doing.\n"
+"Usernames have stricter restrictions than passwords. You can redefine the\n"
+"restrictions in the /etc/login.defs file. Read its man page for information.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"For <b>Brukernavn</b> må bara bokstavar (ingen teikn med aksentar), tall og teiknet <tt>._-</tt> nyttast.\n"
+"Ikkje bruk store bokstavar her viss du ikkje veit nøyaktig kva du gjer.\n"
+"Brukernavn har fleire avgrensingar enn passord. Du kan omdefinera\n"
+"avgrensingane i fila /etc/login.defs. Du finn meir informasjon på manualsiden for fila.\n"
+"</p>\n"
+
+#: src/lib/users/dialogs/inst_user_first.rb:171
+#, fuzzy
+msgid "<p>Check <b>Use this password for system administrator</b> if the same password as entered for the first user should be used for root.</p>"
+msgstr "   Kryss av for    Bruk dette passordet                             viss same passord som vart angjeve for første brukar, skal verta for nytta rotbrukeren"
+
+#: src/lib/users/dialogs/inst_user_first.rb:182
+#, fuzzy
+msgid "Import User Data from a Previous Installation"
+msgstr "Les b&rukerinformasjon frå ein tidlegare installasjon"
+
+#: src/lib/users/dialogs/inst_user_first.rb:183
+msgid ""
+"<p>\n"
+"A previous Linux installation with local users has been detected.\n"
+"The information there can be used to create users in the system being installed.\n"
+"Use the <b>Choose Users</b> button to select some users. Their basic information will\n"
+"be imported.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:191
+msgid "Skip User Creation"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:192
+msgid ""
+"<p>\n"
+"Sometimes root is the only needed local user, like in network environments\n"
+"with an authentication server. Select this option to proceed without creating\n"
+"a local user.\n"
+"</p>\n"
+msgstr ""
+
+#: src/lib/users/dialogs/inst_user_first.rb:274
+#, fuzzy
+msgid "Local User"
+msgstr "Lokale brukarar"
+
+#. TRANSLATORS: Error popup
+#: src/lib/users/dialogs/inst_user_first.rb:329
+msgid ""
+"The new username cannot be blank.\n"
+"If you don't want to create a user now, select\n"
+"'Skip User Creation'."
+msgstr ""
+
+#. TRANSLATORS: error popup
+#: src/lib/users/dialogs/inst_user_first.rb:386
+msgid ""
+"No users from the previous installation were choosen.\n"
+"If you don't want to create a user now, select\n"
+"'Skip User Creation'."
+msgstr ""
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:513
+#, fuzzy
+msgid "&Create New User"
+msgstr "Opprett ny brukar"
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:536
+#, fuzzy
+msgid "&Import User Data from a Previous Installation"
+msgstr "Les b&rukerinformasjon frå ein tidlegare installasjon"
+
+#: src/lib/users/dialogs/inst_user_first.rb:546
+#, fuzzy
+msgid "Choose Users"
+msgstr "Systembrukere"
+
+#. TRANSLATORS: radio button
+#: src/lib/users/dialogs/inst_user_first.rb:562
+msgid "&Skip User Creation"
+msgstr ""
+
+#. checkbox label
+#: src/lib/users/dialogs/inst_user_first.rb:618
+#, fuzzy
+msgid "&Automatic Login"
+msgstr "&Automatisk innlogging"
+
+#: src/lib/users/dialogs/inst_user_first.rb:625
+#, fuzzy
+msgid "No users selected"
+msgstr "Ingen brukar er spesifisert."
+
+#: src/lib/users/dialogs/inst_user_first.rb:627
+#, fuzzy
+msgid "%d user will be imported"
+msgid_plural "%d users will be imported"
+msgstr[0] "Brukaren %1 vil importerast."
+msgstr[1] "Brukaren %1 vil importerast."
+
+#. selection box label
+#: src/lib/users/dialogs/users_to_import.rb:58
+#, fuzzy
+msgid "&Select Users to Read"
+msgstr "Vel brukarar som skal le&sjåast"
+
+#. check box label
+#: src/lib/users/dialogs/users_to_import.rb:66
+#, fuzzy
+msgid "Select or Deselect &All"
+msgstr "Vel eller vel bort &alle"
+
+#. TRANSLATORS: encryption type
+#: src/lib/users/encryption_method.rb:55
+#, fuzzy
+msgid "SHA-256"
+msgstr "SHA-256"
+
+#. TRANSLATORS: encryption type
+#: src/lib/users/encryption_method.rb:57
+#, fuzzy
+msgid "SHA-512"
+msgstr "SHA-512"
+
+#. TRANSLATORS: summary line. Second %s is the name of the method
+#: src/lib/users/encryption_proposal.rb:35
+#, fuzzy
+msgid "Encryption Method: <a href=%s>%s</a>"
+msgstr "Passordkrypteringsmetode: %1"
+
+#. TRANSLATORS: menu button label
+#. menu button label
+#: src/lib/users/encryption_proposal.rb:66 src/lib/users/proposal.rb:82
+#, fuzzy
+msgid "Password &Encryption Type"
+msgstr "Passordkrypteringstype"
+
+#. rich text label
+#: src/lib/users/proposal.rb:75
+#, fuzzy
+msgid "User Settings"
+msgstr "Brukerinnstillinger"
+
+#. menu button label
+#: src/lib/users/proposal.rb:78
+#, fuzzy
+msgid "&User"
+msgstr "&Brukar"
+
+#. menu button label
+#: src/lib/users/proposal.rb:80
+#, fuzzy
+msgid "&Root Password"
+msgstr "&Rotpassord"
+
+#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:92
+#, fuzzy
+msgid "<%1>Root Password<%2> set"
+msgstr "<%1>Rotpassord<%2> definert"
+
+#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:95
+#, fuzzy
+msgid "<%1>Root Password<%2> not set"
+msgstr "<%1>Rotpassord<%2> ikkje definert"
+
+#. summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/lib/users/proposal.rb:104
+#, fuzzy
+msgid "No <%1>user<%2> configured"
+msgstr "Ingen <%1>nytter<%2> sat opp"
+
+#. TRANSLATORS: summary line, %d is the number of users
+#: src/lib/users/proposal.rb:110
+#, fuzzy
+msgid "<a href=%s>%d user</a> will be imported"
+msgid_plural "<a href=%s>%d users</a> will be imported"
+msgstr[0] "<%1>Brukaren<%2> %3 vil importerast."
+msgstr[1] "<%1>Brukaren<%2> %3 vil importerast."
+
+#. TRANSLATORS: summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is login name
+#: src/lib/users/proposal.rb:118
+#, fuzzy
+msgid "<%1>User<%2> %3 configured"
+msgstr "<%1>Brukaren<%2> %3 definert"
+
+#. summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is full name, %4 login name
+#: src/lib/users/proposal.rb:127
+#, fuzzy
+msgid "<%1>User<%2> %3 (%4) configured"
+msgstr "<%1>Brukaren<%2> %3 (%4) definert"
+
+#. TRANSLATORS: summary line. Second %s is the name of the method
+#: src/lib/users/proposal.rb:141
+#, fuzzy
+msgid "Password Encryption Method: <a href=%s>%s</a>"
+msgstr "Passordkrypteringsmetode: %1"
+
 #. User name for user: "root"
 #: src/modules/UsersUI.rb:44
 #, fuzzy
@@ -4737,7 +4418,7 @@
 
 #. Popup text: %1 is the file name (e.g. /etc/fstab),
 #. %2 is the directory (e.g. /home),
-#: src/modules/Users.pm:740
+#: src/modules/Users.pm:716
 #, fuzzy
 msgid ""
 "In %1, there is a mount point for the directory\n"
@@ -4757,237 +4438,237 @@
 "etter at dei er riktig montert. Vil du halda fram brukerkonfigurasjonen?"
 
 #. error message
-#: src/modules/Users.pm:988
+#: src/modules/Users.pm:964
 #, fuzzy
 msgid "Multiple users satisfy the input conditions."
 msgstr "Fleire brukarar samsvarer med vilkåra."
 
 #. progress caption
-#: src/modules/Users.pm:1566
+#: src/modules/Users.pm:1542
 #, fuzzy
 msgid "Initializing User and Group Configuration"
 msgstr "Initialiserer brukar- og gruppekonfigurasjon"
 
 #. progress stage label
-#: src/modules/Users.pm:1573
+#: src/modules/Users.pm:1549
 #, fuzzy
 msgid "Read the default login settings"
 msgstr "Les standardinnstillinger for innlogging"
 
 #. progress stage label
-#: src/modules/Users.pm:1575
+#: src/modules/Users.pm:1551
 #, fuzzy
 msgid "Read the default system settings"
 msgstr "Les standardinnstillinger for system"
 
 #. progress stage label
-#: src/modules/Users.pm:1577
+#: src/modules/Users.pm:1553
 #, fuzzy
 msgid "Read the configuration type"
 msgstr "Les konfigurasjonstype"
 
 #. progress stage label
-#: src/modules/Users.pm:1579
+#: src/modules/Users.pm:1555
 #, fuzzy
 msgid "Read the user custom settings"
 msgstr "Les spesialinnstillinger for brukar"
 
 #. progress stage label
-#: src/modules/Users.pm:1581
+#: src/modules/Users.pm:1557
 #, fuzzy
 msgid "Read users and groups"
 msgstr "Les brukarar og grupper"
 
 #. progress stage label
-#: src/modules/Users.pm:1583
+#: src/modules/Users.pm:1559
 #, fuzzy
 msgid "Build the cache structures"
 msgstr "Opprett mellomlagerstrukturer"
 
 #. progress step label
-#: src/modules/Users.pm:1587
+#: src/modules/Users.pm:1563
 #, fuzzy
 msgid "Reading the default login settings..."
 msgstr "Lesar standardinnstillinger for innlogging …"
 
 #. progress step label
-#: src/modules/Users.pm:1589
+#: src/modules/Users.pm:1565
 #, fuzzy
 msgid "Reading the default system settings..."
 msgstr "Les standardinnstillinger for system …"
 
 #. progress step label
-#: src/modules/Users.pm:1591
+#: src/modules/Users.pm:1567
 #, fuzzy
 msgid "Reading the configuration type..."
 msgstr "Lesar konfigurasjonstype …"
 
 #. progress step label
-#: src/modules/Users.pm:1593
+#: src/modules/Users.pm:1569
 #, fuzzy
 msgid "Reading custom settings..."
 msgstr "Lesar spesialinnstillinger …"
 
 #. progress step label
-#: src/modules/Users.pm:1595
+#: src/modules/Users.pm:1571
 #, fuzzy
 msgid "Reading users and groups..."
 msgstr "Les brukarar og grupper …"
 
 #. progress step label
-#: src/modules/Users.pm:1597
+#: src/modules/Users.pm:1573
 #, fuzzy
 msgid "Building the cache structures..."
 msgstr "Opprettar mellomlagerstrukturer …"
 
 #. final progress step label
-#: src/modules/Users.pm:1599 src/modules/Users.pm:4314
+#: src/modules/Users.pm:1575 src/modules/Users.pm:4290
 #, fuzzy
 msgid "Finished"
 msgstr "Fullført"
 
 #. error message
-#: src/modules/Users.pm:2155
+#: src/modules/Users.pm:2131
 #, fuzzy
 msgid "User does not exist."
 msgstr "Brukaren finst ikkje."
 
 #. error message
-#: src/modules/Users.pm:2407
+#: src/modules/Users.pm:2383
 #, fuzzy
 msgid "Group does not exist."
 msgstr "Gruppa finst ikkje."
 
 #. progress caption
-#: src/modules/Users.pm:4276
+#: src/modules/Users.pm:4252
 #, fuzzy
 msgid "Writing User and Group Configuration"
 msgstr "Lagrar brukar- og gruppekonfigurasjon"
 
 #. progress stage label
-#: src/modules/Users.pm:4285
+#: src/modules/Users.pm:4261
 #, fuzzy
 msgid "Write LDAP users and groups"
 msgstr "Lagre LDAP-brukarar og -grupper"
 
 #. progress stage label
-#: src/modules/Users.pm:4287
+#: src/modules/Users.pm:4263
 #, fuzzy
 msgid "Write groups"
 msgstr "Lagre grupper"
 
 #. progress stage label
-#: src/modules/Users.pm:4289
+#: src/modules/Users.pm:4265
 #, fuzzy
 msgid "Check for deleted users"
 msgstr "Søk etter sletta brukarar"
 
 #. progress stage label
-#: src/modules/Users.pm:4291
+#: src/modules/Users.pm:4267
 #, fuzzy
 msgid "Write users"
 msgstr "Lagre brukarar"
 
 #. progress stage label
-#: src/modules/Users.pm:4293
+#: src/modules/Users.pm:4269
 #, fuzzy
 msgid "Write passwords"
 msgstr "Lagre passord"
 
 #. progress stage label
-#: src/modules/Users.pm:4295
+#: src/modules/Users.pm:4271
 #, fuzzy
 msgid "Write the custom settings"
 msgstr "Lagre spesialinnstillinger"
 
 #. progress stage label
-#: src/modules/Users.pm:4297
+#: src/modules/Users.pm:4273
 #, fuzzy
 msgid "Write the default login settings"
 msgstr "Les standardinnstillinger for innlogging"
 
 #. progress step label
-#: src/modules/Users.pm:4300
+#: src/modules/Users.pm:4276
 #, fuzzy
 msgid "Writing LDAP users and groups..."
 msgstr "Lagrar LDAP-brukarar og -grupper …"
 
 #. progress step label
-#: src/modules/Users.pm:4302
+#: src/modules/Users.pm:4278
 #, fuzzy
 msgid "Writing groups..."
 msgstr "Lagrar grupper …"
 
 #. progress step label
-#: src/modules/Users.pm:4304
+#: src/modules/Users.pm:4280
 #, fuzzy
 msgid "Checking deleted users..."
 msgstr "Søkar etter sletta brukarar …"
 
 #. progress step label
-#: src/modules/Users.pm:4306
+#: src/modules/Users.pm:4282
 #, fuzzy
 msgid "Writing users..."
 msgstr "Lagrar brukarar …"
 
 #. progress step label
-#: src/modules/Users.pm:4308
+#: src/modules/Users.pm:4284
 #, fuzzy
 msgid "Writing passwords..."
 msgstr "Lagrar passord …"
 
 #. progress step label
-#: src/modules/Users.pm:4310
+#: src/modules/Users.pm:4286
 #, fuzzy
 msgid "Writing the custom settings..."
 msgstr "Lagrar spesialinnstillinger …"
 
 #. progress step label
-#: src/modules/Users.pm:4312
+#: src/modules/Users.pm:4288
 #, fuzzy
 msgid "Writing the default login settings..."
 msgstr "Lagrar standardinnstillinger for innlogging …"
 
 #. error popup (%s is a file name)
-#: src/modules/Users.pm:4397
+#: src/modules/Users.pm:4373
 #, fuzzy, perl-format
 msgid "File %s was not read correctly, so it will not be written."
 msgstr "Fila %s kunne ikkje lesast riktig og vil ikkje vart lagra."
 
 #. error popup
-#: src/modules/Users.pm:4433 src/modules/Users.pm:4468
-#: src/modules/Users.pm:4744
+#: src/modules/Users.pm:4409 src/modules/Users.pm:4444
+#: src/modules/Users.pm:4720
 #, fuzzy
 msgid "An error occurred while removing users."
 msgstr "Det oppstod ein feil under sletting av brukarar."
 
 #. error popup (%s is a file name)
-#: src/modules/Users.pm:4446 src/modules/Users.pm:4594
+#: src/modules/Users.pm:4422 src/modules/Users.pm:4570
 #, fuzzy, perl-format
 msgid "File %s was not correctly read, so it will not be written."
 msgstr "Fila %s kunne ikkje lesast riktig og vil ikkje vart lagra."
 
 #. error message
-#: src/modules/Users.pm:4583
+#: src/modules/Users.pm:4559
 msgid ""
 "\n"
 "Encryption support is not installed, home directories will NOT be encrypted."
 msgstr ""
 
 #. error popup
-#: src/modules/Users.pm:4785 src/modules/YaPI/ADMINISTRATOR.pm:101
+#: src/modules/Users.pm:4761 src/modules/YaPI/ADMINISTRATOR.pm:101
 #, fuzzy
 msgid "An error occurred while setting forwarding for root's mail."
 msgstr "Det oppstod ein feil under konfigurasjon av vidaresending av rotbrukerens e-post."
 
 #. error popup
-#: src/modules/Users.pm:4861
+#: src/modules/Users.pm:4837
 #, fuzzy
 msgid "No UID is available for this type of user."
 msgstr "Det finst ingen tilgjengeleg UID for denne brukertypen."
 
 #. error popup
-#: src/modules/Users.pm:4892
+#: src/modules/Users.pm:4868
 #, fuzzy, perl-format
 msgid ""
 "The selected user ID is not allowed.\n"
@@ -4997,7 +4678,7 @@
 "Vel eit gyldig heiltal mellom %i og %i."
 
 #. popup question
-#: src/modules/Users.pm:4923
+#: src/modules/Users.pm:4899
 #, fuzzy
 msgid ""
 "The user ID entered is already in use.\n"
@@ -5007,7 +4688,7 @@
 "Vil du bruka det likevel?"
 
 #. popup question, %i are numbers
-#: src/modules/Users.pm:4936
+#: src/modules/Users.pm:4912
 #, fuzzy, perl-format
 msgid ""
 "The selected user ID is not from a range\n"
@@ -5019,7 +4700,7 @@
 "Vil du verkeleg bruka henne?"
 
 #. popup question
-#: src/modules/Users.pm:4951
+#: src/modules/Users.pm:4927
 #, fuzzy, perl-format
 msgid ""
 "The selected user ID is a local ID,\n"
@@ -5031,7 +4712,7 @@
 "Er du sikker at du vil endra typen til 'local'?"
 
 #. popup question
-#: src/modules/Users.pm:4965
+#: src/modules/Users.pm:4941
 #, fuzzy, perl-format
 msgid ""
 "The selected user ID is a system ID,\n"
@@ -5042,7 +4723,7 @@
 "fordi verdet er mindre enn %i. \n"
 "Er du sikker at du vil endra typen til 'system'?"
 
-#: src/modules/Users.pm:4999
+#: src/modules/Users.pm:4975
 #, fuzzy
 msgid ""
 "\n"
@@ -5052,7 +4733,7 @@
 "Brukernavnet kan tilhøyra ein eksisterande NIS- eller LDAP-brukar."
 
 #. error popup, %1 might be additional sentence ("The existing username...")
-#: src/modules/Users.pm:5003
+#: src/modules/Users.pm:4979
 #, fuzzy
 msgid ""
 "There is a conflict between the entered\n"
@@ -5064,7 +4745,7 @@
 "Prøv eit anna brukernavn."
 
 #. error popup
-#: src/modules/Users.pm:5033
+#: src/modules/Users.pm:5009
 #, fuzzy
 msgid ""
 "The \"Additional User Information\" entry cannot\n"
@@ -5074,7 +4755,7 @@
 "innehalda eit kolon (:). Prøv igjen."
 
 #. error popup
-#: src/modules/Users.pm:5040
+#: src/modules/Users.pm:5016
 #, fuzzy
 msgid ""
 "The \"Additional User Information\" entry can consist\n"
@@ -5086,7 +4767,7 @@
 "Rediger oppføringene."
 
 #. error popup
-#: src/modules/Users.pm:5103
+#: src/modules/Users.pm:5079
 #, fuzzy
 msgid ""
 "The home directory may only contain the following characters:\n"
@@ -5098,7 +4779,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/modules/Users.pm:5126
+#: src/modules/Users.pm:5102
 #, fuzzy, perl-format
 msgid ""
 "The directory %s is not writable.\n"
@@ -5108,7 +4789,7 @@
 "Vel ein annan stig for hjemmekatalogen."
 
 #. error message
-#: src/modules/Users.pm:5137
+#: src/modules/Users.pm:5113
 #, fuzzy
 msgid ""
 "The home directory is used by another user.\n"
@@ -5118,7 +4799,7 @@
 "Prøv igjen."
 
 #. yes/no popup: user seleceted something strange as a home directory
-#: src/modules/Users.pm:5179
+#: src/modules/Users.pm:5155
 #, fuzzy
 msgid ""
 "The path for the selected home directory already exists,\n"
@@ -5130,7 +4811,7 @@
 "Vil du verkeleg bruka denne stigen?"
 
 #. yes/no popup
-#: src/modules/Users.pm:5190
+#: src/modules/Users.pm:5166
 #, fuzzy
 msgid ""
 "The home directory selected already exists.\n"
@@ -5141,7 +4822,7 @@
 
 #. chown is not needed (#25200)
 #. yes/no popup
-#: src/modules/Users.pm:5197
+#: src/modules/Users.pm:5173
 #, fuzzy, perl-format
 msgid ""
 "The selected home directory (%s)\n"
@@ -5153,7 +4834,7 @@
 "Vil du bruka denne katalogen?"
 
 #. yes/no popup
-#: src/modules/Users.pm:5206
+#: src/modules/Users.pm:5182
 #, fuzzy, perl-format
 msgid ""
 "The home directory selected (%s)\n"
@@ -5167,7 +4848,7 @@
 "Vil du bruka denne katalogen?"
 
 #. popup question
-#: src/modules/Users.pm:5234
+#: src/modules/Users.pm:5210
 #, fuzzy
 msgid ""
 "If you select a nonexistent shell, the user may be unable to log in.\n"
@@ -5177,13 +4858,13 @@
 "Vil du bruka dette skalet?"
 
 #. error popup
-#: src/modules/Users.pm:5254
+#: src/modules/Users.pm:5230
 #, fuzzy
 msgid "No GID is available for this type of group."
 msgstr "Ingen GJEV er tilgjengeleg for denne gruppetypen."
 
 #. error popup
-#: src/modules/Users.pm:5287
+#: src/modules/Users.pm:5263
 #, fuzzy, perl-format
 msgid ""
 "The selected group ID is not allowed.\n"
@@ -5193,7 +4874,7 @@
 "Vel eit gyldig heiltal mellom %i og %i."
 
 #. popup question
-#: src/modules/Users.pm:5317
+#: src/modules/Users.pm:5293
 #, fuzzy
 msgid ""
 "The group ID entered is already in use.\n"
@@ -5203,7 +4884,7 @@
 "Vil du bruka det likevel?"
 
 #. popup question, %i are numbers
-#: src/modules/Users.pm:5329
+#: src/modules/Users.pm:5305
 #, fuzzy, perl-format
 msgid ""
 "The selected group ID is not from a range\n"
@@ -5215,7 +4896,7 @@
 "Vil du verkeleg bruka henne?"
 
 #. popup question
-#: src/modules/Users.pm:5344
+#: src/modules/Users.pm:5320
 #, fuzzy, perl-format
 msgid ""
 "The selected group ID is a local ID,\n"
@@ -5227,7 +4908,7 @@
 "Er du sikker på at du vil endra gruppetypen til 'local'?"
 
 #. popup question
-#: src/modules/Users.pm:5358
+#: src/modules/Users.pm:5334
 #, fuzzy, perl-format
 msgid ""
 "The selected group ID is a system ID,\n"
@@ -5239,7 +4920,7 @@
 "Er du sikker på at du vil endra gruppetypen til 'system'?"
 
 #. error popup
-#: src/modules/Users.pm:5377
+#: src/modules/Users.pm:5353
 #, fuzzy
 msgid ""
 "No group name entered.\n"
@@ -5249,7 +4930,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/modules/Users.pm:5394
+#: src/modules/Users.pm:5370
 #, fuzzy, perl-format
 msgid ""
 "The group name must be between %i and %i characters in length.\n"
@@ -5259,7 +4940,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/modules/Users.pm:5407
+#: src/modules/Users.pm:5383
 #, fuzzy
 msgid ""
 "The group name may contain only\n"
@@ -5273,7 +4954,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/modules/Users.pm:5415
+#: src/modules/Users.pm:5391
 #, fuzzy
 msgid ""
 "There is a conflict between the entered\n"
@@ -5284,13 +4965,13 @@
 "du skreiv inn og eit eksisterande gruppenavn.\n"
 "Prøv eit anna namn."
 
-#: src/modules/Users.pm:5531
+#: src/modules/Users.pm:5507
 #, fuzzy, perl-format
 msgid "User %s does not exist."
 msgstr "Brukaren %s finst ikkje."
 
 #. error message: group cannot be deleted
-#: src/modules/Users.pm:5585
+#: src/modules/Users.pm:5561
 #, fuzzy
 msgid ""
 "You cannot delete this group because\n"
@@ -5302,7 +4983,7 @@
 "som standardgruppe."
 
 #. error message: group cannot be deleted
-#: src/modules/Users.pm:5592
+#: src/modules/Users.pm:5568
 #, fuzzy
 msgid ""
 "You cannot delete this group because\n"
@@ -5314,25 +4995,25 @@
 "Slett desse brukarane frå gruppa først."
 
 #. summary label
-#: src/modules/Users.pm:6603
+#: src/modules/Users.pm:6581
 #, fuzzy
 msgid "<h3>Users</h3>"
 msgstr "<h3>Brukarar</h3>"
 
 #. summary label
-#: src/modules/Users.pm:6613
+#: src/modules/Users.pm:6591
 #, fuzzy
 msgid "<h3>Groups</h3>"
 msgstr "<h3>Grupper</h3>"
 
 #. summary label
-#: src/modules/Users.pm:6624
+#: src/modules/Users.pm:6602
 #, fuzzy
 msgid "<h3>Login Settings</h3>"
 msgstr "<h3>Innstillingar for innlogging</h3>"
 
 #. summary item, %1 is user name
-#: src/modules/Users.pm:6626
+#: src/modules/Users.pm:6604
 #, fuzzy
 msgid "User %1 configured for automatic login"
 msgstr "Brukaren %1 vert logga automatisk inn"
@@ -5354,22 +5035,22 @@
 "finst på LDAP-serveren. Vil du oppretta han no?"
 
 #. plugin name
-#: src/modules/UsersPluginKerberos.pm:122
+#: src/modules/UsersPluginKerberos.pm:124
 #, fuzzy
 msgid "Kerberos Configuration"
 msgstr "Diskkvotekonfigurasjon"
 
 #. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:133
+#: src/modules/UsersPluginKerberos.pm:135
 msgid "No Kerberos Management for Groups"
 msgstr ""
 
 #. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:136
+#: src/modules/UsersPluginKerberos.pm:138
 msgid "Manage Kerberos Principials"
 msgstr ""
 
-#: src/modules/UsersPluginKerberos.pm:260
+#: src/modules/UsersPluginKerberos.pm:262
 msgid "Cannot execute kadmin.local."
 msgstr ""
 
@@ -5514,8 +5195,8 @@
 "%2"
 
 #. the ']' is or-ed...
-#. error popup
-#: src/modules/UsersSimple.pm:505
+#. error popup	
+#: src/modules/UsersSimple.pm:379
 #, fuzzy
 msgid ""
 "The password may only contain the following characters:\n"
@@ -5527,7 +5208,7 @@
 "Prøv igjen."
 
 #. help text (default part shown in more places)
-#: src/modules/UsersSimple.pm:540
+#: src/modules/UsersSimple.pm:414
 #, fuzzy
 msgid ""
 "<p>\n"
@@ -5543,7 +5224,7 @@
 "</p>"
 
 #. error popup
-#: src/modules/UsersSimple.pm:620
+#: src/modules/UsersSimple.pm:494
 #, fuzzy
 msgid ""
 "The user's full name cannot contain\n"
@@ -5555,43 +5236,43 @@
 "Prøv igjen."
 
 #. popup question
-#: src/modules/UsersSimple.pm:647
+#: src/modules/UsersSimple.pm:521
 #, fuzzy
 msgid "You have used the group name as a part of the password."
 msgstr "Du har brukt gruppenavnet som ein del av passordet."
 
 #. popup question
-#: src/modules/UsersSimple.pm:650
+#: src/modules/UsersSimple.pm:524
 #, fuzzy
 msgid "You have used the username as a part of the password."
 msgstr "Du har nytta brukernavnet som ein del av passordet."
 
 #. popup question
-#: src/modules/UsersSimple.pm:659
+#: src/modules/UsersSimple.pm:533
 #, fuzzy
 msgid "You have used only lowercase letters for the password."
 msgstr "Du har brukt berre små bokstavar for passordet."
 
 #. popup question
-#: src/modules/UsersSimple.pm:667
+#: src/modules/UsersSimple.pm:541
 #, fuzzy
 msgid "You have used only uppercase letters for the password."
 msgstr "Du har brukt berre store bokstavar for passordet."
 
 #. popup question
-#: src/modules/UsersSimple.pm:674
+#: src/modules/UsersSimple.pm:548
 #, fuzzy
 msgid "You have used a palindrome for the password."
 msgstr "Du har brukt eit palindrom som passord."
 
 #. popup question
-#: src/modules/UsersSimple.pm:682
+#: src/modules/UsersSimple.pm:556
 #, fuzzy
 msgid "You have used only digits for the password."
 msgstr "Du har brukt berre tal for passordet."
 
 #. popup question
-#: src/modules/UsersSimple.pm:704
+#: src/modules/UsersSimple.pm:578
 #, fuzzy, perl-format
 msgid ""
 "The password is too long for the current encryption method.\n"
@@ -5601,7 +5282,7 @@
 "Det vil forkortast til %s teikn?"
 
 #. error message
-#: src/modules/UsersSimple.pm:791
+#: src/modules/UsersSimple.pm:665
 #, fuzzy, perl-format
 msgid ""
 "The password is too simple:\n"
@@ -5611,13 +5292,13 @@
 "%s."
 
 #. popup error, %i is number
-#: src/modules/UsersSimple.pm:805
+#: src/modules/UsersSimple.pm:679
 #, fuzzy, perl-format
 msgid "The password should have at least %i characters."
 msgstr "Passordet bør innehalda minst %i teikn."
 
 #. error popup
-#: src/modules/UsersSimple.pm:826
+#: src/modules/UsersSimple.pm:700
 #, fuzzy
 msgid ""
 "No username entered.\n"
@@ -5627,7 +5308,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/modules/UsersSimple.pm:836
+#: src/modules/UsersSimple.pm:710
 #, fuzzy, perl-format
 msgid ""
 "The username must be between %i and %i characters in length.\n"
@@ -5637,7 +5318,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/modules/UsersSimple.pm:865
+#: src/modules/UsersSimple.pm:739
 #, fuzzy
 msgid ""
 "The username may contain only\n"
@@ -5651,7 +5332,7 @@
 "Prøv igjen."
 
 #. error popup
-#: src/modules/UsersSimple.pm:886
+#: src/modules/UsersSimple.pm:760
 #, fuzzy
 msgid ""
 "There is a conflict between the entered\n"
@@ -5662,16 +5343,14 @@
 "skreiv inn og eit anna brukernavn.\n"
 "Prøv eit anna brukernavn."
 
-#. busy popup message, %1 is package name
 #. busy popup message
-#: src/modules/UsersSimple.pm:1179 src/modules/UsersSimple.pm:1294
+#: src/modules/UsersSimple.pm:982
 #, fuzzy
 msgid "Retrieving %1 extension..."
 msgstr "Hentar %1-utviding …"
 
-#. busy popup message, %1 is package name
 #. busy popup message
-#: src/modules/UsersSimple.pm:1277 src/modules/UsersSimple.pm:1308
+#: src/modules/UsersSimple.pm:996
 #, fuzzy
 msgid "Releasing %1 extension..."
 msgstr "Frigjer   -utviding"
@@ -5750,6 +5429,176 @@
 msgstr "Fleire brukarar samsvarer med vilkåra."
 
 #, fuzzy
+#~ msgid "User Authentication Method"
+#~ msgstr "Metode for brukerautentisering"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>\n"
+#~ "<b>Authentication</b><br>\n"
+#~ "Select the authentication method to use for users on your system.\n"
+#~ "</p>"
+#~ msgstr ""
+#~ "<p>\n"
+#~ "<b>Autentisering</b><br>\n"
+#~ "Her du kan du velja autentiseringsmetode for brukarar i systemet.\n"
+#~ "</p>"
+
+#, fuzzy
+#~ msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
+#~ msgstr "Viss du har ein annan installasjon eller eit anna system, kan du oppretta brukarar basert på denne kjelda. Vel <b>Les brukerinformasjon frå tidlegare installasjon</b> for å gjera dette. Med dette valet kan du bruka ein eksisterande eller oppretta ein ny hjemmekatalog for kvar brukar på den spesifiserte staden for denne installasjonen."
+
+#, fuzzy
+#~ msgid "&LDAP"
+#~ msgstr "&LDAP"
+
+#, fuzzy
+#~ msgid "N&IS"
+#~ msgstr "N&IS"
+
+#, fuzzy
+#~ msgid "&Windows Domain"
+#~ msgstr "&Windows-domane"
+
+#, fuzzy
+#~ msgid "L&ocal (/etc/passwd)"
+#~ msgstr "L&okal (/etc/passwd)"
+
+#, fuzzy
+#~ msgid "eDirectory LDAP"
+#~ msgstr "eDirectory LDAP"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>If you are using a NIS or LDAP server to store user data or if you want\n"
+#~ "to authenticate users against an NT server, choose the appropriate value. Then\n"
+#~ "press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Viss du brukar ein NIS- eller LDAP-servar til lagring av brukerdata eller viss du vil\n"
+#~ "autentisere brukarar mot ein NT-servar, vel det aktuelle verdet. Trykk deretter\n"
+#~ "<b>Neste</b>, og hald med fram klientkonfigurasjonen.</p>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>If you are using a NIS or LDAP server to store user data, choose the\n"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Viss du brukar ein NIS- eller LDAP-servar til lagring av brukerdata, vel det\n"
+#~ "aktuelle verdet. Trykk deretter <b>Neste</b>, og hald med fram klientkonfigurasjonen.</p>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>If you are using an LDAP server to store user data or if you want to\n"
+#~ "authenticate users against an NT server, choose the appropriate value. Then\n"
+#~ "press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Viss du brukar ein LDAP-servar til lagring av brukerdata eller viss du vil\n"
+#~ "autentisere brukarar mot ein NT-servar, vel det aktuelle verdet. Trykk deretter\n"
+#~ "<b>Neste</b>, og hald med fram klientkonfigurasjonen.</p>"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>If you are using an LDAP server to store user data, choose the\n"
+#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
+#~ msgstr ""
+#~ "<p>Viss du brukar ein LDAP-servar til lagring av brukerdata, vel det\n"
+#~ "aktuelle verdet. Trykk deretter <b>Neste</b>, og hald med fram klientkonfigurasjonen.</p>"
+
+#, fuzzy
+#~ msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
+#~ msgstr "<p>Kryss av for <b>Sett opp Kerberos-autentisering</b> for å konfigurera Kerberos etter at du har valt brukerinformasjonskilde.</p>"
+
+#, fuzzy
+#~ msgid "&Choose"
+#~ msgstr "&Vel"
+
+#, fuzzy
+#~ msgid "Authentication Method"
+#~ msgstr "Metode for brukerautentisering"
+
+#, fuzzy
+#~ msgid "Set Up &Kerberos Authentication"
+#~ msgstr "Sett opp &Kerberos-autentisering"
+
+#, fuzzy
+#~ msgid "E&xpert Options..."
+#~ msgstr "A&vanserte alternativ …"
+
+#, fuzzy
+#~ msgid ""
+#~ "<p>If you intend to use this password for creating certificates,\n"
+#~ "it has to be at least %1 characters long.</p>"
+#~ msgstr ""
+#~ "<p>Viss du har til føremål å bruka dette passordet til å oppretta sertifikat,\n"
+#~ "må det har ei lengd på minst %1 teikn.</p>"
+
+#, fuzzy
+#~ msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
+#~ msgstr "<p>Kontrollar om gjeldande tastaturoppsett er riktig ved å skriva inn tekst i feltet <b>Test tastaturoppsett</b>.</p>"
+
+#, fuzzy
+#~ msgid ""
+#~ "If you intend to create certificates,\n"
+#~ "the password should have at least %1 characters."
+#~ msgstr ""
+#~ "Viss du har til føremål å oppretta sertifikat,\n"
+#~ "bør passordet ha minst %1 teikn."
+
+#, fuzzy
+#~ msgid ""
+#~ "The root password could not be set.\n"
+#~ "You might not be able to log in.\n"
+#~ "Try setting it again?\n"
+#~ msgstr ""
+#~ "Eit rotpassord kunne ikkje definerast.\n"
+#~ "Du vil kanskje ikkje kunna logga inn.\n"
+#~ "Vil du freista igjen?\n"
+
+#, fuzzy
+#~ msgid "Initialization of module for configuration of authentication..."
+#~ msgstr "Initialisering av modul for konfigurasjon av autentisering …"
+
+#, fuzzy
+#~ msgid "<p><b>Authentication</b><br></p>"
+#~ msgstr "<p><b>Innloggingsinnstillinger</b></p>"
+
+#, fuzzy
+#~ msgid "Expert Settings"
+#~ msgstr "Avanserte innstillingar"
+
+#, fuzzy
+#~ msgid "The authentication method is local /etc/passwd."
+#~ msgstr "Autentiseringsmetoden er lokal"
+
+#, fuzzy
+#~ msgid "The password encryption method is %s."
+#~ msgstr "Krypteringsmetode for passord er %1."
+
+#, fuzzy
+#~ msgid "&Change..."
+#~ msgstr "&Endre …"
+
+#, fuzzy
+#~ msgid "Summary"
+#~ msgstr "Sammendrag"
+
+#, fuzzy
+#~ msgid "Samba (Windows Domain)"
+#~ msgstr "              -domane"
+
+#, fuzzy
+#~ msgid "<%1>Authentication method<%2>: %3"
+#~ msgstr "<%1>Autentiseringsmetode<%2>: %3"
+
+#, fuzzy
+#~ msgid "<%1>Authentication method<%2>: %3 and Kerberos."
+#~ msgstr "<%1>Autentiseringsmetode<<%2>: %3 og Kerberos."
+
+#, fuzzy
+#~ msgid "<%1>Users<%2> %3 selected for import"
+#~ msgstr "<%1>Brukarane<%2> %3 valt for import"
+
+#, fuzzy
 #~ msgid "No Password Entered"
 #~ msgstr "Passord er ikkje angjeven"
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/vm.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/vm.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/vm.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:37+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2011-05-17 17:42+0200\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: Norwegian Nynorsk \n"
@@ -27,13 +27,13 @@
 msgstr "Set opp den virtuelle maskina …"
 
 #. check for kernel-bigsmp
-#: src/modules/VirtConfig.rb:158
+#: src/modules/VirtConfig.rb:157
 #, fuzzy
 msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is "
 msgstr "x86_64 er den einaste arkitekturen som vert støtta som vert for virtuelle maskiner. Din arktitektur er "
 
 #. we are already in UML, nested virtual machine is not supported
-#: src/modules/VirtConfig.rb:177
+#: src/modules/VirtConfig.rb:176
 msgid ""
 "Virtual machine installation cannot be started inside the UML machine.\n"
 "Start installation in the host system.\n"
@@ -43,175 +43,167 @@
 
 #. progress stage 1/2
 #. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282
+#: src/modules/VirtConfig.rb:193 src/modules/VirtConfig.rb:281
 msgid "Verify Installed Packages"
 msgstr "Kontrollar installerte pakkar"
 
 #. progress stage 2/2
-#: src/modules/VirtConfig.rb:196
+#: src/modules/VirtConfig.rb:195
 msgid "Network Bridge Configuration"
 msgstr "Oppsett av nettverksbru"
 
 #. Headline for management domain installation
-#: src/modules/VirtConfig.rb:211
+#: src/modules/VirtConfig.rb:210
 msgid "Configuring the VM Server (domain 0)"
 msgstr "Set opp VM-tenaren (domene 0)"
 
 #. xen domain0 installation help text - 1/4
-#: src/modules/VirtConfig.rb:214
-msgid ""
-"<p><big><b>VM Server Configuration</b></big></p>"
-"<p>Configuration of the VM Server (domain 0) has two parts.</p>"
-msgstr ""
-"<p><big><b>Oppsett av VM-tenar</b></big></p>"
-"<p>VM-tenaren vert sett opp i to steg.</p>"
+#: src/modules/VirtConfig.rb:213
+msgid "<p><big><b>VM Server Configuration</b></big></p><p>Configuration of the VM Server (domain 0) has two parts.</p>"
+msgstr "<p><big><b>Oppsett av VM-tenar</b></big></p><p>VM-tenaren vert sett opp i to steg.</p>"
 
 #. xen domain0 installation help text - 2/4
-#: src/modules/VirtConfig.rb:218
+#: src/modules/VirtConfig.rb:217
 msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>"
 msgstr "<p>Dei nødvendige pakkane vert først installerte. Systemet byter så tiloppstartslasteren GRUB (viss denne ikkje alt vert brukt), og ei Xen-blokk vert lagd til i oppstartsmenyen viss ho ikkje finst der frå før.</p>"
 
 #. xen domain0 installation help text - 3/4
-#: src/modules/VirtConfig.rb:222
+#: src/modules/VirtConfig.rb:221
 #, fuzzy
 #| msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and Linux kernel.</p>"
 msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
 msgstr "<p>GRUB må brukast, då han støttar standarden som trengst for å starta Xen- og Linux-kjernen.</p>"
 
 #. xen domain0 installation help text - 4/4
-#: src/modules/VirtConfig.rb:226
+#: src/modules/VirtConfig.rb:225
 #, fuzzy
 #| msgid "<p>When the configuration is successfully finished, it is possible to boot the VM Server from the boot loader menu.</p>"
 msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
 msgstr "<p>Når oppsettet er fullført, kan du starta VM-tenaren frå oppstartsmenyen.</p>"
 
 #. error popup
-#: src/modules/VirtConfig.rb:231
+#: src/modules/VirtConfig.rb:230
 msgid "The installation will be aborted."
 msgstr "Installasjonen vert avbroten."
 
-#: src/modules/VirtConfig.rb:234
+#: src/modules/VirtConfig.rb:233
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Choose Hypervisor(s) to install"
 msgstr "Hypervisor og verktøy er installerte."
 
-#: src/modules/VirtConfig.rb:237
+#: src/modules/VirtConfig.rb:236
 msgid "Server: Minimal system to get a running Hypervisor"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:238
+#: src/modules/VirtConfig.rb:237
 #, fuzzy
 #| msgid "Configuring the virtual machine..."
 msgid "Tools: Configure, manage and monitor virtual machines"
 msgstr "Set opp den virtuelle maskina …"
 
-#: src/modules/VirtConfig.rb:251
+#: src/modules/VirtConfig.rb:250
 msgid "KVM Hypervisor"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:253
+#: src/modules/VirtConfig.rb:252
 msgid "KVM server"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:254
+#: src/modules/VirtConfig.rb:253
 msgid "KVM tools"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:259
+#: src/modules/VirtConfig.rb:258
 msgid "libvirt LXC containers"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:261
+#: src/modules/VirtConfig.rb:260
 msgid "libvirt LXC daemon"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:289
+#: src/modules/VirtConfig.rb:288
 msgid "Software to connect to Virtualization server"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:291
+#: src/modules/VirtConfig.rb:290
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Virtualization client tools"
 msgstr "Hypervisor og verktøy er installerte."
 
-#: src/modules/VirtConfig.rb:307
+#: src/modules/VirtConfig.rb:306
 msgid "Xen Hypervisor"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:309
+#: src/modules/VirtConfig.rb:308
 msgid "Xen server"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:310
+#: src/modules/VirtConfig.rb:309
 msgid "Xen tools"
 msgstr ""
 
 #. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VirtConfig.rb:388
+#: src/modules/VirtConfig.rb:387
 #, fuzzy
 #| msgid "The installation will be aborted."
 msgid "Package installation failed\n"
 msgstr "Installasjonen vert avbroten."
 
-#: src/modules/VirtConfig.rb:396
+#: src/modules/VirtConfig.rb:395
 #, fuzzy
 #| msgid "The installation will be aborted."
 msgid "Package installation failed for lxc\n"
 msgstr "Installasjonen vert avbroten."
 
-#: src/modules/VirtConfig.rb:403
+#: src/modules/VirtConfig.rb:402
 msgid "Package installation failed for sled client pattern\n"
 msgstr ""
 
-#: src/modules/VirtConfig.rb:413
+#: src/modules/VirtConfig.rb:412
 msgid "Package installation failed for sles patterns\n"
 msgstr ""
 
 #. Assume python gtk is installed. If in text mode we don't care
-#: src/modules/VirtConfig.rb:426
+#: src/modules/VirtConfig.rb:425
 msgid "Running in text mode. Install graphical components anyway?"
 msgstr "Køyrer i tekstmodus. Vil du likevel installera grafiske komponentar?"
 
 #. progressbar title - check whether Xen packages are installed
-#: src/modules/VirtConfig.rb:439
+#: src/modules/VirtConfig.rb:438
 msgid "Checking packages..."
 msgstr "Kontrollerer pakker …"
 
 #. progressbar title - install the required packages
-#: src/modules/VirtConfig.rb:442
+#: src/modules/VirtConfig.rb:441
 msgid "Installing packages..."
 msgstr "Installerer pakkar …"
 
 #. error popup
 #. Now see if they really were installed (bnc#508347)
-#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454
+#: src/modules/VirtConfig.rb:446 src/modules/VirtConfig.rb:453
 msgid "Cannot install required packages."
 msgstr "Kan ikkje installera nødvendige pakker."
 
 #. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
-#: src/modules/VirtConfig.rb:464
+#: src/modules/VirtConfig.rb:463
 msgid "Updating grub2 configuration files..."
 msgstr ""
 
 #. Default Bridge stage
-#: src/modules/VirtConfig.rb:484
+#: src/modules/VirtConfig.rb:477
 msgid "Configuring Default Network Bridge..."
 msgstr "Set opp standard nettverksbru …"
 
 #. Popup yes/no dialog
-#: src/modules/VirtConfig.rb:505
+#: src/modules/VirtConfig.rb:498
 msgid "Network Bridge."
 msgstr "Nettverksbru."
 
-#: src/modules/VirtConfig.rb:506
-msgid ""
-"<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p>"
-"<p>Configure a default network bridge?</p>"
-msgstr ""
-"<p>For vanlege nettverksoppsett med virtuelle maskiner bør du bruka ei nettverksbru.</p>"
-"<p>Vil du setja opp ei standard nettverksbru?</p>"
+#: src/modules/VirtConfig.rb:499
+msgid "<p>For normal network configurations hosting virtual machines, a network bridge is recommended.</p><p>Configure a default network bridge?</p>"
+msgstr "<p>For vanlege nettverksoppsett med virtuelle maskiner bør du bruka ei nettverksbru.</p><p>Vil du setja opp ei standard nettverksbru?</p>"
 
 #. Firewall stage - modify the firewall setting, add the xen bridge to FW_FORWARD_ALWAYS_INOUT_DEV
 #. Progress::NextStage();
@@ -222,35 +214,35 @@
 #. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
 #. return false;
 #. }
-#: src/modules/VirtConfig.rb:567
+#: src/modules/VirtConfig.rb:568
 msgid "KVM components are installed. Your host is ready to install KVM guests."
 msgstr ""
 
-#: src/modules/VirtConfig.rb:570
+#: src/modules/VirtConfig.rb:571
 #, fuzzy
 #| msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu.\n"
 msgid "KVM components are installed. Reboot the machine and select the native kernel in the boot loader menu to install KVM guests."
 msgstr "For å installera Xen-gjester må maskina startast på nytt for å lasta inn nødvendige drivarar.\n"
 
-#: src/modules/VirtConfig.rb:573
+#: src/modules/VirtConfig.rb:574
 #, fuzzy
 #| msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu.\n"
 msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu."
 msgstr "For å installera Xen-gjester må maskina startast på nytt for å lasta inn nødvendige drivarar.\n"
 
-#: src/modules/VirtConfig.rb:576
+#: src/modules/VirtConfig.rb:577
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Xen Hypervisor and tools are installed."
 msgstr "Hypervisor og verktøy er installerte."
 
-#: src/modules/VirtConfig.rb:577
+#: src/modules/VirtConfig.rb:578
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Virtualization client tools are installed."
 msgstr "Hypervisor og verktøy er installerte."
 
-#: src/modules/VirtConfig.rb:578
+#: src/modules/VirtConfig.rb:579
 #, fuzzy
 #| msgid "Hypervisor and tools are installed."
 msgid "Libvirt LXC components are installed."

Modified: branches/plus-SLE12-SP2/yast/nn/po/vpn.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/vpn.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/vpn.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-09-28 18:17+0200\n"
+"POT-Creation-Date: 2016-05-06 16:59+0200\n"
 "PO-Revision-Date: 2005-08-11 20:37+0200\n"
 "Last-Translator: nynorsk \n"
 "Language-Team:  nn \n"
@@ -200,12 +200,12 @@
 msgstr ""
 
 #. Create the user (:xauth or :eap). Return true if successful.
-#: src/lib/vpn/ipsec.rb:439
+#: src/lib/vpn/ipsec.rb:442
 msgid "The user name is already used."
 msgstr ""
 
 #. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false.
-#: src/lib/vpn/ipsec.rb:503
+#: src/lib/vpn/ipsec.rb:506
 msgid "Cannot find a matching client connection."
 msgstr ""
 
@@ -286,102 +286,102 @@
 msgstr ""
 
 #. Open dialog to edit VPN client passwords/certificates.
-#: src/lib/vpn/main_dialog.rb:285
+#: src/lib/vpn/main_dialog.rb:289
 msgid "Please enter gateway IP before editing credentials."
 msgstr ""
 
 #. Render a table of configured gateway and client connections.
-#: src/lib/vpn/main_dialog.rb:361
+#: src/lib/vpn/main_dialog.rb:365
 msgid "Name"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:361
+#: src/lib/vpn/main_dialog.rb:365
 msgid "Description"
 msgstr ""
 
 #. Render configuration controls for the chosen connection.
-#: src/lib/vpn/main_dialog.rb:376
+#: src/lib/vpn/main_dialog.rb:380
 msgid "Click 'New VPN' to create a gateway or client."
 msgstr ""
 
 #. Make widgets for connection configuration
-#: src/lib/vpn/main_dialog.rb:386
+#: src/lib/vpn/main_dialog.rb:390
 msgid "All IPv4 networks (0.0.0.0/0)"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:387
+#: src/lib/vpn/main_dialog.rb:391
 msgid "All IPv6 networks (::/0)"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:389
+#: src/lib/vpn/main_dialog.rb:393
 msgid "Limited CIDRs, comma separated:"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:395
+#: src/lib/vpn/main_dialog.rb:399
 msgid "Connection name: "
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:396
+#: src/lib/vpn/main_dialog.rb:400
 msgid "Type"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:398
+#: src/lib/vpn/main_dialog.rb:402
 msgid "Gateway (Server)"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:399
+#: src/lib/vpn/main_dialog.rb:403
 msgid "Client"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:406
+#: src/lib/vpn/main_dialog.rb:410
 msgid "The scenario is"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:408
+#: src/lib/vpn/main_dialog.rb:412
 msgid "Secure communication with a pre-shared key"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:409
+#: src/lib/vpn/main_dialog.rb:413
 msgid "Secure communication with a certificate"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:410
+#: src/lib/vpn/main_dialog.rb:414
 msgid "Provide access to Android, iOS, MacOS X clients"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:411
+#: src/lib/vpn/main_dialog.rb:415
 msgid "Provide access to Windows 7, Windows 8 clients"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:413 src/lib/vpn/main_dialog.rb:427
+#: src/lib/vpn/main_dialog.rb:417 src/lib/vpn/main_dialog.rb:431
 msgid "Edit Credentials"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:416
+#: src/lib/vpn/main_dialog.rb:420
 msgid "Provide VPN clients access to"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:417
+#: src/lib/vpn/main_dialog.rb:421
 msgid "Clients' address pool (e.g. 192.168.100.0/24)"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:421
+#: src/lib/vpn/main_dialog.rb:425
 msgid "The gateway requires authentication"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:423
+#: src/lib/vpn/main_dialog.rb:427
 msgid "By a pre-shared key"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:424
+#: src/lib/vpn/main_dialog.rb:428
 msgid "By a certificate"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:426
+#: src/lib/vpn/main_dialog.rb:430
 msgid "VPN gateway IP"
 msgstr ""
 
-#: src/lib/vpn/main_dialog.rb:430
+#: src/lib/vpn/main_dialog.rb:434
 msgid "Use the VPN tunnel to access"
 msgstr ""
 
@@ -466,32 +466,32 @@
 msgstr ""
 
 #. Install packages
-#: src/modules/IPSecConf.rb:172
+#: src/modules/IPSecConf.rb:174
 msgid "Failed to install IPSec packages."
 msgstr ""
 
 #. Enable/disable daemon
-#: src/modules/IPSecConf.rb:180
+#: src/modules/IPSecConf.rb:182
 msgid "Failed to start IPSec daemon."
 msgstr ""
 
 #. Configure IP forwarding
-#: src/modules/IPSecConf.rb:210
+#: src/modules/IPSecConf.rb:212
 msgid "Failed to apply IP forwarding settings using sysctl:"
 msgstr ""
 
 #. Configure/deconfigure firewall
-#: src/modules/IPSecConf.rb:225
+#: src/modules/IPSecConf.rb:228
 msgid ""
 "SuSE firewall is enabled but not activated.\n"
 "In order for VPN to function properly, SuSE firewall will now be activated."
 msgstr ""
 
-#: src/modules/IPSecConf.rb:229 src/modules/IPSecConf.rb:234
+#: src/modules/IPSecConf.rb:232 src/modules/IPSecConf.rb:237
 msgid "Failed to restart SuSE firewall."
 msgstr ""
 
-#: src/modules/IPSecConf.rb:240
+#: src/modules/IPSecConf.rb:243
 msgid ""
 "Both VPN gateway and clients require special SuSE firewall configuration.\n"
 "SuSE firewall is not enabled, therefore you must manually run the configuration script on every reboot. The script will be run now.\n"
@@ -499,28 +499,28 @@
 msgstr ""
 
 #. AutoYaST: Return a rich text summary of the current configuration.
-#: src/modules/IPSecConf.rb:279
+#: src/modules/IPSecConf.rb:282
 msgid "VPN Global Settings"
 msgstr ""
 
-#: src/modules/IPSecConf.rb:280
+#: src/modules/IPSecConf.rb:283
 msgid "Enable VPN (IPSec) daemon: %s"
 msgstr ""
 
-#: src/modules/IPSecConf.rb:281
-msgid "Reduce TCP MSS to 1024: %s"
+#: src/modules/IPSecConf.rb:284
+msgid "Reduce TCP MSS: %s"
 msgstr ""
 
-#: src/modules/IPSecConf.rb:282
+#: src/modules/IPSecConf.rb:285
 msgid "Gateway and Connections"
 msgstr ""
 
 #. Gateway summary
-#: src/modules/IPSecConf.rb:288
+#: src/modules/IPSecConf.rb:291
 msgid "A gateway serving clients in "
 msgstr ""
 
 #. Client summary
-#: src/modules/IPSecConf.rb:292
+#: src/modules/IPSecConf.rb:295
 msgid "A client connecting to "
 msgstr ""

Modified: branches/plus-SLE12-SP2/yast/nn/po/wol.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/wol.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/wol.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -70,13 +70,11 @@
 
 #: src/clients/wol.rb:77
 msgid ""
-"<h2>Wake on LAN</h2>"
-"\n"
+"<h2>Wake on LAN</h2>\n"
 "<p>With WOL, you can 'wake up' your PC simply by sending a 'magic packet' \n"
 "over the network.</p>"
 msgstr ""
-"<h2>Vekk via lokalnett (WOL)</h2>"
-"\n"
+"<h2>Vekk via lokalnett (WOL)</h2>\n"
 "<p>Med denne funksjonen kan du slå på maskina \n"
 "med eit spesielt signal over lokalnettverket.</p>"
 

Modified: branches/plus-SLE12-SP2/yast/nn/po/yast2-apparmor.nn.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nn/po/yast2-apparmor.nn.po	2016-08-04 12:56:40 UTC (rev 96205)
+++ branches/plus-SLE12-SP2/yast/nn/po/yast2-apparmor.nn.po	2016-08-04 12:56:51 UTC (rev 96206)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: @PACKAGE@\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-25 18:36+0200\n"
+"POT-Creation-Date: 2016-05-06 16:57+0200\n"
 "PO-Revision-Date: 2015-09-09 16:23+0100\n"
 "Last-Translator: Karl Ove Hufthammer \n"
 "Language-Team: NorwegianNynorsk \n"
@@ -95,8 +95,7 @@
 #, fuzzy
 msgid ""
 "<p>Choose one of the available AppArmor modules to configure\n"
-" the corresponding action and press <b>Launch</b>.</p>"
-"\n"
+" the corresponding action and press <b>Launch</b>.</p>\n"
 msgstr ""
 "<p>Vel ein av dei tilgjengelege apparmor-modulane for å setja opp\n"
 " tilhøyrande handlingar, og klikk <b>Start</b>.</p>"
@@ -290,35 +289,28 @@
 #: src/include/apparmor/aa-config.rb:441
 #, fuzzy
 msgid ""
-"<p><b>AppArmor Status</b><br>"
-"This reports whether the AppArmor policy enforcement \n"
+"<p><b>AppArmor Status</b><br>This reports whether the AppArmor policy enforcement \n"
 "module is loaded and functioning.</p>"
 msgstr ""
-"<p><b>AppArmor-status</b><br>"
-"Denne rapporten viser om AppArmor-modulen \n"
-"er lasta og aktivert.</p>"
-" "
+"<p><b>AppArmor-status</b><br>Denne rapporten viser om AppArmor-modulen \n"
+"er lasta og aktivert.</p> "
 
 #: src/include/apparmor/aa-config.rb:444
 #, fuzzy
 msgid ""
-"<p><b>Security Event Notification</b><br>"
-"Configure this tool if you want \n"
+"<p><b>Security Event Notification</b><br>Configure this tool if you want \n"
 "to be notified by email when access violations have occurred.</p>"
 msgstr ""
-"<p><b>Varsling av sikkerhetshendelse</b><br>"
-"Sett opp dette verktøyet viss du vil \n"
+"<p><b>Varsling av sikkerhetshendelse</b><br>Sett opp dette verktøyet viss du vil \n"
 "varslast via e-post når brot på tilgangsreglene har funnest.</p>"
 
 #: src/include/apparmor/aa-config.rb:447
 #, fuzzy
 msgid ""
-"<p><b>Profile Modes</b><br>"
-"Use this tool to change the way that AppArmor \n"
+"<p><b>Profile Modes</b><br>Use this tool to change the way that AppArmor \n"
 "uses individual profiles.</p>"
 msgstr ""
-"<p><b>Profilmoduser</b><br>"
-"Bruk dette verktøyet for å endra korleis AppArmor \n"
+"<p><b>Profilmoduser</b><br>Bruk dette verktøyet for å endra korleis AppArmor \n"
 "brukar dei einskilde profila.</p>"
 
 #: src/include/apparmor/aa-config.rb:462
@@ -397,12 +389,8 @@
 
 #: src/include/apparmor/apparmor_profile_check.rb:57
 #, fuzzy
-msgid ""
-"<p>These problems must be corrected before AppArmor can be started or the profile management tools can be used.</p>"
-" "
-msgstr ""
-"<p>Desse feila må rettast før AppArmor kan startast eller profilbehandlingsverktøyet vert nytta.</p>"
-" "
+msgid "<p>These problems must be corrected before AppArmor can be started or the profile management tools can be used.</p> "
+msgstr "<p>Desse feila må rettast før AppArmor kan startast eller profilbehandlingsverktøyet vert nytta.</p> "
 
 #: src/include/apparmor/apparmor_profile_check.rb:64
 #, fuzzy
@@ -905,640 +893,392 @@
 #: src/include/apparmor/capabilities.rb:35
 #, fuzzy
 msgid ""
-"<ul>"
-"<li>In a system with the [_POSIX_CHOWN_RESTRICTED] option defined, \n"
+"<ul><li>In a system with the [_POSIX_CHOWN_RESTRICTED] option defined, \n"
 "this overrides the restriction of changing file ownership \n"
-"and group ownership.</li>"
-"</ul>"
+"and group ownership.</li></ul>"
 msgstr ""
-"<ul>"
-"<li>I eit system kor [_pOSIX_cHOWN_rESTRICTED] er valt, \n"
+"<ul><li>I eit system kor [_pOSIX_cHOWN_rESTRICTED] er valt, \n"
 "overstyrer dette avgrensinga for endring av \n"
-"fil- og gruppeeierskap.</li>"
-"</ul>"
+"fil- og gruppeeierskap.</li></ul>"
 
 #: src/include/apparmor/capabilities.rb:43
 #, fuzzy
 msgid ""
-"<ul>"
-"<li>Override all DAC access, including ACL execute access if \n"
-"[_POSIX_ACL] is defined. Excluding DAC access covered by CAP_LINUX_IMMUTABLE.</li>"
-"</ul>"
+"<ul><li>Override all DAC access, including ACL execute access if \n"
+"[_POSIX_ACL] is defined. Excluding DAC access covered by CAP_LINUX_IMMUTABLE.</li></ul>"
 msgstr ""
-"<ul>"
-"<li>Overstyr all DAC-tilgjenge, inkludert tilgjenge for køyring av ACL viss \n"
-"[_pOSIX_aCL] er vald. Unntaket er DAC-tilgjenge som vert dekt av CAP_lINUX_iMMUTABLE.</li>"
-"</ul>"
+"<ul><li>Overstyr all DAC-tilgjenge, inkludert tilgjenge for køyring av ACL viss \n"
+"[_pOSIX_aCL] er vald. Unntaket er DAC-tilgjenge som vert dekt av CAP_lINUX_iMMUTABLE.</li></ul>"
 
 #: src/include/apparmor/capabilities.rb:49
 #, fuzzy
 msgid ""
-"<ul>"
-"<li>Overrides all DAC restrictions regarding read and search \n"
+"<ul><li>Overrides all DAC restrictions regarding read and search \n"
 "on files and directories, including ACL restrictions if [_POSIX_ACL] is defined. \n"
-"Excluding DAC access covered by CAP_LINUX_IMMUTABLE. </li>"
-"</ul>"
+"Excluding DAC access covered by CAP_LINUX_IMMUTABLE. </li></ul>"
 msgstr ""
-"<ul>"
-"<li>Overstyrer alle DAC-avgrensingar andsynes lesing og søk \n"
+"<ul><li>Overstyrer alle DAC-avgrensingar andsynes lesing og søk \n"
 "etter filer og katalogar, inkludert ACL-avgrensingar viss [_pOSIX_aCL] er valde. \n"
-"Unntaket er DAC-tilgjenge som vert dekt av CAP_lINUX_iMMUTABLE. </li>"
-"</ul>"
+"Unntaket er DAC-tilgjenge som vert dekt av CAP_lINUX_iMMUTABLE. </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:57
 #, fuzzy
 msgid ""
-"<ul>"
-"<li>Overrides all restrictions on allowed operations on files, where file\n"
+"<ul><li>Overrides all restrictions on allowed operations on files, where file\n"
 "owner ID must be equal to the user ID, except where CAP_FSETID is\n"
-"applicable. It does not override MAC and DAC restrictions. </li>"
-"</ul>"
+"applicable. It does not override MAC and DAC restrictions. </li></ul>"
 msgstr ""
-"<ul>"
-"<li>Overstyrer alle avgrensingar om tillatne handlingar for filer, \n"
+"<ul><li>Overstyrer alle avgrensingar om tillatne handlingar for filer, \n"
 "der fileierens ID må vera lik brukar-ID-ein, unntatt der CAP_fSETID \n"
-"gjeld. Overstyrer ikkje MAC- og DAC-avgrensingar. </li>"
-"</ul>"
+"gjeld. Overstyrer ikkje MAC- og DAC-avgrensingar. </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:65
 #, fuzzy
-msgid ""
-"<ul>"
-"<li>Overrides the following restrictions: user ID must match the file owner ID when setting the S_ISUID and S_ISGID bits on that file; the effective group ID (or one of the supplementary group IDs) must match the file owner ID when setting the S_ISGID bit on that file; the S_ISUID and S_ISGID bits are cleared on successful return from chown(2) (not implemented). </li>"
-"</ul>"
+msgid "<ul><li>Overrides the following restrictions: user ID must match the file owner ID when setting the S_ISUID and S_ISGID bits on that file; the effective group ID (or one of the supplementary group IDs) must match the file owner ID when setting the S_ISGID bit on that file; the S_ISUID and S_ISGID bits are cleared on successful return from chown(2) (not implemented). </li></ul>"
 msgstr ""
-"<ul>"
-"<li>Overstyrer følgjande avgrensingar om at fungerande nytter-ID \n"
+"<ul><li>Overstyrer følgjande avgrensingar om at fungerande nytter-ID \n"
 "skal vera lik fileierens ID ved innstilling av S_iSUID- og S_iSGID-bitar for fila, \n"
 "at gjeldande gruppe-ID (eller ein av tilleggsgruppe-ID-eine) skal vera lik \n"
 "fileierens ID ved innstilling av S_iSGID-biten for fila, og at bitane S_iSUID og \n"
-"S_iSGID vert sletta ved vellukka retur frå chown(2) (ikkje implementert). </li>"
-"</ul>"
+"S_iSGID vert sletta ved vellukka retur frå chown(2) (ikkje implementert). </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:71
 #, fuzzy
 msgid ""
-"<ul>"
-"<li>Overrides the restriction that the real or effective user ID \n"
+"<ul><li>Overrides the restriction that the real or effective user ID \n"
 "of a process sending a signal must match the real or effective user ID of the process \n"
-"receiving the signal.</li>"
-"</ul>"
+"receiving the signal.</li></ul>"
 msgstr ""
-"<ul>"
-"<li>Overstyrer avgrensinga om at reell eller gjeldande nytter-ID \n"
+"<ul><li>Overstyrer avgrensinga om at reell eller gjeldande nytter-ID \n"
 "for ein prosess som sender eit signal, må vera lik reelle eller gjeldande brukar-ID for prosessen \n"
-"som mottek signalet.</li>"
-"</ul>"
+"som mottek signalet.</li></ul>"
 
 #: src/include/apparmor/capabilities.rb:79
 #, fuzzy
 msgid ""
-"<ul>"
-"<li>Allows setgid(2) manipulation </li>"
-" "
-"<li> Allows setgroups(2) </li>"
-" \n"
-"<li> Allows forged gids on socket credentials passing. </li>"
-"</ul>"
+"<ul><li>Allows setgid(2) manipulation </li> <li> Allows setgroups(2) </li> \n"
+"<li> Allows forged gids on socket credentials passing. </li></ul>"
 msgstr ""
-"<ul>"
-"<li>Tillèt endring av setgid(2) </li>"
-" "
-"<li> Tillèt setgroups(2) </li>"
-" "
-"<li> \n"
-"Tillèt konstruerte GJEV-er ved overføring av sokkelrettigheter. </li>"
-"</ul>"
+"<ul><li>Tillèt endring av setgid(2) </li> <li> Tillèt setgroups(2) </li> <li> \n"
+"Tillèt konstruerte GJEV-er ved overføring av sokkelrettigheter. </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:85
 #, fuzzy
 msgid ""
-"<ul>"
-"<li>Allows setuid(2) manipulation (including fsuid) </li>"
-" \n"
-"<li> Allows forged pids on socket credentials passing. </li>"
-"</ul>"
+"<ul><li>Allows setuid(2) manipulation (including fsuid) </li> \n"
+"<li> Allows forged pids on socket credentials passing. </li></ul>"
 msgstr ""
-"<ul>"
-"<li>Tillèt endring av setuid(2) (inkludert fsuid) </li>"
-" "
-"<li> \n"
-"Tillèt konstruerte PID-er ved overføring av sokkelrettigheter. </li>"
-"</ul>"
+"<ul><li>Tillèt endring av setuid(2) (inkludert fsuid) </li> <li> \n"
+"Tillèt konstruerte PID-er ved overføring av sokkelrettigheter. </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:91
 #, fuzzy
 msgid ""
-"<ul>"
-"<li> Transfer any capability in your permitted set to any pid, \n"
-"remove any capability in your permitted set from any pid</li>"
-"</ul>"
+"<ul><li> Transfer any capability in your permitted set to any pid, \n"
+"remove any capability in your permitted set from any pid</li></ul>"
 msgstr ""
-"<ul>"
-"<li> Overfør valfri eigenskap i det tillatne settet ditt til valfri PID. \n"
-"Fjern valfri eigenskap for det tillatne settet ditt frå valfri PID</li>"
-"</ul>"
+"<ul><li> Overfør valfri eigenskap i det tillatne settet ditt til valfri PID. \n"
+"Fjern valfri eigenskap for det tillatne settet ditt frå valfri PID</li></ul>"
 
 #: src/include/apparmor/capabilities.rb:97
 #, fuzzy
-msgid ""
-"<ul>"
-"<li>Allows modification of S_IMMUTABLE and S_APPEND file attributes</li>"
-"</ul>"
-msgstr ""
-"<ul>"
-"<li>Tillat endring av filattributtene S_iMMUTABLE og S_aPPEND</li>"
-"</ul>"
+msgid "<ul><li>Allows modification of S_IMMUTABLE and S_APPEND file attributes</li></ul>"
+msgstr "<ul><li>Tillat endring av filattributtene S_iMMUTABLE og S_aPPEND</li></ul>"
 
 #: src/include/apparmor/capabilities.rb:103
 #, fuzzy
 msgid ""
-"<ul>"
-"<li>Allows binding to TCP/UDP sockets below 1024 </li>"
-" \n"
-"<li> Allows binding to ATM VCIs below 32</li>"
-"</ul>"
+"<ul><li>Allows binding to TCP/UDP sockets below 1024 </li> \n"
+"<li> Allows binding to ATM VCIs below 32</li></ul>"
 msgstr ""
-"<ul>"
-"<li>Tillèt binding til TCP/UDP-soklar under1024 </li>"
-" \n"
-"<li> Tillèt binding til ATM VCI-er under 32</li>"
-"</ul>"
+"<ul><li>Tillèt binding til TCP/UDP-soklar under1024 </li> \n"
+"<li> Tillèt binding til ATM VCI-er under 32</li></ul>"
 
 #: src/include/apparmor/capabilities.rb:109
 #, fuzzy
-msgid ""
-"<ul>"
-"<li> Allows broadcasting, listen to multicast </li>"
-"</ul>"
-msgstr ""
-"<ul>"
-"<li> Tillèt kringkasting, lyttar på multikasting </li>"
-"</ul>"
+msgid "<ul><li> Allows broadcasting, listen to multicast </li></ul>"
+msgstr "<ul><li> Tillèt kringkasting, lyttar på multikasting </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:115
 #, fuzzy
 msgid ""
-"<ul>"
-"<li> Allows interface configuration</li>"
-" \n"
-"<li> Allows administration of IP firewall, masquerading and accounting</li>"
-" \n"
-"<li> Allows setting debug option on sockets</li>"
-" \n"
+"<ul><li> Allows interface configuration</li> \n"
+"<li> Allows administration of IP firewall, masquerading and accounting</li> \n"
+"<li> Allows setting debug option on sockets</li> \n"
 "<li> Allows modification of routing tables</li>"
 msgstr ""
-"<ul>"
-"<li>Tillèt oppsett av grensesnitt</li>"
-" \n"
-"<li> Tillèt administrasjon av IP-brannmur, maskering og kontoar</li>"
-" \n"
-"<li> Tillèt feilsøkingsvalg for soklar</li>"
-" \n"
+"<ul><li>Tillèt oppsett av grensesnitt</li> \n"
+"<li> Tillèt administrasjon av IP-brannmur, maskering og kontoar</li> \n"
+"<li> Tillèt feilsøkingsvalg for soklar</li> \n"
 "<li> Tillèt endring av rutingtabeller</li>"
 
 #: src/include/apparmor/capabilities.rb:121
 #, fuzzy
 msgid ""
-"<li> Allows setting arbitrary process / process group ownership on sockets</li>"
-" \n"
-"<li> Allows binding to any address for transparent proxying</li>"
-" \n"
-"<li> Allows setting TOS (type of service)</li>"
-" \n"
-"<li> Allows setting promiscuous mode</li>"
-" \n"
+"<li> Allows setting arbitrary process / process group ownership on sockets</li> \n"
+"<li> Allows binding to any address for transparent proxying</li> \n"
+"<li> Allows setting TOS (type of service)</li> \n"
+"<li> Allows setting promiscuous mode</li> \n"
 "<li> Allows clearing driver statistics</li>"
 msgstr ""
-"<li> Tillèt tilfeldige prosess-/prosessgruppeeierskap for soklar</li>"
-" \n"
-"<li> Tillèt binding til kva for ein som helst adresse for transparente mellomservere</li>"
-" \n"
-"<li> Tillèt TOS (type of service)</li>"
-" \n"
-"<li> Tillèt promiskiøs modus </li>"
-" \n"
+"<li> Tillèt tilfeldige prosess-/prosessgruppeeierskap for soklar</li> \n"
+"<li> Tillèt binding til kva for ein som helst adresse for transparente mellomservere</li> \n"
+"<li> Tillèt TOS (type of service)</li> \n"
+"<li> Tillèt promiskiøs modus </li> \n"
 "<li> Tillèt sletting av driverstatistikk</li>"
 
 #: src/include/apparmor/capabilities.rb:128
 #, fuzzy
 msgid ""
-"<li> Allows multicasting</li>"
-" \n"
-"<li> Allows read/write of device-specific registers</li>"
-" \n"
-"<li> Allows activation of ATM control sockets </li>"
-"\n"
+"<li> Allows multicasting</li> \n"
+"<li> Allows read/write of device-specific registers</li> \n"
+"<li> Allows activation of ATM control sockets </li>\n"
 "</ul>"
 msgstr ""
-"<li> Tillèt multikasting</li>"
-" \n"
-"<li> Tillèt lesing frå / skriving til enhetsspesifikke register</li>"
-" \n"
-"<li> Tillèt aktivering av ATM-kontrollsokler </li>"
-"\n"
+"<li> Tillèt multikasting</li> \n"
+"<li> Tillèt lesing frå / skriving til enhetsspesifikke register</li> \n"
+"<li> Tillèt aktivering av ATM-kontrollsokler </li>\n"
 "</ul>"
 
 #: src/include/apparmor/capabilities.rb:137
 #, fuzzy
 msgid ""
-"<ul>"
-"<li> Allows use of RAW sockets</li>"
-" \n"
-"<li> Allows use of PACKET sockets </li>"
-"</ul>"
+"<ul><li> Allows use of RAW sockets</li> \n"
+"<li> Allows use of PACKET sockets </li></ul>"
 msgstr ""
-"<ul>"
-"<li> Tillèt bruk av RAW-soklar</li>"
-" \n"
-"<li> Tillèt bruk av PACKET-soklar </li>"
-"</ul>"
+"<ul><li> Tillèt bruk av RAW-soklar</li> \n"
+"<li> Tillèt bruk av PACKET-soklar </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:143
 #, fuzzy
 msgid ""
-"<ul>"
-"<li> Allows locking of shared memory segments</li>"
-" "
-"<li> Allows mlock and\n"
-"mlockall (which does not really have anything to do with IPC) </li>"
-"</ul>"
+"<ul><li> Allows locking of shared memory segments</li> <li> Allows mlock and\n"
+"mlockall (which does not really have anything to do with IPC) </li></ul>"
 msgstr ""
-"<ul>"
-"<li> Tillèt låsing av delte minnesegmenter</li>"
-" \n"
-"<li> Tillèt mlock og mlockall (som ikkje eigenleg har noko å gjera med IPC) </li>"
-"</ul>"
+"<ul><li> Tillèt låsing av delte minnesegmenter</li> \n"
+"<li> Tillèt mlock og mlockall (som ikkje eigenleg har noko å gjera med IPC) </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:149
 #, fuzzy
-msgid ""
-"<ul>"
-"<li> Override IPC ownership checks </li>"
-"</ul>"
-msgstr ""
-"<ul>"
-"<li> Overstyr IPC-eierskapskontroller </li>"
-"</ul>"
+msgid "<ul><li> Override IPC ownership checks </li></ul>"
+msgstr "<ul><li> Overstyr IPC-eierskapskontroller </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:153
 #, fuzzy
 msgid ""
-"<ul>"
-"<li> Insert and remove kernel modules - modify kernel without limit</li>"
-" \n"
-"<li> Modify cap_bset </li>"
-"</ul>"
+"<ul><li> Insert and remove kernel modules - modify kernel without limit</li> \n"
+"<li> Modify cap_bset </li></ul>"
 msgstr ""
-"<ul>"
-"<li> Sett inn og fjern kjernemoduler – endra kjerne utan avgrensing</li>"
-" \n"
-"<li> Endre cap_bset </li>"
-"</ul>"
+"<ul><li> Sett inn og fjern kjernemoduler – endra kjerne utan avgrensing</li> \n"
+"<li> Endre cap_bset </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:159
 #, fuzzy
 msgid ""
-"<ul>"
-"<li> Allows ioperm/iopl access</li>"
-" \n"
-"<li> Allows sending USB messages to any device via /proc/bus/usb </li>"
-"</ul>"
+"<ul><li> Allows ioperm/iopl access</li> \n"
+"<li> Allows sending USB messages to any device via /proc/bus/usb </li></ul>"
 msgstr ""
-"<ul>"
-"<li> Tillèt ioperm/iopl-tilgjenge</li>"
-" \n"
-"<li>Tillèt sending av USB-meldingar til alle einingar vigde /proc/bums/usb </li>"
-"</ul>"
+"<ul><li> Tillèt ioperm/iopl-tilgjenge</li> \n"
+"<li>Tillèt sending av USB-meldingar til alle einingar vigde /proc/bums/usb </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:165
 #, fuzzy
-msgid ""
-"<ul>"
-"<li> Allows use of chroot() </li>"
-"</ul>"
-msgstr ""
-"<ul>"
-"<li> Tillèt bruk av chroot() </li>"
-"</ul>"
+msgid "<ul><li> Allows use of chroot() </li></ul>"
+msgstr "<ul><li> Tillèt bruk av chroot() </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:169
 #, fuzzy
-msgid ""
-"<ul>"
-"<li> Allows ptrace() of any process </li>"
-"</ul>"
-msgstr ""
-"<ul>"
-"<li> Tillèt ptrace() for alle prosessar </li>"
-"</ul>"
+msgid "<ul><li> Allows ptrace() of any process </li></ul>"
+msgstr "<ul><li> Tillèt ptrace() for alle prosessar </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:173
 #, fuzzy
-msgid ""
-"<ul>"
-"<li> Allows configuration of process accounting </li>"
-"</ul>"
-msgstr ""
-"<ul>"
-"<li> Tillèt konfigurasjon av prosesskontoadministrasjon </li>"
-"</ul>"
+msgid "<ul><li> Allows configuration of process accounting </li></ul>"
+msgstr "<ul><li> Tillèt konfigurasjon av prosesskontoadministrasjon </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:179
 #, fuzzy
 msgid ""
-"<ul>"
-"<li> Allows configuration of the secure attention key</li>"
-" \n"
-"<li> Allows administration of the random device</li>"
-" \n"
-"<li> Allows examination and configuration of disk quotas</li>"
-" \n"
+"<ul><li> Allows configuration of the secure attention key</li> \n"
+"<li> Allows administration of the random device</li> \n"
+"<li> Allows examination and configuration of disk quotas</li> \n"
 "<li> Allows configuring the kernel's syslog (printk behaviour)</li>"
 msgstr ""
-"<ul>"
-"<li> Tillèt oppsett av secure attention-nøkkel</li>"
-" \n"
-"<li> Tillèt administrasjon av tilfeldig eining</li>"
-" \n"
-"<li> Tillèt gransking og oppsett av diskkvoter</li>"
-" \n"
+"<ul><li> Tillèt oppsett av secure attention-nøkkel</li> \n"
+"<li> Tillèt administrasjon av tilfeldig eining</li> \n"
+"<li> Tillèt gransking og oppsett av diskkvoter</li> \n"
 "<li> Tillèt oppsett av kjernen sin systemlogg (printk-funksjonen)</li>"
 
 #: src/include/apparmor/capabilities.rb:185
 #, fuzzy
 msgid ""
-"<li> Allows setting the domain name</li>"
-" \n"
-"<li> Allows setting the hostname</li>"
-" \n"
-"<li> Allows calling bdflush()</li>"
-" \n"
-"<li> Allows mount() and umount(), setting up new smb connection</li>"
-" \n"
+"<li> Allows setting the domain name</li> \n"
+"<li> Allows setting the hostname</li> \n"
+"<li> Allows calling bdflush()</li> \n"
+"<li> Allows mount() and umount(), setting up new smb connection</li> \n"
 "<li> Allows some autofs root ioctls</li>"
 msgstr ""
-"<li> Tillèt angivelse av domenenavn</li>"
-" \n"
-"<li> Tillèt angivelse av vertsnavn</li>"
-" \n"
-"<li> Tillèt kommandoen bdflush()</li>"
-" \n"
-"<li> Tillèt mount() og umount(), oppsett av ny smb-samband</li>"
-" \n"
+"<li> Tillèt angivelse av domenenavn</li> \n"
+"<li> Tillèt angivelse av vertsnavn</li> \n"
+"<li> Tillèt kommandoen bdflush()</li> \n"
+"<li> Tillèt mount() og umount(), oppsett av ny smb-samband</li> \n"
 "<li> Tillèt nokon formar for autofs root ioctls</li>"
 
 #: src/include/apparmor/capabilities.rb:192
 #, fuzzy
 msgid ""
-"<li> Allows nfsservctl</li>"
-" \n"
-"<li> Allows VM86_REQUEST_IRQ</li>"
-" \n"
-"<li> Allows to read/write pci config on alpha</li>"
-" \n"
-"<li> Allows irix_prctl on mips (setstacksize)</li>"
-" \n"
+"<li> Allows nfsservctl</li> \n"
+"<li> Allows VM86_REQUEST_IRQ</li> \n"
+"<li> Allows to read/write pci config on alpha</li> \n"
+"<li> Allows irix_prctl on mips (setstacksize)</li> \n"
 "<li> Allows flushing all cache on m68k (sys_cacheflush)</li>"
 msgstr ""
-"<li> Tillèt nfsservctl</li>"
-" \n"
-"<li> Tillèt VM86_rEQUEST_iRQ</li>"
-" \n"
-"<li> Tillèt å lesa frå / skriva til pci config on alpha</li>"
-" \n"
-"<li> Tillèt irix_prctl on mips (setstacksize)</li>"
-" \n"
+"<li> Tillèt nfsservctl</li> \n"
+"<li> Tillèt VM86_rEQUEST_iRQ</li> \n"
+"<li> Tillèt å lesa frå / skriva til pci config on alpha</li> \n"
+"<li> Tillèt irix_prctl on mips (setstacksize)</li> \n"
 "<li> Tillèt å tømma heile mellomlageret på m68k (syast_cacheflush)</li>"
 
 #: src/include/apparmor/capabilities.rb:199
 #, fuzzy
 msgid ""
-"<li> Allows removing semaphores</li>"
-" \n"
-"<li> Used instead of CAP_CHOWN to \"chown\" IPC message queues, semaphores and shared memory</li>"
-" \n"
-"<li> Allows locking/unlocking of shared memory segment</li>"
-" \n"
-"<li> Allows turning swap on/off</li>"
-" \n"
+"<li> Allows removing semaphores</li> \n"
+"<li> Used instead of CAP_CHOWN to \"chown\" IPC message queues, semaphores and shared memory</li> \n"
+"<li> Allows locking/unlocking of shared memory segment</li> \n"
+"<li> Allows turning swap on/off</li> \n"
 "<li> Allows forged pids on socket credentials passing</li>"
 msgstr ""
-"<li> Tillèt å fjerna semaforar</li>"
-" \n"
-"<li> Brukt i staden for CAP_cHOWN for «chown» av IPC-meldingskøer, semaforar og delt minne</li>"
-" \n"
-"<li> Tillèt låsing/opplåsing av delte minnesegmenter</li>"
-" \n"
-"<li> Tillèt aktivering/deaktivering av veksleminne</li>"
-" \n"
+"<li> Tillèt å fjerna semaforar</li> \n"
+"<li> Brukt i staden for CAP_cHOWN for «chown» av IPC-meldingskøer, semaforar og delt minne</li> \n"
+"<li> Tillèt låsing/opplåsing av delte minnesegmenter</li> \n"
+"<li> Tillèt aktivering/deaktivering av veksleminne</li> \n"
 "<li> Tillèt konstruerte pid-er ved overføring av sokkelrettigheter</li>"
 
 #: src/include/apparmor/capabilities.rb:206
 #, fuzzy
 msgid ""
-"<li> Allows setting read ahead and flushing buffers on block devices</li>"
-" \n"
-"<li> Allows setting geometry in floppy driver</li>"
-" \n"
-"<li> Allows turning DMA on/off in xd driver</li>"
-" \n"
+"<li> Allows setting read ahead and flushing buffers on block devices</li> \n"
+"<li> Allows setting geometry in floppy driver</li> \n"
+"<li> Allows turning DMA on/off in xd driver</li> \n"
 "<li> Allows administration of md devices (mostly the above, but some extra ioctls)</li>"
 msgstr ""
-"<li> Tillèt å angje lesa- og tømmebuffere for blokkenheter</li>"
-" \n"
-"<li> Tillèt å angje geometri for diskettdriver</li>"
-" \n"
-"<li> Tillèt å aktivera/deaktivere DMA for xd-driv</li>"
-" \n"
+"<li> Tillèt å angje lesa- og tømmebuffere for blokkenheter</li> \n"
+"<li> Tillèt å angje geometri for diskettdriver</li> \n"
+"<li> Tillèt å aktivera/deaktivere DMA for xd-driv</li> \n"
 "<li> Tillèt administrasjon av md-einingar (normalt som ovanfor, men nokre ekstra ioctl-er)</li>"
 
 #: src/include/apparmor/capabilities.rb:212
 #, fuzzy
 msgid ""
-"<li> Allows tuning the ide driver</li>"
-" \n"
-"<li> Allows access to the nvram device</li>"
-" \n"
-"<li> Allows administration of apm_bios, serial and bttv (TV) device</li>"
-" \n"
+"<li> Allows tuning the ide driver</li> \n"
+"<li> Allows access to the nvram device</li> \n"
+"<li> Allows administration of apm_bios, serial and bttv (TV) device</li> \n"
 "<li> Allows manufacturer commands in iaan CAPI support driver</li>"
 msgstr ""
-"<li> Tillèt justering av ide-driv</li>"
-" \n"
-"<li> Tillèt tilgjenge til nvram-eining</li>"
-" \n"
-"<li> Tillèt administrasjon av apm_bios, seriell og bttv (TV)-eining</li>"
-" \n"
+"<li> Tillèt justering av ide-driv</li> \n"
+"<li> Tillèt tilgjenge til nvram-eining</li> \n"
+"<li> Tillèt administrasjon av apm_bios, seriell og bttv (TV)-eining</li> \n"
 "<li> Tillèt produsentkommandoer i iaan CAPI-driver</li>"
 
 #: src/include/apparmor/capabilities.rb:218
 #, fuzzy
 msgid ""
-"<li> Allows reading non-standardized portions of pci configuration space</li>"
-" \n"
-"<li> Allows DDI debug ioctl on sbpcd driver</li>"
-" \n"
-"<li> Allows setting up serial ports</li>"
-" \n"
+"<li> Allows reading non-standardized portions of pci configuration space</li> \n"
+"<li> Allows DDI debug ioctl on sbpcd driver</li> \n"
+"<li> Allows setting up serial ports</li> \n"
 "<li> Allows sending raw qic-117 commands</li>"
 msgstr ""
-"<li> Tillèt lesing av ikkje-standardiserte deler av pci-oppsettsplass</li>"
-" \n"
-"<li> Tillèt DDI debug ioctl for sbpcd-driv</li>"
-" \n"
-"<li> Tillèt oppsett av serieporter</li>"
-" \n"
+"<li> Tillèt lesing av ikkje-standardiserte deler av pci-oppsettsplass</li> \n"
+"<li> Tillèt DDI debug ioctl for sbpcd-driv</li> \n"
+"<li> Tillèt oppsett av serieporter</li> \n"
 "<li> Tillèt sending av ubehandlede qic-117-kommandoar</li>"
 
 #: src/include/apparmor/capabilities.rb:224
 #, fuzzy
 msgid ""
 "<li> Allows enabling/disabling tagged queuing on SCSI controllers\n"
-" and sending arbitrary SCSI commands</li>"
-" \n"
-"<li> Allows setting encryption key on loopback filesystem </li>"
-"</ul>"
+" and sending arbitrary SCSI commands</li> \n"
+"<li> Allows setting encryption key on loopback filesystem </li></ul>"
 msgstr ""
 "<li> Tillèt aktivering/deaktivering av merket køstyring for SCSI-kontrollera\n"
-" og sending av tilfeldige SCSI-kommandoar</li>"
-" \n"
-"<li> Tillèt angivelse av krypteringsnøkkel for loopback-filsystem </li>"
-"</ul>"
+" og sending av tilfeldige SCSI-kommandoar</li> \n"
+"<li> Tillèt angivelse av krypteringsnøkkel for loopback-filsystem </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:232
 #, fuzzy
-msgid ""
-"<ul>"
-"<li> Allows use of reboot() </li>"
-"</ul>"
-msgstr ""
-"<ul>"
-"<li> Tillèt bruk av reboot() </li>"
-"</ul>"
+msgid "<ul><li> Allows use of reboot() </li></ul>"
+msgstr "<ul><li> Tillèt bruk av reboot() </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:236
 #, fuzzy
 msgid ""
-"<ul>"
-"<li> Allows raising priority and setting priority on other (different UID) processes</li>"
-" \n"
+"<ul><li> Allows raising priority and setting priority on other (different UID) processes</li> \n"
 "<li> Allows use of FIFO and round-robin (realtime) scheduling on own processes and setting \n"
-"the scheduling algorithm used by another process.</li>"
-" \n"
-"<li> Allows setting cpu affinity on other processes </li>"
-"</ul>"
+"the scheduling algorithm used by another process.</li> \n"
+"<li> Allows setting cpu affinity on other processes </li></ul>"
 msgstr ""
-"<ul>"
-"<li> Tillèt å heva prioriteten og angje prioriteten for andre prosessar (annan UID)</li>"
-" \n"
+"<ul><li> Tillèt å heva prioriteten og angje prioriteten for andre prosessar (annan UID)</li> \n"
 "<li> Tillèt bruk av FIFO og sanntidsplanlegging på eigne prosessar og innstiling av \n"
-"planleggingsalgoritmer som vert brukte av ein annan prosess.</li>"
-" \n"
-"<li> Tillèt val av cpu-affinitet for andre prosessar </li>"
-"</ul>"
+"planleggingsalgoritmer som vert brukte av ein annan prosess.</li> \n"
+"<li> Tillèt val av cpu-affinitet for andre prosessar </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:245
 #, fuzzy
 msgid ""
-"<ul>"
-"<li> Override resource limits. Set resource limits.</li>"
-" \n"
-"<li> Override quota limits.</li>"
-" \n"
-"<li> Override reserved space on ext2 filesystem</li>"
-" \n"
+"<ul><li> Override resource limits. Set resource limits.</li> \n"
+"<li> Override quota limits.</li> \n"
+"<li> Override reserved space on ext2 filesystem</li> \n"
 "<li> Modify data journaling mode on ext3 filesystem (uses journaling resources)</li>"
 msgstr ""
-"<ul>"
-"<li> Overstyr ressursbegrensninger. Angje ressursbegrensninger.</li>"
-" \n"
-"<li> Overstyr kvotebegrensninger.</li>"
-" \n"
-"<li> Overstyr reservert plass i ext2-filsystem</li>"
-" \n"
+"<ul><li> Overstyr ressursbegrensninger. Angje ressursbegrensninger.</li> \n"
+"<li> Overstyr kvotebegrensninger.</li> \n"
+"<li> Overstyr reservert plass i ext2-filsystem</li> \n"
 "<li> Endre journalmodus for ext3-filsystem (nytter journalressurser)</li>"
 
 #: src/include/apparmor/capabilities.rb:251
 #, fuzzy
 msgid ""
-"<li> NOTE: ext2 honors fsuid when checking for resource overrides, so you can override using fsuid too</li>"
-" \n"
-"<li> Override size restrictions on IPC message queues</li>"
-" \n"
-"<li> Allows more than 64hz interrupts from the real-time clock</li>"
-" \n"
-"<li> Override max number of consoles on console allocation</li>"
-" \n"
-"<li> Override max number of keymaps </li>"
-"</ul>"
+"<li> NOTE: ext2 honors fsuid when checking for resource overrides, so you can override using fsuid too</li> \n"
+"<li> Override size restrictions on IPC message queues</li> \n"
+"<li> Allows more than 64hz interrupts from the real-time clock</li> \n"
+"<li> Override max number of consoles on console allocation</li> \n"
+"<li> Override max number of keymaps </li></ul>"
 msgstr ""
-"MERK: ext2 følgjer fsuid under kontroll av ressursoverstyringer, så du kan overstyra ved hjelp av fsuid òg</li>"
-" \n"
-"<li> Overstyr størrelsesbegrensninger på IPC-meldingskøer</li>"
-" \n"
-"<li> Tillèt avbrytelser på meir enn 64 Hz frå sanntidsklokken</li>"
-" \n"
-"<li> Overstyr maks. mengd konsollar ved konsolltilordning</li>"
-" \n"
-"<li> Overstyr maks. mengd tastaturoppsett </li>"
-"</ul>"
+"MERK: ext2 følgjer fsuid under kontroll av ressursoverstyringer, så du kan overstyra ved hjelp av fsuid òg</li> \n"
+"<li> Overstyr størrelsesbegrensninger på IPC-meldingskøer</li> \n"
+"<li> Tillèt avbrytelser på meir enn 64 Hz frå sanntidsklokken</li> \n"
+"<li> Overstyr maks. mengd konsollar ved konsolltilordning</li> \n"
+"<li> Overstyr maks. mengd tastaturoppsett </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:261
 #, fuzzy
 msgid ""
-"<ul>"
-"<li> Allows manipulation of system clock</li>"
-" \n"
-"<li> Allows irix_stime on mips</li>"
-" \n"
-"<li> Allows setting the real-time clock </li>"
-"</ul>"
+"<ul><li> Allows manipulation of system clock</li> \n"
+"<li> Allows irix_stime on mips</li> \n"
+"<li> Allows setting the real-time clock </li></ul>"
 msgstr ""
-"<ul>"
-"<li> Tillèt endring av systemklokken</li>"
-" \n"
-"<li> Tillèt irix_stime for mips</li>"
-" \n"
-"<li> Tillèt innstilling av sanntidsklokken </li>"
-"</ul>"
+"<ul><li> Tillèt endring av systemklokken</li> \n"
+"<li> Tillèt irix_stime for mips</li> \n"
+"<li> Tillèt innstilling av sanntidsklokken </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:269
 #, fuzzy
 msgid ""
-"<ul>"
-"<li> Allows configuration of tty devices</li>"
-" \n"
-"<li> Allows vhangup() of tty </li>"
-"</ul>"
+"<ul><li> Allows configuration of tty devices</li> \n"
+"<li> Allows vhangup() of tty </li></ul>"
 msgstr ""
-"<ul>"
-"<li> Tillèt oppsett av tty-einingar</li>"
-" \n"
-"<li> Tillèt vhangup() av tty </li>"
-"</ul>"
+"<ul><li> Tillèt oppsett av tty-einingar</li> \n"
+"<li> Tillèt vhangup() av tty </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:275
 #, fuzzy
-msgid ""
-"<ul>"
-"<li> Allows the privileged aspects of mknod() </li>"
-"</ul>"
-msgstr ""
-"<ul>"
-"<li> Tillèt dei privilegerte sidene ved mknod() </li>"
-"</ul>"
+msgid "<ul><li> Allows the privileged aspects of mknod() </li></ul>"
+msgstr "<ul><li> Tillèt dei privilegerte sidene ved mknod() </li></ul>"
 
 #: src/include/apparmor/capabilities.rb:281
 #, fuzzy
-msgid ""
-"<ul>"
-"<li> Allows taking of leases on files </li>"
-"</ul>"
-msgstr ""
-"<ul>"
-"<li> Tillèt leige av filer </li>"
-"</ul>"
+msgid "<ul><li> Allows taking of leases on files </li></ul>"
+msgstr "<ul><li> Tillèt leige av filer </li></ul>"
 
 #. encoding: utf-8
 #. ***************************************************************************
@@ -1565,12 +1305,10 @@
 #: src/include/apparmor/config_complain.rb:34
 #, fuzzy
 msgid ""
-"<p><b>Profile Mode Configuration</b><br>"
-"This tool allows \n"
+"<p><b>Profile Mode Configuration</b><br>This tool allows \n"
 "you to set AppArmor profiles to either complain or enforce mode.</p>"
 msgstr ""
-"<p><b>Profilmodusoppsett</b><br>"
-"Med dette verktøyet kan \n"
+"<p><b>Profilmodusoppsett</b><br>Med dette verktøyet kan \n"
 "kan du velja anten klaga- eller tvingemodus for AppArmor-profil.</p>"
 
 #: src/include/apparmor/config_complain.rb:37
@@ -1707,20 +1445,14 @@
 #: src/include/apparmor/helps.rb:38
 #, fuzzy
 msgid ""
-"<p><b>Notification Types</b><br>"
-" <b>Terse Notification:</b> \n"
+"<p><b>Notification Types</b><br> <b>Terse Notification:</b> \n"
 "Terse notification summarizes the total number of system events without \n"
-"providing details.  <br>"
-"For example:<br>"
-" <tt>dhcp-101.up.wirex.com has \n"
+"providing details.  <br>For example:<br> <tt>dhcp-101.up.wirex.com has \n"
 "had 10 security events since Tue Oct 12 11:10:00 2004</tt></p>"
 msgstr ""
-"<p><b>Varslingstyper</b><br>"
-" <b>Kort varsling:</b> \n"
+"<p><b>Varslingstyper</b><br> <b>Kort varsling:</b> \n"
 "Kort varsling angjev den totale mengda systemhendelser utan p \n"
-"skildra dei nærare.  <br>"
-"Til dømes:<br>"
-" <tt>dhcp-101.up.wirex.com har \n"
+"skildra dei nærare.  <br>Til dømes:<br> <tt>dhcp-101.up.wirex.com har \n"
 "hatt 10 sikkerhetshendelser sidan tir. 12. okt. 11:10:00 2004</tt></p>"
 
 #: src/include/apparmor/helps.rb:44
@@ -1729,9 +1461,7 @@
 "<p><b>Summary Notification:</b> The Summary notification displays \n"
 "the logged AppArmor security events, and lists the number of \n"
 "individual occurrences, including the date of the last occurrence.  \n"
-"<br>"
-"For example:<br>"
-" <tt>AppArmor: PERMITTING access to capability\n"
+"<br>For example:<br> <tt>AppArmor: PERMITTING access to capability\n"
 "'setgid' (httpd2-prefork(6347) profile /usr/sbin/httpd2-prefork \n"
 "active /usr/sbin/httpd2-prefork) 2 times, the latest at Sat Oct 9 16:05:54 2004.</tt>\n"
 "</p>"
@@ -1739,9 +1469,7 @@
 "<p><b>Sammendragsvarsling:</b> Sammendragsvarsling viser \n"
 "logga AppArmor-sikkerhetshendelser og angjev mengda for \n"
 "kvar enkelt hending, inkludert datoen for siste hending.  \n"
-"<br>"
-"Til dømes:<br>"
-" <tt>AppArmor: TILLATE tilgjenge til funksjonen \n"
+"<br>Til dømes:<br> <tt>AppArmor: TILLATE tilgjenge til funksjonen \n"
 "'setgid' (httpd2-prefork(6347) profile /usr/sbin/httpd2-prefork \n"
 "active /usr/sbin/httpd2-prefork) 2 gonger, siste gong lør. 9. okt. 16:05:54 2004.</tt>\n"
 "</p>"
@@ -1767,17 +1495,13 @@
 #, fuzzy
 msgid ""
 "<p>Verbose Notification also reports several messages that \n"
-"the logprof tool uses to interpret profiles. <br>"
-"For example:<br>"
-"\n"
+"the logprof tool uses to interpret profiles. <br>For example:<br>\n"
 "<tt> Oct  9 15:40:31 AppArmor: PERMITTING r access to\n"
 "/etc/apache2/httpd.conf (httpd2-prefork(6068) profile \n"
 "/usr/sbin/httpd2-prefork active /usr/sbin/httpd2-prefork)</tt></p>"
 msgstr ""
 "<p>Detaljert varsling rapporterer òg ulike meldingar som \n"
-"logprof-verktøyet brukar for å tolka profil. <br>"
-"Til dømes:<br>"
-"\n"
+"logprof-verktøyet brukar for å tolka profil. <br>Til dømes:<br>\n"
 "<tt> 9. okt 15:40:31 AppArmor: TILLATE r tilgjenge til \n"
 "/etc/apache2/httpd.conf (httpd2-prefork(6068) profil \n"
 "/usr/sbin/httpd2-prefork aktiv /usr/sbin/httpd2-prefork)</tt></p>"
@@ -1891,24 +1615,18 @@
 #, fuzzy
 msgid ""
 "The following help text describes the detail of the security profile \n"
-"syntax used by AppArmor. <br>"
-"<br>"
-"At any stage, you may \n"
+"syntax used by AppArmor. <br><br>At any stage, you may \n"
 "customize the profile entry by changing the suggested response. \n"
 "This overview will assist you in your options. Refer to the \n"
 "Novell AppArmor Administration Guide for step-by-step \n"
-"instructions. <br>"
-"<br>"
+"instructions. <br><br>"
 msgstr ""
 "Dette er ei detaljert skildring av syntaksen som AppArmor brukar \n"
-"for sikkerhetsprofiler. <br>"
-"<br>"
-"Du kan når som helst \n"
+"for sikkerhetsprofiler. <br><br>Du kan når som helst \n"
 "tilpassa profiloppføringen ved å endra forslaget. \n"
 "Denne gjev deg tips om ulike val. \n"
 "Novells administrasjonsveiledning for AppArmor inneheld \n"
-"trinn for trinn-anvisninger. <br>"
-"<br>"
+"trinn for trinn-anvisninger. <br><br>"
 
 #: src/include/apparmor/helps.rb:125
 #, fuzzy
@@ -2115,12 +1833,8 @@
 
 #: src/include/apparmor/helps.rb:196
 #, fuzzy
-msgid ""
-"<li><b>*</b>   can substitute for any number of characters, except '/'"
-"<li>"
-msgstr ""
-"<li><b>*</b>  kan vert i staden brukt for kva for teikn som helst, unntatt '/'"
-"<li>"
+msgid "<li><b>*</b>   can substitute for any number of characters, except '/'<li>"
+msgstr "<li><b>*</b>  kan vert i staden brukt for kva for teikn som helst, unntatt '/'<li>"
 
 #: src/include/apparmor/helps.rb:199
 #, fuzzy
@@ -2174,13 +1888,11 @@
 #, fuzzy
 msgid ""
 "<b>Capability Selection</b>.\n"
-"<br>"
-"Select desired capabilities for this profile. \n"
+"<br>Select desired capabilities for this profile. \n"
 "Select a Capability name to see information about the capability."
 msgstr ""
 "<b>Val av eigenskapar</b>.\n"
-"<br>"
-"Vel ynskte eigenskapar for denne profilen. \n"
+"<br>Vel ynskte eigenskapar for denne profilen. \n"
 "Vel namnet på ein eigenskap for å vise informasjon om eigenskapen."
 
 #: src/include/apparmor/profile_dialogs.rb:62
@@ -2359,121 +2071,67 @@
 msgid "<p>View and modify the contents of an individual profile. For existing entries double click the permissions to access a modification dialog.</p>"
 msgstr ""
 "<p>I dette skjemaet kan du visa og endra innhaldet i ein bestemd profil. \n"
-"For eksisterande oppføringer kan du dobbeltklikke på rettane for å opne ein endringsdialog."
-"<p>"
+"For eksisterande oppføringer kan du dobbeltklikke på rettane for å opne ein endringsdialog.<p>"
 
 #. help text
 #: src/include/apparmor/profile_dialogs.rb:933
 #, fuzzy
 msgid ""
-"<p><b>Permission Definitions:</b><br>"
-"<code> r - read <br>"
-" \n"
-"w -write<br>"
-"l - link<br>"
-"m - mmap PROT_EXEC<br>"
-"k - file locking<br>"
-"\n"
-"a - file append<br>"
-"x - execute<br>"
-" i - inherit<br>"
-" p - discrete profile<br>"
-"\n"
-"P - discrete profile <br>"
-" (*clean exec)<br>"
-" u - unconstrained<br>"
-" \n"
-"U -unconstrained<br>"
-" (*clean exec)</code></p>"
+"<p><b>Permission Definitions:</b><br><code> r - read <br> \n"
+"w -write<br>l - link<br>m - mmap PROT_EXEC<br>k - file locking<br>\n"
+"a - file append<br>x - execute<br> i - inherit<br> p - discrete profile<br>\n"
+"P - discrete profile <br> (*clean exec)<br> u - unconstrained<br> \n"
+"U -unconstrained<br> (*clean exec)</code></p>"
 msgstr ""
-"<b>Rettighetsdefinisjoner:</b><br>"
-"<code> r – read <br>"
-" \n"
-"w -write<br>"
-"l – link<br>"
-"m – mmap PROT_eXEC<br>"
-"k – fila locking<br>"
-"\n"
-"a – fila append<br>"
-"x – execute<br>"
-" i – inherit<br>"
-" p – discrete profile<br>"
-"\n"
-"P – discrete profile <br>"
-" (*clean exec)<br>"
-" u – unconstrained<br>"
-" \n"
-"U -unconstrained<br>"
-" (*clean exec)</code></p>"
+"<b>Rettighetsdefinisjoner:</b><br><code> r – read <br> \n"
+"w -write<br>l – link<br>m – mmap PROT_eXEC<br>k – fila locking<br>\n"
+"a – fila append<br>x – execute<br> i – inherit<br> p – discrete profile<br>\n"
+"P – discrete profile <br> (*clean exec)<br> u – unconstrained<br> \n"
+"U -unconstrained<br> (*clean exec)</code></p>"
 
 #. help text
 #: src/include/apparmor/profile_dialogs.rb:942
 #, fuzzy
-msgid ""
-"<p><b>Add Entry:</b><br>"
-"Select the type of resource to add from the drop down list.</p>"
-msgstr ""
-"<p><b>Legg til oppføring:</b><br>"
-"Vel typen ressurs du vil leggja til frå, frå nedtrekkslisten."
-"<p>"
+msgid "<p><b>Add Entry:</b><br>Select the type of resource to add from the drop down list.</p>"
+msgstr "<p><b>Legg til oppføring:</b><br>Vel typen ressurs du vil leggja til frå, frå nedtrekkslisten.<p>"
 
 #. help text - part x1
 #: src/include/apparmor/profile_dialogs.rb:947
 #, fuzzy
-msgid ""
-"<p>"
-"<ul>"
-"<li><b>File</b><br>"
-"Add a file entry to this profile.</li>"
-msgstr ""
-"<p>"
-"<ul>"
-"<li><b>Fil</b><br>"
-"Legg til ein filoppføring i denne profilen</li>"
+msgid "<p><ul><li><b>File</b><br>Add a file entry to this profile.</li>"
+msgstr "<p><ul><li><b>Fil</b><br>Legg til ein filoppføring i denne profilen</li>"
 
 #. help text - part x2
 #: src/include/apparmor/profile_dialogs.rb:951
 #, fuzzy
-msgid ""
-"<li><b>Directory</b><br>"
-"Add a directory entry to this profile.</li>"
-msgstr ""
-"<li><b>Katalog</b><br>"
-"Legg til ein katalogoppføring i denne profilen</li>"
+msgid "<li><b>Directory</b><br>Add a directory entry to this profile.</li>"
+msgstr "<li><b>Katalog</b><br>Legg til ein katalogoppføring i denne profilen</li>"
 
 #. help text - part x3
 #: src/include/apparmor/profile_dialogs.rb:955
 #, fuzzy
-msgid ""
-"<li><b>Capability</b><br>"
-"Add a capability entry to this profile.</li>"
-msgstr ""
-"<li><b>Eigenskap</b><br>"
-"Legg til ein egenskapsoppføring i denne profilen</li>"
+msgid "<li><b>Capability</b><br>Add a capability entry to this profile.</li>"
+msgstr "<li><b>Eigenskap</b><br>Legg til ein egenskapsoppføring i denne profilen</li>"
 
 #. help text - part x4
 #: src/include/apparmor/profile_dialogs.rb:959
 #, fuzzy
 msgid ""
-"<li><b>Include</b><br>"
-"Add an include entry to this profile. This option \n"
+"<li><b>Include</b><br>Add an include entry to this profile. This option \n"
 "includes the profile entry contents of another file in this profile at load time.</li>"
 msgstr ""
-"<li><b>Inkluder</b><br>"
-"Legg til ein inkluderingsoppføring i denne profilen. Med dette alternativet \n"
+"<li><b>Inkluder</b><br>Legg til ein inkluderingsoppføring i denne profilen. Med dette alternativet \n"
 "vert inkludert profiloppføringsinnholdet frå ein anna fil i denne profilen ved innlastingstidspunktet.</li>"
 
 #. help text - part x5
 #: src/include/apparmor/profile_dialogs.rb:963
 #, fuzzy
 msgid ""
-"<li><b>Network Entry</b><br>"
-"Add a network rule entry to this profile. \n"
+"<li><b>Network Entry</b><br>Add a network rule entry to this profile. \n"
 "This option will allow you to specify network access privileges for the profile. \n"
 "You may specify a network address family and socket type.</li>"
 msgstr ""
-"<li><b>Nettverksoppføring</b><br>"
-" Legg til ein nettverksregel for denne profilen. \n"
+"<li><b>Nettverksoppføring</b><br> Legg til ein nettverksregel for denne profilen. \n"
 "Med dette valet kan du definera nettverkstilgangen for profilen. \n"
 "Du kan angje ein nettverksadressefamilie og ein sokkeltype.</li>"
 
@@ -2481,15 +2139,13 @@
 #: src/include/apparmor/profile_dialogs.rb:969
 #, fuzzy
 msgid ""
-"<li><b>Hat</b><br>"
-"Add a sub-profile for this profile, called a Hat. This\n"
+"<li><b>Hat</b><br>Add a sub-profile for this profile, called a Hat. This\n"
 "option is analogous to manually creating a new profile, which can be selected\n"
 "during execution only in the context of being asked for by a <b>changehat\n"
 "aware</b> application. \n"
 "For more information on changehat, see <b>man changehat</b> on your system or the Novell AppArmor Administration Guide.</li>"
 msgstr ""
-"<li><b>Paraply</b><br>"
-"Legg til ein underprofil for denne profilen – òg kalla ein paraply. \n"
+"<li><b>Paraply</b><br>Legg til ein underprofil for denne profilen – òg kalla ein paraply. \n"
 "Dette alternativet er det same som å manuelt oppretta ein ny profil som kan bara kan veljast \n"
 "under køyring når det vert etterspurt av eit <b>changehat aware</b>-program. \n"
 "Viss du vil ha meir informasjon om changehat, sjå manualsiden <b>changehat</b> \n"
@@ -2498,40 +2154,24 @@
 #. help text - part x7
 #: src/include/apparmor/profile_dialogs.rb:977
 #, fuzzy
-msgid ""
-"</ul>"
-"</p>"
-"<p><b>Edit Entry:</b><br>"
-"Edit the selected entry.</p>"
-msgstr ""
-"</ul>"
-"<p>"
-"<p><b>Rediger oppføring:</b><br>"
-"Rediger henne valde oppføringen."
-"<p>"
+msgid "</ul></p><p><b>Edit Entry:</b><br>Edit the selected entry.</p>"
+msgstr "</ul><p><p><b>Rediger oppføring:</b><br>Rediger henne valde oppføringen.<p>"
 
 #. help text
 #: src/include/apparmor/profile_dialogs.rb:982
 #, fuzzy
-msgid ""
-"<p><b>Delete Entry:</b><br>"
-"Removes the selected entry from this profile.</p>"
-msgstr ""
-"<p><b>Slett oppføring:</b><br>"
-"Fjernar han valde oppføringen frå denne profilen."
-"<p>"
+msgid "<p><b>Delete Entry:</b><br>Removes the selected entry from this profile.</p>"
+msgstr "<p><b>Slett oppføring:</b><br>Fjernar han valde oppføringen frå denne profilen.<p>"
 
 #. help text - part y1
 #: src/include/apparmor/profile_dialogs.rb:987
 #, fuzzy
 msgid ""
-"<p><b>*Clean Exec</b><br>"
-"The Clean Exec option for the discrete profile \n"
+"<p><b>*Clean Exec</b><br>The Clean Exec option for the discrete profile \n"
 "and unconstrained execute permissions provide added security by stripping the environment \n"
 "that is inherited by the child program of specific variables. These variables are:"
 msgstr ""
-"<p><b>*Clean exec</b><br>"
-"Valet clean exec for discrete-profilen \n"
+"<p><b>*Clean exec</b><br>Valet clean exec for discrete-profilen \n"
 "og uavgrensa kjørerettigheter aukar tryggleiken ved å fjerna spesifikke variablar frå miljøet \n"
 "som arvast av underprogrammet. Desse variablane er:"
 
@@ -2665,15 +2305,11 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p>"
-#~ "<h1>Application to Profile</h1>"
-#~ "\n"
+#~ "<p><h1>Application to Profile</h1>\n"
 #~ "Select the application which you want to profile. Afterwards, when you run the application, AppArmor will collect\n"
 #~ "information about system resources it accesses.</p>"
 #~ msgstr ""
-#~ "<p>"
-#~ "<h1>Program som skal ha en profil</h1>"
-#~ "\n"
+#~ "<p><h1>Program som skal ha en profil</h1>\n"
 #~ "Vel programmet du vil profilera. Når du deretter køyrer programmet, vil AppArmor henta\n"
 #~ "informasjon om systemressursene programmet brukar.</p>"
 
@@ -2703,14 +2339,12 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<b>Program Name Pattern:</b><br>"
-#~ " When you enter a program name or pattern \n"
+#~ "<b>Program Name Pattern:</b><br> When you enter a program name or pattern \n"
 #~ "that matches the name of the binary executable of the program of \n"
 #~ "interest, the report will display security events that have \n"
 #~ "occurred for a specific program.<br>"
 #~ msgstr ""
-#~ "<b>Programnavnmønster:</b><br>"
-#~ " Når du angjev eit programnavn eller mønster \n"
+#~ "<b>Programnavnmønster:</b><br> Når du angjev eit programnavn eller mønster \n"
 #~ "som samsvarer med namnet på det den binære kjørbare fila for det \n"
 #~ "aktuelle programmet, vil rapporten visa sikkehetshendelser som har \n"
 #~ "funnest for eit bestemt program.<br>"
@@ -2803,25 +2437,13 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<ol>"
-#~ "<li>Click <b>Filter By Date Range</b>. The fields become active.</li>"
-#~ "  \n"
-#~ "<li>Enter the start and end dates that delineate the scope of the report.</li>"
-#~ " \n"
-#~ " "
-#~ "<li>Enter other filtering parameters. See below for definitions of parameters.</li>"
-#~ "</ol>"
-#~ "</p>"
+#~ "<ol><li>Click <b>Filter By Date Range</b>. The fields become active.</li>  \n"
+#~ "<li>Enter the start and end dates that delineate the scope of the report.</li> \n"
+#~ " <li>Enter other filtering parameters. See below for definitions of parameters.</li></ol></p>"
 #~ msgstr ""
-#~ "<ol>"
-#~ "<li>Klikk <b>Filtrar etter dato-ormåde</b>. Feltane vert aktiverte.</li>"
-#~ "  \n"
-#~ "<li>Angje start- og sluttdatoen for omfanget til rapporten.</li>"
-#~ " \n"
-#~ " "
-#~ "<li>Angje andre filtreringsparametere. Parametrane er definerte nedanfor.</li>"
-#~ "</ol>"
-#~ "</p>"
+#~ "<ol><li>Klikk <b>Filtrar etter dato-ormåde</b>. Feltane vert aktiverte.</li>  \n"
+#~ "<li>Angje start- og sluttdatoen for omfanget til rapporten.</li> \n"
+#~ " <li>Angje andre filtreringsparametere. Parametrane er definerte nedanfor.</li></ol></p>"
 
 #, fuzzy
 #~ msgid ""
@@ -2896,18 +2518,14 @@
 #, fuzzy
 #~ msgid ""
 #~ "<p>The View Archive Reports form enables you to view previously generated\n"
-#~ "reports located in the /var/log/apparmor/reports-archived directory. Use the checkboxes at the top to narrow-down the category of reports shown in the list to: SIR Reports, AUD Reports or ESS Reports. To see report details, select a report and click the <b>View</b> button.<br>"
-#~ "<br>"
-#~ " You can view reports from one or more systems if you move the reports to the /var/log/apparmor/reports-archived directory.</p>"
+#~ "reports located in the /var/log/apparmor/reports-archived directory. Use the checkboxes at the top to narrow-down the category of reports shown in the list to: SIR Reports, AUD Reports or ESS Reports. To see report details, select a report and click the <b>View</b> button.<br><br> You can view reports from one or more systems if you move the reports to the /var/log/apparmor/reports-archived directory.</p>"
 #~ msgstr ""
 #~ "<p>I skjemaet Vis arkivrapporter kan du visa \n"
 #~ "tidlegare genererte rapportar som er lagra i katalogen /var/log/apparmor/reports-archived. \n"
 #~ "Ved hjelp av avkryssingsboksene øvst kan du avgrensa rapportkategoriene \n"
 #~ "i lista til følgjande: SIR-rapportar, AUD-rapportar eller \n"
 #~ "ESS-rapportar.  For å vise informasjon om rapportane, vel ein rapport og klikk på \n"
-#~ "<b>Vise</b>-knappen.<br>"
-#~ "<br>"
-#~ " Du kan visa rapportar frå eit eller fleire system viss \n"
+#~ "<b>Vise</b>-knappen.<br><br> Du kan visa rapportar frå eit eller fleire system viss \n"
 #~ "du flyttar rapportane til katalogen /var/log/apparmor/reports-archived.</p>"
 
 #, fuzzy
@@ -2930,26 +2548,18 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<ul> "
-#~ "<li><b>Policy Exceptions:</b> When an application requests a resource \n"
-#~ "that's not defined within its profile, a security event is generated.</li>"
-#~ "  \n"
+#~ "<ul> <li><b>Policy Exceptions:</b> When an application requests a resource \n"
+#~ "that's not defined within its profile, a security event is generated.</li>  \n"
 #~ "<li><b>Policy Engine State Changes:</b> Enforces policy for applications and \n"
 #~ "maintains its own state, including when engines start or stop, when a policy \n"
-#~ "is reloaded, and when global security feature are enabled or disabled.</li>"
-#~ "</ul>"
-#~ " \n"
+#~ "is reloaded, and when global security feature are enabled or disabled.</li></ul> \n"
 #~ "Select the report from the archive, then <b>View</b> to see the report details.</p>"
 #~ msgstr ""
-#~ "<ul> "
-#~ "<li><b>Unntak frå retningslinjer:</b> Ein sikkerhetshendelse vert genererte når eit program spør etter ein ressurs \n"
-#~ "som ikkje er definert for denne profilen. </li>"
-#~ " \n"
+#~ "<ul> <li><b>Unntak frå retningslinjer:</b> Ein sikkerhetshendelse vert genererte når eit program spør etter ein ressurs \n"
+#~ "som ikkje er definert for denne profilen. </li> \n"
 #~ "<li><b>Statusendring for sikkerhetssystem:</b> Gjennomfører retningslinjene for program \n"
 #~ "og opprettheld status, bl.a når systemet skal aktiverast/deaktiveres, når eit sett retningslinjer \n"
-#~ "skal lastast på nytt og når ein global sikkerhetsfunksjon skal aktiverast eller deaktiveres. </li>"
-#~ " </ul>"
-#~ " \n"
+#~ "skal lastast på nytt og når ein global sikkerhetsfunksjon skal aktiverast eller deaktiveres. </li> </ul> \n"
 #~ "Vel rapporten frå arkivet og klikk <b>Vis</b> for å sjå detaljert informasjon i rapporten.</p>"
 
 #, fuzzy
@@ -3216,12 +2826,10 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<b>AppArmor Security Events</b>"
-#~ "<p>\n"
+#~ "<b>AppArmor Security Events</b><p>\n"
 #~ "This table displays the events that match your search criteria.\n"
 #~ msgstr ""
-#~ "<b>AppArmor sikkerhetshendelser</b>"
-#~ "<p>\n"
+#~ "<b>AppArmor sikkerhetshendelser</b><p>\n"
 #~ "                    Denne tabellen viser hendingar som samsvarer med dine søkekriterier."
 
 #, fuzzy
@@ -3751,20 +3359,12 @@
 #~ " \n"
 
 #, fuzzy
-#~ msgid ""
-#~ "<h3>Security Incident Report - Generated by AppArmor</h3>"
-#~ "\n"
-#~ msgstr ""
-#~ "<h3>Sikkerhetshendelsesrapport – generert av AppArmor</h3>"
-#~ "\n"
+#~ msgid "<h3>Security Incident Report - Generated by AppArmor</h3>\n"
+#~ msgstr "<h3>Sikkerhetshendelsesrapport – generert av AppArmor</h3>\n"
 
 #, fuzzy
-#~ msgid ""
-#~ "<h4>Period: %s - %s</h4>"
-#~ "\n"
-#~ msgstr ""
-#~ "<h4>Periode: %s–%s</h4>"
-#~ "\n"
+#~ msgid "<h4>Period: %s - %s</h4>\n"
+#~ msgstr "<h4>Periode: %s–%s</h4>\n"
 
 #, fuzzy
 #~ msgid "ag_reports_confined: Couldn't open %s for writing."
@@ -3860,18 +3460,14 @@
 
 #, fuzzy
 #~ msgid ""
-#~ "<p><b>Generate Reports Help</b> "
-#~ "<p>If there were, in fact, \n"
+#~ "<p><b>Generate Reports Help</b> <p>If there were, in fact, \n"
 #~ "going to be any help for you (which, incidentally, there isn't going to be), \n"
-#~ "then you would indeed find said help, here.</p>"
-#~ "<p>Thank you for your time, \n"
+#~ "then you would indeed find said help, here.</p><p>Thank you for your time, \n"
 #~ "and have a nice day.</p>"
 #~ msgstr ""
-#~ "<p><b>Hjelp til å generera rapportar</b> "
-#~ "<p>Viss det hadde \n"
+#~ "<p><b>Hjelp til å generera rapportar</b> <p>Viss det hadde \n"
 #~ "vore nokon hjelpetekst (som ikkje kjem til å verta), så hadde \n"
-#~ "du funne hjelpa her."
-#~ "<p> Takk for at du stakk innom, \n"
+#~ "du funne hjelpa her.<p> Takk for at du stakk innom, \n"
 #~ "og ha ein fin dag.</p>"
 
 #, fuzzy

    

[opensuse-translation-commit] r96206 - branches/plus-SLE12-SP2/yast/nn/po

keichwa＠svn2.opensuse.org