Author: keichwa
Date: 2016-08-04 14:30:42 +0200 (Thu, 04 Aug 2016)
New Revision: 96123
Modified:
branches/plus-SLE12-SP2/yast/nb/po/add-on-creator.nb.po
branches/plus-SLE12-SP2/yast/nb/po/add-on.nb.po
branches/plus-SLE12-SP2/yast/nb/po/audit-laf.nb.po
branches/plus-SLE12-SP2/yast/nb/po/auth-client.nb.po
branches/plus-SLE12-SP2/yast/nb/po/auth-server.nb.po
branches/plus-SLE12-SP2/yast/nb/po/autoinst.nb.po
branches/plus-SLE12-SP2/yast/nb/po/base.nb.po
branches/plus-SLE12-SP2/yast/nb/po/bootloader.nb.po
branches/plus-SLE12-SP2/yast/nb/po/ca-management.nb.po
branches/plus-SLE12-SP2/yast/nb/po/cio.nb.po
branches/plus-SLE12-SP2/yast/nb/po/cluster.nb.po
branches/plus-SLE12-SP2/yast/nb/po/control-center.nb.po
branches/plus-SLE12-SP2/yast/nb/po/control.nb.po
branches/plus-SLE12-SP2/yast/nb/po/country.nb.po
branches/plus-SLE12-SP2/yast/nb/po/crowbar.nb.po
branches/plus-SLE12-SP2/yast/nb/po/dhcp-server.nb.po
branches/plus-SLE12-SP2/yast/nb/po/dns-server.nb.po
branches/plus-SLE12-SP2/yast/nb/po/docker.nb.po
branches/plus-SLE12-SP2/yast/nb/po/drbd.nb.po
branches/plus-SLE12-SP2/yast/nb/po/fcoe-client.nb.po
branches/plus-SLE12-SP2/yast/nb/po/firewall-services.nb.po
branches/plus-SLE12-SP2/yast/nb/po/firewall.nb.po
branches/plus-SLE12-SP2/yast/nb/po/firstboot.nb.po
branches/plus-SLE12-SP2/yast/nb/po/fonts.nb.po
branches/plus-SLE12-SP2/yast/nb/po/ftp-server.nb.po
branches/plus-SLE12-SP2/yast/nb/po/geo-cluster.nb.po
branches/plus-SLE12-SP2/yast/nb/po/http-server.nb.po
branches/plus-SLE12-SP2/yast/nb/po/inetd.nb.po
branches/plus-SLE12-SP2/yast/nb/po/installation.nb.po
branches/plus-SLE12-SP2/yast/nb/po/instserver.nb.po
branches/plus-SLE12-SP2/yast/nb/po/iplb.nb.po
branches/plus-SLE12-SP2/yast/nb/po/iscsi-client.nb.po
branches/plus-SLE12-SP2/yast/nb/po/iscsi-lio-server.nb.po
branches/plus-SLE12-SP2/yast/nb/po/isns.nb.po
branches/plus-SLE12-SP2/yast/nb/po/journal.nb.po
branches/plus-SLE12-SP2/yast/nb/po/kdump.nb.po
branches/plus-SLE12-SP2/yast/nb/po/languages_db.nb.po
branches/plus-SLE12-SP2/yast/nb/po/ldap-client.nb.po
branches/plus-SLE12-SP2/yast/nb/po/ldap.nb.po
branches/plus-SLE12-SP2/yast/nb/po/live-installer.nb.po
branches/plus-SLE12-SP2/yast/nb/po/mail.nb.po
branches/plus-SLE12-SP2/yast/nb/po/multipath.nb.po
branches/plus-SLE12-SP2/yast/nb/po/network.nb.po
branches/plus-SLE12-SP2/yast/nb/po/nfs.nb.po
branches/plus-SLE12-SP2/yast/nb/po/nfs_server.nb.po
branches/plus-SLE12-SP2/yast/nb/po/nis.nb.po
branches/plus-SLE12-SP2/yast/nb/po/nis_server.nb.po
branches/plus-SLE12-SP2/yast/nb/po/ntp-client.nb.po
branches/plus-SLE12-SP2/yast/nb/po/oneclickinstall.nb.po
branches/plus-SLE12-SP2/yast/nb/po/online-update-configuration.nb.po
branches/plus-SLE12-SP2/yast/nb/po/online-update.nb.po
branches/plus-SLE12-SP2/yast/nb/po/opensuse_mirror.nb.po
branches/plus-SLE12-SP2/yast/nb/po/packager.nb.po
branches/plus-SLE12-SP2/yast/nb/po/pam.nb.po
branches/plus-SLE12-SP2/yast/nb/po/pkg-bindings.nb.po
branches/plus-SLE12-SP2/yast/nb/po/printer.nb.po
branches/plus-SLE12-SP2/yast/nb/po/product-creator.nb.po
branches/plus-SLE12-SP2/yast/nb/po/proxy.nb.po
branches/plus-SLE12-SP2/yast/nb/po/rdp.nb.po
branches/plus-SLE12-SP2/yast/nb/po/rear.nb.po
branches/plus-SLE12-SP2/yast/nb/po/registration.nb.po
branches/plus-SLE12-SP2/yast/nb/po/reipl.nb.po
branches/plus-SLE12-SP2/yast/nb/po/relocation-server.nb.po
branches/plus-SLE12-SP2/yast/nb/po/samba-client.nb.po
branches/plus-SLE12-SP2/yast/nb/po/samba-server.nb.po
branches/plus-SLE12-SP2/yast/nb/po/samba-users.nb.po
branches/plus-SLE12-SP2/yast/nb/po/scanner.nb.po
branches/plus-SLE12-SP2/yast/nb/po/security.nb.po
branches/plus-SLE12-SP2/yast/nb/po/services-manager.nb.po
branches/plus-SLE12-SP2/yast/nb/po/slp-server.nb.po
branches/plus-SLE12-SP2/yast/nb/po/snapper.nb.po
branches/plus-SLE12-SP2/yast/nb/po/sound.nb.po
branches/plus-SLE12-SP2/yast/nb/po/squid.nb.po
branches/plus-SLE12-SP2/yast/nb/po/sshd.nb.po
branches/plus-SLE12-SP2/yast/nb/po/storage.nb.po
branches/plus-SLE12-SP2/yast/nb/po/support.nb.po
branches/plus-SLE12-SP2/yast/nb/po/sysconfig.nb.po
branches/plus-SLE12-SP2/yast/nb/po/tftp-server.nb.po
branches/plus-SLE12-SP2/yast/nb/po/timezone_db.nb.po
branches/plus-SLE12-SP2/yast/nb/po/tune.nb.po
branches/plus-SLE12-SP2/yast/nb/po/update.nb.po
branches/plus-SLE12-SP2/yast/nb/po/users.nb.po
branches/plus-SLE12-SP2/yast/nb/po/vm.nb.po
branches/plus-SLE12-SP2/yast/nb/po/vpn.nb.po
branches/plus-SLE12-SP2/yast/nb/po/yast2-apparmor.nb.po
Log:
from SLE12-SP2 plus Factory
Modified: branches/plus-SLE12-SP2/yast/nb/po/add-on-creator.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/add-on-creator.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/add-on-creator.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: add-on-creator\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2013-10-04 17:40+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/add-on.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/add-on.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/add-on.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: add-on\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:35+0200\n"
"PO-Revision-Date: 2009-08-03 18:38+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: American English \n"
@@ -89,16 +89,15 @@
msgid "<li>Media: %1, Path: %2, Product: %3</li>\n"
msgstr "<li>Medium: %1, sti: %2, produkt: %3</li>\n"
-#. set addon specific sig-handling
-#: src/clients/add-on_auto.rb:186
-msgid "Make the add-on \"%1\" available via \"%2\"."
-msgstr "Gjør tillleggsproduktet \"%1\" tilgjengelig via \"%2\""
-
-#. just report error
-#: src/clients/add-on_auto.rb:193
+#. error report
+#: src/clients/add-on_auto.rb:185
msgid "Failed to add add-on product."
msgstr "Kunne ikke legge til tilleggsprodukt."
+#: src/clients/add-on_auto.rb:193
+msgid "Make the add-on \"%1\" available via \"%2\"."
+msgstr "Gjør tillleggsproduktet \"%1\" tilgjengelig via \"%2\""
+
#. placeholder for unknown path
#. summary item, %1 is product name, %2 media URL, %3 directory on media
#. placeholder for unknown directory
Modified: branches/plus-SLE12-SP2/yast/nb/po/audit-laf.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/audit-laf.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/audit-laf.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-09-25 13:46+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/auth-client.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/auth-client.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/auth-client.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-11-30 10:04+0100\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -17,1925 +17,1169 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. Edit Kerberos realm configuration
-#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:52
-#, fuzzy
-#| msgid "Realm"
-msgid "Realm name"
-msgstr "Område"
-
-#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:53
-msgid "Map Domain Name to the Realm (example.com -> EXAMPLE.COM)"
+#. translators: command line help text for authentication client module
+#: src/clients/auth-client.rb:46
+msgid "Authentication client configuration module"
msgstr ""
-#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:55
-msgid "Map Wild Card Domain Name to the Realm (*.example.com -> EXAMPLE.COM)"
+#. translators: command line help text for summary action
+#: src/clients/auth-client.rb:56
+msgid "Configuration summary of the authentication client"
msgstr ""
-#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:58
-#, fuzzy
-#| msgid "Remote Administration Settings"
-msgid "Host Name of Administration Server (Optional)"
-msgstr "Innstillinger for ekstern administrasjon"
-
-#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:60
-msgid "Host Name of Master Key Distribution Server (Optional)"
+#. translators: command line help text for summary action
+#: src/clients/auth-client.rb:61
+msgid "Create autoyast rnc from @parameters"
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
-#, fuzzy
-#| msgid "Principal Container"
-msgid "Principal Name"
-msgstr "Container for primærbruker"
-
-#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:69
-msgid "User Name"
-msgstr "Brukernavn"
-
-#: 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
-#, fuzzy
-#| msgid "Open ports for the Key Distribution Center"
-msgid "Please type in the host name of Key Distribution Centre:"
-msgstr "Åpne porter for nøkkeldistribusjonssenteret"
-
-#. Add an auth_to_local
-#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:102
-msgid "Please type in the auth_to_local rule:"
-msgstr ""
-
-#. Add an auth_to_local_names
-#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:115
-msgid "Please type in the principal name and user name in the format of \"princ_name = user_name\":"
-msgstr ""
-
-#. Save realm settings
-#: src/lib/authui/ldapkrb/edit_realm_dialog.rb:135
-#, fuzzy
-#| msgid "Please enter your last name"
-msgid "Please enter realm name."
-msgstr "Skriv inn etternavnet"
-
-#. 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
-#, fuzzy
-#| msgid "Additional IP Addresses or &Network/Netmask (separated by space)"
-msgid "Additional Addresses to be put in Ticket (Comma separated)"
-msgstr "Flere IP-adresser eller &nettverk/nettverksmaske (adskilt av mellomrom)"
-
-#: src/lib/authui/ldapkrb/krb_extended_opts_dialog.rb:59
-#, fuzzy
-#| msgid "R&eset"
-msgid "Reset"
-msgstr "&Tilbakestill"
-
-#. Edit more configuration items for LDAP.
-#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:53
-#, fuzzy
-#| msgid "On Cable Connection"
-msgid "In Case Of Connection Outage:"
-msgstr "Aktiv tilkoblingslinje"
-
-#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:54
-#, fuzzy
-#| msgid "The operation &policy"
-msgid "Retry The Operation Endlessly"
-msgstr "Handlings&praksis"
-
-#: 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
-#, fuzzy
-#| msgid "Time-Out in Tenths of Seconds"
-msgid "Timeout for Bind Operations in Seconds"
-msgstr "Tidsavbrudd i tidels sekunder"
-
-#: src/lib/authui/ldapkrb/ldap_extended_opts_dialog.rb:59
-#, fuzzy
-#| msgid "Timeout in Seconds"
-msgid "Timeout for Search Operations in Seconds"
-msgstr "Tidsavbrudd i sekunder"
-
-#. the last saved tab
-#: src/lib/authui/ldapkrb/main_dialog.rb:44
-#: src/lib/authui/ldapkrb/main_dialog.rb:63
-msgid "Use a Directory as Identity Provider (LDAP)"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:44
-#: src/lib/authui/ldapkrb/main_dialog.rb:67
-#, fuzzy
-#| msgid "authentication via eDirectory"
-msgid "Authentication via Kerberos"
-msgstr "autentisering via eDirectory"
-
-#. 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
-#, fuzzy
-#| msgid "Please enter a new share name."
-msgid "Please enter server URI."
-msgstr "Angi et navn for den nye delte ressursen."
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:126
-#, fuzzy
-#| msgid "Please enter a new share name."
-msgid "Please enter DN of search base."
-msgstr "Angi et navn for den nye delte ressursen."
-
-#. 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
-#, fuzzy
-#| msgid "IP not specified."
-msgid "(not specified)"
-msgstr "IP ikke angitt."
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:202
-#, fuzzy
-#| msgid "Are you sure you want to delete: "
-msgid "Are you sure to delete realm %s?"
-msgstr "Er du sikker på at du vil slette: "
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:334
-msgid "Allow LDAP Users To Authenticate (pam_ldap)"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:335
-msgid "Cache LDAP Entries For Faster Response (nscd)"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:336
-#: src/lib/authui/ldapkrb/main_dialog.rb:405
-#, fuzzy
-#| msgid "A&utomatically Generate Records From"
-msgid "Automatically Create Home Directory"
-msgstr "Generer oppføringer a&utomatisk fra"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:338
-#, fuzzy
-#| msgid "Create the following databases:"
-msgid "Read the following items from LDAP data source:"
-msgstr "Opprett følgende r"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:339
-#: src/lib/authui/sssd/main_dialog.rb:80
-msgid "Users"
-msgstr "Brukere"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:340
-#: src/lib/authui/sssd/main_dialog.rb:81
-msgid "Groups"
-msgstr "Grupper"
-
-#: 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
-#, fuzzy
-#| msgid "Use the LDAP server to store user information"
-msgid "Enter LDAP server locations (space separated), in either format:"
-msgstr "Bruk LDAP-serveren til lagring av brukerinformasjon"
-
-#: 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
-#, fuzzy
-#| msgid "Communication"
-msgid "Secure LDAP communication"
-msgstr "Kommunikasjon"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:363
-#, fuzzy
-#| msgid "Do Not Use TLS"
-msgid "Do Not Use Security"
-msgstr "Ikke bruk TLS"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:364
-#, fuzzy
-#| msgid "Secure Connection"
-msgid "Secure Communication via TLS"
-msgstr "Sikker forbindelse"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:365
-#, fuzzy
-#| msgid "Encrypted connection (StartTLS)"
-msgid "Secure Communication via StartTLS"
-msgstr "Kryptert forbindelse (StartTLS)"
-
-#
-#: src/lib/authui/ldapkrb/main_dialog.rb:368
-msgid "Test Connection"
-msgstr "Test forbindelsen"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:368
-#: src/lib/authui/ldapkrb/main_dialog.rb:428
-#: src/lib/authui/sssd/main_dialog.rb:186
-#, fuzzy
-#| msgid "&Extended partition"
-msgid "Extended Options"
-msgstr "Utvid&et partisjon"
-
-#. If not specified, append the default port number
-#: src/lib/authui/ldapkrb/main_dialog.rb:403
-#, fuzzy
-#| msgid "Allows \"anonymous\" user access to authenticated areas"
-msgid "Allow Kerberos Users To Authenticate (pam_krb5)"
-msgstr "Gir brukeren \"anonym\" tilgang til områder som krever autentisering"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:407
-#, fuzzy
-#| msgid "D&isable User Login"
-msgid "Default Realm For User Login:"
-msgstr "D&eaktiver brukerinnlogging"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:409
-#, fuzzy
-#| msgid "Authentication Realms"
-msgid "All Authentication Realms"
-msgstr "Autentiseringsområder"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:411
-#, fuzzy
-#| msgid "Realm"
-msgid "Add Realm"
-msgstr "Område"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:411
-#, fuzzy
-#| msgid "&Edit Default"
-msgid "Edit Realm"
-msgstr "&Rediger standard"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:411
-#, fuzzy
-#| msgid "Delete "
-msgid "Delete Realm"
-msgstr "Slett"
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:414
-msgid "Use DNS TXT Record to Discover Realms"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:416
-msgid "Use DNS SVC record to Discover KDC servers"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:419
-msgid "Allow Insecure Encryption (Windows NT)"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:421
-msgid "Allow KDC on Other Networks to Issue Authentication Tickets"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:423
-msgid "Allow Kerberos-Enabled Services to Take on The Identity Of a User"
-msgstr ""
-
-#: src/lib/authui/ldapkrb/main_dialog.rb:425
-msgid "Issue Address-Less Tickets for Computers Behind NAT"
-msgstr ""
-
-#. Entry point can be :sssd, :ldapkrb, or :auto
-#. In auto mode, there will be two change settings buttons.
-#: src/lib/authui/main_dialog.rb:46
-#, fuzzy
-#| msgid "Kerberos Client"
-msgid "LDAP and Kerberos Client"
-msgstr "Kerberos-klient"
-
-#: src/lib/authui/main_dialog.rb:48
-#, fuzzy
-#| msgid "User &Management"
-msgid "User Logon Management"
-msgstr "Bruker&administrasjon"
-
-#: src/lib/authui/main_dialog.rb:63
-#, fuzzy
-#| msgid "Base Settings"
-msgid "Change Settings"
-msgstr "Grunninnstillinger"
-
-#. Allow entering both SSSD and ldapkrb settings
-#: src/lib/authui/main_dialog.rb:67
-#, fuzzy
-#| msgid "User Permissions Configuration"
-msgid "User Logon Configuration"
-msgstr "Konfigurasjon av brukerrettigheter"
-
-#: src/lib/authui/main_dialog.rb:68
-#, fuzzy
-#| msgid "LDAP Server Configuration"
-msgid "LDAP/Kerberos Configuration"
-msgstr "Konfigurasjon av LDAP-server"
-
-#. Let user choose one additional parameter to customise for domain.
-#: src/lib/authui/main_dialog.rb:89
-#: src/lib/authui/sssd/extended_param_dialog.rb:54
-#: src/lib/authui/sssd/main_dialog.rb:177
-#: src/lib/authui/sssd/manage_ad_dialog.rb:98
-msgid "Name"
-msgstr "Navn"
-
-#: src/lib/authui/main_dialog.rb:89 src/lib/authui/sssd/main_dialog.rb:177
-#: src/lib/authui/sssd/manage_ad_dialog.rb:98
-msgid "Value"
-msgstr "Verdi"
-
-#: src/lib/authui/main_dialog.rb:91
-#, fuzzy
-#| msgid "Computer Names"
-msgid "Computer Name"
-msgstr "Datamaskinnavn"
-
-#: src/lib/authui/main_dialog.rb:92
-#, fuzzy
-#| msgid "Computer Names"
-msgid "Full Computer Name"
-msgstr "Datamaskinnavn"
-
-#: src/lib/authui/main_dialog.rb:92 src/lib/authui/main_dialog.rb:93
-#, fuzzy
-#| msgid "Supplemented resolvables"
-msgid "(Name is not resolvable)"
-msgstr "Ekstra nødvendige pakker"
-
-#: src/lib/authui/main_dialog.rb:93
-#, fuzzy
-#| msgid "Network mask"
-msgid "Network Domain"
-msgstr "Nettverksmaske"
-
-#: src/lib/authui/main_dialog.rb:94
-msgid "IP Addresses"
-msgstr "IP-adresser"
-
-#: src/lib/authui/main_dialog.rb:95
-#, fuzzy
-#| msgid "Additional Domains"
-msgid "Identity Domains"
-msgstr "Flere domener"
-
-#: src/lib/authui/sssd/extended_param_dialog.rb:54
-msgid "Description"
-msgstr "Beskrivelse"
-
-#: src/lib/authui/sssd/extended_param_dialog.rb:65
-#, fuzzy
-#| msgid "&Extended partition"
-msgid "Extended options"
-msgstr "Utvid&et partisjon"
-
-#: src/lib/authui/sssd/extended_param_dialog.rb:68
-#, fuzzy
-#| msgid "Filter:"
-msgid "Name filter:"
-msgstr "Filter:"
-
#. Create parameter editor controls (label, input, help text) and return them.
-#: src/lib/authui/sssd/initial_customisation_dialog.rb:74
+#: src/lib/yauthclient/initial_customisation_dialog.rb:70
#, fuzzy
#| msgid "None"
msgid "None."
msgstr "Ingen"
#. Render controls for editing parameter values, according to parameter data type.
-#: src/lib/authui/sssd/initial_customisation_dialog.rb:109
+#: src/lib/yauthclient/initial_customisation_dialog.rb:105
#, fuzzy
#| msgid "Mount Parameters"
msgid "Mandatory Parameters"
msgstr "Monteringsparametere"
-#: src/lib/authui/sssd/initial_customisation_dialog.rb:116
+#: src/lib/yauthclient/initial_customisation_dialog.rb:112
#, fuzzy
#| msgid "Optional Parameter File"
msgid "Optional Parameters"
msgstr "Fil med alternative parametere"
#. Check that all mandatory parameters are set
-#: src/lib/authui/sssd/initial_customisation_dialog.rb:142
+#: src/lib/yauthclient/initial_customisation_dialog.rb:138
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 "Generelle alternativer"
-
-#: src/lib/authui/sssd/main_dialog.rb:40
-#, fuzzy
-#| msgid "Filter:"
-msgid "Name switch"
-msgstr "Filter:"
-
-#: src/lib/authui/sssd/main_dialog.rb:41
-msgid "Authentication"
-msgstr "Autentisering"
-
-#: src/lib/authui/sssd/main_dialog.rb:41
-msgid "Sudo"
-msgstr ""
-
-#: src/lib/authui/sssd/main_dialog.rb:42
-#, fuzzy
-#| msgid "Mount"
-msgid "Auto-Mount"
-msgstr "Monter"
-
-#: src/lib/authui/sssd/main_dialog.rb:42 src/lib/authui/sssd/main_dialog.rb:84
-#, fuzzy
-#| msgid "GPG Public Keys"
-msgid "SSH Public Keys"
-msgstr "Offentlige GPG-nøkler"
-
-#: src/lib/authui/sssd/main_dialog.rb:43 src/lib/authui/sssd/main_dialog.rb:85
-msgid "Privilege Account Certificate (MS-PAC)"
-msgstr ""
-
#. Render overview and edit buttons on left side, config editor on right side.
-#: src/lib/authui/sssd/main_dialog.rb:67
+#: src/lib/yauthclient/main_dialog.rb:55
#, fuzzy
-#| msgid "Manage User Quota"
-msgid "Manage Domain User Logon"
-msgstr "Diskkvotebehandler for brukere"
+#| msgid "Authenticated Clients"
+msgid "Authentication Client Configuration"
+msgstr "Autentiserte klienter"
-#: src/lib/authui/sssd/main_dialog.rb:75
-#, fuzzy
-#| msgid "Current Status: "
-msgid "Daemon Status: "
-msgstr "Gjeldende status: "
+#. Overview of all config sections
+#: src/lib/yauthclient/main_dialog.rb:62
+msgid "Global Configuration"
+msgstr "Generell konfigurasjon"
-#: src/lib/authui/sssd/main_dialog.rb:75
-msgid "Running"
-msgstr "Kjører"
-
-#: src/lib/authui/sssd/main_dialog.rb:75
-msgid "Stopped"
-msgstr "Stoppet"
-
-#: src/lib/authui/sssd/main_dialog.rb:76
-msgid "Allow Domain User Logon"
-msgstr ""
-
-#: src/lib/authui/sssd/main_dialog.rb:77
-#, fuzzy
-#| msgid "Create Home Directory on Login"
-msgid "Create Home Directory"
+#: src/lib/yauthclient/main_dialog.rb:65
+msgid "Create Home Directory on Login"
msgstr "Opprett hjemmekatalog ved innlogging"
-#: src/lib/authui/sssd/main_dialog.rb:79
+#: src/lib/yauthclient/main_dialog.rb:68
#, fuzzy
-#| msgid "Enabling sources..."
-msgid "Enable domain data source:"
-msgstr "Aktiverer kilder..."
+#| msgid "Enable the NTP daemon"
+msgid "Enable SSSD daemon"
+msgstr "Aktiver NTP-nisse"
-#: src/lib/authui/sssd/main_dialog.rb:83
-msgid "Map Network Drives (automount)"
-msgstr ""
-
-#: src/lib/authui/sssd/main_dialog.rb:91
+#: src/lib/yauthclient/main_dialog.rb:73
#, fuzzy
-#| msgid "Domain"
-msgid "Join Domain"
-msgstr "Domene"
+#| msgid "Sections: %1"
+msgid "Sections"
+msgstr "Seksjoner: %1"
-#: src/lib/authui/sssd/main_dialog.rb:92
+#: src/lib/yauthclient/main_dialog.rb:76
#, fuzzy
-#| msgid "Local Domains"
-msgid "Leave Domain"
-msgstr "Lokale domener"
+#| msgid "Network Services"
+msgid "New Service/Domain"
+msgstr "Nettverkstjenester"
-#: src/lib/authui/sssd/main_dialog.rb:93
+#: src/lib/yauthclient/main_dialog.rb:77
#, fuzzy
-#| msgid "Clients Domain Name"
-msgid "Clear Domain Cache"
-msgstr "Klientens domenenavn"
+#| msgid "Selected Service"
+msgid "Delete Service/Domain"
+msgstr "Valgt tjeneste"
-#. 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
+#. 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
#, fuzzy
-#| msgid "Search Options"
-msgid "Service Options"
-msgstr "Søkevalg"
+#| msgid "Custom Registration Server"
+msgid "Customisation - %s"
+msgstr "Egendefinert registreringsserver"
-#: src/lib/authui/sssd/main_dialog.rb:139
-#: src/lib/authui/sssd/main_dialog.rb:150
-#, fuzzy
-#| msgid "Formatting Options"
-msgid "Domain Options"
-msgstr "Formateringsvalg"
+#: src/lib/yauthclient/main_dialog.rb:118
+#: src/lib/yauthclient/main_dialog.rb:143
+msgid "Name"
+msgstr "Navn"
-#: src/lib/authui/sssd/main_dialog.rb:151
-msgid "Select Global Options, a service, or a domain to customise."
-msgstr ""
+#: src/lib/yauthclient/main_dialog.rb:118
+msgid "Value"
+msgstr "Verdi"
-#. Additional widgets for a domain
-#: src/lib/authui/sssd/main_dialog.rb:157
-#, fuzzy
-#| msgid "Really delete this domain?"
-msgid "Use this domain"
-msgstr "Er du sikker på at du vil slette dette domenet?"
+#: src/lib/yauthclient/main_dialog.rb:118
+#: src/lib/yauthclient/main_dialog.rb:143
+msgid "Description"
+msgstr "Beskrivelse"
-#. Additiona widgets for an AD domain
-#: src/lib/authui/sssd/main_dialog.rb:162
+#. For the currently selected config section, render list of additional parameters for customisation.
+#: src/lib/yauthclient/main_dialog.rb:137
#, fuzzy
-#| msgid "Active Directory Server"
-msgid "Enroll to Active Directory"
-msgstr "Active Directory-server"
+#| msgid "Modem Parameters"
+msgid "More Parameters"
+msgstr "Modemparametere"
-#. TRANSLATORS: Label of the area used to customise parameters.
-#. %s is the name of the section being customised.
-#: src/lib/authui/sssd/main_dialog.rb:172
+#: src/lib/yauthclient/main_dialog.rb:140
#, fuzzy
-#| msgid "Options"
-msgid "Options - %s"
-msgstr "Valg"
+#| msgid "Filter:"
+msgid "Name filter:"
+msgstr "Filter:"
-#. Delete the chosen domain
-#: src/lib/authui/sssd/main_dialog.rb:217
-#, fuzzy
-#| msgid "Please select a scanner from the list."
-msgid "Please select a domain among the list."
-msgstr "Velg en skanner fra listen."
-
-#: src/lib/authui/sssd/main_dialog.rb:220
-#, fuzzy
-#| msgid "Do you really want to delete partition %1?"
-msgid "Do you really wish to erase configuration for domain %s?"
-msgstr "Er du sikker på at du vil slette partisjonen %1?"
-
-#. Enable/disable SSSD daemon
-#: src/lib/authui/sssd/main_dialog.rb:252
+#. Check system environment for the proper operation of SSSD
+#: src/lib/yauthclient/main_dialog.rb:169
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\"."
+"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?"
msgstr ""
-#. Enable/disable NSS password database
-#: src/lib/authui/sssd/main_dialog.rb:284
+#: src/lib/yauthclient/main_dialog.rb:179
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\"."
+"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?"
msgstr ""
-#. 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 ""
+#. Delete the chosen section (domain or service)
+#: src/lib/yauthclient/main_dialog.rb:223
+#, fuzzy
+#| msgid "You cannot delete the active profile."
+msgid "You may not delete section SSSD."
+msgstr "Du kan ikke slette den aktive profilen."
-#. Enable/disable NSS sudoers database
-#: src/lib/authui/sssd/main_dialog.rb:320
-msgid ""
-"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:225
+#, fuzzy
+#| msgid "Do you really want to delete partition %1?"
+msgid "Do you really wish to delete section %s?"
+msgstr "Er du sikker på at du vil slette partisjonen %1?"
-#: src/lib/authui/sssd/main_dialog.rb:328
-msgid ""
-"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 ""
-
-#. 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/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/authui/sssd/main_dialog.rb:409
+#: src/lib/yauthclient/main_dialog.rb:269
msgid "This is a mandatory parameter and it may not be deleted."
msgstr ""
#. Warn against removal of important parameters
-#: src/lib/authui/sssd/main_dialog.rb:414
+#: src/lib/yauthclient/main_dialog.rb:274
#, fuzzy
#| msgid "Modem parameter details"
msgid "Confirm parameter removal: "
msgstr "Detaljerte modemparametere"
-#: src/lib/authui/sssd/main_dialog.rb:415
+#: src/lib/yauthclient/main_dialog.rb:275
msgid ""
-"The parameter is important. Removal of the parameter may cause configuration failure.\n"
+"The parameter is important. Removal of the parameter may cause SSSD startup failure.\n"
"Please consult SSSD manual page before moving on.\n"
-"Do you still wish to remove the parameter?"
+"Do you still wish to continue?"
msgstr ""
#. Save settings - validate
-#: src/lib/authui/sssd/main_dialog.rb:434
+#: src/lib/yauthclient/main_dialog.rb:305
#, fuzzy
-#| msgid "NIS domain"
-msgid "No domain"
-msgstr "NIS-domene"
+#| msgid "Logging enabled"
+msgid "No domain enabled"
+msgstr "Logging aktivert"
-#: src/lib/authui/sssd/main_dialog.rb:435
+#: src/lib/yauthclient/main_dialog.rb:306
msgid ""
-"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"
+"No domain has been enabled in [sssd] \"domains\" parameter.\n"
+"SSSD will not start, and only local authentication will be available.\n"
"Do you still wish to proceed?"
msgstr ""
-#. Remove all SSSD cache files
-#: src/lib/authui/sssd/main_dialog.rb:455
-#, fuzzy
-#| msgid "No patches have been installed."
-msgid "All cached data have been erased."
-msgstr "Ingen oppgraderinger er installert."
-
-#. 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:"
+#. user must correct the mistake
+#: src/lib/yauthclient/main_dialog.rb:323
+msgid "Inactive domain(s) found"
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:69
-msgid "Username"
-msgstr "Brukernavn"
+#. Render input box and dropdowns for service/domain creation
+#: src/lib/yauthclient/new_section_dialog.rb:49
+#, fuzzy
+#| msgid "Would you like to enable access to the profile repository?"
+msgid "Would you like to enable another service or join a domain?"
+msgstr "Vil du aktivere tilgang til profilarkivet?"
-#: src/lib/authui/sssd/manage_ad_dialog.rb:70
-msgid "Password"
-msgstr "Passord"
+#. New service
+#: src/lib/yauthclient/new_section_dialog.rb:54
+msgid "Service"
+msgstr "Tjeneste"
-#: src/lib/authui/sssd/manage_ad_dialog.rb:71
-msgid "Optional Organisation Unit such as \"Headquarter/HR/BuildingA\""
-msgstr ""
+#. New domain and provider types
+#: src/lib/yauthclient/new_section_dialog.rb:58
+msgid "Domain"
+msgstr "Domene"
-#: src/lib/authui/sssd/manage_ad_dialog.rb:72
-msgid "Overwrite Samba configuration to work with this AD"
+#: src/lib/yauthclient/new_section_dialog.rb:61
+msgid "Domain name (example.com):"
msgstr ""
-#: 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:64
+#, fuzzy
+#| msgid "Identification:"
+msgid "Identification provider:"
+msgstr "Identifikasjon:"
-#: src/lib/authui/sssd/manage_ad_dialog.rb:78
-msgid " (Auto-discovered via DNS)"
-msgstr ""
-
-#: src/lib/authui/sssd/manage_ad_dialog.rb:82
+#: src/lib/yauthclient/new_section_dialog.rb:69
#, fuzzy
-#| msgid "Show error&s"
-msgid "(DNS error)"
-msgstr "Vis fei&l"
+#| msgid "&Authentication Mode"
+msgid "Authentication provider:"
+msgstr "&Autentiseringsmodus"
-#: 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."
+#: src/lib/yauthclient/new_section_dialog.rb:72
+msgid "Activate Domain"
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:89
-msgid "Already enrolled"
-msgstr ""
-
-#: src/lib/authui/sssd/manage_ad_dialog.rb:91
+#. Create new service
+#: src/lib/yauthclient/new_section_dialog.rb:105
#, fuzzy
-#| msgid "Not yet implemented"
-msgid "Not yet enrolled"
-msgstr "Ikke implementert ennå"
+#| msgid "These services will be enabled"
+msgid "There are no more services to be enabled."
+msgstr "Disse tjenestene vil bli aktivert"
-#: src/lib/authui/sssd/manage_ad_dialog.rb:114
+#. Create new domain
+#: src/lib/yauthclient/new_section_dialog.rb:123
#, fuzzy
-#| msgid "Active Directory Server"
-msgid "Active Directory enrollment"
-msgstr "Active Directory-server"
+#| msgid "Enter a name for the new profile."
+msgid "Please enter a name for the new domain."
+msgstr "Angi et navn for den nye profilen."
-#: src/lib/authui/sssd/manage_ad_dialog.rb:116
+#: src/lib/yauthclient/new_section_dialog.rb:126
#, fuzzy
-#| msgid "Current status:"
-msgid "Current status"
-msgstr "Gjeldende status:"
+#| msgid "This domain is already defined."
+msgid "The domain name is already in-use."
+msgstr "Dette domenet is allerede definert."
-#: src/lib/authui/sssd/manage_ad_dialog.rb:116
-#, fuzzy
-#| msgid "Checking status..."
-msgid "Gathering status..."
-msgstr "Kontrollerer status..."
-
-#. Enroll the computer, or save the enrollment details
-#: src/lib/authui/sssd/manage_ad_dialog.rb:134
-#, fuzzy
-#| msgid "Please enter a password"
-msgid "Please enter both username and password."
-msgstr "Angi et passord"
-
-#. 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."
+#. Define Global Parameters
+#: src/lib/yauthclient/params.rb:108
+msgid "Indicates what is the syntax of the config file."
msgstr ""
-#: src/lib/authui/sssd/manage_ad_dialog.rb:150
-msgid ""
-"Enrollment has completed successfully!\n"
-"\n"
-"Command output:\n"
+#: src/lib/yauthclient/params.rb:114
+msgid "Comma separated list of services that are started when sssd itself starts."
msgstr ""
-#. If user enters this dialog once again, the details should be cleared.
-#: src/lib/authui/sssd/manage_ad_dialog.rb:158
+#: src/lib/yauthclient/params.rb:115
msgid ""
-"The enrollment process failed.\n"
"\n"
-"Command output:\n"
+"Supported services: nss, pam, sudo, autofs, ssh"
msgstr ""
-#. 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)"
+#: 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"
msgstr ""
-#: src/lib/authui/sssd/new_section_dialog.rb:38
-#: src/lib/authui/sssd/new_section_dialog.rb:51
-#, fuzzy
-#| msgid "Local database"
-msgid "Local SSSD file database"
-msgstr "Lokal database"
-
-#: src/lib/authui/sssd/new_section_dialog.rb:39
-#: src/lib/authui/sssd/new_section_dialog.rb:49
-#, fuzzy
-#| msgid "Active Directory Server"
-msgid "Microsoft Active Directory"
-msgstr "Active Directory-server"
-
-#: src/lib/authui/sssd/new_section_dialog.rb:40
-#: src/lib/authui/sssd/new_section_dialog.rb:48
-#, fuzzy
-#| msgid "Free"
-msgid "FreeIPA"
-msgstr "Ledig"
-
-#: src/lib/authui/sssd/new_section_dialog.rb:41
-#: src/lib/authui/sssd/new_section_dialog.rb:46
-msgid "Generic directory service (LDAP)"
+#: 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."
msgstr ""
-#: src/lib/authui/sssd/new_section_dialog.rb:47
-#, fuzzy
-#| msgid "Configuration of Kerberos server"
-msgid "Generic Kerberos service"
-msgstr "Oppsett av Kerberos-server"
-
-#: src/lib/authui/sssd/new_section_dialog.rb:52
-#, fuzzy
-#| msgid "The selected connection does not use certificates for authentication."
-msgid "The domain does not provide authentication service"
-msgstr "Den valgte tilkoblingen benytter ikke sertifikater til autentisering."
-
-#. New domain and provider types
-#: src/lib/authui/sssd/new_section_dialog.rb:75
-#, fuzzy
-#| msgid "Domain name cannot be empty."
-msgid "Domain name (such as example.com):"
-msgstr "Du må angi et domenenavn."
-
-#: src/lib/authui/sssd/new_section_dialog.rb:78
-msgid "Which service provides identity data, such as user names and group memberships?"
+#: src/lib/yauthclient/params.rb:126
+msgid "This parameter contains the list of domains in the order these will be queried."
msgstr ""
-#: src/lib/authui/sssd/new_section_dialog.rb:83
-#, fuzzy
-#| msgid "The username to be used for proxy authentication"
-msgid "Which service handles user authentication?"
-msgstr "Brukernavn for mellomserverautentisering"
-
-#
-#: src/lib/authui/sssd/new_section_dialog.rb:86
-#, fuzzy
-#| msgid "Unable to join the domain."
-msgid "Enable the domain"
-msgstr "Kan ikke kople til domenet."
-
-#. Create new domain
-#: src/lib/authui/sssd/new_section_dialog.rb:106
-#, fuzzy
-#| msgid "Please enter a new share name."
-msgid "Please enter the domain name."
-msgstr "Angi et navn for den nye delte ressursen."
-
-#: src/lib/authui/sssd/new_section_dialog.rb:109
-msgid "The domain name collides with a reserved keyword. Please choose a different name."
+#: 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"
msgstr ""
-#: src/lib/authui/sssd/new_section_dialog.rb:112
-#, fuzzy
-#| msgid "This domain is already defined."
-msgid "The domain name is already in-use."
-msgstr "Dette domenet is allerede definert."
-
-#. Define Global Parameters
-#. Omit 'services' and 'domains' from section [sssd], because they are never customised directly by the end-user.
-#: src/lib/authui/sssd/params.rb:110
-#, fuzzy
-#| msgid "Boot loader configuration file contains errors"
-msgid "Version of configuration file syntax (1 or 2)"
-msgstr "Konfigurasjonsfil for oppstartslaster inneholder feil"
-
-#: 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"
+#: 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."
msgstr ""
-#: src/lib/authui/sssd/params.rb:119
-msgid "The regular expression parses user name and domain name into components"
+#: 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."
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"
+#: 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."
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"
+#: src/lib/yauthclient/params.rb:143
+msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files."
msgstr ""
-#: src/lib/authui/sssd/params.rb:131
-msgid "Directory on the filesystem where SSSD should store Kerberos replay cache files"
+#: 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."
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
-#. 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)"
+#: 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."
msgstr ""
-#: src/lib/authui/sssd/params.rb:151
+#: src/lib/yauthclient/params.rb:159
msgid "Add a timestamp to the debug messages"
msgstr ""
-#: src/lib/authui/sssd/params.rb:156
+#: src/lib/yauthclient/params.rb:164
msgid "Add microseconds to the timestamp in debug messages"
msgstr ""
-#: src/lib/authui/sssd/params.rb:161
-msgid "Timeout in seconds between heartbeats for this service"
+#: src/lib/yauthclient/params.rb:169
+msgid "Timeout in seconds between heartbeats for this service."
msgstr ""
-#: src/lib/authui/sssd/params.rb:171
-msgid "Maximum number of file descriptors that may be opened at a time by SSSD service process"
+#: 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."
msgstr ""
-#: 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"
+#: 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."
msgstr ""
-#: src/lib/authui/sssd/params.rb:181
-msgid "The service will receive SIGTERM after this number of seconds of consecutive ping check failure"
+#: 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."
msgstr ""
-#: src/lib/authui/sssd/params.rb:193
+#. NSS configuration options
+#: src/lib/yauthclient/params.rb:197
msgid "How many seconds should cache nss_sss enumerations (requests for info about all users)?"
msgstr ""
-#: src/lib/authui/sssd/params.rb:198
+#: src/lib/yauthclient/params.rb:202
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/authui/sssd/params.rb:203
+#: src/lib/yauthclient/params.rb:207
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/authui/sssd/params.rb:209
+#: src/lib/yauthclient/params.rb:213
msgid "Exclude certain users from being fetched by SSS backend"
msgstr ""
-#: src/lib/authui/sssd/params.rb:215
+#: src/lib/yauthclient/params.rb:219
msgid "Exclude certain groups from being fetched by SSS backend"
msgstr ""
-#: src/lib/authui/sssd/params.rb:220
+#: src/lib/yauthclient/params.rb:224
msgid "If you want filtered user to still be group members set this option to false."
msgstr ""
-#: src/lib/authui/sssd/params.rb:224
+#: src/lib/yauthclient/params.rb:228
msgid "Override the user's home directory. You can either provide an absolute value or a template."
msgstr ""
-#: src/lib/authui/sssd/params.rb:228 src/lib/authui/sssd/params.rb:1209
+#: src/lib/yauthclient/params.rb:232 src/lib/yauthclient/params.rb:1185
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/authui/sssd/params.rb:232
+#: src/lib/yauthclient/params.rb:236
msgid "Override the login shell for all users."
msgstr ""
-#: src/lib/authui/sssd/params.rb:236
+#: src/lib/yauthclient/params.rb:240
msgid "Restrict user shell to one of the listed values."
msgstr ""
-#: src/lib/authui/sssd/params.rb:240
+#: src/lib/yauthclient/params.rb:244
msgid "Replace any instance of these shells with the shell_fallback"
msgstr ""
-#: src/lib/authui/sssd/params.rb:245
+#: src/lib/yauthclient/params.rb:249
msgid "The default shell to use if an allowed shell is not installed on the machine."
msgstr ""
-#: src/lib/authui/sssd/params.rb:249 src/lib/authui/sssd/params.rb:1213
+#: src/lib/yauthclient/params.rb:253 src/lib/yauthclient/params.rb:1189
msgid "The default shell to use if the provider does not return one during lookup."
msgstr ""
-#: src/lib/authui/sssd/params.rb:254 src/lib/authui/sssd/params.rb:301
+#: src/lib/yauthclient/params.rb:258 src/lib/yauthclient/params.rb:301
msgid "Specifies time in seconds for which the list of subdomains will be considered valid."
msgstr ""
-#: src/lib/authui/sssd/params.rb:259
+#: src/lib/yauthclient/params.rb:263
msgid "Specifies time in seconds for which records in the in-memory cache will be valid."
msgstr ""
-#: src/lib/authui/sssd/params.rb:271
+#. PAM configuration options
+#: src/lib/yauthclient/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/authui/sssd/params.rb:276 src/lib/authui/sssd/params.rb:281
+#: src/lib/yauthclient/params.rb:276 src/lib/yauthclient/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/authui/sssd/params.rb:286
+#: src/lib/yauthclient/params.rb:286
msgid "Controls what kind of messages are shown to the user during authentication."
msgstr ""
-#: src/lib/authui/sssd/params.rb:291
+#: src/lib/yauthclient/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/authui/sssd/params.rb:296 src/lib/authui/sssd/params.rb:811
-#: src/lib/authui/sssd/params.rb:1096
+#: src/lib/yauthclient/params.rb:296 src/lib/yauthclient/params.rb:788
+#: src/lib/yauthclient/params.rb:1073
msgid "Display a warning N days before the password expires."
msgstr ""
-#: src/lib/authui/sssd/params.rb:313
+#. SUDO configuration options
+#: src/lib/yauthclient/params.rb:309
msgid "Whether or not to evaluate the sudoNotBefore and sudoNotAfter attributes that implement time-dependent sudoers entries."
msgstr ""
-#: src/lib/authui/sssd/params.rb:325
+#. AUTOFS configuration options
+#: src/lib/yauthclient/params.rb:317
msgid "Specifies for how many seconds the autofs responder should cache negative hits before asking the back end again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:337
+#. SSH configuration options
+#: src/lib/yauthclient/params.rb:325
msgid "Whether or not to hash host names and addresses in the managed known_hosts file."
msgstr ""
-#: src/lib/authui/sssd/params.rb:342
+#: src/lib/yauthclient/params.rb:330
msgid "How many seconds to keep a host in the managed known_hosts file after its host keys were requested."
msgstr ""
-#: src/lib/authui/sssd/params.rb:355 src/lib/authui/sssd/params.rb:360
+#. 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
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/authui/sssd/params.rb:366
+#: src/lib/yauthclient/params.rb:350
msgid "Read all entities from backend database (increase server load)"
msgstr ""
-#: src/lib/authui/sssd/params.rb:371
+#: src/lib/yauthclient/params.rb:355
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/authui/sssd/params.rb:376
+#: src/lib/yauthclient/params.rb:360
msgid "How many seconds nss_sss should consider entries valid before asking the backend again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:381
+#: src/lib/yauthclient/params.rb:365
msgid "How many seconds nss_sss should consider user entries valid before asking the backend again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:386
+#: src/lib/yauthclient/params.rb:370
msgid "How many seconds nss_sss should consider group entries valid before asking the backend again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:391
+#: src/lib/yauthclient/params.rb:375
msgid "How many seconds nss_sss should consider netgroup entries valid before asking the backend again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:396
+#: src/lib/yauthclient/params.rb:380
msgid "How many seconds nss_sss should consider service entries valid before asking the backend again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:401
+#: src/lib/yauthclient/params.rb:385
msgid "How many seconds sudo should consider rules valid before asking the backend again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:406
+#: src/lib/yauthclient/params.rb:390
msgid "How many seconds the autofs service should consider automounter maps valid before asking the backend again."
msgstr ""
-#: src/lib/authui/sssd/params.rb:412
+#: src/lib/yauthclient/params.rb:396
msgid "Cache credentials for offline use"
msgstr ""
-#: src/lib/authui/sssd/params.rb:417
+#: src/lib/yauthclient/params.rb:401
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/authui/sssd/params.rb:424
+#: src/lib/yauthclient/params.rb:408
msgid "The identification provider used for the domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:429
+#: src/lib/yauthclient/params.rb:413
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/authui/sssd/params.rb:436
+#: src/lib/yauthclient/params.rb:420
msgid "The authentication provider used for the domain"
msgstr ""
-#: src/lib/authui/sssd/params.rb:442
+#: src/lib/yauthclient/params.rb:426
msgid "The access control provider used for the domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:447
+#: src/lib/yauthclient/params.rb:431
msgid "The provider which should handle change password operations for the domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:453
+#: src/lib/yauthclient/params.rb:437
msgid "The SUDO provider used for the domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:459
+#: src/lib/yauthclient/params.rb:443
msgid "The provider which should handle loading of selinux settings."
msgstr ""
-#: src/lib/authui/sssd/params.rb:465
+#: src/lib/yauthclient/params.rb:449
msgid "The provider which should handle fetching of subdomains."
msgstr ""
-#: src/lib/authui/sssd/params.rb:471
+#: src/lib/yauthclient/params.rb:455
msgid "The autofs provider used for the domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:477
+#: src/lib/yauthclient/params.rb:461
msgid "The provider used for retrieving host identity information."
msgstr ""
-#: src/lib/authui/sssd/params.rb:482
+#: src/lib/yauthclient/params.rb:466
msgid "Regular expression for this domain that describes how to parse the string containing user name and domain into these components."
msgstr ""
-#: src/lib/authui/sssd/params.rb:487
+#: src/lib/yauthclient/params.rb:471
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/authui/sssd/params.rb:493
+#: src/lib/yauthclient/params.rb:477
msgid "Provides the ability to select preferred address family to use when performing DNS lookups."
msgstr ""
-#: src/lib/authui/sssd/params.rb:498
+#: src/lib/yauthclient/params.rb:482
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/authui/sssd/params.rb:502
+#: src/lib/yauthclient/params.rb:486
msgid "If service discovery is used in the back end, specifies the domain part of the service discovery DNS query."
msgstr ""
-#: src/lib/authui/sssd/params.rb:506
+#: src/lib/yauthclient/params.rb:490
msgid "Override the primary GID value with the one specified."
msgstr ""
-#: src/lib/authui/sssd/params.rb:512
+#: src/lib/yauthclient/params.rb:495
msgid "Treat user and group names as case sensitive."
msgstr ""
-#: src/lib/authui/sssd/params.rb:517
+#: src/lib/yauthclient/params.rb:500
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/authui/sssd/params.rb:522
+#: src/lib/yauthclient/params.rb:505
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/authui/sssd/params.rb:528
+#: src/lib/yauthclient/params.rb:511
msgid "Comma separated list of users who are allowed to log in."
msgstr ""
-#: src/lib/authui/sssd/params.rb:533
+#: src/lib/yauthclient/params.rb:516
msgid "Comma separated list of groups who are allowed to log in. This applies only to groups within this SSSD domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:538
+#: src/lib/yauthclient/params.rb:521
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/authui/sssd/params.rb:547
+#: src/lib/yauthclient/params.rb:530
msgid "The tools append the login name to base_directory and use that as the home directory."
msgstr ""
-#: src/lib/authui/sssd/params.rb:552
+#: src/lib/yauthclient/params.rb:535
msgid "Indicate if a home directory should be created by default for new users."
msgstr ""
-#: src/lib/authui/sssd/params.rb:557
+#: src/lib/yauthclient/params.rb:540
msgid "Indicate if a home directory should be removed by default for deleted users."
msgstr ""
-#: src/lib/authui/sssd/params.rb:562
+#: src/lib/yauthclient/params.rb:545
msgid "Used by sss_useradd(8) to specify the default permissions on a newly created home directory."
msgstr ""
-#: src/lib/authui/sssd/params.rb:567
+#: src/lib/yauthclient/params.rb:550
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/authui/sssd/params.rb:572
+#: src/lib/yauthclient/params.rb:555
msgid "The mail spool directory."
msgstr ""
-#: src/lib/authui/sssd/params.rb:576
+#: src/lib/yauthclient/params.rb:559
msgid "The command that is run after a user is removed."
msgstr ""
#. The ldap domain section
-#: 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
+#: src/lib/yauthclient/params.rb:568
msgid "URIs (ldap://) of LDAP servers (comma separated)"
msgstr ""
-#: src/lib/authui/sssd/params.rb:597
+#: src/lib/yauthclient/params.rb:574
msgid "The default base DN to use for performing LDAP sudo rules."
msgstr ""
-#: src/lib/authui/sssd/params.rb:602
+#: src/lib/yauthclient/params.rb:579
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/authui/sssd/params.rb:608 src/lib/authui/sssd/params.rb:614
+#: src/lib/yauthclient/params.rb:585 src/lib/yauthclient/params.rb:591
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/authui/sssd/params.rb:620
+#: src/lib/yauthclient/params.rb:597
#, fuzzy
#| msgid "Base DN for the database"
msgid "Base DN for LDAP search"
msgstr "Hoved-DN for database"
-#: src/lib/authui/sssd/params.rb:627
+#: src/lib/yauthclient/params.rb:604
#, fuzzy
#| msgid "LDAP secure port"
msgid "LDAP schema type"
msgstr "Sikker LDAP-port"
-#: src/lib/authui/sssd/params.rb:631
+#: src/lib/yauthclient/params.rb:608
msgid "The default bind DN to use for performing LDAP operations."
msgstr ""
-#: src/lib/authui/sssd/params.rb:637
+#: src/lib/yauthclient/params.rb:614
msgid "The type of the authentication token of the default bind DN."
msgstr ""
-#: src/lib/authui/sssd/params.rb:641
+#: src/lib/yauthclient/params.rb:618
msgid "The authentication token of the default bind DN."
msgstr ""
-#: src/lib/authui/sssd/params.rb:646
+#: src/lib/yauthclient/params.rb:623
msgid "The object class of a user entry in LDAP."
msgstr ""
-#: src/lib/authui/sssd/params.rb:651
+#: src/lib/yauthclient/params.rb:628
msgid "The LDAP attribute that corresponds to the user's login name."
msgstr ""
-#: src/lib/authui/sssd/params.rb:656
+#: src/lib/yauthclient/params.rb:633
msgid "The LDAP attribute that corresponds to the user's id."
msgstr ""
-#: src/lib/authui/sssd/params.rb:661
+#: src/lib/yauthclient/params.rb:638
msgid "The LDAP attribute that corresponds to the user's primary group id."
msgstr ""
-#: src/lib/authui/sssd/params.rb:666
+#: src/lib/yauthclient/params.rb:643
msgid "The LDAP attribute that corresponds to the user's gecos field."
msgstr ""
-#: src/lib/authui/sssd/params.rb:671
+#: src/lib/yauthclient/params.rb:648
msgid " The LDAP attribute that contains the name of the user's home directory."
msgstr ""
-#: src/lib/authui/sssd/params.rb:676
+#: src/lib/yauthclient/params.rb:653
msgid "The LDAP attribute that contains the path to the user's default shell."
msgstr ""
-#: src/lib/authui/sssd/params.rb:681
+#: src/lib/yauthclient/params.rb:658
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP user object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:686
+#: src/lib/yauthclient/params.rb:663
msgid "The LDAP attribute that contains the objectSID of an LDAP user object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:691 src/lib/authui/sssd/params.rb:896
+#: src/lib/yauthclient/params.rb:668 src/lib/yauthclient/params.rb:873
msgid "The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:696
+#: src/lib/yauthclient/params.rb:673
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/authui/sssd/params.rb:701
+#: src/lib/yauthclient/params.rb:678
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/authui/sssd/params.rb:706
+#: src/lib/yauthclient/params.rb:683
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/authui/sssd/params.rb:711
+#: src/lib/yauthclient/params.rb:688
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/authui/sssd/params.rb:716
+#: src/lib/yauthclient/params.rb:693
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/authui/sssd/params.rb:721
+#: src/lib/yauthclient/params.rb:698
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/authui/sssd/params.rb:726
+#: src/lib/yauthclient/params.rb:703
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/authui/sssd/params.rb:731
+#: src/lib/yauthclient/params.rb:708
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/authui/sssd/params.rb:736
+#: src/lib/yauthclient/params.rb:713
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/authui/sssd/params.rb:741
+#: src/lib/yauthclient/params.rb:718
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/authui/sssd/params.rb:746
+#: src/lib/yauthclient/params.rb:723
msgid "When using ldap_account_expire_policy=rhds or equivalent, this parameter determines if access is allowed or not."
msgstr ""
-#: src/lib/authui/sssd/params.rb:751
+#: src/lib/yauthclient/params.rb:728
msgid "When using ldap_account_expire_policy=nds, this attribute determines if access is allowed or not."
msgstr ""
-#: src/lib/authui/sssd/params.rb:756
+#: src/lib/yauthclient/params.rb:733
msgid "When using ldap_account_expire_policy=nds, this attribute determines until which date access is granted."
msgstr ""
-#: src/lib/authui/sssd/params.rb:761
+#: src/lib/yauthclient/params.rb:738
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/authui/sssd/params.rb:766
+#: src/lib/yauthclient/params.rb:743
msgid "The LDAP attribute that contains the user's Kerberos User Principal Name (UPN)."
msgstr ""
-#: src/lib/authui/sssd/params.rb:770
+#: src/lib/yauthclient/params.rb:747
msgid "The LDAP attribute that contains the user's SSH public keys."
msgstr ""
-#: src/lib/authui/sssd/params.rb:775
+#: src/lib/yauthclient/params.rb:752
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/authui/sssd/params.rb:776
+#: src/lib/yauthclient/params.rb:753
msgid "Set this option to true if you want to use an upper-case realm."
msgstr ""
-#: src/lib/authui/sssd/params.rb:781
+#: src/lib/yauthclient/params.rb:758
msgid "Specifies how many seconds SSSD has to wait before refreshing its cache of enumerated records."
msgstr ""
-#: src/lib/authui/sssd/params.rb:786
+#: src/lib/yauthclient/params.rb:763
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/authui/sssd/params.rb:791
+#: src/lib/yauthclient/params.rb:768
msgid "The LDAP attribute that corresponds to the user's full name."
msgstr ""
-#: src/lib/authui/sssd/params.rb:796
+#: src/lib/yauthclient/params.rb:773
msgid "The LDAP attribute that lists the user's group memberships."
msgstr ""
-#: src/lib/authui/sssd/params.rb:801
+#: src/lib/yauthclient/params.rb:778
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/authui/sssd/params.rb:806
+#: src/lib/yauthclient/params.rb:783
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/authui/sssd/params.rb:816
+#: src/lib/yauthclient/params.rb:793
msgid "The object class of a group entry in LDAP."
msgstr ""
-#: src/lib/authui/sssd/params.rb:821
+#: src/lib/yauthclient/params.rb:798
msgid "The LDAP attribute that corresponds to the group name."
msgstr ""
-#: src/lib/authui/sssd/params.rb:826
+#: src/lib/yauthclient/params.rb:803
msgid "The LDAP attribute that corresponds to the group's id."
msgstr ""
-#: src/lib/authui/sssd/params.rb:831
+#: src/lib/yauthclient/params.rb:808
msgid "The LDAP attribute that contains the names of the group's members."
msgstr ""
-#: src/lib/authui/sssd/params.rb:836
+#: src/lib/yauthclient/params.rb:813
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP group object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:841
+#: src/lib/yauthclient/params.rb:818
msgid "The LDAP attribute that contains the objectSID of an LDAP group object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:846
+#: src/lib/yauthclient/params.rb:823
msgid " The LDAP attribute that contains timestamp of the last modification of the parent object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:852
+#: src/lib/yauthclient/params.rb:829
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/authui/sssd/params.rb:858
+#: src/lib/yauthclient/params.rb:835
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/authui/sssd/params.rb:864
+#: src/lib/yauthclient/params.rb:841
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/authui/sssd/params.rb:870
+#: src/lib/yauthclient/params.rb:847
msgid " The object class of a netgroup entry in LDAP."
msgstr ""
-#: src/lib/authui/sssd/params.rb:876
+#: src/lib/yauthclient/params.rb:853
msgid "The LDAP attribute that corresponds to the netgroup name."
msgstr ""
-#: src/lib/authui/sssd/params.rb:881
+#: src/lib/yauthclient/params.rb:858
msgid "The LDAP attribute that contains the names of the netgroup's members."
msgstr ""
-#: src/lib/authui/sssd/params.rb:886
+#: src/lib/yauthclient/params.rb:863
msgid "The LDAP attribute that contains the (host, user, domain) netgroup triples."
msgstr ""
-#: src/lib/authui/sssd/params.rb:891
+#: src/lib/yauthclient/params.rb:868
msgid "The LDAP attribute that contains the UUID/GUID of an LDAP netgroup object."
msgstr ""
-#: src/lib/authui/sssd/params.rb:901
+#: src/lib/yauthclient/params.rb:878
msgid "The object class of a service entry in LDAP."
msgstr ""
-#: src/lib/authui/sssd/params.rb:906
+#: src/lib/yauthclient/params.rb:883
msgid "The LDAP attribute that contains the name of service attributes and their aliases."
msgstr ""
-#: src/lib/authui/sssd/params.rb:911
+#: src/lib/yauthclient/params.rb:888
msgid "The LDAP attribute that contains the port managed by this service."
msgstr ""
-#: src/lib/authui/sssd/params.rb:916
+#: src/lib/yauthclient/params.rb:893
msgid "The LDAP attribute that contains the protocols understood by this service."
msgstr ""
-#: src/lib/authui/sssd/params.rb:922
+#: src/lib/yauthclient/params.rb:899
msgid "An optional base DN, search scope and LDAP filter to restrict LDAP searches for this attribute type."
msgstr ""
-#: src/lib/authui/sssd/params.rb:927
+#: src/lib/yauthclient/params.rb:904
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/authui/sssd/params.rb:932
+#: src/lib/yauthclient/params.rb:909
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/authui/sssd/params.rb:937
+#: src/lib/yauthclient/params.rb:914
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/authui/sssd/params.rb:942
+#: src/lib/yauthclient/params.rb:919
msgid "Specifies a timeout (in seconds) after which calls to synchronous LDAP APIs will abort if no response is received."
msgstr ""
-#: src/lib/authui/sssd/params.rb:947
+#: src/lib/yauthclient/params.rb:924
msgid "Specifies a timeout (in seconds) that a connection to an LDAP server will be maintained."
msgstr ""
-#: src/lib/authui/sssd/params.rb:952
+#: src/lib/yauthclient/params.rb:929
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/authui/sssd/params.rb:957
+#: src/lib/yauthclient/params.rb:934
msgid "Disable the LDAP paging control."
msgstr ""
-#: src/lib/authui/sssd/params.rb:961
+#: src/lib/yauthclient/params.rb:938
msgid "When communicating with an LDAP server using SASL, specify the minimum security level necessary to establish the connection."
msgstr ""
-#: src/lib/authui/sssd/params.rb:966
+#: src/lib/yauthclient/params.rb:943
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/authui/sssd/params.rb:973
+#: src/lib/yauthclient/params.rb:950
msgid "Validate server certification in LDAP TLS session"
msgstr ""
-#: src/lib/authui/sssd/params.rb:977
+#: src/lib/yauthclient/params.rb:954
msgid "Specifies the file that contains certificates for all of the Certificate Authorities that sssd will recognize."
msgstr ""
-#: src/lib/authui/sssd/params.rb:981
+#: src/lib/yauthclient/params.rb:958
msgid "Specifies the path of a directory that contains Certificate Authority certificates in separate individual files."
msgstr ""
-#: src/lib/authui/sssd/params.rb:985
+#: src/lib/yauthclient/params.rb:962
msgid "Specifies the file that contains the certificate for the client's key."
msgstr ""
-#: src/lib/authui/sssd/params.rb:989
+#: src/lib/yauthclient/params.rb:966
msgid "Specifies the file that contains the client's key."
msgstr ""
-#: src/lib/authui/sssd/params.rb:994
+#: src/lib/yauthclient/params.rb:971
msgid "Specifies acceptable cipher suites."
msgstr ""
-#: src/lib/authui/sssd/params.rb:999
+#: src/lib/yauthclient/params.rb:976
msgid "Specifies that the id_provider connection must also use tls to protect the channel."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1004
+#: src/lib/yauthclient/params.rb:981
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/authui/sssd/params.rb:1008
+#: src/lib/yauthclient/params.rb:985
msgid "Specify the SASL mechanism to use."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1013
+#: src/lib/yauthclient/params.rb:990
msgid "Specify the SASL authorization id to use."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1018
+#: src/lib/yauthclient/params.rb:995
msgid "Specify the SASL realm to use."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1023
+#: src/lib/yauthclient/params.rb:1000
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/authui/sssd/params.rb:1028
+#: src/lib/yauthclient/params.rb:1005
msgid "Specify the keytab to use when using SASL/GSSAPI."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1033
+#: src/lib/yauthclient/params.rb:1010
msgid "Specifies that the id_provider should init Kerberos credentials (TGT)."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1038
+#: src/lib/yauthclient/params.rb:1015
msgid "Specifies the lifetime in seconds of the TGT if GSSAPI is used."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1043
+#: src/lib/yauthclient/params.rb:1020
msgid "Select the policy to evaluate the password expiration on the client side."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1048
+#: src/lib/yauthclient/params.rb:1025
msgid "Specifies whether automatic referral chasing should be enabled."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1053
+#: src/lib/yauthclient/params.rb:1030
msgid "Specifies the service name to use when service discovery is enabled."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1057
+#: src/lib/yauthclient/params.rb:1034
msgid "Specifies the service name to use to find an LDAP server which allows password changes when service discovery is enabled."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1062
+#: src/lib/yauthclient/params.rb:1039
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/authui/sssd/params.rb:1067
+#: src/lib/yauthclient/params.rb:1044
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/authui/sssd/params.rb:1072
+#: src/lib/yauthclient/params.rb:1049
msgid " With this option a client side evaluation of access control attributes can be enabled."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1078
+#: src/lib/yauthclient/params.rb:1055
msgid "Comma separated list of access control options."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1083
+#: src/lib/yauthclient/params.rb:1060
msgid "Specifies how alias dereferencing is done when performing a search."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1088
+#: src/lib/yauthclient/params.rb:1065
msgid "Allows to retain local users as members of an LDAP group for servers that use the RFC2307 schema."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1101
+#: src/lib/yauthclient/params.rb:1078
#, fuzzy
#| msgid "The IP address (or host name) of the host with a fixed address"
msgid "IP address or host names of Kerberos servers (comma separated)"
msgstr "IP-adressen (eller vertsmaskinnavnet) til vertsmaskinen med fast adresse"
-#: src/lib/authui/sssd/params.rb:1105
+#: src/lib/yauthclient/params.rb:1082
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/authui/sssd/params.rb:1110
+#: src/lib/yauthclient/params.rb:1087
msgid "Kerberos realm (e.g. EXAMPLE.COM)"
msgstr ""
-#: src/lib/authui/sssd/params.rb:1114 src/lib/authui/sssd/params.rb:1119
+#: src/lib/yauthclient/params.rb:1091 src/lib/yauthclient/params.rb:1096
msgid "If the change password service is not running on the KDC, alternative servers can be defined here."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1124
+#: src/lib/yauthclient/params.rb:1101
msgid "Directory to store credential caches."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1129
+#: src/lib/yauthclient/params.rb:1106
msgid "Location of the user's credential cache."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1134
+#: src/lib/yauthclient/params.rb:1111
msgid " Timeout in seconds after an online authentication request or change password request is aborted."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1139
+#: src/lib/yauthclient/params.rb:1116
msgid "Verify with the help of krb5_keytab that the TGT obtained has not been spoofed."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1144
+#: src/lib/yauthclient/params.rb:1121
msgid "The location of the keytab to use when validating credentials obtained from KDCs."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1149
+#: src/lib/yauthclient/params.rb:1126
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/authui/sssd/params.rb:1153
+#: src/lib/yauthclient/params.rb:1130
msgid "Request a renewable ticket with a total lifetime, given as an integer immediately followed by a time unit."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1157
+#: src/lib/yauthclient/params.rb:1134
msgid "Request ticket with a with a lifetime, given as an integer immediately followed by a time unit."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1161
+#: src/lib/yauthclient/params.rb:1138
msgid "The time in seconds between two checks if the TGT should be renewed."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1166
+#: src/lib/yauthclient/params.rb:1143
msgid "Enables flexible authentication secure tunneling (FAST) for Kerberos pre-authentication."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1170
+#: src/lib/yauthclient/params.rb:1147
msgid "Specifies the server principal to use for FAST."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1175
+#: src/lib/yauthclient/params.rb:1152
msgid "Specifies if the host and user principal should be canonicalized."
msgstr ""
#. The Active Directory domain section
-#: src/lib/authui/sssd/params.rb:1187
+#: src/lib/yauthclient/params.rb:1164
msgid "Specifies the name of the Active Directory domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1192
+#: src/lib/yauthclient/params.rb:1169
#, fuzzy
#| msgid "I&P address or name of NFS server:"
msgid "IP addresses or host names of AD servers (comma separated)"
msgstr "I&P-adresse eller navn på NFS-server:"
-#: src/lib/authui/sssd/params.rb:1196
+#: src/lib/yauthclient/params.rb:1173
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/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."
+#: 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."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1205
+#: src/lib/yauthclient/params.rb:1181
msgid "Override the user's home directory."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1218
+#: src/lib/yauthclient/params.rb:1194
msgid " Specifies the lower bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1223
+#: src/lib/yauthclient/params.rb:1199
msgid "Specifies the upper bound of the range of POSIX IDs to use for mapping Active Directory user and group SIDs."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1228
+#: src/lib/yauthclient/params.rb:1204
msgid "Specifies the number of IDs available for each slice."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1232
+#: src/lib/yauthclient/params.rb:1208
msgid "Specify the domain SID of the default domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1236
+#: src/lib/yauthclient/params.rb:1212
msgid "Specify the name of the default domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1241
+#: src/lib/yauthclient/params.rb:1217
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/authui/sssd/params.rb:1253
+#: src/lib/yauthclient/params.rb:1229
msgid "Specifies the name of the IPA domain."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1258
+#: src/lib/yauthclient/params.rb:1234
#, fuzzy
#| msgid "I&P address or name of NFS server:"
msgid "IP addresses or host names of IPA servers (comma separated)"
msgstr "I&P-adresse eller navn på NFS-server:"
-#: src/lib/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."
+#: src/lib/yauthclient/params.rb:1238
+msgid "May be set on machines where the hostname(5) does not reflect the fully qualified name."
msgstr ""
#
-#: src/lib/authui/sssd/params.rb:1268
+#: src/lib/yauthclient/params.rb:1243
#, fuzzy
#| msgid "The configuration of the NIS client will be saved.\n"
msgid "The automounter location this IPA client will be using."
msgstr "Konfigurasjonen for NIS-klienten vil bli lagret.\n"
-#: src/lib/authui/sssd/params.rb:1273
+#: src/lib/yauthclient/params.rb:1248
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/authui/sssd/params.rb:1278
+#: src/lib/yauthclient/params.rb:1253
msgid "The TTL to apply to the client DNS record when updating it."
msgstr ""
-#: src/lib/authui/sssd/params.rb:1282
+#: src/lib/yauthclient/params.rb:1257
msgid "Choose the interface whose IP address should be used for dynamic DNS updates."
msgstr ""
-#, fuzzy
-#~| msgid "Authenticated Clients"
-#~ msgid "Authentication Client Configuration"
-#~ msgstr "Autentiserte klienter"
+#. 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 ""
-#~ msgid "Global Configuration"
-#~ msgstr "Generell konfigurasjon"
+#: src/modules/AuthClient.rb:232
+msgid "Failed to start %s service. Please use system journal (journalctl -n -u %s) to diagnose."
+msgstr ""
-#, fuzzy
-#~| msgid "Enable the NTP daemon"
-#~ msgid "Enable SSSD daemon"
-#~ msgstr "Aktiver NTP-nisse"
+#. end Export
+#. ################################################################
+#. ################################################################
+#. Summary()
+#. returns html formated configuration summary
+#. @return summary
+#: src/modules/AuthClient.rb:345
+msgid "System is configured for using nss_ldap.\n"
+msgstr ""
-#, fuzzy
-#~| msgid "Sections: %1"
-#~ msgid "Sections"
-#~ msgstr "Seksjoner: %1"
+#: src/modules/AuthClient.rb:348
+msgid "System is configured for using sssd.\n"
+msgstr ""
-#, fuzzy
-#~| msgid "Network Services"
-#~ msgid "New Service/Domain"
-#~ msgstr "Nettverkstjenester"
+#: src/modules/AuthClient.rb:354
+msgid "System is configured for using OES.\n"
+msgstr ""
-#, fuzzy
-#~| msgid "Selected Service"
-#~ msgid "Delete Service/Domain"
-#~ msgstr "Valgt tjeneste"
+#: src/modules/AuthClient.rb:357
+msgid "System is configured for using /etc/passwd only.\n"
+msgstr ""
-#, fuzzy
-#~| msgid "Custom Registration Server"
-#~ msgid "Customisation - %s"
-#~ msgstr "Egendefinert registreringsserver"
-
-#, fuzzy
-#~| msgid "Modem Parameters"
-#~ msgid "More Parameters"
-#~ msgstr "Modemparametere"
-
-#, fuzzy
-#~| msgid "You cannot delete the active profile."
-#~ msgid "You may not delete section SSSD."
-#~ msgstr "Du kan ikke slette den aktive profilen."
-
-#, fuzzy
-#~| msgid "Logging enabled"
-#~ msgid "No domain enabled"
-#~ msgstr "Logging aktivert"
-
-#, fuzzy
-#~| msgid "Would you like to enable access to the profile repository?"
-#~ msgid "Would you like to enable another service or join a domain?"
-#~ msgstr "Vil du aktivere tilgang til profilarkivet?"
-
-#~ msgid "Service"
-#~ msgstr "Tjeneste"
-
-#, fuzzy
-#~| msgid "Identification:"
-#~ msgid "Identification provider:"
-#~ msgstr "Identifikasjon:"
-
-#, fuzzy
-#~| msgid "&Authentication Mode"
-#~ msgid "Authentication provider:"
-#~ msgstr "&Autentiseringsmodus"
-
-#, fuzzy
-#~| msgid "These services will be enabled"
-#~ msgid "There are no more services to be enabled."
-#~ msgstr "Disse tjenestene vil bli aktivert"
-
-#, fuzzy
-#~| msgid "Enter a name for the new profile."
-#~ msgid "Please enter a name for the new domain."
-#~ msgstr "Angi et navn for den nye profilen."
-
#~ msgid "Cancel"
#~ msgstr "Avbryt"
Modified: branches/plus-SLE12-SP2/yast/nb/po/auth-server.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/auth-server.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/auth-server.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -448,12 +448,12 @@
msgid "Configure Account for Replication"
msgstr "Sett opp konto for replikasjon"
-#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:908
-#: src/modules/LdapDatabase.rb:1167
+#: src/include/auth-server/dialogs.rb:1057 src/modules/LdapDatabase.rb:914
+#: src/modules/LdapDatabase.rb:1173
msgid "is not a valid LDAP DN"
msgstr "er ikke en gyldig DN for LDAP"
-#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1673
+#: src/include/auth-server/dialogs.rb:1068 src/modules/LdapDatabase.rb:1679
msgid "Password"
msgstr "Passord"
@@ -479,8 +479,8 @@
msgid "Provider Details"
msgstr ""
-#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1601
-#: src/modules/LdapDatabase.rb:1696
+#: src/include/auth-server/dialogs.rb:1139 src/modules/LdapDatabase.rb:1607
+#: src/modules/LdapDatabase.rb:1702
msgid "Protocol"
msgstr "Protokoll"
@@ -488,7 +488,7 @@
msgid "Provider Hostname"
msgstr "Vertsnavn for leverandør"
-#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1618
+#: src/include/auth-server/dialogs.rb:1153 src/modules/LdapDatabase.rb:1624
msgid "Use StartTLS"
msgstr "Bruk StartTLS"
@@ -569,8 +569,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:1965
-#: src/modules/LdapDatabase.rb:1992
+#: src/include/auth-server/dialogs.rb:1413 src/modules/LdapDatabase.rb:1971
+#: src/modules/LdapDatabase.rb:1998
msgid "The test returned the following error messages:"
msgstr "Kontrollen genererte følgende feilmeldinger:"
@@ -2261,7 +2261,7 @@
msgid "Index Cache (IDL cache)"
msgstr "Indeksmellomlager (IDL cache)"
-#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2096
+#: src/include/auth-server/widgets.rb:341 src/modules/LdapDatabase.rb:2102
msgid "Checkpoint Settings"
msgstr ""
@@ -2331,7 +2331,7 @@
msgstr "Legg til indeks"
#. encoding: utf-8
-#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2233
+#: src/modules/LdapDatabase.rb:40 src/modules/LdapDatabase.rb:2239
msgid "Password Policy Settings"
msgstr "Passordregelinnstillinger"
@@ -2492,237 +2492,237 @@
msgstr "Katalogen finnes ikke. Vil du opprette den?"
#. try to read the ppolicy from the server
-#: src/modules/LdapDatabase.rb:631
+#: src/modules/LdapDatabase.rb:637
msgid "Authentication failed. The password is probably incorrect.\n"
msgstr "Autentisering mislyktes. Passordet er sannsynligvis feil.\n"
-#: src/modules/LdapDatabase.rb:634
+#: src/modules/LdapDatabase.rb:640
msgid "The error message was: '"
msgstr "Feilmeldingen er: '"
-#: src/modules/LdapDatabase.rb:639
+#: src/modules/LdapDatabase.rb:645
msgid "Try again?"
msgstr "Vil du prøve igjen?"
#. PasswordPolicyDialog only returns the changes made to the original
#. Entry, try to merge them here
-#: src/modules/LdapDatabase.rb:714
+#: src/modules/LdapDatabase.rb:720
msgid "Available Attribute Types"
msgstr "Tilgjengelige attributtyper"
-#: src/modules/LdapDatabase.rb:718
+#: src/modules/LdapDatabase.rb:724
msgid "Selected Attribute Types"
msgstr "Valgte attributtyper"
#. Popup to add/edit the acl "by" clauses
-#: src/modules/LdapDatabase.rb:807 src/modules/LdapDatabase.rb:979
+#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:985
msgid "Who should this rule apply to"
msgstr "For hvem skal denne regelen gjelde"
-#: src/modules/LdapDatabase.rb:813 src/modules/LdapDatabase.rb:940
-#: src/modules/LdapDatabase.rb:983 src/modules/LdapDatabase.rb:1221
+#: src/modules/LdapDatabase.rb:819 src/modules/LdapDatabase.rb:946
+#: src/modules/LdapDatabase.rb:989 src/modules/LdapDatabase.rb:1227
msgid "Entry DN"
msgstr "Oppføringens DN"
-#: src/modules/LdapDatabase.rb:814 src/modules/LdapDatabase.rb:984
+#: src/modules/LdapDatabase.rb:820 src/modules/LdapDatabase.rb:990
msgid "Select"
msgstr "Velg"
-#: src/modules/LdapDatabase.rb:820
+#: src/modules/LdapDatabase.rb:826
msgid "Define the Access Level"
msgstr "Definer tilgangsnivået"
-#: src/modules/LdapDatabase.rb:830
+#: src/modules/LdapDatabase.rb:836
msgid "Stop access control evaluation here (default)"
msgstr ""
-#: src/modules/LdapDatabase.rb:837
+#: src/modules/LdapDatabase.rb:843
msgid "Continue with next access control rule (\"break\")"
msgstr ""
-#: src/modules/LdapDatabase.rb:843
+#: src/modules/LdapDatabase.rb:849
msgid "Continue evaluation of this rule (\"continue\")"
msgstr "Fortsett evaluering av denne regelen (\"continue\")"
-#: src/modules/LdapDatabase.rb:898
+#: src/modules/LdapDatabase.rb:904
msgid "Please enter a DN in the textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:942 src/modules/LdapDatabase.rb:1084
-#: src/modules/LdapDatabase.rb:1219
+#: src/modules/LdapDatabase.rb:948 src/modules/LdapDatabase.rb:1090
+#: src/modules/LdapDatabase.rb:1225
msgid "Subtree DN"
msgstr "Underfilstruktur-DN"
-#: src/modules/LdapDatabase.rb:944
+#: src/modules/LdapDatabase.rb:950
msgid "Group DN"
msgstr "Gruppe-DN"
-#: src/modules/LdapDatabase.rb:967
+#: src/modules/LdapDatabase.rb:973
msgid "Edit Access Control Rule"
msgstr "Rediger tilgangskontrollregel"
-#: src/modules/LdapDatabase.rb:972
+#: src/modules/LdapDatabase.rb:978
msgid "Target Objects"
msgstr "Målobjekter"
-#: src/modules/LdapDatabase.rb:993
+#: src/modules/LdapDatabase.rb:999
msgid "Matching the filter:"
msgstr "Samsvarer med filteret:"
-#: src/modules/LdapDatabase.rb:1000
+#: src/modules/LdapDatabase.rb:1006
msgid "LDAP Filter"
msgstr "LDAP-filter"
-#: src/modules/LdapDatabase.rb:1010
+#: src/modules/LdapDatabase.rb:1016
msgid "Apply this rule only to the listed attribute"
msgstr ""
-#: src/modules/LdapDatabase.rb:1015 src/modules/LdapDatabase.rb:1309
+#: src/modules/LdapDatabase.rb:1021 src/modules/LdapDatabase.rb:1315
msgid "Attributes"
msgstr "Attributter"
-#: src/modules/LdapDatabase.rb:1017
+#: src/modules/LdapDatabase.rb:1023
msgid "Edit"
msgstr "Rediger"
-#: src/modules/LdapDatabase.rb:1023 src/modules/LdapDatabase.rb:1035
+#: src/modules/LdapDatabase.rb:1029 src/modules/LdapDatabase.rb:1041
msgid "Access Level"
msgstr "Tilgangsnivå"
-#: src/modules/LdapDatabase.rb:1033
+#: src/modules/LdapDatabase.rb:1039
msgid "Who"
msgstr "Hvem"
-#: src/modules/LdapDatabase.rb:1034 src/modules/LdapDatabase.rb:1309
+#: src/modules/LdapDatabase.rb:1040 src/modules/LdapDatabase.rb:1315
msgid "DN"
msgstr "DN"
-#: src/modules/LdapDatabase.rb:1036
+#: src/modules/LdapDatabase.rb:1042
msgid "Flow Control"
msgstr "Flytkontroll"
-#: src/modules/LdapDatabase.rb:1041 src/modules/LdapDatabase.rb:1313
+#: src/modules/LdapDatabase.rb:1047 src/modules/LdapDatabase.rb:1319
msgid "Up"
msgstr "Opp"
-#: src/modules/LdapDatabase.rb:1042 src/modules/LdapDatabase.rb:1314
+#: src/modules/LdapDatabase.rb:1048 src/modules/LdapDatabase.rb:1320
msgid "Down"
msgstr "Ned"
#. FIXME: Validate attribute types
-#: src/modules/LdapDatabase.rb:1179
+#: src/modules/LdapDatabase.rb:1185
msgid "Enter a list of valid attributes in the <b>Attributes</b> textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:1191
+#: src/modules/LdapDatabase.rb:1197
msgid "Enter valid a LDAP filter in the textfield"
msgstr ""
-#: src/modules/LdapDatabase.rb:1197
+#: src/modules/LdapDatabase.rb:1203
msgid "You must add at least one item to the \"Access Level\" list."
msgstr ""
-#: src/modules/LdapDatabase.rb:1309
+#: src/modules/LdapDatabase.rb:1315
msgid "Target"
msgstr "Mål"
-#: src/modules/LdapDatabase.rb:1309
+#: src/modules/LdapDatabase.rb:1315
msgid "Filter"
msgstr "Filter"
-#: src/modules/LdapDatabase.rb:1341
+#: src/modules/LdapDatabase.rb:1347
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:1588
+#: src/modules/LdapDatabase.rb:1594
msgid "This database is a Replication Consumer."
msgstr ""
-#: src/modules/LdapDatabase.rb:1608
+#: src/modules/LdapDatabase.rb:1614
msgid "Provider Name"
msgstr "Leverandørnavn"
-#: src/modules/LdapDatabase.rb:1613 src/modules/LdapDatabase.rb:1710
+#: src/modules/LdapDatabase.rb:1619 src/modules/LdapDatabase.rb:1716
msgid "Port"
msgstr "Port"
-#: src/modules/LdapDatabase.rb:1631
+#: src/modules/LdapDatabase.rb:1637
msgid "Replication Type"
msgstr "Replikasjonstype"
-#: src/modules/LdapDatabase.rb:1638
+#: src/modules/LdapDatabase.rb:1644
msgid "Replication Interval"
msgstr "Replikasjonsintervall"
-#: src/modules/LdapDatabase.rb:1641
+#: src/modules/LdapDatabase.rb:1647
msgid "Days"
msgstr "Dager"
-#: src/modules/LdapDatabase.rb:1645
+#: src/modules/LdapDatabase.rb:1651
msgid "Hours"
msgstr "Timer"
-#: src/modules/LdapDatabase.rb:1649 src/modules/LdapDatabase.rb:2112
+#: src/modules/LdapDatabase.rb:1655 src/modules/LdapDatabase.rb:2118
msgid "Minutes"
msgstr "Minutter"
-#: src/modules/LdapDatabase.rb:1653
+#: src/modules/LdapDatabase.rb:1659
msgid "Seconds"
msgstr "Sekunder"
-#: src/modules/LdapDatabase.rb:1666
+#: src/modules/LdapDatabase.rb:1672
msgid "Authentication DN"
msgstr "Autentiserings-DN"
-#: src/modules/LdapDatabase.rb:1687
+#: src/modules/LdapDatabase.rb:1693
msgid "Custom update referral"
msgstr "Tilpasset oppdateringshenvisning"
-#: src/modules/LdapDatabase.rb:1703
+#: src/modules/LdapDatabase.rb:1709
msgid "Target Host"
msgstr "Målvertsmaskin"
#. no updateref
-#: src/modules/LdapDatabase.rb:1923
+#: src/modules/LdapDatabase.rb:1929
msgid "Invalid replication interval specified"
msgstr ""
#. test connection
-#: src/modules/LdapDatabase.rb:1959
+#: src/modules/LdapDatabase.rb:1965
msgid "Checking LDAP connectivity to the provider failed."
msgstr ""
-#: src/modules/LdapDatabase.rb:1974 src/modules/LdapDatabase.rb:2001
+#: src/modules/LdapDatabase.rb:1980 src/modules/LdapDatabase.rb:2007
msgid "Do you still want to continue?"
msgstr "Vil du likevel forsøke på nytt?"
-#: src/modules/LdapDatabase.rb:1983
+#: src/modules/LdapDatabase.rb:1989
msgid "Checking the LDAPsync capabilities of the provider failed."
msgstr ""
-#: src/modules/LdapDatabase.rb:1989
+#: src/modules/LdapDatabase.rb:1995
msgid "Please verify that the target server is enabled to be a LDAPsync provider"
msgstr "Bekreft at målserveren er aktivert som LDAPsync-leverandør"
-#: src/modules/LdapDatabase.rb:2088
+#: src/modules/LdapDatabase.rb:2094
msgid "Enable ldapsync provider for this database"
msgstr "Aktiver ldapsync-leverandør for denne databasen"
-#: src/modules/LdapDatabase.rb:2102 src/modules/LdapDatabase.rb:2138
+#: src/modules/LdapDatabase.rb:2108 src/modules/LdapDatabase.rb:2144
msgid "Operations"
msgstr "Handlinger"
-#: src/modules/LdapDatabase.rb:2125
+#: src/modules/LdapDatabase.rb:2131
msgid "Session Log"
msgstr ""
-#: src/modules/LdapDatabase.rb:2131
+#: src/modules/LdapDatabase.rb:2137
msgid "Enable Session Log"
msgstr ""
-#: src/modules/LdapDatabase.rb:2265
+#: src/modules/LdapDatabase.rb:2271
msgid "Replication Settings"
msgstr ""
Modified: branches/plus-SLE12-SP2/yast/nb/po/autoinst.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/autoinst.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/autoinst.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: autoinst\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2009-10-08 12:43+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -39,7 +39,7 @@
#: src/clients/autoinst_test_clone.rb:16 src/clients/autoyast.rb:123
#: src/include/autoinstall/conftree.rb:622
-#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:358
+#: src/include/autoinstall/dialogs.rb:333 src/modules/Profile.rb:352
msgid "This may take a while"
msgstr "Dette kan ta en stund"
@@ -59,12 +59,12 @@
#. command line options
#. Init variables
-#. We will have to set default entries which are defined
-#. in the import call of ServicesManager
+#. Import users configuration from the profile
+#.
#. 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:389
+#: src/clients/inst_autoinit.rb:188 src/clients/inst_autosetup.rb:410
#: src/clients/inst_autosetup_upgrade.rb:484
#: src/modules/AutoInstallRules.rb:1001
msgid ""
@@ -327,21 +327,23 @@
msgid "Executing Post-Scripts"
msgstr "Kjører postskript"
-#: src/clients/inst_autoconfigure.rb:303
+#. Do not restart dbus. Otherwise some services will hang.
+#. bnc#937900
+#: src/clients/inst_autoconfigure.rb:304
msgid "Restarting all running services"
msgstr "Starter alle kjørende tjenester på nytt"
-#: src/clients/inst_autoconfigure.rb:326
+#: src/clients/inst_autoconfigure.rb:327
msgid "Activating systemd default target"
msgstr "Akiverer standardmål for systemd"
#. Just in case, remove this file to avoid reconfiguring...
-#: src/clients/inst_autoconfigure.rb:341
+#: src/clients/inst_autoconfigure.rb:342
msgid "Finishing Configuration"
msgstr "Fullfører konfigurasjon"
#. NetworkInterfaces::Write( ".*" );
-#: src/clients/inst_autoconfigure.rb:444
+#: src/clients/inst_autoconfigure.rb:448
msgid "Processing resource %1"
msgstr "Behandler ressursen %1"
@@ -514,98 +516,112 @@
#. Uwe Gansert
#.
#. $Id: inst_autosetup.ycp 61521 2010-03-29 09:10:07Z ug $
-#: src/clients/inst_autosetup.rb:50 src/clients/inst_autosetup_upgrade.rb:47
+#: src/clients/inst_autosetup.rb:53 src/clients/inst_autosetup_upgrade.rb:47
msgid "<P>Please wait while the system is prepared for autoinstallation.</P>"
msgstr "<p>Vent mens systemet klargjøres for autoinstallasjon.</p>"
-#: src/clients/inst_autosetup.rb:54 src/clients/inst_autosetup_upgrade.rb:52
+#: src/clients/inst_autosetup.rb:57 src/clients/inst_autosetup_upgrade.rb:52
msgid "Execute pre-install user scripts"
msgstr "Kjør brukerskript før installasjon"
-#: src/clients/inst_autosetup.rb:55 src/clients/inst_autosetup_upgrade.rb:51
+#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:51
msgid "Configure General Settings "
msgstr "Konfigurer generelle innstillinger "
-#: src/clients/inst_autosetup.rb:56 src/clients/inst_autosetup_upgrade.rb:53
+#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:53
msgid "Set up language"
msgstr "Språkinnstillinger"
-#: src/clients/inst_autosetup.rb:57
+#: src/clients/inst_autosetup.rb:60
msgid "Create partition plans"
msgstr "Opprett partisjonstabeller"
-#: src/clients/inst_autosetup.rb:58 src/clients/inst_autosetup_upgrade.rb:56
+#: src/clients/inst_autosetup.rb:61 src/clients/inst_autosetup_upgrade.rb:56
msgid "Configure Bootloader"
msgstr "Konfigurer oppstartslaster"
-#: src/clients/inst_autosetup.rb:59 src/clients/inst_autosetup_upgrade.rb:54
+#: src/clients/inst_autosetup.rb:62 src/clients/inst_autosetup_upgrade.rb:54
msgid "Registration"
msgstr "Registrering"
-#: src/clients/inst_autosetup.rb:60 src/clients/inst_autosetup_upgrade.rb:55
+#: src/clients/inst_autosetup.rb:63 src/clients/inst_autosetup_upgrade.rb:55
msgid "Configure Software selections"
msgstr "Konfigurer programvareutvalg"
-#: src/clients/inst_autosetup.rb:61
+#: src/clients/inst_autosetup.rb:64
#, fuzzy
#| msgid "Activating systemd default target"
msgid "Configure Systemd Default Target"
msgstr "Akiverer standardmål for systemd"
-#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:61
+#: src/clients/inst_autosetup.rb:65
+#, fuzzy
+#| msgid "Configure Volume Groups"
+msgid "Configure users and groups"
+msgstr "Konfigurere volumgrupper"
+
+#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61
msgid "Executing pre-install user scripts..."
msgstr "Kjører brukerskript før installasjon..."
-#: src/clients/inst_autosetup.rb:66 src/clients/inst_autosetup_upgrade.rb:60
+#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:60
msgid "Configuring general settings..."
msgstr "Konfigurerer generelle innstillinger..."
-#: src/clients/inst_autosetup.rb:67 src/clients/inst_autosetup_upgrade.rb:62
+#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:62
msgid "Setting up language..."
msgstr "Setter opp språk..."
-#: src/clients/inst_autosetup.rb:68
+#: src/clients/inst_autosetup.rb:72
msgid "Creating partition plans..."
msgstr "Oppretter partisjonstabeller..."
-#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:65
+#: src/clients/inst_autosetup.rb:73 src/clients/inst_autosetup_upgrade.rb:65
msgid "Configuring Bootloader..."
msgstr "Konfigurerer oppstartslaster..."
-#: src/clients/inst_autosetup.rb:70 src/clients/inst_autosetup_upgrade.rb:63
+#: src/clients/inst_autosetup.rb:74 src/clients/inst_autosetup_upgrade.rb:63
#, fuzzy
#| msgid "Repairing file system..."
msgid "Registering the system..."
msgstr "Reparerer filsystem..."
-#: src/clients/inst_autosetup.rb:71 src/clients/inst_autosetup_upgrade.rb:64
+#: src/clients/inst_autosetup.rb:75 src/clients/inst_autosetup_upgrade.rb:64
msgid "Configuring Software selections..."
msgstr "Konfigurerer programvareutvalg..."
-#: src/clients/inst_autosetup.rb:72
+#: src/clients/inst_autosetup.rb:76
#, fuzzy
#| msgid "Activating systemd default target"
msgid "Configuring Systemd Default Target..."
msgstr "Akiverer standardmål for systemd"
-#: src/clients/inst_autosetup.rb:76 src/clients/inst_autosetup_upgrade.rb:69
+#: 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
msgid "Preparing System for Automated Installation"
msgstr "Klargjør system for automatisk installasjon"
-#. configure general settings
-#: src/clients/inst_autosetup.rb:164
+#. 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
msgid "Handling Add-On Products..."
msgstr "Håndterer tilleggsprodukter..."
#. Set it in the Language module.
#.
#. Set it in the Language module.
-#: src/clients/inst_autosetup.rb:184 src/clients/inst_autosetup_upgrade.rb:149
+#: src/clients/inst_autosetup.rb:202 src/clients/inst_autosetup_upgrade.rb:149
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:273
+#: src/clients/inst_autosetup.rb:290
msgid ""
"Error while configuring partitions.\n"
"Try again.\n"
@@ -614,7 +630,7 @@
"Forsøk igjen.\n"
#. Software
-#: src/clients/inst_autosetup.rb:331
+#: src/clients/inst_autosetup.rb:344
msgid ""
"Error while configuring software selections.\n"
"Try again.\n"
@@ -1591,7 +1607,7 @@
#. list<any> l = [ "key1",0,"key3" ];
#. m[ l ] = v;
#. @return [Hash]
-#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:813
+#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807
msgid "Checking XML with RNG validation..."
msgstr "Kontrollerer XML med RNG-validering..."
@@ -1601,7 +1617,7 @@
msgstr "Seksjon %1:"
#. jing validation -- validates complete xml profile
-#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:825
+#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819
msgid "Checking XML with RNC validation..."
msgstr "Kontrollerer XML med RNC-validering..."
@@ -1640,7 +1656,7 @@
msgstr "Start maskinen på nytt etter andre trinn"
#: src/include/autoinstall/general_dialogs.rb:90
-#: src/modules/AutoinstGeneral.rb:121
+#: src/modules/AutoinstGeneral.rb:126
msgid "Signature Handling"
msgstr "Signaturbehandling"
@@ -2309,7 +2325,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:744
+#: src/modules/AutoInstallRules.rb:909 src/modules/Profile.rb:738
msgid "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
msgstr "XML-analysen rapporterte en feil under analysen av autoyast-profilen. Feilmeldingen var:\n"
@@ -2330,45 +2346,45 @@
#. The line above needs to be fixed when we have more attributes
#. comment will look like this: "(description=BLA BLA)"
-#: src/modules/AutoinstConfig.rb:273
+#: src/modules/AutoinstConfig.rb:278
msgid "Choose Profile"
msgstr "Velg profil"
#. SetProtocolMessage ()
#. @return [void]
-#: src/modules/AutoinstConfig.rb:329
+#: src/modules/AutoinstConfig.rb:334
msgid "Retrieving control file from floppy."
msgstr "Henter kontrollfil fra diskett."
-#: src/modules/AutoinstConfig.rb:332
+#: src/modules/AutoinstConfig.rb:337
msgid "Retrieving control file (%1) from TFTP server: %2."
msgstr "Henter kontrollfil (%1) fra TFTP-server: %2."
-#: src/modules/AutoinstConfig.rb:338
+#: src/modules/AutoinstConfig.rb:343
msgid "Retrieving control file (%1) from NFS server: %2."
msgstr "Henter kontrollfil (%1) fra NFS-server: %2."
-#: src/modules/AutoinstConfig.rb:344
+#: src/modules/AutoinstConfig.rb:349
msgid "Retrieving control file (%1) from HTTP server: %2."
msgstr "Henter kontrollfil (%1) fra HTTP-server: %2."
-#: src/modules/AutoinstConfig.rb:350
+#: src/modules/AutoinstConfig.rb:355
msgid "Retrieving control file (%1) from FTP server: %2."
msgstr "Henter kontrollfil (%1) fra FTP-server: %2."
-#: src/modules/AutoinstConfig.rb:356
+#: src/modules/AutoinstConfig.rb:361
msgid "Copying control file from file: %1."
msgstr "Kopierer kontrollfil fra fil: %1."
-#: src/modules/AutoinstConfig.rb:361
+#: src/modules/AutoinstConfig.rb:366
msgid "Copying control file from device: /dev/%1."
msgstr "Kopierer kontrollfil fra enhet: /dev/%1."
-#: src/modules/AutoinstConfig.rb:365
+#: src/modules/AutoinstConfig.rb:370
msgid "Copying control file from default location."
msgstr "Kopierer kontrollfil fra standardplassering."
-#: src/modules/AutoinstConfig.rb:367
+#: src/modules/AutoinstConfig.rb:372
msgid "Source unknown."
msgstr "Ukjent kilde."
@@ -2378,7 +2394,7 @@
#. {
#. local_rules_file = (string)WFM::Args(1);
#. }
-#: src/modules/AutoinstConfig.rb:447
+#: src/modules/AutoinstConfig.rb:452
msgid ""
"<h3>AutoYaST Configuration Management System</h3>\n"
"<p>Almost all resources of the control file can be\n"
@@ -2388,7 +2404,7 @@
"<p>Nesten alle ressursene i kontrollfilen kan\n"
"konfigureres ved hjelp av konfigurasjonsadministrasjonssystemet.</p>\n"
-#: src/modules/AutoinstConfig.rb:452
+#: src/modules/AutoinstConfig.rb:457
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"
@@ -2402,7 +2418,7 @@
"installere et annet system ved hjelp av AutoYaST.\n"
"</p>\n"
-#: src/modules/AutoinstConfig.rb:459
+#: src/modules/AutoinstConfig.rb:464
msgid ""
"<p>In addition to the existing and familiar modules,\n"
"new interfaces were created for special and complex configurations, including\n"
@@ -2436,79 +2452,103 @@
#. string language_name = "";
#. string keyboard_name = "";
-#: src/modules/AutoinstGeneral.rb:85
+#: src/modules/AutoinstGeneral.rb:90
msgid "Confirm installation?"
msgstr "Bekreft installasjon?"
-#: 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
+#: 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
msgid "Yes"
msgstr "Ja"
-#: src/modules/AutoinstGeneral.rb:88 src/modules/AutoinstGeneral.rb:94
-#: src/modules/AutoinstGeneral.rb:103
+#: src/modules/AutoinstGeneral.rb:93 src/modules/AutoinstGeneral.rb:99
+#: src/modules/AutoinstGeneral.rb:108
msgid "No"
msgstr "Nei"
-#: src/modules/AutoinstGeneral.rb:91
+#: src/modules/AutoinstGeneral.rb:96
msgid "Second Stage of AutoYaST"
msgstr "Andre fase i AutoYaST"
-#: src/modules/AutoinstGeneral.rb:99
+#: src/modules/AutoinstGeneral.rb:104
msgid "Halting the machine after stage one"
msgstr "Slå av maskinen etter første trinn"
-#: src/modules/AutoinstGeneral.rb:108
+#: src/modules/AutoinstGeneral.rb:113
msgid "Halting the machine after stage two"
msgstr "Slå av maskinen etter andre trinn"
-#: src/modules/AutoinstGeneral.rb:115
+#: src/modules/AutoinstGeneral.rb:120
msgid "Reboot the machine after stage two"
msgstr "Start maskinen på nytt etter andre trinn"
-#: src/modules/AutoinstGeneral.rb:125
+#: src/modules/AutoinstGeneral.rb:130
msgid "Accepting unsigned files"
msgstr "Godta usignerte filer"
-#: src/modules/AutoinstGeneral.rb:126
+#: src/modules/AutoinstGeneral.rb:131
msgid "Not accepting unsigned files"
msgstr "Ikke godta usignerte filer"
-#: src/modules/AutoinstGeneral.rb:135
+#: src/modules/AutoinstGeneral.rb:140
msgid "Accepting files without a checksum"
msgstr "Godta filer uten en kontrollsum"
-#: src/modules/AutoinstGeneral.rb:136
+#: src/modules/AutoinstGeneral.rb:141
msgid "Not accepting files without a checksum"
msgstr "Ikke godta filer uten en kontrollsum"
-#: src/modules/AutoinstGeneral.rb:145
+#: src/modules/AutoinstGeneral.rb:150
msgid "Accepting failed verifications"
msgstr "Godta mislykkede bekreftelser"
-#: src/modules/AutoinstGeneral.rb:146
+#: src/modules/AutoinstGeneral.rb:151
msgid "Not accepting failed verifications"
msgstr "Ikke godta mislykkede bekreftelser"
-#: src/modules/AutoinstGeneral.rb:151
+#: src/modules/AutoinstGeneral.rb:156
msgid "Accepting unknown GPG keys"
msgstr "Godta ukjente GPG-nøkler"
-#: src/modules/AutoinstGeneral.rb:152
+#: src/modules/AutoinstGeneral.rb:157
msgid "Not accepting unknown GPG Keys"
msgstr "Ikke godta ukjente GPG-nøkler"
-#: src/modules/AutoinstGeneral.rb:157
+#: src/modules/AutoinstGeneral.rb:162
msgid "Importing new GPG keys"
msgstr "Importere nye GPG-nøkler"
-#: src/modules/AutoinstGeneral.rb:158
+#: src/modules/AutoinstGeneral.rb:163
msgid "Not importing new GPG Keys"
msgstr "Ikke importere nye GPG-nøkler"
+#. NTP syncing
+#: src/modules/AutoinstGeneral.rb:414
+#, fuzzy
+#| msgid "Syncing server..."
+msgid "Syncing time..."
+msgstr "Synkroniserer server..."
+
+#. 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 "Parsing failed."
+msgid "Time syncing failed."
+msgstr "Tolking mislyktes."
+
+#: src/modules/AutoinstGeneral.rb:424
+#, fuzzy
+#| msgid "Cannot mount file system."
+msgid "Cannot update system time."
+msgstr "Kan ikke montere filsystem."
+
#. look for VGs to reuse
-#: src/modules/AutoinstLVM.rb:111
+#: src/modules/AutoinstLVM.rb:113
msgid "Cannot reuse volume group %1. The volume group does not exist."
msgstr "Kan ikke gjenbruke volumgruppen %1. Volumgruppen finnes ikke."
@@ -2591,7 +2631,7 @@
msgstr "Ukjent"
#. warning text during the installation. %1 is a list of package names
-#: src/modules/AutoinstSoftware.rb:171
+#: src/modules/AutoinstSoftware.rb:172
msgid ""
"These packages could not be found in the software repositories:\n"
"%1"
@@ -2601,31 +2641,31 @@
#. 4 means "already exists"
#. Add add-ons
-#: src/modules/AutoinstSoftware.rb:325 src/modules/AutoinstSoftware.rb:345
+#: src/modules/AutoinstSoftware.rb:327 src/modules/AutoinstSoftware.rb:347
msgid "Adding repo %1 failed"
msgstr "Kunne ikke legge til pakkebrønnen %1"
#. Install
-#: src/modules/AutoinstSoftware.rb:373
+#: src/modules/AutoinstSoftware.rb:375
msgid "Image creation failed while pattern installation. Please check /tmp/ay_image.log"
msgstr "Diskbilde kunne ikke opprettes under installasjon av mønster. Kontroller /tmp/ay_image.log"
-#: src/modules/AutoinstSoftware.rb:381
+#: src/modules/AutoinstSoftware.rb:383
msgid "Creating Image - installing packages"
msgstr "Oppretter diskbilde - installerer pakker"
-#: src/modules/AutoinstSoftware.rb:391
+#: src/modules/AutoinstSoftware.rb:393
msgid "Image creation failed while package installation. Please check /tmp/ay_image.log"
msgstr "Diskbilde kunne ikke opprettes under installasjon av pakker. Kontroller /tmp/ay_image.log"
#. Popup::Message( _("in the next file dialog you have to choose the target directory to save the image") );
-#: src/modules/AutoinstSoftware.rb:402
+#: src/modules/AutoinstSoftware.rb:404
msgid "Store image to ..."
msgstr "Lagre diskbilde som ..."
#. Compress image:
#. tar cfz /srv/www/htdocs/image.tar.gz --exclude="proc*" .
-#: src/modules/AutoinstSoftware.rb:431
+#: src/modules/AutoinstSoftware.rb:433
msgid ""
"You can do changes to the image now in %1/\n"
"If you press the ok-button, the image will be compressed and can't be changed anymore."
@@ -2633,16 +2673,16 @@
"Du kan fremdeles endre diskbildet i %1/\n"
"Hvis du trykker OK, vil diskbildet bli komprimert og kan ikke lenger endres."
-#: src/modules/AutoinstSoftware.rb:445
+#: src/modules/AutoinstSoftware.rb:447
msgid "Image compressing failed in '%1'. Please check /tmp/ay_image.log"
msgstr "Komprimering av diskbilde i '%1' mislyktes. Kontroller /tmp/ay_image.log"
-#: src/modules/AutoinstSoftware.rb:452
+#: src/modules/AutoinstSoftware.rb:454
msgid "Image created successfully"
msgstr "Diskbildet er opprettet"
#. copy a directory (ends with / in directory.yast)
-#: src/modules/AutoinstSoftware.rb:488
+#: src/modules/AutoinstSoftware.rb:490
msgid ""
"can not get the directory.yast file at `%1`.\n"
"You can create that file with 'ls -F > directory.yast' if it's missing."
@@ -2651,30 +2691,30 @@
"Du kan opprette filen med kommandoen 'ls -F > directory.yast' hvis den mangler."
#. don't copy subdirs. They have to be mentioned explicit. Copy only files from that dir.
-#: src/modules/AutoinstSoftware.rb:522
+#: src/modules/AutoinstSoftware.rb:524
msgid "can not read '%1'. Try again?"
msgstr "kan ikke lese '%1'. Vil du forsøke igjen?"
#. copy a file
-#: src/modules/AutoinstSoftware.rb:540
+#: src/modules/AutoinstSoftware.rb:542
msgid "can not read '%1'. ISO creation failed"
msgstr "Kan ikke lese '%1'. ISO kunne ikke opprettes."
#. we will have the image.tar.gz and autoinst.xml on the root of the DVD/CD
-#: src/modules/AutoinstSoftware.rb:570
+#: src/modules/AutoinstSoftware.rb:572
msgid "Preparing ISO Filestructure ..."
msgstr "Klargjør ISO-filstruktur ..."
#. prepare and save isolinux.cfg boot menu of the media
-#: src/modules/AutoinstSoftware.rb:619
+#: src/modules/AutoinstSoftware.rb:621
msgid "boot config for the DVD"
msgstr "Oppstartsoppsett for DVD"
-#: src/modules/AutoinstSoftware.rb:623
+#: src/modules/AutoinstSoftware.rb:625
msgid "Ok"
msgstr "OK"
-#: src/modules/AutoinstSoftware.rb:626
+#: src/modules/AutoinstSoftware.rb:628
msgid ""
"You can do changes to the ISO now in %1, like adding a complete different AutoYaST XML file.\n"
"If you press the ok-button, the iso will be created."
@@ -2684,43 +2724,43 @@
#. create the actual ISO file
#. Popup::Message( _("Please choose a place where you want to save the ISO file in the next dialog") );
-#: src/modules/AutoinstSoftware.rb:645
+#: src/modules/AutoinstSoftware.rb:647
msgid "Store ISO image to ..."
msgstr "Lagre ISO-diskbilde som ..."
-#: src/modules/AutoinstSoftware.rb:646
+#: src/modules/AutoinstSoftware.rb:648
msgid "Creating ISO File ..."
msgstr "Oppretter ISO-fil ..."
-#: src/modules/AutoinstSoftware.rb:667
+#: src/modules/AutoinstSoftware.rb:669
msgid "ISO successfully created at %1"
msgstr "ISO er opprettet på %1"
#. Summary
#. @return Html formatted configuration summary
-#: src/modules/AutoinstSoftware.rb:743
+#: src/modules/AutoinstSoftware.rb:745
msgid "Selected Patterns"
msgstr "Valgte mønstre"
-#: src/modules/AutoinstSoftware.rb:753
+#: src/modules/AutoinstSoftware.rb:755
msgid "Individually Selected Packages"
msgstr "Valgte enkeltpakker"
-#: src/modules/AutoinstSoftware.rb:759
+#: src/modules/AutoinstSoftware.rb:761
msgid "Packages to Remove"
msgstr "Pakker som skal fjernes"
-#: src/modules/AutoinstSoftware.rb:766
+#: src/modules/AutoinstSoftware.rb:768
msgid "Force Kernel Package"
msgstr "Velg spesiell kjernepakke"
#. set SoftLock to avoid the installation of recommended patterns (#159466)
-#: src/modules/AutoinstSoftware.rb:856
+#: src/modules/AutoinstSoftware.rb:858
msgid "Could not set patterns: %1."
msgstr "Kunne ikke definere mønstre: %1."
#. Solve dependencies
-#: src/modules/AutoinstSoftware.rb:917
+#: src/modules/AutoinstSoftware.rb:919
msgid "The package resolver run failed. Please check your software section in the autoyast profile."
msgstr "Kjøringen av pakkeløseren mislyktes. Kontroller programvareseksjonen i autoyast-profilen."
@@ -2765,14 +2805,14 @@
#. Prepare Profile for saving and remove empty data structs
#. @return [void]
-#: src/modules/Profile.rb:357
+#: src/modules/Profile.rb:351
msgid "Collecting configuration data..."
msgstr "Henter konfigurasjonsdata..."
#. Save YCP data into XML
#. @param path to file
#. @return [Boolean] true on success
-#: src/modules/Profile.rb:460
+#: src/modules/Profile.rb:454
msgid "Encrypted AutoYaST profile. Enter the password twice."
msgstr "Kryptert Autoast-profil. Angi passordet to ganger."
@@ -2780,14 +2820,14 @@
#.
#. @param [String] dir - directory to store section xml files in
#. @return - list of filenames
-#: src/modules/Profile.rb:534
+#: src/modules/Profile.rb:528
msgid "Could not write section %1 to file %2."
msgstr "Kunne ikke lagre seksjonen %1 i filen %2."
#. Read XML into YCP data
#. @param path to file
#. @return [Boolean]
-#: src/modules/Profile.rb:701 src/modules/ProfileLocation.rb:190
+#: src/modules/Profile.rb:695 src/modules/ProfileLocation.rb:190
msgid "Encrypted AutoYaST profile. Enter the correct password."
msgstr "Kryptert AutoYast-profil. Angi riktig passord."
@@ -2805,26 +2845,6 @@
msgid "&OK"
msgstr "&OK"
-#, fuzzy
-#~| msgid "Configure Volume Groups"
-#~ msgid "Configure users and groups"
-#~ msgstr "Konfigurere volumgrupper"
-
-#, fuzzy
-#~| msgid "Syncing server..."
-#~ msgid "Syncing time..."
-#~ msgstr "Synkroniserer server..."
-
-#, fuzzy
-#~| msgid "Parsing failed."
-#~ msgid "Time syncing failed."
-#~ msgstr "Tolking mislyktes."
-
-#, fuzzy
-#~| msgid "Cannot mount file system."
-#~ msgid "Cannot update system time."
-#~ msgstr "Kan ikke montere filsystem."
-
#~ msgid "Configure runlevel"
#~ msgstr "Konfigurer kjørenivåer"
Modified: branches/plus-SLE12-SP2/yast/nb/po/base.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/base.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/base.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-08-07 23:21+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -395,7 +395,7 @@
#. for translators: use the localized page for your language if it exists,
#. check the combo box "In other laguages" on top of the page
#: library/control/src/modules/InstError.rb:167
-#: library/control/src/modules/ProductControl.rb:1450
+#: library/control/src/modules/ProductControl.rb:1444
msgid "http://en.opensuse.org/Bugs/YaST"
msgstr "http://en.opensuse.org/Bugs/YaST"
@@ -435,7 +435,7 @@
msgstr "Vil du fjerne pakken %1?"
#. error report
-#: library/control/src/modules/ProductControl.rb:1259
+#: library/control/src/modules/ProductControl.rb:1253
msgid "No workflow defined for this installation mode."
msgstr "Ingen prosedyre er definert for denne installasjonsmodusen."
@@ -447,14 +447,14 @@
#. button label
#. Button that will continue with the installation
#: library/control/src/modules/ProductProfile.rb:183
-#: library/general/src/modules/Popup.rb:737
+#: library/general/src/modules/Popup.rb:744
msgid "&Continue Installation"
msgstr "&Fortsett installasjonen"
#. button label
#. Button that will really abort the installation
#: library/control/src/modules/ProductProfile.rb:185
-#: library/general/src/modules/Popup.rb:735
+#: library/general/src/modules/Popup.rb:742
msgid "&Abort Installation"
msgstr "&Avbryt installasjonen"
@@ -500,7 +500,7 @@
msgstr "Det oppstod en intern feil ved integrasjon av tilleggsarbeidsflyt."
#. message popup, %1 is a label of some widget
-#: library/cwm/src/modules/CWM.rb:691
+#: library/cwm/src/modules/CWM.rb:677
msgid "The value of %1 is invalid."
msgstr "Verdien for %1 er ugyldig."
@@ -1113,89 +1113,6 @@
"<p>I noen dialoger er ingen eller bare noen\n"
"av F-tastene tilgjengelige.</p>"
-#. @param service [Object] An object providing the following methods:
-#. #name, #start, #stop, #enabled?, #running?
-#. For systemd compliant services, just do
-#. Yast::SystemdService.find("name_of_the_service")
-#. Note that this widget will #start and #stop the service by itself but
-#. the actions referenced by the flags (reloading and enabling/disabling)
-#. are expected to be done by the caller, when the whole configuration is
-#. written.
-#. @param reload_flag [Boolean] Initial value for the "reload" checkbox.
-#. Keep in mind it will always be displayed as unchecked if the service
-#. is not running, despite the real value.
-#. @param reload_flag_label [Symbol] Type of label for the "reload" checkbox.
-#. :reload means the service will be reloaded.
-#. :restart means the service will be restarted.
-#: library/general/src/lib/ui/service_status.rb:59
-#, fuzzy
-#| msgid "Read Other Settings."
-msgid "Restart After Saving Settings"
-msgstr "Les andre innstillinger."
-
-#: library/general/src/lib/ui/service_status.rb:61
-#, fuzzy
-#| msgid "Read Other Settings."
-msgid "Reload After Saving Settings"
-msgstr "Les andre innstillinger."
-
-#. @return [YaST::Term]
-#: library/general/src/lib/ui/service_status.rb:68
-#, fuzzy
-#| msgid "Service Start"
-msgid "Service Status"
-msgstr "Start av tjeneste"
-
-#. 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
-msgid "Current status:"
-msgstr "Gjeldende status:"
-
-#. Widget to configure the status on boot
-#: library/general/src/lib/ui/service_status.rb:172
-#, fuzzy
-#| msgid "Operating System Boot"
-msgid "Start During System Boot"
-msgstr "Oppstart av operativsystem"
-
-#. TRANSLATORS: status of a service
-#: library/general/src/lib/ui/service_status.rb:196
-#, fuzzy
-#| msgid "Warning"
-msgid "running"
-msgstr "Advarsel"
-
-#: library/general/src/lib/ui/service_status.rb:198
-#, fuzzy
-#| msgid "S&top now ..."
-msgid "Stop now"
-msgstr "S&topp nå ..."
-
-#. TRANSLATORS: status of a service
-#: library/general/src/lib/ui/service_status.rb:203
-#, fuzzy
-#| msgid "Stopped"
-msgid "stopped"
-msgstr "Stoppet"
-
-#: library/general/src/lib/ui/service_status.rb:205
-#, fuzzy
-#| msgid "Start it now?"
-msgid "Start now"
-msgstr "Start den nå?"
-
#. TRANSLATORS: popup question (with continue / cancel buttons)
#. %1 is the filesystem path
#: library/general/src/modules/FileUtils.rb:292
@@ -1396,7 +1313,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:665
+#: library/packages/src/modules/PackageCallbacks.rb:664
#: library/wizard/src/modules/Confirm.rb:126
msgid "&Skip"
msgstr "&Hopp over"
@@ -1419,7 +1336,7 @@
#. TextEntry Label
#. textentry label
#: library/general/src/modules/Label.rb:319
-#: library/packages/src/modules/PackageCallbacks.rb:2231
+#: library/packages/src/modules/PackageCallbacks.rb:2230
msgid "&Password"
msgstr "&Passord"
@@ -1644,27 +1561,27 @@
msgstr "Kerberos-skjemafil ikke funnet"
#. Confirm user request to abort installation
-#: library/general/src/modules/Popup.rb:733
+#: library/general/src/modules/Popup.rb:740
msgid "Really abort the installation?"
msgstr "Er du sikker på at du vil avbryte installasjonen?"
#. Confirm user request to abort System Repair
-#: library/general/src/modules/Popup.rb:742
+#: library/general/src/modules/Popup.rb:749
msgid "Really abort YaST System Repair?"
msgstr "Er du sikker på at du vil avbryte YaST systemreparasjon?"
#. Button that will really abort the repair
-#: library/general/src/modules/Popup.rb:744
+#: library/general/src/modules/Popup.rb:751
msgid "Abort System Repair"
msgstr "Avbryt systemreparasjon"
#. Button that will continue with the repair
-#: library/general/src/modules/Popup.rb:746
+#: library/general/src/modules/Popup.rb:753
msgid "&Continue System Repair"
msgstr "&Fortsett systemreparasjon"
#. Warning text for aborting an installation before anything is installed
-#: library/general/src/modules/Popup.rb:749
+#: library/general/src/modules/Popup.rb:756
msgid ""
"If you abort the installation now,\n"
"Linux will not be installed.\n"
@@ -1677,7 +1594,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:759
+#: library/general/src/modules/Popup.rb:766
msgid ""
"If you abort the installation now, you will\n"
"have an incomplete Linux system\n"
@@ -1691,7 +1608,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:768
+#: library/general/src/modules/Popup.rb:775
msgid ""
"If you abort the installation now,\n"
"Linux will be unusable.\n"
@@ -1702,18 +1619,18 @@
"Du må installere på nytt."
#. Confirm aborting the program
-#: library/general/src/modules/Popup.rb:822
+#: library/general/src/modules/Popup.rb:829
msgid "Really abort?"
msgstr "Er du sikker at du vil avbryte?"
#. Additional hint when trying to abort program in spite of changes
-#: library/general/src/modules/Popup.rb:830
+#: library/general/src/modules/Popup.rb:837
msgid "All changes will be lost!"
msgstr "Alle endringer vil gå tapt!"
#. FIXME: BNC #422612, Use `opt(`noSanityCheck) later
#. button label
-#: library/general/src/modules/Popup.rb:860
+#: library/general/src/modules/Popup.rb:867
msgid "&Details..."
msgstr "&Detaljer..."
@@ -2754,47 +2671,47 @@
"Mellomrom er ikke tillatt.\n"
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:116
+#: library/network/src/modules/SuSEFirewall.rb:115
msgid "External Zone"
msgstr "Ekstern sone"
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:120
+#: library/network/src/modules/SuSEFirewall.rb:119
msgid "Internal Zone"
msgstr "Intern sone"
#. TRANSLATORS: Firewall zone name - used in combo box or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:124
+#: library/network/src/modules/SuSEFirewall.rb:123
msgid "Demilitarized Zone"
msgstr "Demilitarisert sone"
#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:247
+#: library/network/src/modules/SuSEFirewall.rb:246
msgid "TCP"
msgstr "TCP"
#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:249
+#: library/network/src/modules/SuSEFirewall.rb:248
msgid "UDP"
msgstr "UDP"
#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:251
+#: library/network/src/modules/SuSEFirewall.rb:250
msgid "RPC"
msgstr "RPC"
#. protocol name
-#: library/network/src/modules/SuSEFirewall.rb:253
+#: library/network/src/modules/SuSEFirewall.rb:252
msgid "IP"
msgstr "IP"
#. TRANSLATORS: Firewall zone full-name, used as combo box item or dialog title
-#: library/network/src/modules/SuSEFirewall.rb:1159
+#: library/network/src/modules/SuSEFirewall.rb:1158
msgid "Unknown Zone"
msgstr "Ukjent sone"
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1508
+#: library/network/src/modules/SuSEFirewall.rb:1506
msgid ""
"Interface '%1' is included in multiple firewall zones.\n"
"Continuing with configuration can produce errors.\n"
@@ -2810,8 +2727,8 @@
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
#. TRANSLATORS: Error message, %1 = interface name (like eth0)
-#: library/network/src/modules/SuSEFirewall.rb:1973
-#: library/network/src/modules/SuSEFirewall.rb:2049
+#: library/network/src/modules/SuSEFirewall.rb:1971
+#: library/network/src/modules/SuSEFirewall.rb:2047
msgid ""
"Interface '%1' is not assigned to any firewall zone.\n"
"Run YaST2 Firewall and assign it.\n"
@@ -2820,72 +2737,72 @@
"Det kan tilordnes manuelt under Brannmur i YaST2.\n"
#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2480
+#: library/network/src/modules/SuSEFirewall.rb:2478
msgid "Initializing Firewall Configuration"
msgstr "Initialiserer brannmurkonfigurasjon"
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2488
+#: library/network/src/modules/SuSEFirewall.rb:2486
msgid "Check for network devices"
msgstr "Søk etter nettverksenheter"
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2490
+#: library/network/src/modules/SuSEFirewall.rb:2488
msgid "Read current configuration"
msgstr "Les gjeldende konfigurasjon"
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2492
+#: library/network/src/modules/SuSEFirewall.rb:2490
msgid "Check possibly conflicting services"
msgstr "Kontroller om det finnes tjenester som skaper konflikter"
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2496
+#: library/network/src/modules/SuSEFirewall.rb:2494
msgid "Checking for network devices..."
msgstr "Søker etter nettverksenheter..."
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2498
+#: library/network/src/modules/SuSEFirewall.rb:2496
msgid "Reading current configuration..."
msgstr "Leser gjeldende konfigurasjon..."
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2500
+#: library/network/src/modules/SuSEFirewall.rb:2498
msgid "Checking possibly conflicting services..."
msgstr "Kontrollerer om det finnes tjenester som skaper konflikter..."
#. TRANSLATORS: Dialog caption
-#: library/network/src/modules/SuSEFirewall.rb:2643
+#: library/network/src/modules/SuSEFirewall.rb:2648
msgid "Writing Firewall Configuration"
msgstr "Lagrer brannmurkonfigurasjon"
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2651
+#: library/network/src/modules/SuSEFirewall.rb:2656
msgid "Write firewall settings"
msgstr "Lagre brannmurinnstillinger"
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2653
+#: library/network/src/modules/SuSEFirewall.rb:2658
msgid "Adjust firewall service"
msgstr "Tilpass brannmurtjenesten"
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2657
+#: library/network/src/modules/SuSEFirewall.rb:2662
msgid "Writing firewall settings..."
msgstr "Lagrer brannmurinnstillinger..."
#. TRANSLATORS: Progress step
-#: library/network/src/modules/SuSEFirewall.rb:2659
+#: library/network/src/modules/SuSEFirewall.rb:2664
msgid "Adjusting firewall service..."
msgstr "Tilpasser brannmurtjenesten..."
#. TRANSLATORS: a popup error message
-#: library/network/src/modules/SuSEFirewall.rb:2678
+#: library/network/src/modules/SuSEFirewall.rb:2683
msgid "Writing settings failed"
msgstr "Innstillingene kunne ikke lagres"
#. table item, %1 stands for the buggy protocol name
-#: library/network/src/modules/SuSEFirewall.rb:3471
+#: library/network/src/modules/SuSEFirewall.rb:3476
msgid "Unknown protocol (%1)"
msgstr "Ukjent protokoll (%1)"
@@ -2977,52 +2894,51 @@
#. Returns service definition.
#. See @services for the format.
-#. If *silent* is `false` (the default), the method throws an exception
-#. {Yast::SuSEFirewalServiceNotFound} if service is not found on disk.
+#. If `silent` is not defined or set to `true`, function throws an exception
+#. SuSEFirewalServiceNotFound if service is not found on disk.
#.
-#. @param [String] service name (including the "service:" prefix)
+#. @param [String] service name
#. @param [String] (optional) whether to silently return nil
#. when service is not found (default false)
-#. @api private
#. Immediately writes the configuration of service defined by package to the
#. service definition file. Service must be defined by package, this function
#. doesn't work for hard-coded services (SuSEFirewallServices).
-#. Function throws an exception {Yast::SuSEFirewalServiceNotFound}
+#. Function throws an exception SuSEFirewalServiceNotFound
#. if service is not known (undefined) or it is not a service
#. defined by package.
#.
#. @param [String] service ID (e.g., "service:ssh")
-#. @param [Hash{String => Array<String>] store_definition of full service definition
+#. @param map 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:356
-#: library/network/src/modules/SuSEFirewallServices.rb:640
+#. $[
+#. "tcp_ports" : [ "22", "ftp-data", "400:420" ],
+#. "udp_ports" : [ ],
+#. "rpc_ports" : [ "portmap", "ypbind" ],
+#. "ip_protocols" : [ "esp" ],
+#. "broadcast_ports" : [ ],
+#. ]
+#. );
+#: library/network/src/modules/SuSEFirewallServices.rb:354
+#: library/network/src/modules/SuSEFirewallServices.rb:637
msgid "Service with name '%{service_name}' does not exist"
msgstr ""
#. Fallback for presented service
-#: library/network/src/modules/SuSEFirewallServices.rb:434
+#: library/network/src/modules/SuSEFirewallServices.rb:430
#, fuzzy
#| msgid "Service: %1"
msgid "Service: %{filename}"
msgstr "Tjeneste: %1"
#. TRANSLATORS: Name of unknown service. %1 is a requested service id like nis-server
-#: library/network/src/modules/SuSEFirewallServices.rb:505
+#: library/network/src/modules/SuSEFirewallServices.rb:503
msgid "Unknown service '%1'"
msgstr "Ukjent enhet '%1'"
@@ -3046,79 +2962,35 @@
msgid "&Uninstall"
msgstr "&Avinstaller"
-#. TRANSLATORS: progress bar label
-#: library/packages/src/lib/packages/file_conflict_callbacks.rb:77
-#, fuzzy
-#| msgid "Checking file system..."
-msgid "Checking file conflicts..."
-msgstr "Kontrollerer filsystem..."
-
-#. 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
-#, fuzzy
-#| msgid "(no message available)"
-msgid "This message will be available at %s"
-msgstr "(ingen melding tilgjengelig)"
-
#. --------------------------------------------------------------------------
#. defaults
#. at start of file providal
-#: library/packages/src/modules/PackageCallbacks.rb:150
-#: library/packages/src/modules/PackageCallbacks.rb:158
+#: library/packages/src/modules/PackageCallbacks.rb:149
+#: library/packages/src/modules/PackageCallbacks.rb:157
msgid "Downloading package %1 (%2)..."
msgstr "Laster ned pakken %1 (%2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:162
+#: library/packages/src/modules/PackageCallbacks.rb:161
msgid "Downloading Package"
msgstr "Laster ned pakken"
#. error message, %1 is a package name
-#: library/packages/src/modules/PackageCallbacks.rb:221
+#: library/packages/src/modules/PackageCallbacks.rb:220
msgid "Package %1 is broken, integrity check has failed."
msgstr "Feil ved pakke %1, problemer med integriteten."
#. command line mode - ask user whether installation of the failed package should be retried
#. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:233
-#: library/packages/src/modules/PackageCallbacks.rb:448
+#: library/packages/src/modules/PackageCallbacks.rb:232
+#: library/packages/src/modules/PackageCallbacks.rb:447
msgid "Retry installation of the package?"
msgstr "Vil du forsøke å installere pakken på nytt?"
#. command line mode - ask user whether the installation should be aborted
#. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:241
-#: library/packages/src/modules/PackageCallbacks.rb:456
+#: library/packages/src/modules/PackageCallbacks.rb:240
+#: library/packages/src/modules/PackageCallbacks.rb:455
msgid "Abort the installation?"
msgstr "Vil du avbryte installasjonen?"
@@ -3127,15 +2999,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:269
-#: library/packages/src/modules/PackageCallbacks.rb:303
-#: library/packages/src/modules/PackageCallbacks.rb:2144
+#: library/packages/src/modules/PackageCallbacks.rb:268
+#: library/packages/src/modules/PackageCallbacks.rb:302
+#: library/packages/src/modules/PackageCallbacks.rb:2143
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:327
+#: library/packages/src/modules/PackageCallbacks.rb:326
msgid ""
"Ignoring a download failure may result in a broken system.\n"
"Verify the system later by running the Software Management module.\n"
@@ -3144,35 +3016,35 @@
"Kontroller systemet senere med modulen Legg til og fjern programmer.\n"
#. At start of package install.
-#: library/packages/src/modules/PackageCallbacks.rb:365
+#: library/packages/src/modules/PackageCallbacks.rb:364
msgid "Uninstalling package %1 (%2)..."
msgstr "Avinstallerer pakken %1 (%2)..."
-#: library/packages/src/modules/PackageCallbacks.rb:367
+#: library/packages/src/modules/PackageCallbacks.rb:366
msgid "Installing package %1 (%2)..."
msgstr "Installerer pakken %1 (%2)..."
-#: library/packages/src/modules/PackageCallbacks.rb:375
+#: library/packages/src/modules/PackageCallbacks.rb:374
msgid "Uninstalling Package"
msgstr "Avinstallerer pakke"
-#: library/packages/src/modules/PackageCallbacks.rb:375
+#: library/packages/src/modules/PackageCallbacks.rb:374
msgid "Installing Package"
msgstr "Installerer pakke"
#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:431
+#: library/packages/src/modules/PackageCallbacks.rb:430
msgid "Removal of package %1 failed."
msgstr "Pakken %1 kunne ikke fjernes."
#. error popup during package installation, %1 is the name of the package
-#: library/packages/src/modules/PackageCallbacks.rb:434
+#: library/packages/src/modules/PackageCallbacks.rb:433
msgid "Installation of package %1 failed."
msgstr "Installasjon av pakken %1 mislyktes."
#. TODO: add "Don't show again" checkbox
#. a warning popup displayed after pressing [Ignore] after a package installation error
-#: library/packages/src/modules/PackageCallbacks.rb:507
+#: library/packages/src/modules/PackageCallbacks.rb:506
msgid ""
"Ignoring a package failure may result in a broken system.\n"
"The system should be later verified by running the Software Management module."
@@ -3181,7 +3053,7 @@
"Systemet bør kontrolleres senere ved å kjøre modulen Legg til og fjern programmer."
#. error report
-#: library/packages/src/modules/PackageCallbacks.rb:576
+#: library/packages/src/modules/PackageCallbacks.rb:575
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"
@@ -3196,27 +3068,27 @@
#. media is double sided, we want the user to insert the 'Side A' of the media
#. the complete string will be "<product> <media> <number>, <side>"
#. e.g. "'SuSE Linux 9.0' DVD 1, Side A"
-#: library/packages/src/modules/PackageCallbacks.rb:591
+#: library/packages/src/modules/PackageCallbacks.rb:590
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:594
+#: library/packages/src/modules/PackageCallbacks.rb:593
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:609
+#: library/packages/src/modules/PackageCallbacks.rb:608
msgid "%1 (Disc %2)"
msgstr "%1 (Disk %2)"
#. label for a repository - %1 product name (e.g. openSUSE 10.2), %2 medium number (e.g. 2)
-#: library/packages/src/modules/PackageCallbacks.rb:612
+#: library/packages/src/modules/PackageCallbacks.rb:611
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:618
+#: library/packages/src/modules/PackageCallbacks.rb:617
msgid ""
"Insert\n"
"'%1'"
@@ -3225,7 +3097,7 @@
"'%1'"
#. report error while accessing local directory with product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:623
+#: library/packages/src/modules/PackageCallbacks.rb:622
msgid ""
"Cannot access installation media\n"
"%1\n"
@@ -3238,7 +3110,7 @@
"Kontroller at katalogen er tilgjengelig."
#. report error while accessing network media of product (%1 = URL, %2 = "SuSE Linux ...")
-#: library/packages/src/modules/PackageCallbacks.rb:635
+#: library/packages/src/modules/PackageCallbacks.rb:634
msgid ""
"Cannot access installation media \n"
"%1\n"
@@ -3252,83 +3124,83 @@
#. wrong media id, offer "Ignore"
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:660
-#: library/packages/src/modules/PackageCallbacks.rb:1839
+#: library/packages/src/modules/PackageCallbacks.rb:659
+#: library/packages/src/modules/PackageCallbacks.rb:1838
msgid "Skip Autorefresh"
msgstr "Hopp over auto-oppdatering"
#. menu button label - used for more then one device
#. push button label - in the media change popup, user can eject the CD/DVD
-#: library/packages/src/modules/PackageCallbacks.rb:679
-#: library/packages/src/modules/PackageCallbacks.rb:682
+#: library/packages/src/modules/PackageCallbacks.rb:678
+#: library/packages/src/modules/PackageCallbacks.rb:681
msgid "&Eject"
msgstr "&Løs ut"
-#: library/packages/src/modules/PackageCallbacks.rb:689
+#: library/packages/src/modules/PackageCallbacks.rb:688
msgid "A&utomatically Eject CD or DVD Medium"
msgstr "Løs a&utomatisk ut CD- eller DVD-medium"
#. command line mode - ask user whether installation of the failed package should be retried
-#: library/packages/src/modules/PackageCallbacks.rb:756
+#: library/packages/src/modules/PackageCallbacks.rb:755
msgid "Retry the installation?"
msgstr "Vil du forsøke å installere på nytt?"
#. command line mode - ask user whether the installation should be aborted
-#: library/packages/src/modules/PackageCallbacks.rb:764
+#: library/packages/src/modules/PackageCallbacks.rb:763
msgid "Skip the medium?"
msgstr "Vil du hoppe over mediet?"
#. otherwise ignore the medium
-#: library/packages/src/modules/PackageCallbacks.rb:771
+#: library/packages/src/modules/PackageCallbacks.rb:770
msgid "Ignoring the bad medium..."
msgstr "Ignorerer ugyldig medium..."
#. TextEntry label
#. TextEntry label
-#: library/packages/src/modules/PackageCallbacks.rb:792
-#: library/packages/src/modules/PackageCallbacks.rb:848
+#: library/packages/src/modules/PackageCallbacks.rb:791
+#: library/packages/src/modules/PackageCallbacks.rb:847
msgid "&URL"
msgstr "&Nettadresse"
#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1040
+#: library/packages/src/modules/PackageCallbacks.rb:1039
msgid "Creating Repository %1"
msgstr "Oppretter pakkebrønnen %1"
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1073
+#: library/packages/src/modules/PackageCallbacks.rb:1072
msgid "An error occurred while creating the repository."
msgstr "Det oppstod en feil under oppretting av pakkebrønnen."
#. error message - a label followed by a richtext with details
#. error message - a label followed by a richtext with details
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1077
-#: library/packages/src/modules/PackageCallbacks.rb:1204
-#: library/packages/src/modules/PackageCallbacks.rb:1314
+#: library/packages/src/modules/PackageCallbacks.rb:1076
+#: library/packages/src/modules/PackageCallbacks.rb:1203
+#: library/packages/src/modules/PackageCallbacks.rb:1313
msgid "Unable to retrieve the remote repository description."
msgstr "Kan ikke hente beskrivelse for ekstern pakkebrønn."
#. error message - a label followed by a richtext with details
#. error message - a label followed by a richtext with details
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1080
-#: library/packages/src/modules/PackageCallbacks.rb:1207
-#: library/packages/src/modules/PackageCallbacks.rb:1317
+#: library/packages/src/modules/PackageCallbacks.rb:1079
+#: library/packages/src/modules/PackageCallbacks.rb:1206
+#: library/packages/src/modules/PackageCallbacks.rb:1316
msgid "An error occurred while retrieving the new metadata."
msgstr "Det oppstod en feil under henting av ny metainformasjon."
#. error message - a label followed by a richtext with details
#. error message - a label followed by a richtext with details
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1083
-#: library/packages/src/modules/PackageCallbacks.rb:1210
-#: library/packages/src/modules/PackageCallbacks.rb:1320
+#: library/packages/src/modules/PackageCallbacks.rb:1082
+#: library/packages/src/modules/PackageCallbacks.rb:1209
+#: library/packages/src/modules/PackageCallbacks.rb:1319
msgid "The repository is not valid."
msgstr "Pakkebrønnen er ikke gyldig."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1086
+#: library/packages/src/modules/PackageCallbacks.rb:1085
msgid "The repository metadata is invalid."
msgstr "Pakkebrønnen har ugyldige metadata."
@@ -3336,92 +3208,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:1099
-#: library/packages/src/modules/PackageCallbacks.rb:1229
-#: library/packages/src/modules/PackageCallbacks.rb:1333
-#: library/packages/src/modules/PackageCallbacks.rb:2098
+#: 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
msgid "Retry?"
msgstr "Vil du prøve på nytt?"
#. popup label (%1 is repository URL)
-#: library/packages/src/modules/PackageCallbacks.rb:1145
-#: library/packages/src/modules/PackageCallbacks.rb:1153
+#: library/packages/src/modules/PackageCallbacks.rb:1144
+#: library/packages/src/modules/PackageCallbacks.rb:1152
msgid "Probing Repository %1"
msgstr "Undersøker pakkebrønnen %1"
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1200
+#: library/packages/src/modules/PackageCallbacks.rb:1199
msgid "Error occurred while probing the repository."
msgstr "Det oppstod en feil under gransking av pakkebrønn."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1213
+#: library/packages/src/modules/PackageCallbacks.rb:1212
msgid "Repository probing details."
msgstr "Granskningsdetaljer."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1216
+#: library/packages/src/modules/PackageCallbacks.rb:1215
msgid "Repository metadata is invalid."
msgstr "Pakkebrønn har ugyldige metadata."
#. error message - a label followed by a richtext with details
-#: library/packages/src/modules/PackageCallbacks.rb:1310
+#: library/packages/src/modules/PackageCallbacks.rb:1309
msgid "Repository %1"
msgstr "Pakkebrønn %1"
#. at start of delta providal
-#: library/packages/src/modules/PackageCallbacks.rb:1398
+#: library/packages/src/modules/PackageCallbacks.rb:1397
msgid "Downloading delta RPM package %1 (%2)..."
msgstr "Laster ned delta-RPM-pakken %1 (%2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1406
+#: library/packages/src/modules/PackageCallbacks.rb:1405
msgid "Downloading Delta RPM package"
msgstr "Laster ned delta-RPM-pakke"
#. at start of delta application
-#: library/packages/src/modules/PackageCallbacks.rb:1419
+#: library/packages/src/modules/PackageCallbacks.rb:1418
msgid "Applying delta RPM package %1..."
msgstr "Bruker delta-RPM-pakken %1..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1426
+#: library/packages/src/modules/PackageCallbacks.rb:1425
msgid "Applying delta RPM package"
msgstr "Bruker delta-RPM-pakke"
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1428
-#: library/packages/src/modules/PackageCallbacks.rb:3082
+#: library/packages/src/modules/PackageCallbacks.rb:1427
+#: library/packages/src/modules/PackageCallbacks.rb:3075
msgid "Package: "
msgstr "Pakke: "
#. close popup
-#: library/packages/src/modules/PackageCallbacks.rb:1494
+#: library/packages/src/modules/PackageCallbacks.rb:1493
msgid "Starting script %1 (patch %2)..."
msgstr "Starter skript %1 (pakkeoppdatering %2)..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:1503
+#: library/packages/src/modules/PackageCallbacks.rb:1502
msgid "Running Script"
msgstr "Kjører skript"
#. label, patch name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1508
+#: library/packages/src/modules/PackageCallbacks.rb:1507
msgid "Patch: "
msgstr "Pakkeoppdatering: "
#. label, script name follows
-#: library/packages/src/modules/PackageCallbacks.rb:1517
+#: library/packages/src/modules/PackageCallbacks.rb:1516
msgid "Script: "
msgstr "Skript: "
#. label
-#: library/packages/src/modules/PackageCallbacks.rb:1523
+#: library/packages/src/modules/PackageCallbacks.rb:1522
msgid "Output of the Script"
msgstr "Resultat av skriptet"
#. label, %1 is patch name with version and architecture
-#: library/packages/src/modules/PackageCallbacks.rb:1611
+#: library/packages/src/modules/PackageCallbacks.rb:1610
msgid ""
"Patch: %1\n"
"\n"
@@ -3430,7 +3302,7 @@
"\n"
#. a popup question with "Continue", "Skip" and "Abort" buttons
-#: library/packages/src/modules/PackageCallbacks.rb:1628
+#: library/packages/src/modules/PackageCallbacks.rb:1627
msgid ""
"The repositories are being refreshed.\n"
"Continue with refreshing?\n"
@@ -3445,36 +3317,36 @@
"mangle eller være foreldet."
#. push button label
-#: library/packages/src/modules/PackageCallbacks.rb:1643
+#: library/packages/src/modules/PackageCallbacks.rb:1642
msgid "&Skip Refresh"
msgstr "&Hopp over oppdatering"
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1677
+#: library/packages/src/modules/PackageCallbacks.rb:1676
msgid "Downloading"
msgstr "Laster ned"
#. message in a progress popup
#. progress bar label, %1 is URL with optional download rate
-#: library/packages/src/modules/PackageCallbacks.rb:1724
-#: library/packages/src/modules/PackageCallbacks.rb:1772
+#: library/packages/src/modules/PackageCallbacks.rb:1723
+#: library/packages/src/modules/PackageCallbacks.rb:1771
msgid "Downloading: %1"
msgstr "Laster ned: %1"
#. heading of popup
#. heading of popup
-#: library/packages/src/modules/PackageCallbacks.rb:1876
-#: library/packages/src/modules/PackageCallbacks.rb:1942
+#: library/packages/src/modules/PackageCallbacks.rb:1875
+#: library/packages/src/modules/PackageCallbacks.rb:1941
msgid "Checking Package Database"
msgstr "Søker i pakkedatabase"
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1879
+#: library/packages/src/modules/PackageCallbacks.rb:1878
msgid "Rebuilding package database. This process can take some time."
msgstr "Gjenoppretter pakkedatabasen. Denne prosessen kan ta en stund."
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1912
+#: library/packages/src/modules/PackageCallbacks.rb:1911
msgid ""
"Rebuilding of package database failed:\n"
"%1"
@@ -3483,16 +3355,16 @@
"%1"
#. message in a progress popup
-#: library/packages/src/modules/PackageCallbacks.rb:1945
+#: library/packages/src/modules/PackageCallbacks.rb:1944
msgid "Converting package database. This process can take some time."
msgstr "Konverterer pakkedatabase. Denne prosessen ta en stund."
-#: library/packages/src/modules/PackageCallbacks.rb:1958
+#: library/packages/src/modules/PackageCallbacks.rb:1957
msgid "Status"
msgstr "Status"
#. error message, %1 is the cause for the error
-#: library/packages/src/modules/PackageCallbacks.rb:1982
+#: library/packages/src/modules/PackageCallbacks.rb:1981
msgid ""
"Conversion of package database failed:\n"
"%1"
@@ -3501,12 +3373,12 @@
"%1"
#. progress message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2018
+#: library/packages/src/modules/PackageCallbacks.rb:2017
msgid "Reading RPM database..."
msgstr "Leser RPM-database..."
#. popup heading
-#: library/packages/src/modules/PackageCallbacks.rb:2028
+#: library/packages/src/modules/PackageCallbacks.rb:2027
msgid "Reading Installed Packages"
msgstr "Finner installerte pakker"
@@ -3517,27 +3389,27 @@
#. `Label(""),
#. `PushButton(`id(`abort), Label::AbortButton())
#. )
-#: library/packages/src/modules/PackageCallbacks.rb:2034
-#: library/packages/src/modules/PackageCallbacks.rb:2050
+#: library/packages/src/modules/PackageCallbacks.rb:2033
+#: library/packages/src/modules/PackageCallbacks.rb:2049
msgid "Scanning RPM database..."
msgstr "Skanner RPM-database..."
#. error message, could not read RPM database
-#: library/packages/src/modules/PackageCallbacks.rb:2087
+#: library/packages/src/modules/PackageCallbacks.rb:2086
msgid "Initialization of the target failed."
msgstr "Feil ved initialisering mål."
#. status message (command line mode)
-#: library/packages/src/modules/PackageCallbacks.rb:2179
+#: library/packages/src/modules/PackageCallbacks.rb:2178
msgid "RPM database read"
msgstr "RPM-database lest"
#. heading in a popup window
-#: library/packages/src/modules/PackageCallbacks.rb:2213
+#: library/packages/src/modules/PackageCallbacks.rb:2212
msgid "User Authentication"
msgstr "Brukerautentisering"
-#: library/packages/src/modules/PackageCallbacks.rb:2219
+#: library/packages/src/modules/PackageCallbacks.rb:2218
msgid ""
"URL: %1\n"
"\n"
@@ -3548,20 +3420,20 @@
"%2"
#. textentry label
-#: library/packages/src/modules/PackageCallbacks.rb:2228
+#: library/packages/src/modules/PackageCallbacks.rb:2227
msgid "&User Name"
msgstr "&Brukernavn"
#. check box
-#: library/packages/src/modules/PackageCallbacks.rb:3017
+#: library/packages/src/modules/PackageCallbacks.rb:3010
msgid "Show &details"
msgstr "Vis &detaljer"
-#: library/packages/src/modules/PackageCallbacks.rb:3083
+#: library/packages/src/modules/PackageCallbacks.rb:3076
msgid "Size: "
msgstr "Størrelse: "
-#: library/packages/src/modules/PackageCallbacks.rb:3106
+#: library/packages/src/modules/PackageCallbacks.rb:3099
msgid "Remaining time to automatic retry: %1"
msgstr "Nytt forsøk blir automatisk utført om: %1"
@@ -3639,12 +3511,12 @@
"løses manuelt i pakkebehandleren."
#. error report
-#: library/packages/src/modules/PackageSystem.rb:417
+#: library/packages/src/modules/PackageSystem.rb:415
msgid "Installing required packages failed."
msgstr "Installasjon av nødvendige pakker mislyktes."
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:421
+#: library/packages/src/modules/PackageSystem.rb:419
msgid ""
"Installing required packages failed. If you continue\n"
"without installing required packages,\n"
@@ -3655,12 +3527,12 @@
"kan det hende at YaST ikke fungerer riktig.\n"
#. error report
-#: library/packages/src/modules/PackageSystem.rb:432
+#: library/packages/src/modules/PackageSystem.rb:430
msgid "Cannot continue without installing required packages."
msgstr "Kan ikke fortsette konfigurasjonen uten at alle nødvendige pakker er installert."
#. continue/cancel popup
-#: library/packages/src/modules/PackageSystem.rb:437
+#: library/packages/src/modules/PackageSystem.rb:435
msgid ""
"If you continue without installing required \n"
"packages, YaST may not work properly.\n"
@@ -3669,22 +3541,22 @@
"installert, kan det hende at YaST ikke fungerer riktig.\n"
#. dialog heading, %1 is package name
-#: library/packages/src/modules/PackagesUI.rb:156
+#: library/packages/src/modules/PackagesUI.rb:152
msgid "Confirm Package License: %1"
msgstr "Bekreft pakkelisens: %1"
#. push button
-#: library/packages/src/modules/PackagesUI.rb:163
+#: library/packages/src/modules/PackagesUI.rb:159
msgid "I &Agree"
msgstr "&Godtar"
#. push button
-#: library/packages/src/modules/PackagesUI.rb:165
+#: library/packages/src/modules/PackagesUI.rb:161
msgid "I &Disagree"
msgstr "Godtar &ikke"
#. help text
-#: library/packages/src/modules/PackagesUI.rb:177
+#: library/packages/src/modules/PackagesUI.rb:173
msgid ""
"<p><b><big>License Confirmation</big></b><br>\n"
"The package in the headline of the dialog requires an explicit confirmation\n"
@@ -3703,7 +3575,7 @@
"For å avvise pakkelisensen, klikk <b>Godtar ikke</b></p>."
#. Help text for software patterns / selections dialog
-#: library/packages/src/modules/PackagesUI.rb:347
+#: library/packages/src/modules/PackagesUI.rb:326
msgid ""
"<p>\n"
"\t\t This dialog allows you to define this system's tasks and what software to install.\n"
@@ -3717,7 +3589,7 @@
"\t\t fordelt på kategorier. Velg et element i listen for å vise en beskrivelse.\n"
"\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:354
+#: library/packages/src/modules/PackagesUI.rb:333
msgid ""
"<p>\n"
"\t\t Change the status of an item by clicking its status icon\n"
@@ -3731,7 +3603,7 @@
"\t\t Du kan også endre status for alle elementer i hurtigmenyen.\n"
"\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:361
+#: library/packages/src/modules/PackagesUI.rb:340
msgid ""
"<p>\n"
"\t\t <b>Details</b> opens the detailed software package selection\n"
@@ -3743,7 +3615,7 @@
"\t\t Her kan du vise og velge individuelle programvarepakker.\n"
"\t\t </p>"
-#: library/packages/src/modules/PackagesUI.rb:367
+#: library/packages/src/modules/PackagesUI.rb:346
msgid ""
"<p>\n"
"\t\t The disk usage display in the lower right corner shows the remaining disk space\n"
@@ -3763,134 +3635,134 @@
#. Dialog title
#. Hint for German translation: "Softwareauswahl und Einsatzzweck des Systems"
-#: library/packages/src/modules/PackagesUI.rb:388
+#: library/packages/src/modules/PackagesUI.rb:367
msgid "Software Selection and System Tasks"
msgstr "Programvareutvalg og systemoppgaver"
#. don't get all the way out - the user might just have
#. been scared of the gory details.
-#: library/packages/src/modules/PackagesUI.rb:429
+#: library/packages/src/modules/PackagesUI.rb:408
msgid "(more)"
msgstr "(flere)"
-#: library/packages/src/modules/PackagesUI.rb:445
+#: library/packages/src/modules/PackagesUI.rb:424
msgid "Installation Successfully Finished"
msgstr "Installasjonen er fullført"
-#: library/packages/src/modules/PackagesUI.rb:447
+#: library/packages/src/modules/PackagesUI.rb:426
msgid "Package Installation Failed"
msgstr "Pakkeinstallasjonen mislyktes"
-#: library/packages/src/modules/PackagesUI.rb:459
+#: library/packages/src/modules/PackagesUI.rb:438
msgid "Error Message: %1"
msgstr "Feilmelding: %1"
-#: library/packages/src/modules/PackagesUI.rb:476
+#: library/packages/src/modules/PackagesUI.rb:455
msgid "Failed Packages: %1"
msgstr "Pakker som ikke kunne installeres: %1"
-#: library/packages/src/modules/PackagesUI.rb:495
+#: library/packages/src/modules/PackagesUI.rb:474
msgid "Installed Packages: %1"
msgstr "Installerte pakker: %1"
-#: library/packages/src/modules/PackagesUI.rb:514
+#: library/packages/src/modules/PackagesUI.rb:493
msgid "Updated Packages: %1"
msgstr "Oppdaterte pakker: %1"
-#: library/packages/src/modules/PackagesUI.rb:533
+#: library/packages/src/modules/PackagesUI.rb:512
msgid "Removed Packages: %1"
msgstr "Pakker som er fjernet: %1"
-#: library/packages/src/modules/PackagesUI.rb:555
+#: library/packages/src/modules/PackagesUI.rb:534
msgid "Not Installed Packages: %1"
msgstr "Ikke installerte pakker: %1"
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/PackagesUI.rb:571
-#: library/packages/src/modules/SlideShow.rb:534
+#: library/packages/src/modules/PackagesUI.rb:550
+#: library/packages/src/modules/SlideShow.rb:533
msgid "Packages"
msgstr "Pakker"
#. reset the items list
-#: library/packages/src/modules/PackagesUI.rb:582
+#: library/packages/src/modules/PackagesUI.rb:561
msgid "Elapsed Time: %1"
msgstr "Brukt tid: %1"
-#: library/packages/src/modules/PackagesUI.rb:592
+#: library/packages/src/modules/PackagesUI.rb:571
msgid "Total Installed Size: %1"
msgstr "Samlet installert størrelse: %1"
-#: library/packages/src/modules/PackagesUI.rb:602
+#: library/packages/src/modules/PackagesUI.rb:581
msgid "Total Downloaded Size: %1"
msgstr "Samlet nedlastingsstørrelse: %1"
-#: library/packages/src/modules/PackagesUI.rb:611
+#: library/packages/src/modules/PackagesUI.rb:590
msgid "Statistics"
msgstr "Statistikk"
#. display installation log
-#: library/packages/src/modules/PackagesUI.rb:624
-#: library/packages/src/modules/PackagesUI.rb:712
+#: library/packages/src/modules/PackagesUI.rb:603
+#: library/packages/src/modules/PackagesUI.rb:691
msgid "Installation log"
msgstr "Installasjonslogg"
-#: library/packages/src/modules/PackagesUI.rb:631
+#: library/packages/src/modules/PackagesUI.rb:610
msgid "Details"
msgstr "Detaljer"
#. open a new wizard dialog if needed
-#: library/packages/src/modules/PackagesUI.rb:679
+#: library/packages/src/modules/PackagesUI.rb:658
#, fuzzy
#| msgid "Installing Package"
msgid "After Installing Packages"
msgstr "Installerer pakke"
-#: library/packages/src/modules/PackagesUI.rb:680
+#: library/packages/src/modules/PackagesUI.rb:659
msgid "Show This Report"
msgstr ""
-#: library/packages/src/modules/PackagesUI.rb:681
+#: library/packages/src/modules/PackagesUI.rb:660
#, fuzzy
#| msgid "&Finish"
msgid "Finish"
msgstr "&Fullfør"
-#: library/packages/src/modules/PackagesUI.rb:682
+#: library/packages/src/modules/PackagesUI.rb:661
#, fuzzy
#| msgid "Accessing the Software Management Failed"
msgid "Continue in the Software Manager"
msgstr "Feil ved tilgang til pakkebehandler"
-#: library/packages/src/modules/PackagesUI.rb:687
+#: library/packages/src/modules/PackagesUI.rb:666
#, fuzzy
#| msgid "<P><BIG><B>Installation Summary</B></BIG><BR>Here is a summary of installed packages.</P>"
msgid "<P><BIG><B>Installation Report</B></BIG><BR>Here is a summary of installed or removed packages.</P>"
msgstr "<P><BIG><B>Installasjonssammendrag</B></BIG><BR>Dette er en oversikt over installerte pakker.</P>"
-#: library/packages/src/modules/PackagesUI.rb:695
+#: library/packages/src/modules/PackagesUI.rb:674
#, fuzzy
#| msgid "Installation Error"
msgid "Installation Report"
msgstr "Installasjonsfeil"
-#: library/packages/src/modules/PackagesUI.rb:717
+#: library/packages/src/modules/PackagesUI.rb:696
msgid "Installed Packages"
msgstr "Installerte pakker"
-#: library/packages/src/modules/PackagesUI.rb:722
+#: library/packages/src/modules/PackagesUI.rb:701
msgid "Updated Packages"
msgstr "Oppdaterte pakker"
-#: library/packages/src/modules/PackagesUI.rb:727
+#: library/packages/src/modules/PackagesUI.rb:706
msgid "Removed Packages"
msgstr "Pakker som er fjernet"
-#: library/packages/src/modules/PackagesUI.rb:732
+#: library/packages/src/modules/PackagesUI.rb:711
msgid "Remaining Packages"
msgstr "Beholdte pakker"
#. disabling installation report dialog, inform the user how to enable it back
-#: library/packages/src/modules/PackagesUI.rb:753
+#: library/packages/src/modules/PackagesUI.rb:732
msgid ""
"If you want to show this report dialog again edit\n"
"\n"
@@ -4317,84 +4189,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:153
-#: library/packages/src/modules/SlideShow.rb:324
-#: library/packages/src/modules/SlideShow.rb:345
+#: library/packages/src/modules/SlideShow.rb:323
+#: library/packages/src/modules/SlideShow.rb:344
msgid "Installing..."
msgstr "Installerer..."
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:530
+#: library/packages/src/modules/SlideShow.rb:529
msgid "Media"
msgstr "Medium"
#. Table headings for CD statistics during installation - keep as short as possible!
-#: library/packages/src/modules/SlideShow.rb:532
+#: library/packages/src/modules/SlideShow.rb:531
#, fuzzy
#| msgid "Remaining Packages"
msgid "Remaining"
msgstr "Beholdte pakker"
#. Table headings for CD statistics during installation
-#: library/packages/src/modules/SlideShow.rb:536
+#: library/packages/src/modules/SlideShow.rb:535
msgid "Time"
msgstr "Tid"
#. Construct widgets for the "details" page
#.
#. @return A term describing the widgets
-#: library/packages/src/modules/SlideShow.rb:552
+#: library/packages/src/modules/SlideShow.rb:551
msgid "Actions performed:"
msgstr "Utførte handlinger:"
#. Help text while software packages are being installed (displayed only in rare cases)
-#: library/packages/src/modules/SlideShow.rb:634
+#: library/packages/src/modules/SlideShow.rb:633
msgid "<p>Packages are being installed.</p>"
msgstr "<p>Pakkene installeres.</p>"
-#: library/packages/src/modules/SlideShow.rb:635
+#: library/packages/src/modules/SlideShow.rb:634
msgid "<P><B>Aborting Installation</B> Package installation can be aborted using the <B>Abort</B> button. However, the system then can be in an inconsistent or unusable state or it may not boot if the basic system component is not installed.</P>"
msgstr "<P><B>Avbryte installasjon</B> Pakkeinstallasjonen kan avbrytes med <B>Avbryt</B>-knappen. Men hvis ikke alle grunnleggende systemkomponenter er installert ennå, kan det hende at systemet blir inkonsistent, ubrukelig eller ikke kan startes.</P>"
#. Translators: Tab name, keep short, %s is product name, e.g. SLES
-#: library/packages/src/modules/SlideShow.rb:653
+#: library/packages/src/modules/SlideShow.rb:652
#, fuzzy
#| msgid "Release &Notes"
msgid "%s Release Notes"
msgstr "Versjonsmerk&nader"
#. tab
-#: library/packages/src/modules/SlideShow.rb:665
+#: library/packages/src/modules/SlideShow.rb:664
msgid "Slide Sho&w"
msgstr "Lysbildepresentasjo&n"
#. tab
-#: library/packages/src/modules/SlideShow.rb:667
+#: library/packages/src/modules/SlideShow.rb:666
msgid "&Details"
msgstr "&Detaljert"
#. Dialog heading - software packages are being upgraded
-#: library/packages/src/modules/SlideShow.rb:706
+#: library/packages/src/modules/SlideShow.rb:705
#, fuzzy
#| msgid "Perform Update"
msgid "Performing Upgrade"
msgstr "Utfør oppgradering"
#. Dialog heading - software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:709
+#: library/packages/src/modules/SlideShow.rb:708
#, fuzzy
#| msgid "Perform Installation"
msgid "Performing Installation"
msgstr "Utfør installasjon"
#. Dialog heading while software packages are being installed
-#: library/packages/src/modules/SlideShow.rb:744
+#: library/packages/src/modules/SlideShow.rb:743
msgid "Package Installation"
msgstr "Pakkeinstallasjon"
#. popup yes-no
-#: library/packages/src/modules/SlideShow.rb:816
+#: library/packages/src/modules/SlideShow.rb:815
msgid ""
"Do you really want\n"
"to quit the installation?"
@@ -4403,7 +4275,7 @@
"avslutte installasjonen?"
#. Mode::update (), Stage::cont ()
-#: library/packages/src/modules/SlideShow.rb:828
+#: library/packages/src/modules/SlideShow.rb:827
msgid "Aborted"
msgstr "Avbrutt"
@@ -4998,16 +4870,6 @@
msgid "Bluetooth device"
msgstr "Bluetooth-enhet"
-#. 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
msgid ""
@@ -5097,7 +4959,7 @@
"heksadesimalsiffer adskilt av kolon."
#. Translators: dot: ".", hyphen: "-"
-#: library/types/src/modules/Hostname.rb:56
+#: library/types/src/modules/Hostname.rb:55
msgid ""
"A valid domain name consists of components separated by dots.\n"
"Each component contains letters, digits, and hyphens. A hyphen may not\n"
@@ -5108,7 +4970,7 @@
"innlede eller avslutte et komponentnavn, og det siste komponentnavnet kan ikke begynne med et tall."
#. Translators: hyphen: "-"
-#: library/types/src/modules/Hostname.rb:67
+#: library/types/src/modules/Hostname.rb:66
msgid ""
"A valid host name consists of letters, digits, and hyphens.\n"
"A host name may not begin or end with a hyphen.\n"
@@ -6064,6 +5926,68 @@
"Det er ikke noen baklengs sone for %1 som administreres av DNS-serveren.\n"
"Vertsnavnet %2 kan ikke legges til."
+#: src/lib/ui/srv_status_component.rb:60
+#, fuzzy
+#| msgid "Service Start"
+msgid "Service Status"
+msgstr "Start av tjeneste"
+
+#. Content for the help
+#: src/lib/ui/srv_status_component.rb:114
+msgid ""
+"<p><b><big>Current status</big></b><br>\n"
+"Displays the current status of the service. The status will remain the same after saving the settings, independently of the value of 'start service during boot'.</p>\n"
+"<p><b><big>Reload After Saving Settings</big></b><br>\n"
+"Only applicable if the service is currently running. Ensures the running service reloads the new configuration after saving it (via 'ok' or 'save' buttons).</p>\n"
+"<p><b><big>Start During System Boot</big></b><br>\n"
+"Check this field to enable the service at system boot. Un-check it to disable the service. This does not affect the current status of the service in the already running system.</p>\n"
+msgstr ""
+
+#. Widget displaying the status and associated buttons
+#: src/lib/ui/srv_status_component.rb:181
+msgid "Current status:"
+msgstr "Gjeldende status:"
+
+#. Widget to configure the status on boot
+#: src/lib/ui/srv_status_component.rb:194
+#, fuzzy
+#| msgid "Operating System Boot"
+msgid "Start During System Boot"
+msgstr "Oppstart av operativsystem"
+
+#. Widget to configure reloading of the running service
+#: src/lib/ui/srv_status_component.rb:208
+#, fuzzy
+#| msgid "Read Other Settings."
+msgid "Reload After Saving Settings"
+msgstr "Les andre innstillinger."
+
+#. TRANSLATORS: status of a service
+#: src/lib/ui/srv_status_component.rb:218
+#, fuzzy
+#| msgid "Warning"
+msgid "running"
+msgstr "Advarsel"
+
+#: src/lib/ui/srv_status_component.rb:220
+#, fuzzy
+#| msgid "S&top now ..."
+msgid "Stop now"
+msgstr "S&topp nå ..."
+
+#. TRANSLATORS: status of a service
+#: src/lib/ui/srv_status_component.rb:225
+#, fuzzy
+#| msgid "Stopped"
+msgid "stopped"
+msgstr "Stoppet"
+
+#: src/lib/ui/srv_status_component.rb:227
+#, fuzzy
+#| msgid "Start it now?"
+msgid "Start now"
+msgstr "Start den nå?"
+
#~ msgid "The correct repository medium could not be mounted."
#~ msgstr "Korrekt pakkebrønnmedium kunne ikke monteres."
Modified: branches/plus-SLE12-SP2/yast/nb/po/bootloader.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/bootloader.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/bootloader.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: bootloader\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2009-09-25 13:51+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -37,157 +37,53 @@
#. command line help text for delete action
#: src/clients/bootloader.rb:58
-msgid "Delete a global option or option of a section"
-msgstr "Slett et generelt alternativ eller et seksjonsalternativ"
+#, fuzzy
+#| msgid "Set a global option"
+msgid "Delete a global option"
+msgstr "Definer et globalt alternativ"
#. command line help text for set action
#: src/clients/bootloader.rb:65
-msgid "Set a global option or option of a section"
-msgstr "Definer et generelt alternativ eller seksjonsalternativ"
+msgid "Set a global option"
+msgstr "Definer et globalt alternativ"
-#. command line help text for add action
-#: src/clients/bootloader.rb:72
-msgid "Add a new section - please use interactive mode"
-msgstr "Legg til en ny seksjon - bruk interaktiv modus"
-
#. command line help text for print action
-#: src/clients/bootloader.rb:82
+#: src/clients/bootloader.rb:75
msgid "Print value of specified option"
msgstr "Skriv ut verdien for det spesifiserte alternativet"
#. command line help text for an option
-#: src/clients/bootloader.rb:90
-msgid "The name of the section"
-msgstr "Seksjonens navn"
-
-#. command line help text for an option
-#: src/clients/bootloader.rb:97
+#: src/clients/bootloader.rb:83
msgid "The key of the option"
msgstr "Alternativets kode"
#. command line help text for an option
-#: src/clients/bootloader.rb:104
+#: src/clients/bootloader.rb:90
msgid "The value of the option"
msgstr "Alternativets verdi"
-#. 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
-msgid "Section %1 not found."
-msgstr "Seksjonen %1 ikke funnet."
-
#. command line error report
-#: src/clients/bootloader.rb:201
+#: src/clients/bootloader.rb:152
msgid "Value was not specified."
msgstr "Ingen verdi 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
-msgid "Add option is available only in commandline interactive mode"
-msgstr "Legg til-valget er kun tilgjengelig i interaktiv kommandolinjemodus"
-
#. command line error report
-#: src/clients/bootloader.rb:245
-msgid "Section name must be specified."
-msgstr "Et seksjonsnavn må spesifiseres."
-
-#. command line error report
-#: src/clients/bootloader.rb:265
+#: src/clients/bootloader.rb:174
msgid "Option was not specified."
msgstr "Alternativ ikke spesifisert."
+#. command line, %1 is the value of bootloader option
+#: src/clients/bootloader.rb:180
+#, fuzzy
+#| msgid "Value: %1"
+msgid "Value: %s"
+msgstr "Verdi: %1"
+
#. command line error report
-#: src/clients/bootloader.rb:284
+#: src/clients/bootloader.rb:183
msgid "Specified option does not exist."
msgstr "Det spesifiserte alternativet finnes ikke."
-#. command line, %1 is the value of bootloader option
-#: src/clients/bootloader.rb:287
-msgid "Value: %1"
-msgstr "Verdi: %1"
-
-#. progress step title
-#: src/clients/bootloader_finish.rb:52
-msgid "Saving bootloader configuration..."
-msgstr "Lagrer 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%2\n"
-#| "For details, read the related chapter \n"
-#| "in the documentation. \n"
-msgid ""
-"\n"
-"Your system will now shut down.%1\n"
-"For details, read the related chapter \n"
-"in the documentation. \n"
-msgstr ""
-"\n"
-"Systemet vil bli slått av.%1%2\n"
-"Du finner mer informasjon i det aktuelle kapittelet \n"
-"i dokumentasjonen. \n"
-
-#. 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
-msgid "The system will reboot now..."
-msgstr "Maskinen vil bli startet på nytt nå..."
-
-#. warning text in the summary richtext
-#: src/clients/bootloader_proposal.rb:116
-msgid "No boot loader is selected for installation. Your system might not be bootable."
-msgstr "Ingen oppstartslaster er valgt for installasjon. Systemet vil kanskje ikke kunne startes opp."
-
-#. error in the proposal
-#: src/clients/bootloader_proposal.rb:126
-msgid "Because of the partitioning, the bootloader cannot be installed properly"
-msgstr "Oppstartslasteren kan ikke installeres riktig med denne partisjoneringen"
-
-#. proposal part - bootloader label
-#: src/clients/bootloader_proposal.rb:225
-msgid "Booting"
-msgstr "Oppstart"
-
-#. menubutton entry
-#: src/clients/bootloader_proposal.rb:227
-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
-msgid "Disk Order"
-msgstr "Diskrekkefølge"
-
-#: src/include/bootloader/grub/dialogs.rb:50
-#: src/include/bootloader/grub2/dialogs.rb:230
-msgid "Disk order settings"
-msgstr "Innstillinger fir diskrekkefølge"
-
-#. Run dialog for loader installation details on i386
-#. @return [Symbol] for wizard sequencer
-#: src/include/bootloader/grub/dialogs.rb:68
-msgid "Boot Menu"
-msgstr "Oppstartsmeny"
-
-#. `VSpacing(1),
-#. Window title
-#: src/include/bootloader/grub/dialogs.rb:106
-#: src/include/bootloader/grub2/dialogs.rb:143
-msgid "Boot Loader Options"
-msgstr "Alternativer for oppstartslaster"
-
#. encoding: utf-8
#. File:
#. include/bootloader/grup/helps.ycp
@@ -275,21 +171,13 @@
#: src/include/bootloader/grub/helps.rb:47
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>Velg <b>Bruk pålitelig Grub</b> for å installere og bruke pålitelig Grub. Valget <i>Grafisk menyfil</i> vil bli ignorert.\n"
-"Det anbefales å installere Grub i MBR</p>"
-
-#: src/include/bootloader/grub/helps.rb:50
-msgid ""
"<p><b>Boot from Master Boot Record</b> is not recommended if you have another operating system\n"
"installed on your computer</p>"
msgstr ""
"<p><b>Start fra hovedoppstartssektor</b> anbefales ikke hvis du har et annet operativsystem\n"
"installert på datamaskinen</p>"
-#: src/include/bootloader/grub/helps.rb:53
+#: src/include/bootloader/grub/helps.rb:50
msgid ""
"<p><b>Boot from Root Partition</b> is the recommended option whenever there is a suitable\n"
"partition. Either select <b>Set active Flag in Partition Table for Boot Partition</b> and <b>Write generic Boot Code to MBR</b>\n"
@@ -301,17 +189,17 @@
" i <b>Oppstartslastervalg</b> for å oppdatere \"master boot record\" hvis det er nødvendig, eller konfigurere den andre oppstartslasteren\n"
" til å starte denne seksjonen.</p>"
-#: src/include/bootloader/grub/helps.rb:59
+#: src/include/bootloader/grub/helps.rb:56
msgid ""
"<p><b>Boot from Extended Partition</b> should be selected if your root partition is on \n"
"logical partition and the /boot partition is missing</p>"
msgstr ""
-#: src/include/bootloader/grub/helps.rb:62
+#: src/include/bootloader/grub/helps.rb:59
msgid "<p><b>Custom Boot Partition</b> lets you choose a partition to boot from.</p>"
msgstr "<p>Med <b>Egendefinert oppstartspartisjon</b> kan du velge hvilken partisjon du vil starte fra.</p>"
-#: src/include/bootloader/grub/helps.rb:65
+#: src/include/bootloader/grub/helps.rb:62
msgid ""
"<p>MD array is build from 2 disks. <b>Enable Redundancy for MD Array</b>\n"
"enable to write GRUB to MBR of both disks.</p>"
@@ -319,18 +207,29 @@
"<p>MD-tilordning opprettes fra 2 disker. <b>Aktiver redundans for MD-tilordning</b>\n"
"aktiver lagring av GRUB i MBR på begge disker.</p>"
-#: src/include/bootloader/grub/helps.rb:68
+#: src/include/bootloader/grub/helps.rb:65
+#, fuzzy
+#| msgid ""
+#| "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
+#| "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
msgid ""
"<p><b>Use Serial Console</b> lets you define the parameters to use\n"
-"for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
+"for a serial console. Please see the grub documentation (<code>info grub2</code>) for details.</p>"
msgstr ""
"<p>Med <b>Bruk seriell konsoll</b> kan du definere parametere som skal brukes\n"
"for en seriell konsoll. Du finner mer informasjon i grub-dokumentasjonen (<code>info grub</code>).</p>"
-#: src/include/bootloader/grub/helps.rb:71
+#: src/include/bootloader/grub/helps.rb:68
+#, fuzzy
+#| msgid ""
+#| "<p><b>Terminal Definition</b></p><br>\n"
+#| "Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n"
+#| "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n"
+#| "command, as <code>serial console</code>. In this case, a terminal in which you\n"
+#| "press any key will be selected as a GRUB terminal.</p>"
msgid ""
"<p><b>Terminal Definition</b></p><br>\n"
-"Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n"
+"Defines the type of terminal you want to use. For a serial terminal (e.g. a serial console),\n"
"you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n"
"command, as <code>serial console</code>. In this case, a terminal in which you\n"
"press any key will be selected as a GRUB terminal.</p>"
@@ -341,7 +240,7 @@
" kommandoen, som <code>seriell konsoll</code>. I dette tilfellet vil det bli valgt en terminal \n"
"der du kan trykke en hvilken som helst tast, som GRUB-terminal.</p>"
-#: src/include/bootloader/grub/helps.rb:78
+#: src/include/bootloader/grub/helps.rb:75
msgid ""
"<p><b>Fallback Sections if default Fails</b> contains a list of section numbers\n"
"that will be used for booting in case the default section is unbootable.</p>"
@@ -349,30 +248,26 @@
"<p><b>Reserveseksjoner hvis standard mislykkes</b> inneholder en liste med numre \n"
"på seksjoner som blir brukt til oppstart hvis filsystemet i standardseksjonen ikke kan startes.</p>"
-#: src/include/bootloader/grub/helps.rb:81
+#: src/include/bootloader/grub/helps.rb:78
msgid "<p>Selecting <b>Hide Menu on Boot</b> will hide the boot menu.</p>"
msgstr "<p>Hvis du velger <b>Skjul meny ved oppstart</b>, skjules oppstartsmenyen.</p>"
-#: src/include/bootloader/grub/helps.rb:84
-msgid "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>"
-msgstr "<p><b>Fil for grafisk meny</b> definerere filen som skal brukes til den grafiske oppstartsmenyen.</p>"
-
-#: src/include/bootloader/grub/helps.rb:87
-msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>"
-msgstr "<p><b>Aktiver lydsignaler</b> slå på/av lydsignaler.</p>"
-
-#: src/include/bootloader/grub/helps.rb:90
+#: src/include/bootloader/grub/helps.rb:81
+#, fuzzy
+#| msgid ""
+#| "<p><b>Protect Boot Loader with Password</b><br>\n"
+#| "Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n"
+#| "it in <b>Retype Password</b>.</p>"
msgid ""
"<p><b>Protect Boot Loader with Password</b><br>\n"
-"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>"
+"At boot time, modifying or even booting any entry will require the password. If <b>Protect Entry Modification Only</b> is checked then booting any entry is not restricted but modifying entries requires the password (which is the way GRUB 1 behaved).<br>YaST will only accept the password if you repeat it in <b>Retype Password</b>.</p>"
msgstr ""
"<p><b>Passord for oppstartslaster</b><br>\n"
"Angi passordet som må brukes for å få tilgang til oppstartsmenyen. YaST godkjenner bare passordet når du gjentar det i\n"
" <b>Gjenta passordet</b>.</p>"
#. help text 1/5
-#: src/include/bootloader/grub/helps.rb:97
+#: src/include/bootloader/grub/helps.rb:91
msgid ""
"<p><big><b>Disks Order</b></big><br>\n"
"To specify the order of the disks according to the order in BIOS, use\n"
@@ -386,197 +281,125 @@
"Bruk <b>Legg til</b> for å legge til en disk.\n"
"Bruk <b>Fjern</b> for å fjerne en disk.</p>"
-#: src/include/bootloader/grub/helps.rb:108
+#: src/include/bootloader/grub/helps.rb:101
msgid "Boot Loader Locations"
msgstr "Plassering av oppstartslaster"
-#: src/include/bootloader/grub/helps.rb:109
+#: src/include/bootloader/grub/helps.rb:102
msgid "Set &active Flag in Partition Table for Boot Partition"
msgstr "Angi oppstartspartisjonen som &aktiv i partisjonstabellen"
-#: src/include/bootloader/grub/helps.rb:112
-#: src/include/bootloader/routines/common_helps.rb:29
+#: src/include/bootloader/grub/helps.rb:105
+#: src/include/bootloader/routines/common_helps.rb:28
msgid "&Timeout in Seconds"
msgstr "&Tidsavbrudd i sekunder"
-#: src/include/bootloader/grub/helps.rb:113
+#: src/include/bootloader/grub/helps.rb:106
msgid "&Default Boot Section"
msgstr "Standar&d oppstartsseksjon"
-#: src/include/bootloader/grub/helps.rb:114
+#: src/include/bootloader/grub/helps.rb:107
msgid "Write &generic Boot Code to MBR"
msgstr "Skriv &generisk oppstartskode til MBR"
-#: src/include/bootloader/grub/helps.rb:115
-msgid "Use &Trusted Grub"
-msgstr "Bruk påli&telig Grub"
-
-#: src/include/bootloader/grub/helps.rb:116
+#: src/include/bootloader/grub/helps.rb:108
msgid "Custom Boot Partition"
msgstr "Egendefinert oppstartspartisjon"
-#: src/include/bootloader/grub/helps.rb:117
+#: src/include/bootloader/grub/helps.rb:109
msgid "Boot from Master Boot Record"
msgstr "Start fra hovedoppstartssektor"
-#: src/include/bootloader/grub/helps.rb:118
+#: src/include/bootloader/grub/helps.rb:110
msgid "Boot from Root Partition"
msgstr "Start fra rotpartisjon"
-#: src/include/bootloader/grub/helps.rb:119
+#: src/include/bootloader/grub/helps.rb:111
msgid "Boot from Boot Partition"
msgstr "Start fra oppstartspartisjon"
-#: src/include/bootloader/grub/helps.rb:120
+#: src/include/bootloader/grub/helps.rb:112
msgid "Boot from Extended Partition"
msgstr "Start fra utvidet partisjon"
-#: src/include/bootloader/grub/helps.rb:121
+#: src/include/bootloader/grub/helps.rb:113
msgid "Serial Connection &Parameters"
msgstr "&Parametere for seriell tilkobling"
-#: src/include/bootloader/grub/helps.rb:122
+#: src/include/bootloader/grub/helps.rb:114
msgid "Fallback Sections if Default fails"
msgstr "Reserveseksjoner hvis standard mislykkes"
-#: src/include/bootloader/grub/helps.rb:123
+#: src/include/bootloader/grub/helps.rb:115
msgid "&Hide Menu on Boot"
msgstr "&Skjul meny ved oppstart"
-#: src/include/bootloader/grub/helps.rb:124
-msgid "Graphical &Menu File"
-msgstr "Fil for grafisk &meny"
-
-#: src/include/bootloader/grub/helps.rb:125
+#: src/include/bootloader/grub/helps.rb:116
msgid "Pa&ssword for the Menu Interface"
msgstr "Pa&ssord for menygrensesnitt"
-#: src/include/bootloader/grub/helps.rb:126
+#: src/include/bootloader/grub/helps.rb:117
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
-msgid "Choose new graphical menu file"
-msgstr "Velg ny fil for grafisk meny"
-
-#. `Left(`CheckBox(`id(`enable_acoustic_signals), _("Enable Acoustic &Signals"))),
-#: src/include/bootloader/grub/options.rb:129
-msgid "Enable Acoustic &Signals"
-msgstr "Aktiver lyd&signaler"
-
#. 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:254
+#: src/include/bootloader/grub/options.rb:73
msgid "Prot&ect Boot Loader with Password"
msgstr "B&eskytt oppstartslasteren med et passord"
+#. TRANSLATORS: checkbox entry
+#: src/include/bootloader/grub/options.rb:79
+msgid "P&rotect Entry Modification Only"
+msgstr ""
+
#. text entry
-#: src/include/bootloader/grub/options.rb:259
+#: src/include/bootloader/grub/options.rb:85
msgid "&Password"
msgstr "&Passord"
#. text entry
-#: src/include/bootloader/grub/options.rb:262
+#: src/include/bootloader/grub/options.rb:88
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
-msgid "Use &serial console"
-msgstr "Bruk &seriell konsoll"
-
-#: src/include/bootloader/grub/options.rb:366
-#: src/include/bootloader/grub2/options.rb:302
-msgid "&Console arguments"
-msgstr "&Konsollargumenter"
-
-#. textentry header
-#: src/include/bootloader/grub/options.rb:455
-msgid "&Device"
-msgstr "&Enhet"
-
-#. disabling & enabling up/down, do it after change
-#: src/include/bootloader/grub/options.rb:534
-msgid "Device map must contain at least one device"
-msgstr "Enhetskartet må inneholde minst én enhet"
-
-#: src/include/bootloader/grub/options.rb:543
-msgid "D&isks"
-msgstr "D&isker"
-
-#: src/include/bootloader/grub/options.rb:555
-msgid "&Up"
-msgstr "&Opp"
-
-#: src/include/bootloader/grub/options.rb:556
-msgid "&Down"
-msgstr "&Ned"
-
#. Create Frame "Boot Loader Location"
#.
#. @return [Yast::Term] with widgets
-#: src/include/bootloader/grub/options.rb:730
+#: src/include/bootloader/grub/options.rb:222
msgid "Boot from &Root Partition"
msgstr "Start fra &rotpartisjon"
-#: src/include/bootloader/grub/options.rb:731
+#: src/include/bootloader/grub/options.rb:224
msgid "Boo&t from Boot Partition"
msgstr "Star&t fra oppstartspartisjon"
-#: src/include/bootloader/grub/options.rb:739
-#: src/include/bootloader/grub/options.rb:766
-#: src/include/bootloader/grub/options.rb:801
+#: src/include/bootloader/grub/options.rb:235
+msgid "C&ustom Boot Partition"
+msgstr "E&gendefinert oppstartspartisjon"
+
+#: src/include/bootloader/grub/options.rb:250
+#: src/include/bootloader/grub/options.rb:280
+#: src/include/bootloader/grub/options.rb:301
msgid "Boot Loader Location"
msgstr "Oppstartslasterens plassering"
-#: src/include/bootloader/grub/options.rb:745
-#: src/include/bootloader/grub/options.rb:772
-#: src/include/bootloader/grub/options.rb:807
+#: src/include/bootloader/grub/options.rb:256
+#: src/include/bootloader/grub/options.rb:286
+#: src/include/bootloader/grub/options.rb:307
msgid "Boot from &Master Boot Record"
msgstr "Start fra &Master Boot Record"
-#: src/include/bootloader/grub/options.rb:752
+#: src/include/bootloader/grub/options.rb:263
msgid "Boot from &Extended Partition"
msgstr "Start fra utvid&et partisjon"
-#: src/include/bootloader/grub/options.rb:778
-#: src/include/bootloader/grub/options.rb:819
-msgid "C&ustom Boot Partition"
-msgstr "E&gendefinert oppstartspartisjon"
-
-#: src/include/bootloader/grub/options.rb:812
+#: src/include/bootloader/grub/options.rb:312
msgid "Enable Red&undancy for MD Array"
msgstr "Aktiver red&undans for MD-tilordning"
-#. push button
-#. push button
-#: src/include/bootloader/grub/options.rb:871
-#: src/include/bootloader/routines/global_widgets.rb:831
-msgid "Boot Loader Installation &Details"
-msgstr "&Informasjon om oppstartslasterinstallasjon"
-
#. Title in tab
#: src/include/bootloader/grub2/dialogs.rb:57
#, fuzzy
@@ -585,36 +408,41 @@
msgstr "Alternativer for oppstartslaster"
#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:82
+#: src/include/bootloader/grub2/dialogs.rb:84
#, fuzzy
#| msgid "Other Kernel &Parameters"
msgid "Kernel Parameters"
msgstr "Andre kjerne¶metere"
#. Title in tab
-#: src/include/bootloader/grub2/dialogs.rb:102
+#: src/include/bootloader/grub2/dialogs.rb:103
#, fuzzy
#| msgid "Boot Loader Options"
msgid "Bootloader Options"
msgstr "Alternativer for oppstartslaster"
-#: src/include/bootloader/grub2/dialogs.rb:183
+#. Window title
+#: src/include/bootloader/grub2/dialogs.rb:149
+msgid "Boot Loader Options"
+msgstr "Alternativer for oppstartslaster"
+
+#: src/include/bootloader/grub2/dialogs.rb:190
msgid "Secure Boot"
msgstr "Sikker oppstart"
-#: src/include/bootloader/grub2/dialogs.rb:189
+#: src/include/bootloader/grub2/dialogs.rb:196
msgid "Enable &Secure Boot Support"
msgstr "Aktiver støtte for &sikker oppstart"
#. TRANSLATORS: place where boot code is installed
-#: src/include/bootloader/grub2/dialogs.rb:262
+#: src/include/bootloader/grub2/dialogs.rb:247
#, fuzzy
#| msgid "Boot Loader Location"
msgid "Boot &Loader Location"
msgstr "Oppstartslasterens plassering"
#. help text
-#: src/include/bootloader/grub2/dialogs.rb:281
+#: src/include/bootloader/grub2/dialogs.rb:266
msgid "Choose partition where is boot sequence installed."
msgstr ""
@@ -633,56 +461,34 @@
#.
#. $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
msgid "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>"
msgstr "<p>Med <b>Andre kommandolinjeparametere for kjernen</b> kan du definere tilleggsparametere som skal sendes til kjernen.</p>"
#: src/include/bootloader/grub2/helps.rb:26
-#: src/include/bootloader/routines/section_helps.rb:30
msgid "<p><b>Vga Mode</b> defines the VGA mode the kernel should set the <i>console</i> to when booting.</p>"
msgstr "<p><b>VGA-modus</b> definerer VGA-modusen for <i>konsollen</i> kjernen skal stille inn ved oppstart.</p>"
#: src/include/bootloader/grub2/helps.rb:29
-msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>"
-msgstr "<p>Med <b>Feilsikre kommandolinjeparametere</b> kan du definere feilsikre parametere som skal sendes 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 "<p>Velg <b>Søk etter andre OS</b> for å søke etter oppstartsalternativer som omfatter andre operativsystemer </p>"
-#: src/include/bootloader/grub2/helps.rb:35
+#: src/include/bootloader/grub2/helps.rb:32
msgid "<p><b>Protective MBR flag</b> is expert only settings, that is needed only on exotic hardware. For details see Protective MBR in GPT disks. Do not touch if you are not sure.</p>"
msgstr ""
#: src/include/bootloader/grub2/helps.rb:38
-msgid "<p><b>Distributor</b> specifies name of distributor of kernel used to create boot entry name. </p>"
-msgstr ""
-
-#: src/include/bootloader/grub2/helps.rb:44
-#: src/include/bootloader/routines/section_helps.rb:99
msgid "O&ptional Kernel Command Line Parameter"
msgstr "Andre kommandolinje¶metere for kjernen"
-#: src/include/bootloader/grub2/helps.rb:45
-#, fuzzy
-#| msgid "Distribution:"
-msgid "D&istributor"
-msgstr "Distribusjon:"
-
-#: src/include/bootloader/grub2/helps.rb:46
-#: src/include/bootloader/routines/section_helps.rb:98
+#: src/include/bootloader/grub2/helps.rb:39
msgid "&Vga Mode"
msgstr "&VGA-modus"
-#: src/include/bootloader/grub2/helps.rb:47
-msgid "&Failsafe Kernel Command Line Parameter"
-msgstr "&Feilsikker kommandolinjeparameter for kjerne"
-
-#: src/include/bootloader/grub2/helps.rb:48
+#: src/include/bootloader/grub2/helps.rb:40
msgid "Probe Foreign OS"
msgstr "Søk etter andre OS"
-#: src/include/bootloader/grub2/helps.rb:49
+#: src/include/bootloader/grub2/helps.rb:41
msgid "Protective MBR flag"
msgstr ""
@@ -691,30 +497,20 @@
#. %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
msgid "%1x%2, %3 bits (mode %4)"
msgstr "%1x%2, %3 bits (modus %4)"
#: src/include/bootloader/grub2/options.rb:68
-#: src/include/bootloader/routines/section_widgets.rb:537
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
msgid "Unspecified"
msgstr "Uspesifisert"
@@ -739,223 +535,70 @@
#. Init function for console
#. @param [String] widget
-#: src/include/bootloader/grub2/options.rb:174
+#: src/include/bootloader/grub2/options.rb:173
msgid "Autodetect by grub2"
msgstr "Automatisk søk med grub2"
#. FATE: #110038: Serial console
#. add or remove console key with value for sections
-#: src/include/bootloader/grub2/options.rb:249
+#: src/include/bootloader/grub2/options.rb:246
msgid "Choose new graphical theme file"
msgstr "Velg ny fil for grafisk tema"
-#: src/include/bootloader/grub2/options.rb:261
+#: src/include/bootloader/grub2/options.rb:258
msgid "Use &graphical console"
msgstr "Bruk &grafisk konsoll"
-#: src/include/bootloader/grub2/options.rb:268
+#: src/include/bootloader/grub2/options.rb:265
msgid "&Console resolution"
msgstr "&Konsolloppløsning"
-#: src/include/bootloader/grub2/options.rb:276
+#: src/include/bootloader/grub2/options.rb:273
msgid "&Console theme"
msgstr "&Konsolltema"
-#. FIXME this should be better handled by exception and show it properly, but it require too big change now
-#: src/include/bootloader/routines/autoinstall.rb:169
+#: src/include/bootloader/grub2/options.rb:292
+msgid "Use &serial console"
+msgstr "Bruk &seriell konsoll"
+
+#: src/include/bootloader/grub2/options.rb:299
+msgid "&Console arguments"
+msgstr "&Konsollargumenter"
+
+#. FIXME: this should be better handled by exception and show it properly, but it require too big change now
+#: src/include/bootloader/routines/autoinstall.rb:131
msgid "Unsupported bootloader '%s'. Adapt your AutoYaST profile accordingly."
msgstr ""
#. file open popup caption
-#. 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
+#: src/include/bootloader/routines/common_options.rb:98
msgid "Select File"
msgstr "Velg 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:90 src/modules/Bootloader.rb:270
+#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:239
msgid "The boot partition is of type NFS. Bootloader cannot be installed."
msgstr "Oppstartspartisjonen er av typen NFS. Oppstartslasteren kan ikke installeres."
#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:131
+#: src/include/bootloader/routines/dialogs.rb:114
msgid "Boot Loader Settings"
msgstr "Oppstartslasterinnstillinger"
#. message
-#: src/include/bootloader/routines/dialogs.rb:159
+#: src/include/bootloader/routines/dialogs.rb:142
msgid "There are no options to set for the current boot loader."
msgstr "Ingen tilgjengelige valg for denne oppstartslasteren."
-#. heading
-#. heading
-#. heading
-#: src/include/bootloader/routines/dialogs.rb:177
-#: src/include/bootloader/routines/dialogs.rb:255
-#: src/include/bootloader/routines/dialogs.rb:325
-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
-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
-msgid "Boot Loader Settings: Section Management"
-msgstr "Oppstartslasterinnstillinger: Administrasjon av seksjoner"
-
-#. 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
-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
-msgid "Menu Section"
-msgstr "Meny-seksjon"
-
-#. heading
-#. radio button
-#: src/include/bootloader/routines/dialogs.rb:516
-#: src/include/bootloader/routines/section_widgets.rb:593
-msgid "Dump Section"
-msgstr "Dumpseksjon"
-
-#. label
-#. label
-#: src/include/bootloader/routines/dialogs.rb:573
-#: src/include/bootloader/routines/dialogs.rb:628
-msgid "Other System Section"
-msgstr "Annen systemseksjon"
-
-#. combobox label
-#: src/include/bootloader/routines/dialogs.rb:803
-msgid "&Filename"
-msgstr "&Filnavn"
-
-#. label. %1 is name of file (eg. /etc/lilo.conf
-#: src/include/bootloader/routines/dialogs.rb:811
-msgid "Filename: %1"
-msgstr "Filnavn: %1"
-
-#. multiline edit header
-#: src/include/bootloader/routines/dialogs.rb:828
-msgid "Fi&le Contents"
-msgstr "Fi&linnhold"
-
-#. dialog caption
-#: src/include/bootloader/routines/dialogs.rb:836
-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
-msgid "Other"
-msgstr "Annet"
-
-#: src/include/bootloader/routines/global_widgets.rb:116
-msgid "Image"
-msgstr "Diskbilde"
-
-#: src/include/bootloader/routines/global_widgets.rb:134
-msgid "Xen"
-msgstr "Xen"
-
-#: src/include/bootloader/routines/global_widgets.rb:152
-msgid "Floppy"
-msgstr "Diskett"
-
-#: src/include/bootloader/routines/global_widgets.rb:154
-msgid "Menu"
-msgstr "Meny"
-
-#: src/include/bootloader/routines/global_widgets.rb:161
-msgid "Dump"
-msgstr "Dump"
-
-#. table header, Def stands for default
-#: src/include/bootloader/routines/global_widgets.rb:255
-msgid "Def."
-msgstr "Def."
-
-#. table header
-#: src/include/bootloader/routines/global_widgets.rb:257
-msgid "Label"
-msgstr "Betegnelse"
-
-#. table header
-#: src/include/bootloader/routines/global_widgets.rb:259
-#: src/include/bootloader/routines/global_widgets.rb:746
-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
-msgid "Image / Device"
-msgstr "Diskbilde / Enhet"
-
-#: src/include/bootloader/routines/global_widgets.rb:271
-msgid "Set as De&fault"
-msgstr "Definer som st&andard"
-
#. combo box
-#: src/include/bootloader/routines/global_widgets.rb:312
+#: src/include/bootloader/routines/global_widgets.rb:109
msgid "&Boot Loader"
msgstr "&Oppstartslaster"
#. popup - Continue/Cancel
-#: src/include/bootloader/routines/global_widgets.rb:343
+#: src/include/bootloader/routines/global_widgets.rb:138
msgid ""
"\n"
"If you do not install any boot loader, the system\n"
@@ -969,116 +612,66 @@
"\n"
"Vil du fortsette?\n"
-#. warning - popup, followed by radio buttons
-#: src/include/bootloader/routines/global_widgets.rb:377
-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 valgte å endre oppstartslasteren. Under konvertering \n"
-"av konfigurasjonen kan noen innstillinger gå tapt.\n"
-"\n"
-"Gjeldende konfigurasjon vil bli lagret, og du kan\n"
-"gjenopprette den hvis du går tilbake til gjeldende oppstartslaster.\n"
-"\n"
-"Velg hva du vil gjøre:\n"
+#. menu button entry
+#: src/include/bootloader/routines/global_widgets.rb:175
+msgid "E&dit Configuration Files"
+msgstr "&Rediger konfigurasjonsfiler"
-#. radiobutton
#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:399
-#: src/include/bootloader/routines/global_widgets.rb:593
+#: src/include/bootloader/routines/global_widgets.rb:182
msgid "&Propose New Configuration"
msgstr "&Foreslå ny konfigurasjon"
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:406
-msgid "Co&nvert Current Configuration"
-msgstr "Ko&nverter gjeldende konfigurasjon"
-
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:415
-msgid "&Start New Configuration from Scratch"
-msgstr "&Lag helt ny konfigurasjon"
-
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:423
-msgid "&Read Configuration Saved on Disk"
-msgstr "&Les konfigurasjon som er lagret på disk"
-
-#. radiobutton
-#: src/include/bootloader/routines/global_widgets.rb:433
-msgid "Res&tore Configuration Saved before Conversion"
-msgstr "Gjen&opprett konfigurasjon som ble lagret før konvertering"
-
-#. popup message
-#: src/include/bootloader/routines/global_widgets.rb:514
-msgid "Select the boot loader before editing sections."
-msgstr "Velg en oppstartslaster før du redigerer seksjoner."
-
-#. pushbutton
-#. menu button entry
-#: src/include/bootloader/routines/global_widgets.rb:563
-#: src/include/bootloader/routines/global_widgets.rb:586
-msgid "E&dit Configuration Files"
-msgstr "&Rediger konfigurasjonsfiler"
-
#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:600
+#: src/include/bootloader/routines/global_widgets.rb:189
msgid "&Start from Scratch"
msgstr "&Lag helt ny"
#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:608
+#: src/include/bootloader/routines/global_widgets.rb:197
msgid "&Reread Configuration from Disk"
msgstr "&Bruk konfigurasjon fra disk"
#. menubutton item, keep as short as possible
-#: src/include/bootloader/routines/global_widgets.rb:625
+#: src/include/bootloader/routines/global_widgets.rb:214
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:633
+#: src/include/bootloader/routines/global_widgets.rb:222
msgid "Write bootloader boot code to disk"
msgstr "Skriv oppstartskode for oppstartslaster til disk"
+#. menu button
+#: src/include/bootloader/routines/global_widgets.rb:230
+msgid "Other"
+msgstr "Annet"
+
#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:665
+#: src/include/bootloader/routines/global_widgets.rb:254
msgid "MBR restored successfully."
msgstr "MBR gjenopprettet."
#. message popup
-#: src/include/bootloader/routines/global_widgets.rb:668
+#: src/include/bootloader/routines/global_widgets.rb:257
msgid "Failed to restore MBR."
msgstr "MBR kunne ikke gjenopprettes."
#. Bootloader::blSave (false, false, false);
-#: src/include/bootloader/routines/global_widgets.rb:691
+#: src/include/bootloader/routines/global_widgets.rb:280
msgid "Writing bootloader settings failed."
msgstr "Oppstartslasterinnstillingene kunne ikke lagres."
-#. tab header
-#: src/include/bootloader/routines/global_widgets.rb:730
-msgid "&Section Management"
-msgstr "Administrasjon av &seksjoner"
-
-#. tab header
-#: src/include/bootloader/routines/global_widgets.rb:740
-msgid "Boot Loader &Installation"
-msgstr "&Installasjon av oppstartslaster"
-
#. push button
-#: src/include/bootloader/routines/global_widgets.rb:818
+#: src/include/bootloader/routines/global_widgets.rb:329
msgid "Boot &Loader Options"
msgstr "Oppstarts&lastervalg"
+#. push button
+#: src/include/bootloader/routines/global_widgets.rb:342
+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
msgid ""
@@ -1097,18 +690,9 @@
"<P><B><BIG>Lagrer konfigurasjon for oppstartslaster </BIG></B><BR>\n"
"Vent...<br></p>"
-#. help text, optional part of following
+#. help text 1/2 (%1 may be following sentence, optionally empty)
#: src/include/bootloader/routines/helps.rb:52
msgid ""
-"If you have multiple Linux systems installed,\n"
-"YaST can try to find them and merge their menus."
-msgstr ""
-"Hvis du har flere Linux-systemer installert,\n"
-"kan YaST forsøke å finne dem og slå sammen menyene."
-
-#. help text 1/2 (%1 may be following sentence, optionally empty)
-#: src/include/bootloader/routines/helps.rb:58
-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"
@@ -1120,7 +704,7 @@
"konfigurasjonen som er lagret på disken som utgangspunkt. %1</P>"
#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:73
+#: src/include/bootloader/routines/helps.rb:67
msgid ""
"<P>To edit boot loader configuration files\n"
"manually, click <B>Edit Configuration Files</B>.</P>"
@@ -1129,7 +713,7 @@
"manuelt, klikk <B>Rediger konfigurasjonsfiler</B>.</P>"
#. help 1/4
-#: src/include/bootloader/routines/helps.rb:83
+#: src/include/bootloader/routines/helps.rb:76
msgid ""
"<P> In the table, each section represents one item\n"
"in the boot menu.</P>"
@@ -1138,7 +722,7 @@
"i oppstartsmenyen.</P>"
#. help 2/4
-#: src/include/bootloader/routines/helps.rb:87
+#: src/include/bootloader/routines/helps.rb:80
msgid ""
"<P> Press <B>Edit</B> to display the properties of the\n"
"selected section.</P>"
@@ -1147,7 +731,7 @@
"valgte seksjonen.</P>"
#. help 3/4
-#: src/include/bootloader/routines/helps.rb:91
+#: src/include/bootloader/routines/helps.rb:84
msgid ""
"<P> By pressing <b>Set as Default</b>, mark the selected \n"
"section as default. When booting, the boot loader will provide \n"
@@ -1164,7 +748,7 @@
"kan endres ved å bruke <B>Opp</B>- og <B>Ned</B>knappene.</P>"
#. help 4/4
-#: src/include/bootloader/routines/helps.rb:100
+#: src/include/bootloader/routines/helps.rb:93
msgid ""
"<P>Press <B>Add</B> to create a new boot loader section\n"
"or <B>Delete</B> to delete the selected section.</P>"
@@ -1175,7 +759,7 @@
#. 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:115
+#: src/include/bootloader/routines/helps.rb:107
msgid ""
"<p><big><b>Boot Loader Location</b></big><br>\n"
"The boot manager (%1) can be installed in the following ways:</p>"
@@ -1184,7 +768,7 @@
"Oppstartslasteren (%1) kan installeres på følgende måter:</p>"
#. custom bootloader help text, 2 of 7
-#: src/include/bootloader/routines/helps.rb:124
+#: src/include/bootloader/routines/helps.rb:116
msgid ""
"<p>- In the <b>Master Boot Record</b> (MBR).\n"
"This is not recommended if there is another operating system installed\n"
@@ -1195,7 +779,7 @@
"på datamaskinen.</p>"
#. custom bootloader help text, 3 of 7
-#: src/include/bootloader/routines/helps.rb:134
+#: src/include/bootloader/routines/helps.rb:126
msgid ""
"<p>\n"
"- In the <b>Boot Sector</b> of the <tt>/boot</tt> or <tt>/</tt> (root) \n"
@@ -1215,24 +799,8 @@
"hvis dette er nødvendig, eller konfigurer den andre oppstartslasteren\n"
"for å starte &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
-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å en <b>diskett</b>.\n"
-"Bruk dette valget for å unngå å påvirke et eksisterende\n"
-"oppstartssystem. Du må aktivere oppstart fra diskett i\n"
-"BIOS for å bruke dette valget.</p>"
-
#. custom bootloader help text, 5 of 7
-#: src/include/bootloader/routines/helps.rb:164
+#: src/include/bootloader/routines/helps.rb:141
msgid ""
"<p>\n"
"- In some <b>Other</b> partition. Consider your system's restrictions\n"
@@ -1243,7 +811,7 @@
"hvis du velger dette alternativet.</p>"
#. optional part, only inserted on x86 architectures. 6 of 7
-#: src/include/bootloader/routines/helps.rb:174
+#: src/include/bootloader/routines/helps.rb:151
msgid ""
"<p>For example, most PCs have a BIOS\n"
"limit that restricts booting to\n"
@@ -1256,7 +824,7 @@
"er det kanskje mulig å starte opp fra en logisk partisjon, og kanskje ikke.</p>"
#. custom bootloader help text, 7 of 7
-#: src/include/bootloader/routines/helps.rb:186
+#: src/include/bootloader/routines/helps.rb:163
msgid ""
"<p>\n"
"Enter the device name of the partition (for example, <tt>/dev/hda3</tt> or\n"
@@ -1267,7 +835,7 @@
"<tt>/dev/sdb</tt>) i feltet.</p>"
#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:199
+#: src/include/bootloader/routines/helps.rb:176
msgid ""
"<p><b>Boot Loader Installation Details</b><br>\n"
"To adjust advanced boot loader installation options (such as the device\n"
@@ -1278,7 +846,7 @@
"enhetsmapping) under <b>Informasjon om oppstartslasterinstallasjon</b>.</p>"
#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:210
+#: src/include/bootloader/routines/helps.rb:187
msgid ""
"<p><b>Boot Loader Type</b><br>\n"
"To select whether to install a boot loader and which bootloader to install,\n"
@@ -1289,7 +857,7 @@
"under <b>Oppstartslaster</b>.</p>"
#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:222
+#: src/include/bootloader/routines/helps.rb:198
msgid ""
"<p><b>Boot Loader Options</b><br>\n"
"To adjust options of the boot loader, such as the time-out, click\n"
@@ -1300,7 +868,7 @@
"<b>Oppstartslastervalg</b>.</p>"
#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:233
+#: src/include/bootloader/routines/helps.rb:209
msgid ""
"<P><B>Expert Manual Configuration</B><BR>\n"
"Here, manually edit the boot loader configuration.</P>\n"
@@ -1311,7 +879,7 @@
"<P>Merk: Den endelige konfigurasjonsfilen trenger ikke å ha samme tekstinnrykk.</P>"
#. help text 1/1
-#: src/include/bootloader/routines/helps.rb:244
+#: src/include/bootloader/routines/helps.rb:220
msgid ""
"<p><b>Section Name</b><br>\n"
"Use <b>Section Name</b> to specify the boot loader section name. The section\n"
@@ -1322,7 +890,7 @@
"må være unikt.</p>"
#. help text 1/5
-#: src/include/bootloader/routines/helps.rb:255
+#: src/include/bootloader/routines/helps.rb:231
msgid ""
"<p><big><b>Type of the New Section</b></big><br>\n"
"Select the type of the new section to create.</p>"
@@ -1331,7 +899,7 @@
"Velg hvilken ny seksjonstype som skal opprettes.</p>"
#. help text 2/5
-#: src/include/bootloader/routines/helps.rb:259
+#: src/include/bootloader/routines/helps.rb:235
msgid ""
"<p>Select <b>Clone Selected Section</b> to clone the currently selected\n"
"section. Then modify the options that should differ from the\n"
@@ -1342,7 +910,7 @@
"som skal være annerledes.</p>"
#. help text 3/5
-#: src/include/bootloader/routines/helps.rb:265
+#: src/include/bootloader/routines/helps.rb:241
msgid ""
"<p>Select <b>Image Section</b> to add a new Linux kernel or other image\n"
"to load and start.</p>"
@@ -1351,7 +919,7 @@
"som skal lastes og startes.</p>"
#. help text 4/5
-#: src/include/bootloader/routines/helps.rb:269
+#: src/include/bootloader/routines/helps.rb:245
msgid ""
"<p>Select <b>Xen Section</b> to add a new Linux kernel or other image,\n"
"but to start it in a Xen environment.</p>"
@@ -1360,7 +928,7 @@
"men starte den i et XEN-miljø.</p>"
#. help text 5/5
-#: src/include/bootloader/routines/helps.rb:273
+#: src/include/bootloader/routines/helps.rb:249
msgid ""
"<p>Select <b>Other System (Chainloader)</b> to add a section that \n"
"loads and starts a boot sector of a partition of the disk. This is used for\n"
@@ -1370,7 +938,7 @@
"skal laste og starte opp en oppstartssektor på en diskpartisjon. Dette valget benyttes for\n"
"å starte opp andre operativsystemer.</p>"
-#: src/include/bootloader/routines/helps.rb:278
+#: src/include/bootloader/routines/helps.rb:254
msgid ""
"<p>Select <b>Menu Section</b> to add a section that \n"
"loads configuration file (the list of boot sections) from a partition of the disk. This is used for\n"
@@ -1381,50 +949,40 @@
"å starte opp andre operativsystemer.</p>"
#. part of summary, %1 is a list of hard disks device names
-#: src/include/bootloader/routines/lilolike.rb:697
+#: src/include/bootloader/routines/lilolike.rb:108
msgid "Order of Hard Disks: %1"
msgstr "Harddiskrekkefølge: %1"
#. summary string
-#: src/include/bootloader/routines/misc.rb:48
+#: src/include/bootloader/routines/misc.rb:51
msgid "Do not install any boot loader"
msgstr "Ikke installer noen oppstartslaster"
#. combo box item
-#: src/include/bootloader/routines/misc.rb:50
+#: src/include/bootloader/routines/misc.rb:54
msgid "Do Not Install Any Boot Loader"
msgstr "Ikke installer noen oppstartslaster"
#. summary string
-#: src/include/bootloader/routines/misc.rb:55
+#: src/include/bootloader/routines/misc.rb:60
msgid "Install the default boot loader"
msgstr "Installer standard oppstartslaster"
#. combo box item
-#: src/include/bootloader/routines/misc.rb:57
+#: src/include/bootloader/routines/misc.rb:63
msgid "Install Default Boot Loader"
msgstr "Installer standard oppstartslaster"
#. summary string
-#: src/include/bootloader/routines/misc.rb:61
+#: src/include/bootloader/routines/misc.rb:68
msgid "Boot loader"
msgstr "Oppstartslaster"
#. combo box item
-#: src/include/bootloader/routines/misc.rb:63
+#: src/include/bootloader/routines/misc.rb:71
msgid "Boot Loader"
msgstr "Oppstartslaster"
-#. popup, %1 is bootloader name
-#: src/include/bootloader/routines/misc.rb:101
-msgid "The %1 boot sector has been written to the floppy disk."
-msgstr "%1-oppstartssektoren er lagret på disketten."
-
-#. popup - continuing
-#: src/include/bootloader/routines/misc.rb:113
-msgid "Leave the floppy disk in the drive."
-msgstr "La disketten stå i stasjonen."
-
#. popup message
#: src/include/bootloader/routines/popups.rb:35
msgid ""
@@ -1443,18 +1001,13 @@
"Er du sikker på at du vil avslutte konfigurasjonen av oppstartslasteren uten å lagre?\n"
"Alle endringer vil gå tapt.\n"
-#. yes-no popup question
-#: src/include/bootloader/routines/popups.rb:59
-msgid "Really delete section %1?"
-msgstr "Er du sikker på at du vil slette seksjonen %1?"
-
#. error popup
-#: src/include/bootloader/routines/popups.rb:65
+#: src/include/bootloader/routines/popups.rb:57
msgid "The password must not be empty."
msgstr "Passordfeltet må ikke være tomt."
#. error popup
-#: src/include/bootloader/routines/popups.rb:74
+#: src/include/bootloader/routines/popups.rb:66
msgid ""
"'Password' and 'Retype password'\n"
"do not match. Retype the password."
@@ -1462,81 +1015,15 @@
"'Passord og Bekreft passord'\n"
"samsvarte ikke. Skriv inn passordet på nytt."
-#. message popup, %1 is sectino label
-#: src/include/bootloader/routines/popups.rb:88
-msgid ""
-"The disk settings have changed.\n"
-"Check section %1 settings.\n"
-msgstr ""
-"Diskinnstillingene er endret.\n"
-"Kontroller innstillingene for seksjonen %1.\n"
-
-#. message popup
-#: src/include/bootloader/routines/popups.rb:100
-msgid ""
-"The disk settings have changed and you edited boot loader\n"
-"configuration files manually. Check the boot loader settings.\n"
-msgstr ""
-"Diskinnstillingene er endret, og du har endret oppstartslasterens\n"
-"konfigurasjonsfiler manuelt. Kontroller oppstartslasteren innstillinger.\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:116
+#: src/include/bootloader/routines/popups.rb:82
msgid "%1Set default boot loader location?\n"
msgstr "%1Definer oppstartslasterens plassering?\n"
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:128
-msgid "Do Not Create a File System"
-msgstr "Ikke opprett noe filsystem"
-
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:130
-msgid "Create an ext2 File System"
-msgstr "Opprett et ext2-filsystem"
-
-#. combobox item
-#: src/include/bootloader/routines/popups.rb:136
-msgid "Create a FAT File System"
-msgstr "Opprett et FAT-filsystem"
-
-#. label
-#: src/include/bootloader/routines/popups.rb:142
-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 bli lagret\n"
-"på en diskett. Sett inn en diskett\n"
-"og bekreft med OK.\n"
-
-#. checkbox
-#: src/include/bootloader/routines/popups.rb:150
-msgid "&Low Level Format"
-msgstr "&Lavnivåformater"
-
-#. combobox
-#: src/include/bootloader/routines/popups.rb:153
-msgid "&Create File System"
-msgstr "&Opprett filsystem"
-
-#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:182
-msgid "Low level format failed. Try again?"
-msgstr "Lavnivåformatering mislyktes. Vil du prøve igjen?"
-
-#. error report
-#. error report
-#: src/include/bootloader/routines/popups.rb:195
-#: src/include/bootloader/routines/popups.rb:207
-msgid "Creating file system failed."
-msgstr "Oppretting av filsystem mislyktes."
-
#. error popup
-#: src/include/bootloader/routines/popups.rb:218
+#: src/include/bootloader/routines/popups.rb:90
msgid ""
"The name selected is already used.\n"
"Use a different one.\n"
@@ -1545,7 +1032,7 @@
"Velg et annet.\n"
#. yes-no popup
-#: src/include/bootloader/routines/popups.rb:229
+#: src/include/bootloader/routines/popups.rb:101
msgid ""
"An error occurred during boot loader\n"
"installation. Retry boot loader configuration?\n"
@@ -1553,14 +1040,9 @@
"En feil oppstod under installasjon av\n"
"oppstartslasteren. Vil du forsøke å konfigurere oppstartslasteren på nytt?\n"
-#. FIXME too generic, but was already translated
-#: src/include/bootloader/routines/popups.rb:241
-msgid "Unable to install the boot loader."
-msgstr "Kan ikke installere oppstartslasteren."
-
#. warning popup. %1 is device name, %2 is date/time in form of
#. 'date' command output
-#: src/include/bootloader/routines/popups.rb:283
+#: src/include/bootloader/routines/popups.rb:125
msgid ""
"Warning!\n"
"\n"
@@ -1583,606 +1065,785 @@
"Vil du fortsette?\n"
#. PushButton
-#: src/include/bootloader/routines/popups.rb:305
+#: src/include/bootloader/routines/popups.rb:147
msgid "&Yes, Rewrite"
msgstr "&Ja, overskriv"
-#. 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
-msgid "<p><b>Image Section</b></p>"
-msgstr "<p><b>Diskbilde-seksjon</b></p>"
+#. error report
+#: src/include/bootloader/routines/wizards.rb:36
+msgid "Because of the partitioning, the boot loader cannot be installed properly."
+msgstr "Oppstartslasteren kan ikke installeres riktig med denne partisjoneringen."
-#: src/include/bootloader/routines/section_helps.rb:24
-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 startes. Skriv inn navnet direkte, eller velg en kjerne med <b>Bla gjennom.</b></p>"
+#. Represents dialog for modification of device map
+#: src/lib/bootloader/device_map_dialog.rb:53
+msgid "Device map must contain at least one device"
+msgstr "Enhetskartet må inneholde minst én enhet"
-#: src/include/bootloader/routines/section_helps.rb:27
-msgid "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"
-msgstr "<p><b>Rotenhet</b> angir enheten som skal sendes til kjernen som rotenhet.</p>"
+#. we just go back to original dialog
+#: src/lib/bootloader/device_map_dialog.rb:96
+msgid "Disk order settings"
+msgstr "Innstillinger fir diskrekkefølge"
-#: src/include/bootloader/routines/section_helps.rb:36
-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, hvis utfylt, hvilken RAM-disk som skal brukes først. Skriv inn stien og filnavnet\n"
-"direkte, eller velg en disk ved hjelp av <b>Bla gjennom</b>.</p>\n"
+#: src/lib/bootloader/device_map_dialog.rb:101
+msgid "D&isks"
+msgstr "D&isker"
-#: src/include/bootloader/routines/section_helps.rb:39
-msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>"
-msgstr "<p>Velg <b>Chainloader-seksjon</b> hvis du vil definere en seksjon for å starte et annet operativsystem enn Linux.</p>"
+#. textentry header
+#: src/lib/bootloader/device_map_dialog.rb:146
+msgid "&Device"
+msgstr "&Enhet"
-#: src/include/bootloader/routines/section_helps.rb:42
-msgid "<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>"
-msgstr "<p>Hvis du angir <b>Bruk passordbeskyttelse</p>, vil det kreves et passord for å velge denne seksjonen.</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:45
-msgid "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>"
-msgstr "<p>Med <b>Annet system</b> kan du velge blant de andre operativsystemene (ikke Linux) på datamaskinen.</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:48
-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>Velg <b>Aktiver denne partisjonen når den er valgt for oppstart</b> hvis BIOSen trenger dette flagget for å starte den</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:51
-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"
+#. TRANSLATORS: %s stands for partition
+#: src/lib/bootloader/disk_change_detector.rb:47
+msgid "Selected custom bootloader partition %s is not available any more."
msgstr ""
-"<p>Med <b>Blokkforskyvning for chainloading</b> kan du angi listen over blokker som skal startes. I de fleste tilfeller bør du\n"
-"angi <code>+1</code> her. Du finner mer informasjon om blokklistenotasjon i grub-dokumentasjonen.</p>\n"
-#: src/include/bootloader/routines/section_helps.rb:54
-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"
+#. 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 ""
-"<p>Velg <b>Xen-seksjon</b> hvis du vil legge til en ny Linux-kjerne eller et annet diskbilde\n"
-"som skal startes i et Xen-miljø.</p>\n"
-#: src/include/bootloader/routines/section_helps.rb:57
-msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
-msgstr "<p><b>Hypervisor</b> angir hvilken hypervisor som skal brukes.</p>"
+#. Finish client for bootloader configuration
+#: src/lib/bootloader/finish_client.rb:28
+msgid "Saving bootloader configuration..."
+msgstr "Lagrer konfigurasjon for oppstartslaster..."
-#: src/include/bootloader/routines/section_helps.rb:60
-msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>"
-msgstr "<p>Med <b>Flere Xen Hypervisor-parametere</b> kan du du angi flere parametere som skal sendes til Xen Hypervisor.</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:63
-msgid "<p><b>Menu Section</b></p>"
-msgstr "<p><b>Meny-seksjon</b></p>"
-
-#: src/include/bootloader/routines/section_helps.rb:64
-msgid "<p><b>Partition of Menu File</b></p>"
-msgstr "<p><b>Partisjon for menyfil</b></p>"
-
-#: src/include/bootloader/routines/section_helps.rb:65
+#. TRANSLATORS: reboot message
+#. %1 is replaced with additional message from reIPL
+#: src/lib/bootloader/finish_client.rb:145
#, fuzzy
-#| msgid "<p><b>Menu Description File<b> specifies path on root device from which is loaded menu file.</p>"
-msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>"
-msgstr "<p><b>Menybeskrivelsesfil<b> angir adressen på rotenheten der menyfilen lastes fra.</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:68
-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å vanligvis ligge på første disk.</p>"
-
-#: src/include/bootloader/routines/section_helps.rb:71
+#| msgid ""
+#| "\n"
+#| "Your system will now shut down.%1%2\n"
+#| "For details, read the related chapter \n"
+#| "in the documentation. \n"
msgid ""
-"<p><b>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>"
+"\n"
+"Your system will now shut down.%1\n"
+"For details, read the related chapter \n"
+"in the documentation. \n"
msgstr ""
-"<p>Bruk <b>Måling</b> for å inkludere målte filer med PCR. Tabellen kan endres med knappen: <b>Legg til</b> , \n"
-"<b>Rediger</b> og <b>Slett</b></p>"
+"\n"
+"Systemet vil bli slått av.%1%2\n"
+"Du finner mer informasjon i det aktuelle kapittelet \n"
+"i dokumentasjonen. \n"
-#: src/include/bootloader/routines/section_helps.rb:74
-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"
-"Angis vanligvis i den generelle 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
+msgid "The system will reboot now..."
+msgstr "Maskinen vil bli startet på nytt nå..."
-#: src/include/bootloader/routines/section_helps.rb:77
-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"
-"Angis vanligvis i den globale seksjonen</p>"
+#. proposal part - bootloader label
+#: src/lib/bootloader/proposal_client.rb:94
+msgid "Booting"
+msgstr "Oppstart"
-#: src/include/bootloader/routines/section_helps.rb:80
-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>Velg<b>Dump seksjon</b> for å legge til en seksjon som definerer\n"
-"hvordan en systemdump skal opprettes på en DASD-diskpartisjon eller båndenhet\n"
-" eller en fil på en SCSI-diskpartisjon.</p>"
+#. menubutton entry
+#: src/lib/bootloader/proposal_client.rb:96
+msgid "&Booting"
+msgstr "&Oppstart"
-#: src/include/bootloader/routines/section_helps.rb:85
-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>Velg<b>Menyseksjon</b> for å legge til en meny i oppsettet.\n"
-"Menyseksjoner representerer en liste over oppgaver som er gruppert sammen</p>\n"
+#. warning text in the summary richtext
+#: src/lib/bootloader/proposal_client.rb:174
+msgid "No boot loader is selected for installation. Your system might not be bootable."
+msgstr "Ingen oppstartslaster er valgt for installasjon. Systemet vil kanskje ikke kunne startes opp."
-#: src/include/bootloader/routines/section_helps.rb:88
-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>Velg <b>Aktiver SELinux</b> for å legge til nødvendige oppstartsparametere for kjernen for å aktivere sikkerhetssystemet SELinux. \n"
-"Husk at dette også vil deaktivere AppArmor.</p>"
+#. error in the proposal
+#: src/lib/bootloader/proposal_client.rb:183
+msgid "Because of the partitioning, the bootloader cannot be installed properly"
+msgstr "Oppstartslasteren kan ikke installeres riktig med denne partisjoneringen"
-#. radio button
-#: src/include/bootloader/routines/section_helps.rb:95
-#: src/include/bootloader/routines/section_widgets.rb:583
-msgid "Image Section"
-msgstr "Diskbildeseksjon"
-
-#: src/include/bootloader/routines/section_helps.rb:96
-msgid "&Kernel Image"
-msgstr "&Kjernediskbilde"
-
-#: src/include/bootloader/routines/section_helps.rb:97
-msgid "&Root Device"
-msgstr "&Rotenhet"
-
-#: src/include/bootloader/routines/section_helps.rb:100
-msgid "&Initial RAM Disk"
-msgstr "&Første RAM-disk"
-
-#: src/include/bootloader/routines/section_helps.rb:101
-msgid "Chainloader Section"
-msgstr "Chainloader-seksjon"
-
-#: src/include/bootloader/routines/section_helps.rb:102
-msgid "Use Password Protection"
-msgstr "Bruk passordbeskyttelse"
-
-#: src/include/bootloader/routines/section_helps.rb:103
-msgid "&Other System"
-msgstr "&Annet system"
-
-#: src/include/bootloader/routines/section_helps.rb:104
-msgid "Do not &verify Filesystem before Booting"
-msgstr "Ikke &verifiser filsystem før oppstart"
-
-#: src/include/bootloader/routines/section_helps.rb:105
-msgid "&Activate this Partition when selected for Boot"
-msgstr "&Aktiver denne partisjonen når den er valgt for oppstart"
-
-#: src/include/bootloader/routines/section_helps.rb:106
-msgid "B&lock Offset for Chainloading"
-msgstr "B&lokkforskyvning for chainloading"
-
-#: src/include/bootloader/routines/section_helps.rb:107
-msgid "&Map Section to the First Disk in Device Map"
-msgstr "&Plasser seksjonen på første disk i enhetskartet"
-
-#: src/include/bootloader/routines/section_helps.rb:109
-msgid "&Hypervisor"
-msgstr "&Hypervisor"
-
-#: src/include/bootloader/routines/section_helps.rb:110
-msgid "&Additional Xen Hypervisor Parameters"
-msgstr "Flere p&arametere for Xen Hypervisor"
-
-#: src/include/bootloader/routines/section_helps.rb:112
-msgid "&Partition of Menu File"
-msgstr "&Partisjon for menyfil"
-
-#: src/include/bootloader/routines/section_helps.rb:113
-msgid "&Menu Description File"
-msgstr "Fil for &menybeskrivelse"
-
-#: src/include/bootloader/routines/section_helps.rb:114
-msgid "&Force root filesystem to be mounted read-only"
-msgstr "Bruk skrivebeskyttet montering av rot&filsystem"
-
-#: src/include/bootloader/routines/section_helps.rb:115
-msgid "Allow attempt to &relocate"
-msgstr "Tillat fo&rsøk på flytting"
-
-#: src/include/bootloader/routines/section_helps.rb:116
-msgid "Tar&get Directory for Section"
-msgstr "Målkatalo&g for seksjon"
-
-#: src/include/bootloader/routines/section_helps.rb:117
-msgid "Op&tional Parameter File"
-msgstr "Fil med al&ternative parametere"
-
-#: src/include/bootloader/routines/section_helps.rb:118
-msgid "Dump Section (obsolete)"
-msgstr "Dump-seksjon (foreldet)"
-
-#: src/include/bootloader/routines/section_helps.rb:119
-msgid "&Dump Device"
-msgstr "&Dumpenhet"
-
-#: src/include/bootloader/routines/section_helps.rb:120
-msgid "&SCSI Dump Device"
-msgstr "&SCSI-dumpenhet"
-
-#: src/include/bootloader/routines/section_helps.rb:122
-msgid "&List of Menu Entries"
-msgstr "&Liste over menyoppføringer"
-
-#: src/include/bootloader/routines/section_helps.rb:123
-msgid "&Number of Default Entry"
-msgstr "&Nummer på standardoppføring"
-
-#: src/include/bootloader/routines/section_helps.rb:124
-msgid "&Timeout in seconds"
-msgstr "&Tidsavbrudd i sekunder"
-
-#: src/include/bootloader/routines/section_helps.rb:125
-msgid "&Show boot menu"
-msgstr "Vis opp&startsmeny"
-
-#: src/include/bootloader/routines/section_helps.rb:126
-msgid "C&opy Image to Boot Partition"
-msgstr "K&opier diskbilde til oppstartspartisjon"
-
-#: src/include/bootloader/routines/section_helps.rb:127
-msgid "&Skip Section gracefully on Errors"
-msgstr "Hopp over &seksjonen uten melding ved feil"
-
-#: src/include/bootloader/routines/section_helps.rb:128
-msgid "Boot &Partition of Other System"
-msgstr "Oppstarts&partisjon for annet system"
-
-#. Cache for CommonSectionWidgets
-#: src/include/bootloader/routines/section_widgets.rb:58
-msgid "Image section must have specified kernel image"
-msgstr "Det må være angitt et kjernediskbilde for diskbildeseksjonen"
-
-#: src/include/bootloader/routines/section_widgets.rb:65
-msgid "Image file doesn't exist now. Do you really want use it?"
-msgstr "Diskbildefilen finnes foreløpig ikke. Vil du bruke den likevel?"
-
-#: src/include/bootloader/routines/section_widgets.rb:82
-msgid "Initrd file doesn't exist now. Do you really want use it?"
-msgstr "Initrd-filen finnes foreløpig ikke. Vil du bruke den likevel?"
-
-#. string append = BootCommon::current_section["append"]:"";
-#: src/include/bootloader/routines/section_widgets.rb:227
-msgid "Enable &SELinux"
-msgstr "Aktiver &SELinux"
-
-#. bnc#456362 filter out special chars like diacritics china chars etc.
-#: src/include/bootloader/routines/section_widgets.rb:401
-msgid "The name includes unallowable char(s)"
-msgstr "Navnet inneholder ugyldige tegn"
-
-#: src/include/bootloader/routines/section_widgets.rb:533
-msgid "Ask for resolution during boot."
-msgstr "Spør om oppløsning under oppstart."
-
-#. radio button
-#: src/include/bootloader/routines/section_widgets.rb:573
-msgid "Clone Selected Section"
-msgstr "Klon valgt seksjon"
-
-#. radio button (don't translate 'chainloader')
-#: src/include/bootloader/routines/section_widgets.rb:587
-msgid "Other System (Chainloader)"
-msgstr "Annet system (chainloader)"
-
-#. frame
-#: src/include/bootloader/routines/section_widgets.rb:609
-msgid "Section Type"
-msgstr "Seksjonstype"
-
-#. text entry
-#: src/include/bootloader/routines/section_widgets.rb:668
-msgid "Section &Name"
-msgstr "Seksjonens &navn"
-
-#. error report
-#: src/include/bootloader/routines/wizards.rb:36
-msgid "Because of the partitioning, the boot loader cannot be installed properly."
-msgstr "Oppstartslasteren kan ikke installeres riktig med denne partisjoneringen."
-
#. 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
+#: src/modules/BootGRUB2.rb:168
#, fuzzy
#| msgid "Boot from MBR is enabled (disable</a>"
msgid "Install bootcode into MBR (do not install</a>)"
msgstr "Oppstart fra MBR er aktivert (deaktiver</a>"
-#: src/modules/BootGRUB.rb:661 src/modules/BootGRUB2.rb:193
+#: src/modules/BootGRUB2.rb:172
#, fuzzy
#| msgid "Boot from MBR is disabled (enable</a>"
msgid "Do not install bootcode into MBR (install</a>)"
msgstr "Oppstart fra MBR er deaktivert (aktiver</a>"
#. 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
+#: src/modules/BootGRUB2.rb:185
#, fuzzy
#| msgid "Boot from /boot partition is enabled (disable</a>"
msgid "Install bootcode into /boot partition (do not install</a>)"
msgstr "Oppstart fra /boot-partisjon er aktivert (deaktiver</a>"
-#: src/modules/BootGRUB.rb:677 src/modules/BootGRUB2.rb:210
+#: src/modules/BootGRUB2.rb:189
#, fuzzy
#| msgid "Boot from /boot partition is disabled (enable</a>"
msgid "Do not install bootcode into /boot partition (install</a>)"
msgstr "Oppstart fra /boot-partisjon er deaktivert (aktiver</a>"
-#: src/modules/BootGRUB.rb:683 src/modules/BootGRUB2.rb:216
+#: src/modules/BootGRUB2.rb:195
#, fuzzy
#| msgid "Boot from \"/\" partition is enabled (disable</a>"
msgid "Install bootcode into \"/\" partition (do not install</a>)"
msgstr "Oppstart fra «/»-partisjon er aktivert (deaktiver</a>"
-#: src/modules/BootGRUB.rb:687 src/modules/BootGRUB2.rb:220
+#: src/modules/BootGRUB2.rb:199
#, fuzzy
#| msgid "Boot from \"/\" partition is disabled (enable</a>"
msgid "Do not install bootcode into \"/\" partition (install</a>)"
msgstr "Oppstart fra «/»-partisjon er deaktivert (aktiver</a>"
+#. no location chosen, so warn user that it is problem unless he is sure
+#: src/modules/BootGRUB2.rb:209
+msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
+msgstr ""
+
#. TRANSLATORS: title for list of location proposals
-#: src/modules/BootGRUB.rb:695 src/modules/BootGRUB2.rb:238
+#: src/modules/BootGRUB2.rb:217
#, fuzzy
#| msgid "Change Location: %1"
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
+#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100
msgid "Boot Loader Type: %1"
msgstr "Oppstartslastertype: %1"
-#. summary text, location is location description (eg. /dev/hda)
-#: src/modules/BootGRUB.rb:718
-msgid " (\"/boot\")"
-msgstr " («/boot»)"
-
#. TRANSLATORS: extended is here for extended partition. Keep translation short.
-#: src/modules/BootGRUB.rb:724 src/modules/BootGRUB2.rb:259
+#: src/modules/BootGRUB2.rb:237
msgid " (extended)"
msgstr " (utvidet)"
-#: src/modules/BootGRUB.rb:730
-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
+#: src/modules/BootGRUB2.rb:245
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
+#: src/modules/BootGRUB2.rb:252
msgid "Status Location: %1"
msgstr "Status for plassering: %1"
-#. section name "suffix" for default section
-#: src/modules/BootGRUB.rb:768
-msgid " (default)"
-msgstr " (standard)"
-
-#: src/modules/BootGRUB.rb:779
-msgid "Sections:<br>%1"
-msgstr "Seksjoner:<br>%1"
-
-#. summary text
-#: src/modules/BootGRUB.rb:788
-msgid "Do not install boot loader; just create configuration files"
-msgstr "Ikke installer oppstartslasteren - bare opprett konfigurasjonsfiler"
-
-#. menubutton item, keep as short as possible
-#: src/modules/BootGRUB.rb:919
-msgid "Propose and &Merge with Existing GRUB Menus"
-msgstr "Foreslå og &slå sammen med eksisterende GRUB-menyer"
-
-#. no location chosen, so warn user that it is problem unless he is sure
-#: src/modules/BootGRUB2.rb:230
-msgid "Warning: No location for bootloader stage1 selected.Unless you know what you are doing please select above location."
-msgstr ""
-
-#: src/modules/BootGRUB2EFI.rb:104
+#: src/modules/BootGRUB2EFI.rb:108
msgid "Enable Secure Boot: %1"
msgstr "Aktiver sikker oppstart: %1"
#. Check that bootloader is known and supported
-#: src/modules/BootSupportCheck.rb:70
+#: src/modules/BootSupportCheck.rb:65
msgid "Unknown bootloader: %1"
msgstr "Ukjent oppstartslaster: %1"
#. grub2 is sooo cool...
-#: src/modules/BootSupportCheck.rb:101
+#: src/modules/BootSupportCheck.rb:99
msgid "Unsupported combination of hardware platform %1 and bootloader %2"
msgstr "En kombinasjon av maskinvareplattformen %1 og oppstartslasteren %2 støttes ikke"
#. TRANSLATORS: description of technical problem. Do not translate technical terms unless native language have well known translation.
-#: src/modules/BootSupportCheck.rb:140
+#: src/modules/BootSupportCheck.rb:139
msgid "Boot from MBR does not work together with btrfs filesystem and GPT disk label without bios_grub partition.To fix this issue, create bios_grub partition or use any ext filesystem for boot partition or do not install stage 1 to MBR."
msgstr ""
#. check if boot device is on raid0
-#: src/modules/BootSupportCheck.rb:168
+#: src/modules/BootSupportCheck.rb:167
msgid "The boot device is on raid type: %1. System will not boot."
msgstr "Oppstartsenheten er på raid-typen: %1. Systemet vil ikke starte opp."
#. bnc#501043 added check for valid configuration
-#: src/modules/BootSupportCheck.rb:188
+#: src/modules/BootSupportCheck.rb:187
msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record"
msgstr "Oppstartsenheten er plassert på programvarebasert RAID1. Velg en annen plassering for oppstartslasteren, f.eks. Master Boot Record."
-#. s390 do not have bios boot order (bnc#874106)
-#: src/modules/BootSupportCheck.rb:243
-#, fuzzy
-#| msgid "It was not possible to determine the exact order of disks for device map. The order of disks can be changed in \"Boot Loader Installation Details\""
-msgid "YaST could not determine the exact boot order of disks needed for the device map. Review and possibly adjust the boot order of disks in \"Boot Loader Installation Details\""
-msgstr "Det var ikke mulig å definere den nøyaktige diskrekkefølgen for enhetskartet. Diskrekkefølgen kan endres under «Informasjon om oppstartslasterinstallasjon»"
-
#. if partitioning worked before upgrade, it will keep working (bnc#886604)
-#: src/modules/BootSupportCheck.rb:263
+#: src/modules/BootSupportCheck.rb:239
msgid "Missing ext partition for booting. Cannot install boot code."
msgstr ""
+#. 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:170
+#: src/modules/Bootloader.rb:146
msgid "Check boot loader"
msgstr "Kontroller oppstartslaster"
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:172
+#: src/modules/Bootloader.rb:148
msgid "Read partitioning"
msgstr "Les partisjonstabell"
#. progress stage, text in dialog (short, infinitiv)
-#: src/modules/Bootloader.rb:174
+#: src/modules/Bootloader.rb:150
msgid "Load boot loader settings"
msgstr "Last innstillinger for oppstartslaster"
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:178
+#: src/modules/Bootloader.rb:154
msgid "Checking boot loader..."
msgstr "Kontrollerer oppstartslaster..."
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:180
+#: src/modules/Bootloader.rb:156
msgid "Reading partitioning..."
msgstr "Leser partisjonstabell..."
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:182
+#: src/modules/Bootloader.rb:158
msgid "Loading boot loader settings..."
msgstr "Laster innstillinger for oppstartslaster..."
#. dialog header
-#: src/modules/Bootloader.rb:186
+#: src/modules/Bootloader.rb:162
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
-msgid "Added Kernel Parameters: %1"
-msgstr "Ekstra kjerneparametere: %1"
-
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:367
+#: src/modules/Bootloader.rb:281
msgid "Create initrd"
msgstr "Opprett initrd"
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:369
+#: src/modules/Bootloader.rb:283
msgid "Save boot loader configuration files"
msgstr "Lagre konfigurasjonsfiler for oppstartslaster"
#. progress stage, text in dialog (short)
-#: src/modules/Bootloader.rb:371
+#: src/modules/Bootloader.rb:285
msgid "Install boot loader"
msgstr "Installer oppstartslaster"
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:375
+#: src/modules/Bootloader.rb:289
msgid "Creating initrd..."
msgstr "Oppretter initrd..."
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:377
+#: src/modules/Bootloader.rb:291
msgid "Saving boot loader configuration files..."
msgstr "Lagrer konfigurasjonsfiler for oppstartslaster..."
#. progress step, text in dialog (short)
-#: src/modules/Bootloader.rb:379
+#: src/modules/Bootloader.rb:293
msgid "Installing boot loader..."
msgstr "Installerer oppstartslaster..."
#. progress line
-#: src/modules/Bootloader.rb:385
+#: src/modules/Bootloader.rb:299
msgid "Saving Boot Loader Configuration"
msgstr "Lagrer konfigurasjon for oppstartslaster"
#, fuzzy
-#~| msgid "Set a global option"
-#~ msgid "Delete a global option"
-#~ msgstr "Definer et globalt alternativ"
+#~| msgid "Distribution:"
+#~ msgid "D&istributor"
+#~ msgstr "Distribusjon:"
-#~ msgid "Set a global option"
-#~ msgstr "Definer et globalt alternativ"
+#~ msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>"
+#~ msgstr "<p>Med <b>Feilsikre kommandolinjeparametere</b> kan du definere feilsikre parametere som skal sendes til kjernen.</p>"
-#, fuzzy
-#~| msgid "Value: %1"
-#~ msgid "Value: %s"
-#~ msgstr "Verdi: %1"
+#~ msgid "&Failsafe Kernel Command Line Parameter"
+#~ msgstr "&Feilsikker kommandolinjeparameter for kjerne"
-#, fuzzy
-#~| msgid ""
-#~| "<p><b>Use Serial Console</b> lets you define the parameters to use\n"
-#~| "for a serial console. Please see the grub documentation (<code>info grub</code>) for details.</p>"
+#~ msgid "Delete a global option or option of a section"
+#~ msgstr "Slett et generelt alternativ eller et seksjonsalternativ"
+
+#~ msgid "Set a global option or option of a section"
+#~ msgstr "Definer et generelt alternativ eller seksjonsalternativ"
+
+#~ msgid "Add a new section - please use interactive mode"
+#~ msgstr "Legg til en ny seksjon - bruk interaktiv modus"
+
+#~ msgid "The name of the section"
+#~ msgstr "Seksjonens navn"
+
+#~ msgid "Section %1 not found."
+#~ msgstr "Seksjonen %1 ikke funnet."
+
+#~ msgid "Add option is available only in commandline interactive mode"
+#~ msgstr "Legg til-valget er kun tilgjengelig i interaktiv kommandolinjemodus"
+
+#~ msgid "Section name must be specified."
+#~ msgstr "Et seksjonsnavn må spesifiseres."
+
+#~ msgid "Disk Order"
+#~ msgstr "Diskrekkefølge"
+
+#~ msgid "Boot Menu"
+#~ msgstr "Oppstartsmeny"
+
#~ 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>"
+#~ "<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>Med <b>Bruk seriell konsoll</b> kan du definere parametere som skal brukes\n"
-#~ "for en seriell konsoll. Du finner mer informasjon i grub-dokumentasjonen (<code>info grub</code>).</p>"
+#~ "<p>Velg <b>Bruk pålitelig Grub</b> for å installere og bruke pålitelig Grub. Valget <i>Grafisk menyfil</i> vil bli ignorert.\n"
+#~ "Det anbefales å installere Grub i MBR</p>"
-#, fuzzy
-#~| msgid ""
-#~| "<p><b>Terminal Definition</b></p><br>\n"
-#~| "Defines the type of terminal you want to use. For a serial terminal (eg. a serial console),\n"
-#~| "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n"
-#~| "command, as <code>serial console</code>. In this case, a terminal in which you\n"
-#~| "press any key will be selected as a GRUB terminal.</p>"
+#~ msgid "<p><b>Graphical Menu File</b> defines the file to use for the graphical boot menu.</p>"
+#~ msgstr "<p><b>Fil for grafisk meny</b> definerere filen som skal brukes til den grafiske oppstartsmenyen.</p>"
+
+#~ msgid "<p><b>Enable Acoustic Signals</b> turn on/off acoustic signals.</p>"
+#~ msgstr "<p><b>Aktiver lydsignaler</b> slå på/av lydsignaler.</p>"
+
+#~ msgid "Use &Trusted Grub"
+#~ msgstr "Bruk påli&telig Grub"
+
+#~ msgid "Graphical &Menu File"
+#~ msgstr "Fil for grafisk &meny"
+
+#~ msgid "Choose new graphical menu file"
+#~ msgstr "Velg ny fil for grafisk meny"
+
+#~ msgid "Enable Acoustic &Signals"
+#~ msgstr "Aktiver lyd&signaler"
+
+#~ msgid "&Up"
+#~ msgstr "&Opp"
+
+#~ msgid "&Down"
+#~ msgstr "&Ned"
+
+#~ msgid "Kernel Section"
+#~ msgstr "Kjerneseksjon"
+
+#~ msgid "Section Settings"
+#~ msgstr "Seksjonsinnstillinger"
+
+#~ msgid "Boot Loader Settings: Section Management"
+#~ msgstr "Oppstartslasterinnstillinger: Administrasjon av seksjoner"
+
+#~ msgid "Xen Section"
+#~ msgstr "Xen-seksjon"
+
+#~ msgid "Menu Section"
+#~ msgstr "Meny-seksjon"
+
+#~ msgid "Dump Section"
+#~ msgstr "Dumpseksjon"
+
+#~ msgid "Other System Section"
+#~ msgstr "Annen systemseksjon"
+
+#~ msgid "&Filename"
+#~ msgstr "&Filnavn"
+
+#~ msgid "Filename: %1"
+#~ msgstr "Filnavn: %1"
+
+#~ msgid "Fi&le Contents"
+#~ msgstr "Fi&linnhold"
+
+#~ msgid "Expert Manual Configuration"
+#~ msgstr "Avansert manuell konfigurasjon"
+
+#~ msgid "Image"
+#~ msgstr "Diskbilde"
+
+#~ msgid "Xen"
+#~ msgstr "Xen"
+
+#~ msgid "Floppy"
+#~ msgstr "Diskett"
+
+#~ msgid "Menu"
+#~ msgstr "Meny"
+
+#~ msgid "Dump"
+#~ msgstr "Dump"
+
+#~ msgid "Def."
+#~ msgstr "Def."
+
+#~ msgid "Label"
+#~ msgstr "Betegnelse"
+
+#~ msgid "Type"
+#~ msgstr "Type"
+
+#~ msgid "Image / Device"
+#~ msgstr "Diskbilde / Enhet"
+
+#~ msgid "Set as De&fault"
+#~ msgstr "Definer som st&andard"
+
#~ msgid ""
-#~ "<p><b>Terminal Definition</b></p><br>\n"
-#~ "Defines the type of terminal you want to use. For a serial terminal (e.g. a serial console),\n"
-#~ "you have to specify <code>serial</code>. You can also pass <code>console</code> to the\n"
-#~ "command, as <code>serial console</code>. In this case, a terminal in which you\n"
-#~ "press any key will be selected as a GRUB terminal.</p>"
+#~ "\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 ""
-#~ "<p><b>Terminaldefinisjon</b></p><br>\n"
-#~ "Definerer typen terminal du vil bruke. For en seriell terminal (f.eks. en seriell konsoll),\n"
-#~ " må du angi <code>seriell</code>. Du kan også sende <code>konsoll</code> til\n"
-#~ " kommandoen, som <code>seriell konsoll</code>. I dette tilfellet vil det bli valgt en terminal \n"
-#~ "der du kan trykke en hvilken som helst tast, som GRUB-terminal.</p>"
+#~ "\n"
+#~ "Du valgte å endre oppstartslasteren. Under konvertering \n"
+#~ "av konfigurasjonen kan noen innstillinger gå tapt.\n"
+#~ "\n"
+#~ "Gjeldende konfigurasjon vil bli lagret, og du kan\n"
+#~ "gjenopprette den hvis du går tilbake til gjeldende oppstartslaster.\n"
+#~ "\n"
+#~ "Velg hva du vil gjøre:\n"
+#~ msgid "Co&nvert Current Configuration"
+#~ msgstr "Ko&nverter gjeldende konfigurasjon"
+
+#~ msgid "&Start New Configuration from Scratch"
+#~ msgstr "&Lag helt ny konfigurasjon"
+
+#~ msgid "&Read Configuration Saved on Disk"
+#~ msgstr "&Les konfigurasjon som er lagret på disk"
+
+#~ msgid "Res&tore Configuration Saved before Conversion"
+#~ msgstr "Gjen&opprett konfigurasjon som ble lagret før konvertering"
+
+#~ msgid "Select the boot loader before editing sections."
+#~ msgstr "Velg en oppstartslaster før du redigerer seksjoner."
+
+#~ msgid "&Section Management"
+#~ msgstr "Administrasjon av &seksjoner"
+
+#~ msgid "Boot Loader &Installation"
+#~ msgstr "&Installasjon av oppstartslaster"
+
+#~ msgid ""
+#~ "If you have multiple Linux systems installed,\n"
+#~ "YaST can try to find them and merge their menus."
+#~ msgstr ""
+#~ "Hvis du har flere Linux-systemer installert,\n"
+#~ "kan YaST forsøke å finne dem og slå sammen menyene."
+
+#~ 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å en <b>diskett</b>.\n"
+#~ "Bruk dette valget for å unngå å påvirke et eksisterende\n"
+#~ "oppstartssystem. Du må aktivere oppstart fra diskett i\n"
+#~ "BIOS for å bruke dette valget.</p>"
+
+#~ msgid "The %1 boot sector has been written to the floppy disk."
+#~ msgstr "%1-oppstartssektoren er lagret på disketten."
+
+#~ msgid "Leave the floppy disk in the drive."
+#~ msgstr "La disketten stå i stasjonen."
+
+#~ msgid "Really delete section %1?"
+#~ msgstr "Er du sikker på at du vil slette seksjonen %1?"
+
+#~ msgid ""
+#~ "The disk settings have changed.\n"
+#~ "Check section %1 settings.\n"
+#~ msgstr ""
+#~ "Diskinnstillingene er endret.\n"
+#~ "Kontroller innstillingene for seksjonen %1.\n"
+
+#~ msgid ""
+#~ "The disk settings have changed and you edited boot loader\n"
+#~ "configuration files manually. Check the boot loader settings.\n"
+#~ msgstr ""
+#~ "Diskinnstillingene er endret, og du har endret oppstartslasterens\n"
+#~ "konfigurasjonsfiler manuelt. Kontroller oppstartslasteren innstillinger.\n"
+
+#~ msgid "Do Not Create a File System"
+#~ msgstr "Ikke opprett noe filsystem"
+
+#~ msgid "Create an ext2 File System"
+#~ msgstr "Opprett et ext2-filsystem"
+
+#~ msgid "Create a FAT File System"
+#~ msgstr "Opprett et FAT-filsystem"
+
+#~ 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 bli lagret\n"
+#~ "på en diskett. Sett inn en diskett\n"
+#~ "og bekreft med OK.\n"
+
+#~ msgid "&Low Level Format"
+#~ msgstr "&Lavnivåformater"
+
+#~ msgid "&Create File System"
+#~ msgstr "&Opprett filsystem"
+
+#~ msgid "Low level format failed. Try again?"
+#~ msgstr "Lavnivåformatering mislyktes. Vil du prøve igjen?"
+
+#~ msgid "Creating file system failed."
+#~ msgstr "Oppretting av filsystem mislyktes."
+
+#~ msgid "Unable to install the boot loader."
+#~ msgstr "Kan ikke installere oppstartslasteren."
+
+#~ msgid "<p><b>Image Section</b></p>"
+#~ msgstr "<p><b>Diskbilde-seksjon</b></p>"
+
+#~ 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 startes. Skriv inn navnet direkte, eller velg en kjerne med <b>Bla gjennom.</b></p>"
+
+#~ msgid "<p><b>Root Device</b> sets the device to pass to the kernel as root device.</p>"
+#~ msgstr "<p><b>Rotenhet</b> angir enheten som skal sendes til kjernen som rotenhet.</p>"
+
+#~ 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, hvis utfylt, hvilken RAM-disk som skal brukes først. Skriv inn stien og filnavnet\n"
+#~ "direkte, eller velg en disk ved hjelp av <b>Bla gjennom</b>.</p>\n"
+
+#~ msgid "<p>Select <b>Chainloader Section</b> if you want to define a section for booting an OS other than Linux.</p>"
+#~ msgstr "<p>Velg <b>Chainloader-seksjon</b> hvis du vil definere en seksjon for å starte et annet operativsystem enn Linux.</p>"
+
+#~ msgid "<p>Setting <b>Use Password Protection</p> will require a password to select this section.</p>"
+#~ msgstr "<p>Hvis du angir <b>Bruk passordbeskyttelse</p>, vil det kreves et passord for å velge denne seksjonen.</p>"
+
+#~ msgid "<p><b>Other System</b> lets you choose among the non-Linux operating systems found on your computer.</p>"
+#~ msgstr "<p>Med <b>Annet system</b> kan du velge blant de andre operativsystemene (ikke Linux) på datamaskinen.</p>"
+
+#~ 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>Velg <b>Aktiver denne partisjonen når den er valgt for oppstart</b> hvis BIOSen trenger dette flagget for å starte den</p>"
+
+#~ 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 angi listen over blokker som skal startes. I de fleste tilfeller bør du\n"
+#~ "angi <code>+1</code> her. Du finner mer informasjon om blokklistenotasjon i grub-dokumentasjonen.</p>\n"
+
+#~ 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>Velg <b>Xen-seksjon</b> hvis du vil legge til en ny Linux-kjerne eller et annet diskbilde\n"
+#~ "som skal startes i et Xen-miljø.</p>\n"
+
+#~ msgid "<p><b>Hypervisor</b> specifies the Hypervisor to use.</p>"
+#~ msgstr "<p><b>Hypervisor</b> angir hvilken hypervisor som skal brukes.</p>"
+
+#~ msgid "<p><b>Additional Xen Hypervisor Parameters</b> lets you define additional parameters to pass to the xen hypervisor.</p>"
+#~ msgstr "<p>Med <b>Flere Xen Hypervisor-parametere</b> kan du du angi flere parametere som skal sendes til Xen Hypervisor.</p>"
+
+#~ msgid "<p><b>Menu Section</b></p>"
+#~ msgstr "<p><b>Meny-seksjon</b></p>"
+
+#~ msgid "<p><b>Partition of Menu File</b></p>"
+#~ msgstr "<p><b>Partisjon for menyfil</b></p>"
+
#, fuzzy
-#~| msgid ""
-#~| "<p><b>Protect Boot Loader with Password</b><br>\n"
-#~| "Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n"
-#~| "it in <b>Retype Password</b>.</p>"
+#~| msgid "<p><b>Menu Description File<b> specifies path on root device from which is loaded menu file.</p>"
+#~ msgid "<p><b>Menu Description File</b> specifies path on root device from which is loaded menu file.</p>"
+#~ msgstr "<p><b>Menybeskrivelsesfil<b> angir adressen på rotenheten der menyfilen lastes fra.</p>"
+
+#~ 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å vanligvis ligge på første disk.</p>"
+
#~ msgid ""
-#~ "<p><b>Protect Boot Loader with Password</b><br>\n"
-#~ "At boot time, modifying or even booting any entry will require the password. If <b>Protect Entry Modification Only</b> is checked then booting any entry is not restricted but modifying entries requires the password (which is the way GRUB 1 behaved).<br>YaST will only accept the password if you repeat it in <b>Retype Password</b>.</p>"
+#~ "<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><b>Passord for oppstartslaster</b><br>\n"
-#~ "Angi passordet som må brukes for å få tilgang til oppstartsmenyen. YaST godkjenner bare passordet når du gjentar det i\n"
-#~ " <b>Gjenta passordet</b>.</p>"
+#~ "<p>Bruk <b>Måling</b> for å inkludere målte filer med PCR. Tabellen kan endres med knappen: <b>Legg til</b> , \n"
+#~ "<b>Rediger</b> og <b>Slett</b></p>"
+#~ 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"
+#~ "Angis vanligvis i den generelle seksjonen</p>"
+
+#~ 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"
+#~ "Angis vanligvis i den globale seksjonen</p>"
+
+#~ 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>Velg<b>Dump seksjon</b> for å legge til en seksjon som definerer\n"
+#~ "hvordan en systemdump skal opprettes på en DASD-diskpartisjon eller båndenhet\n"
+#~ " eller en fil på en SCSI-diskpartisjon.</p>"
+
+#~ 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>Velg<b>Menyseksjon</b> for å legge til en meny i oppsettet.\n"
+#~ "Menyseksjoner representerer en liste over oppgaver som er gruppert sammen</p>\n"
+
+#~ 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>Velg <b>Aktiver SELinux</b> for å legge til nødvendige oppstartsparametere for kjernen for å aktivere sikkerhetssystemet SELinux. \n"
+#~ "Husk at dette også vil deaktivere AppArmor.</p>"
+
+#~ msgid "Image Section"
+#~ msgstr "Diskbildeseksjon"
+
+#~ msgid "&Kernel Image"
+#~ msgstr "&Kjernediskbilde"
+
+#~ msgid "&Root Device"
+#~ msgstr "&Rotenhet"
+
+#~ msgid "&Initial RAM Disk"
+#~ msgstr "&Første RAM-disk"
+
+#~ msgid "Chainloader Section"
+#~ msgstr "Chainloader-seksjon"
+
+#~ msgid "Use Password Protection"
+#~ msgstr "Bruk passordbeskyttelse"
+
+#~ msgid "&Other System"
+#~ msgstr "&Annet system"
+
+#~ msgid "Do not &verify Filesystem before Booting"
+#~ msgstr "Ikke &verifiser filsystem før oppstart"
+
+#~ msgid "&Activate this Partition when selected for Boot"
+#~ msgstr "&Aktiver denne partisjonen når den er valgt for oppstart"
+
+#~ msgid "B&lock Offset for Chainloading"
+#~ msgstr "B&lokkforskyvning for chainloading"
+
+#~ msgid "&Map Section to the First Disk in Device Map"
+#~ msgstr "&Plasser seksjonen på første disk i enhetskartet"
+
+#~ msgid "&Hypervisor"
+#~ msgstr "&Hypervisor"
+
+#~ msgid "&Additional Xen Hypervisor Parameters"
+#~ msgstr "Flere p&arametere for Xen Hypervisor"
+
+#~ msgid "&Partition of Menu File"
+#~ msgstr "&Partisjon for menyfil"
+
+#~ msgid "&Menu Description File"
+#~ msgstr "Fil for &menybeskrivelse"
+
+#~ msgid "&Force root filesystem to be mounted read-only"
+#~ msgstr "Bruk skrivebeskyttet montering av rot&filsystem"
+
+#~ msgid "Allow attempt to &relocate"
+#~ msgstr "Tillat fo&rsøk på flytting"
+
+#~ msgid "Tar&get Directory for Section"
+#~ msgstr "Målkatalo&g for seksjon"
+
+#~ msgid "Op&tional Parameter File"
+#~ msgstr "Fil med al&ternative parametere"
+
+#~ msgid "Dump Section (obsolete)"
+#~ msgstr "Dump-seksjon (foreldet)"
+
+#~ msgid "&Dump Device"
+#~ msgstr "&Dumpenhet"
+
+#~ msgid "&SCSI Dump Device"
+#~ msgstr "&SCSI-dumpenhet"
+
+#~ msgid "&List of Menu Entries"
+#~ msgstr "&Liste over menyoppføringer"
+
+#~ msgid "&Number of Default Entry"
+#~ msgstr "&Nummer på standardoppføring"
+
+#~ msgid "&Timeout in seconds"
+#~ msgstr "&Tidsavbrudd i sekunder"
+
+#~ msgid "&Show boot menu"
+#~ msgstr "Vis opp&startsmeny"
+
+#~ msgid "C&opy Image to Boot Partition"
+#~ msgstr "K&opier diskbilde til oppstartspartisjon"
+
+#~ msgid "&Skip Section gracefully on Errors"
+#~ msgstr "Hopp over &seksjonen uten melding ved feil"
+
+#~ msgid "Boot &Partition of Other System"
+#~ msgstr "Oppstarts&partisjon for annet system"
+
+#~ msgid "Image section must have specified kernel image"
+#~ msgstr "Det må være angitt et kjernediskbilde for diskbildeseksjonen"
+
+#~ msgid "Image file doesn't exist now. Do you really want use it?"
+#~ msgstr "Diskbildefilen finnes foreløpig ikke. Vil du bruke den likevel?"
+
+#~ msgid "Initrd file doesn't exist now. Do you really want use it?"
+#~ msgstr "Initrd-filen finnes foreløpig ikke. Vil du bruke den likevel?"
+
+#~ msgid "Enable &SELinux"
+#~ msgstr "Aktiver &SELinux"
+
+#~ msgid "The name includes unallowable char(s)"
+#~ msgstr "Navnet inneholder ugyldige tegn"
+
+#~ msgid "Ask for resolution during boot."
+#~ msgstr "Spør om oppløsning under oppstart."
+
+#~ msgid "Clone Selected Section"
+#~ msgstr "Klon valgt seksjon"
+
+#~ msgid "Other System (Chainloader)"
+#~ msgstr "Annet system (chainloader)"
+
+#~ msgid "Section Type"
+#~ msgstr "Seksjonstype"
+
+#~ msgid "Section &Name"
+#~ msgstr "Seksjonens &navn"
+
+#~ msgid " (\"/boot\")"
+#~ msgstr " («/boot»)"
+
+#~ msgid " (\"/\")"
+#~ msgstr " (\"/\")"
+
+#~ msgid " (default)"
+#~ msgstr " (standard)"
+
+#~ msgid "Sections:<br>%1"
+#~ msgstr "Seksjoner:<br>%1"
+
+#~ msgid "Do not install boot loader; just create configuration files"
+#~ msgstr "Ikke installer oppstartslasteren - bare opprett konfigurasjonsfiler"
+
+#~ msgid "Propose and &Merge with Existing GRUB Menus"
+#~ msgstr "Foreslå og &slå sammen med eksisterende GRUB-menyer"
+
#~ msgid "Partition number > 3 is being used for booting with GPT partition table"
#~ msgstr "Partisjonsnummer > 3 brukes til oppstart med GPT-partisjonstabellen"
+#, fuzzy
+#~| msgid "It was not possible to determine the exact order of disks for device map. The order of disks can be changed in \"Boot Loader Installation Details\""
+#~ msgid "YaST could not determine the exact boot order of disks needed for the device map. Review and possibly adjust the boot order of disks in \"Boot Loader Installation Details\""
+#~ msgstr "Det var ikke mulig å definere den nøyaktige diskrekkefølgen for enhetskartet. Diskrekkefølgen kan endres under «Informasjon om oppstartslasterinstallasjon»"
+
+#~ msgid "Added Kernel Parameters: %1"
+#~ msgstr "Ekstra kjerneparametere: %1"
+
#~ msgid "The boot device is on iSCSI disk: %1. System may not boot."
#~ msgstr "Oppstartsenheten er på iSCSI-disken: %1. Systemet vil kanskje ikke starte."
Modified: branches/plus-SLE12-SP2/yast/nb/po/ca-management.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/ca-management.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/ca-management.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: ca-management.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-08-08 08:33+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -1919,14 +1919,14 @@
#. Creating default CA/Certificate
#. @return [Boolean] ( success )
-#: src/include/ca-management/new_cert_read_write.rb:1891
+#: src/include/ca-management/new_cert_read_write.rb:1890
msgid "Creating certificate..."
msgstr "Oppretter sertifikat..."
#. Creating server certificate
#. Exporting to common server certificate
-#: src/include/ca-management/new_cert_read_write.rb:1933
-#: src/include/ca-management/new_cert_read_write.rb:2014
+#: src/include/ca-management/new_cert_read_write.rb:1932
+#: src/include/ca-management/new_cert_read_write.rb:2013
msgid ""
"The default certificate can also be created in\n"
"the CA Management module.\n"
@@ -1935,27 +1935,28 @@
"modulen CA-administrasjon.\n"
#. To translators: ContinueCancel Popup headline
-#: src/include/ca-management/popup.rb:52
+#: src/include/ca-management/popup.rb:50
msgid "Finish"
msgstr "Fullfør"
#. To translators: ContinueCancel Popup
-#: src/include/ca-management/popup.rb:54
+#: src/include/ca-management/popup.rb:52
msgid "Really save configuration ?"
msgstr "Er du sikker på at du vil lagre konfigurasjonen?"
#. To translators: YesNo Popup headline
-#: src/include/ca-management/popup.rb:66
+#: src/include/ca-management/popup.rb:64
msgid "Exit"
msgstr "Avslutt"
#. To translators: YesNo Popup
-#: src/include/ca-management/popup.rb:68
+#: src/include/ca-management/popup.rb:66
msgid "Really exit configuration without saving ?"
msgstr "Er du sikker på at du vil avslutte konfigurasjonen uten å lagre?"
-#. Show description while normal installation only.(bnc#962328)
-#: src/include/ca-management/popup.rb:91
+#. Popup displaying openssl error messages
+#. @return [void]
+#: src/include/ca-management/popup.rb:88
msgid "Details"
msgstr "Detaljer"
Modified: branches/plus-SLE12-SP2/yast/nb/po/cio.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/cio.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/cio.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
@@ -45,13 +45,13 @@
msgstr "Brukt"
#: src/lib/iochannel/channels_dialog.rb:142
+msgid "yes"
+msgstr "ja"
+
+#: src/lib/iochannel/channels_dialog.rb:142
msgid "no"
msgstr "nei"
-#: src/lib/iochannel/channels_dialog.rb:142
-msgid "yes"
-msgstr "ja"
-
#. filter can be empty if dialog is not yet created
#: src/lib/iochannel/channels_dialog.rb:160
#, fuzzy
Modified: branches/plus-SLE12-SP2/yast/nb/po/cluster.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/cluster.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/cluster.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
@@ -143,7 +143,7 @@
msgstr "Test lyden når kortet er konfigurert"
#: src/include/cluster/dialogs.rb:228 src/include/cluster/dialogs.rb:256
-#: src/include/cluster/dialogs.rb:1429
+#: src/include/cluster/dialogs.rb:1427
msgid "The Multicast Address has to be fulfilled"
msgstr ""
@@ -171,7 +171,7 @@
msgstr "Bind-nettverksadresse:"
#: src/include/cluster/dialogs.rb:460 src/include/cluster/dialogs.rb:478
-#: src/include/cluster/dialogs.rb:1365
+#: src/include/cluster/dialogs.rb:1363
msgid "Multicast Address:"
msgstr "Multikastadresse:"
@@ -225,133 +225,133 @@
msgstr ""
#. Notice, current could be "nil" if the list is empty.
-#: src/include/cluster/dialogs.rb:717
+#: src/include/cluster/dialogs.rb:715
msgid "Enable Security Auth"
msgstr "Aktiver sikkerhetsautorisasjon"
-#: src/include/cluster/dialogs.rb:721
+#: src/include/cluster/dialogs.rb:719
#, fuzzy
#| msgid "For newly created cluster, push the button below to generate /etc/corosync/authkey."
msgid "For a newly created cluster, push the button below to generate /etc/corosync/authkey."
msgstr "Bruk knappen nedenfor fo rå generere /etc/corosync/authkey for en nyopprettet klynge."
-#: src/include/cluster/dialogs.rb:726
+#: src/include/cluster/dialogs.rb:724
msgid "To join an existing cluster, please copy /etc/corosync/authkey from other nodes manually."
msgstr "For å bli medlem i en eksisterende klynge, kopier /etc/corosync/authkey manuelt fra andre noder."
-#: src/include/cluster/dialogs.rb:752
+#: src/include/cluster/dialogs.rb:750
msgid "Failed to create /etc/corosync/authkey"
msgstr ""
-#: src/include/cluster/dialogs.rb:754
+#: src/include/cluster/dialogs.rb:752
msgid "Create /etc/corosync/authkey succeeded"
msgstr ""
-#: src/include/cluster/dialogs.rb:815 src/include/cluster/dialogs.rb:885
+#: src/include/cluster/dialogs.rb:813 src/include/cluster/dialogs.rb:883
msgid "Running"
msgstr "Kjører"
-#: src/include/cluster/dialogs.rb:817
+#: src/include/cluster/dialogs.rb:815
msgid "Not running"
msgstr "Kjører ikke"
#. servie:cluster is the name of /etc/sysconfig/SuSEfirewall2.d/services/cluster
-#: src/include/cluster/dialogs.rb:853
+#: src/include/cluster/dialogs.rb:851
msgid "Booting"
msgstr "Oppstart"
-#: src/include/cluster/dialogs.rb:863
+#: src/include/cluster/dialogs.rb:861
#, fuzzy
#| msgid "On -- Start openais at booting"
msgid "On -- Start pacemaker during boot"
msgstr "På -- Start openais ved oppstart"
-#: src/include/cluster/dialogs.rb:870
+#: src/include/cluster/dialogs.rb:868
#, fuzzy
#| msgid "Off -- Start openais manually only"
msgid "Off -- Start pacemaker manually"
msgstr "Av -- Start openais manuelt"
-#: src/include/cluster/dialogs.rb:879
+#: src/include/cluster/dialogs.rb:877
msgid "Switch On and Off"
msgstr "Aktivere og deaktivere"
-#: src/include/cluster/dialogs.rb:884
+#: src/include/cluster/dialogs.rb:882
msgid "Current Status: "
msgstr "Gjeldende status: "
-#: src/include/cluster/dialogs.rb:893
+#: src/include/cluster/dialogs.rb:891
#, fuzzy
#| msgid "Start openais Now"
msgid "Start pacemaker Now"
msgstr "Start openais nå"
-#: src/include/cluster/dialogs.rb:894
+#: src/include/cluster/dialogs.rb:892
#, fuzzy
#| msgid "Stop openais Now"
msgid "Stop pacemaker Now"
msgstr "Stopp openais nå"
#. BNC#874563,stop pacemaker could stop corosync since BNC#872651 is fixed
-#: src/include/cluster/dialogs.rb:992
+#: src/include/cluster/dialogs.rb:990
msgid "Sync Host"
msgstr "Synkroniseringsvert"
-#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
+#: src/include/cluster/dialogs.rb:994 src/include/cluster/dialogs.rb:1006
msgid "Add"
msgstr "Legg til"
-#: src/include/cluster/dialogs.rb:997 src/include/cluster/dialogs.rb:1009
+#: src/include/cluster/dialogs.rb:995 src/include/cluster/dialogs.rb:1007
msgid "Del"
msgstr "Slett"
-#: src/include/cluster/dialogs.rb:998 src/include/cluster/dialogs.rb:1010
+#: src/include/cluster/dialogs.rb:996 src/include/cluster/dialogs.rb:1008
msgid "Edit"
msgstr "Rediger"
-#: src/include/cluster/dialogs.rb:1004
+#: src/include/cluster/dialogs.rb:1002
msgid "Sync File"
msgstr "Synkroniseringsfil"
-#: src/include/cluster/dialogs.rb:1011
+#: src/include/cluster/dialogs.rb:1009
msgid "Add Suggested Files"
msgstr "Legg til foreslåtte filer"
-#: src/include/cluster/dialogs.rb:1020
+#: src/include/cluster/dialogs.rb:1018
msgid "Generate Pre-Shared-Keys"
msgstr "Generer forhåndsdelte nøkler"
#. remove duplicated elements
-#: src/include/cluster/dialogs.rb:1145
+#: src/include/cluster/dialogs.rb:1143
msgid "Csync2 Status Unknown"
msgstr "Ukjent Csync2-status"
-#: src/include/cluster/dialogs.rb:1148
+#: src/include/cluster/dialogs.rb:1146
msgid "Turn csync2 ON"
msgstr "Slå PÅ csync2"
-#: src/include/cluster/dialogs.rb:1151
+#: src/include/cluster/dialogs.rb:1149
msgid "Turn csync2 OFF"
msgstr "Slå AV csync2"
-#: src/include/cluster/dialogs.rb:1181
+#: src/include/cluster/dialogs.rb:1179
msgid "Enter a hostname"
msgstr "Angi et vertsnavn."
-#: src/include/cluster/dialogs.rb:1195
+#: src/include/cluster/dialogs.rb:1193
msgid "Edit the hostname"
msgstr "Endre vertsnavn"
-#: src/include/cluster/dialogs.rb:1209
+#: src/include/cluster/dialogs.rb:1207
msgid "Enter a filename to synchronize"
msgstr "Angi et navnet på en fil som skal synkroniseres"
-#: src/include/cluster/dialogs.rb:1224
+#: src/include/cluster/dialogs.rb:1222
msgid "Edit the filename"
msgstr "Endre filnavn"
#. key file exist
-#: src/include/cluster/dialogs.rb:1256
+#: src/include/cluster/dialogs.rb:1254
msgid ""
"Key file %1 already exist.\n"
"Do you want to overwrite it?"
@@ -360,12 +360,12 @@
"Vil du overskrive den?"
#. remove exist key file
-#: src/include/cluster/dialogs.rb:1266
+#: src/include/cluster/dialogs.rb:1264
msgid "Delete key file %1 failed."
msgstr "Nøkkelfilen %1 kunne ikke slettes."
#. generate key file
-#: src/include/cluster/dialogs.rb:1280
+#: src/include/cluster/dialogs.rb:1278
msgid ""
"Key file %1 is generated.\n"
"Clicking \"Add Suggested Files\" button adds it to sync list."
@@ -373,35 +373,35 @@
"Nøkkelfilen %1 er generert.\n"
"Klikk på «Legg til foreslåtte filer» for å legge den til i synkroniseringslisten."
-#: src/include/cluster/dialogs.rb:1287
+#: src/include/cluster/dialogs.rb:1285
msgid "Key generation failed."
msgstr "Nøkkelen ble ikke genererert."
#. SaveCsync2();
-#: src/include/cluster/dialogs.rb:1349
+#: src/include/cluster/dialogs.rb:1347
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:1360
+#: src/include/cluster/dialogs.rb:1358
msgid "Dedicated Interface:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1363
+#: src/include/cluster/dialogs.rb:1361
msgid "IP:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1366
+#: src/include/cluster/dialogs.rb:1364
msgid "Group Number:"
msgstr ""
-#: src/include/cluster/dialogs.rb:1370
+#: src/include/cluster/dialogs.rb:1368
msgid "Generate /etc/conntrackd/conntrackd.conf"
msgstr ""
-#: src/include/cluster/dialogs.rb:1437
+#: src/include/cluster/dialogs.rb:1435
#, fuzzy
#| msgid "The value for pos must be a positive integer."
msgid "The Group Number must be a positive integer"
@@ -547,103 +547,103 @@
msgstr "Initialiserer ..."
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:394
+#: src/modules/Cluster.rb:390
#, fuzzy
#| msgid "Initializing Cluster Configuration"
msgid "Initializing cluster Configuration"
msgstr "Initialiserer klyngeoppsett"
#. Progress stage 1/3
-#: src/modules/Cluster.rb:410
+#: src/modules/Cluster.rb:406
msgid "Read the database"
msgstr "Les databasen"
#. Progress stage 2/3
-#: src/modules/Cluster.rb:412
+#: src/modules/Cluster.rb:408
msgid "Read the previous settings"
msgstr "Les tidligere innstillinger"
#. Progress stage 3/3
-#: src/modules/Cluster.rb:414
+#: src/modules/Cluster.rb:410
msgid "Read SuSEFirewall Settings"
msgstr "Les brannmurinnstillinger"
#. Progress step 1/3
-#: src/modules/Cluster.rb:418
+#: src/modules/Cluster.rb:414
msgid "Reading the database..."
msgstr "Leser databasen..."
#. Progress step 2/3
-#: src/modules/Cluster.rb:420
+#: src/modules/Cluster.rb:416
msgid "Reading the previous settings..."
msgstr "Leser tidligere innstillinger..."
#. Progress step 3/3
-#: src/modules/Cluster.rb:422
+#: src/modules/Cluster.rb:418
msgid "Reading SuSEFirewall settings..."
msgstr "Leser brannmurinnstillinger..."
#. Progress finished
#. Progress finished
-#: src/modules/Cluster.rb:424 src/modules/Cluster.rb:526
+#: src/modules/Cluster.rb:420 src/modules/Cluster.rb:522
msgid "Finished"
msgstr "Fullført"
-#: src/modules/Cluster.rb:439
+#: src/modules/Cluster.rb:435
msgid "Cannot install required package"
msgstr "Kan ikke installere nødvendig pakke"
#. read database
-#: src/modules/Cluster.rb:448
+#: src/modules/Cluster.rb:444
#, fuzzy
#| msgid "Cannot load existing configuration."
msgid "Cannot load existing configuration"
msgstr "Kan ikke laste gjeldende oppsett."
#. Error message
-#: src/modules/Cluster.rb:459
+#: src/modules/Cluster.rb:455
msgid "Cannot read database1."
msgstr "Kan ikke lese database1."
#. Error message
-#: src/modules/Cluster.rb:467
+#: src/modules/Cluster.rb:463
msgid "Cannot read database2."
msgstr "Kan ikke lese database2."
#. Error message
-#: src/modules/Cluster.rb:483
+#: src/modules/Cluster.rb:479
msgid "Cannot detect devices."
msgstr "Finner ingen enheter."
#. Cluster read dialog caption
-#: src/modules/Cluster.rb:501
+#: src/modules/Cluster.rb:497
#, fuzzy
#| msgid "Saving Cluster Configuration"
msgid "Saving cluster Configuration"
msgstr "Lagrer klyngeoppsett"
#. Progress stage 1/2
-#: src/modules/Cluster.rb:516
+#: src/modules/Cluster.rb:512
msgid "Write the settings"
msgstr "Lagre innstillingene"
#. Progress stage 2/2
-#: src/modules/Cluster.rb:518
+#: src/modules/Cluster.rb:514
msgid "Save changes to SuSEFirewall"
msgstr "Lagre endringer i brannmuroppsett"
#. Progress step 1/2
-#: src/modules/Cluster.rb:522
+#: src/modules/Cluster.rb:518
msgid "Writing the settings..."
msgstr "Lagrer innstillingene..."
#. Progress step 2/2
-#: src/modules/Cluster.rb:524
+#: src/modules/Cluster.rb:520
msgid "Saving changes to SuSEFirewall..."
msgstr "Lagrer endringer i brannmuroppsett..."
#. Error message
-#: src/modules/Cluster.rb:536
+#: src/modules/Cluster.rb:532
msgid "Cannot write settings."
msgstr "Kan ikke lagre innstillingene."
Modified: branches/plus-SLE12-SP2/yast/nb/po/control-center.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/control-center.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/control-center.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: control-center.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2007-07-25 10:48+0200\n"
"Last-Translator: Rune Nordbøe Skillingstad \n"
"Language-Team: Norwegian\n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/control.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/control.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/control.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: control\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-10-01 12:19+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -24,318 +24,326 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Lokalize 1.0\n"
-#: control/control.SLED.glade.translations.glade:3
+#: control/control.openSUSE.glade.translations.glade:3
#, fuzzy
#| msgid ""
#| "\n"
-#| "<p>\n"
-#| "The installation has completed successfully.\n"
-#| "Your system is ready for use.\n"
-#| "Click Finish to log in to the system.\n"
-#| "</p>\n"
-#| "<p>\n"
-#| "Please visit us at http://www.suse.com/.\n"
-#| "</p>\n"
-#| "\t"
+#| "<p><b>Congratulations!</b></p>\n"
+#| "<p>The installation of openSUSE on your machine is complete.\n"
+#| "After clicking <b>Finish</b>, you can log in to the system.</p>\n"
+#| "<p>Visit us at %1.</p>\n"
+#| "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
+#| "\t "
msgid ""
"\n"
-"<p>\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"
-" "
+"<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"
-"Installasjonen er fullført.\n"
-"Systemet er klart til bruk.\n"
-"Klikk Fullfør for å logge på systemet.\n"
-"</p>\n"
-"<p>\n"
-"Besøk oss på http://www.suse.com/.\n"
-"</p>\n"
+"<p><b>Gratulerer!</b></p>\n"
+"<p>Installasjonen av openSUSE på maskinen er fullført.\n"
+"Etter at du har klikket på <b>Fullfør</b>, kan du logge på systemet.</p>\n"
+"<p>Besøk oss på %1.</p>\n"
+"<p>Ha det gøy!<br>openSUSE-utviklerne</p>\n"
"\t"
-#: control/control.SLED.glade.translations.glade:15
-msgid "CIM Server"
-msgstr "CIM-server"
+#: control/control.openSUSE.glade.translations.glade:10
+msgid ""
+"The desktop environment on your computer provides the graphical user\n"
+"interface for your computer, as well as a suite of applications for\n"
+"email, Web browsing, office productivity, games, and utilities to\n"
+"manage your computer.\n"
+"\n"
+"openSUSE offers a choice of desktop environments. The most widely\n"
+"used desktop environments are GNOME and KDE, and they are equally\n"
+"supported under openSUSE. Both desktop environments are easy to use,\n"
+"highly integrated, and have an attractive look and feel. Each desktop\n"
+"environment has a distinct style, so personal taste determines which\n"
+"is the most appropriate desktop for you."
+msgstr ""
+"Skrivebordsmiljøet for datamaskinen utgjør datamaskinens grafiske\n"
+"brukergrensesnitt, og omfatter et sett programmer for\n"
+"e-post, nettlesing, kontorarbeid, spill og verktøy for å\n"
+"administrere datamaskinen.\n"
+"\n"
+"openSUSE tilbyr ulike skrivebordsmiljøer. De mest\n"
+"brukte skrivebordsmiljøene er GNOME og KDE. Disse har like god\n"
+"støtte i openSUSE. Begge disse skrivebordsmiljøene er enkle å bruke,\n"
+"er godt integrert og har elegant utforming. De to\n"
+"skrivebordsmiljøene har sitt særpreg, så det er opp til deg\n"
+"hvilket skrivebord du foretrekker."
-#: control/control.SLED.glade.translations.glade: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
+#: control/control.openSUSE.glade.translations.glade:21
+msgid "GNOME Desktop"
+msgstr "GNOME-skrivebord"
+
+#: control/control.openSUSE.glade.translations.glade:22
+msgid "KDE Desktop"
+msgstr "KDE-skrivebord"
+
+#: control/control.openSUSE.glade.translations.glade:23
+msgid "XFCE Desktop"
+msgstr "XFCE-skrivebordet"
+
+#: control/control.openSUSE.glade.translations.glade:24
+msgid "LXDE Desktop"
+msgstr "LXDE-skrivebord"
+
+#: control/control.openSUSE.glade.translations.glade:25
+msgid "Minimal X Window"
+msgstr "Minimalt grafisk grensesnitt"
+
+#: control/control.openSUSE.glade.translations.glade:26
+msgid "Enlightenment Desktop"
+msgstr "Skrivebordsmiljøet Enlightenment"
+
+#: control/control.openSUSE.glade.translations.glade:27
+msgid "Minimal Server Selection (Text Mode)"
+msgstr "Server uten grafisk grensesnitt (tekstmodus)"
+
+#: control/control.openSUSE.glade.translations.glade:28
+#: control/control.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
msgid "Installation Settings"
msgstr "Installasjonsinnstillinger"
-#: control/control.SLED.glade.translations.glade:18
-msgid "Overview"
-msgstr "Oversikt"
-
-#: control/control.SLED.glade.translations.glade:19
-msgid "Expert"
-msgstr "Avansert"
-
-#: control/control.SLED.glade.translations.glade:20
+#: control/control.openSUSE.glade.translations.glade:30
msgid "Live Installation Settings"
msgstr "Live-installasjonsinnstillinger"
-#: control/control.SLED.glade.translations.glade:21
+#: control/control.openSUSE.glade.translations.glade:31
+#: control/control.openSUSE.glade.translations.glade:85
msgid "Update Settings"
msgstr "Oppdater innstillinger"
-#: control/control.SLED.glade.translations.glade:23
+#: control/control.openSUSE.glade.translations.glade:33
msgid "Network Configuration"
msgstr "Nettverkskonfigurasjon"
-#: control/control.SLED.glade.translations.glade:24
+#: control/control.openSUSE.glade.translations.glade:34
msgid "Hardware Configuration"
msgstr "Maskinvarekonfigurasjon"
-#: control/control.SLED.glade.translations.glade:25
-#: control/control.SLED.glade.translations.glade:63
-#: control/control.SLED.glade.translations.glade:90
+#: control/control.openSUSE.glade.translations.glade:35
+#: control/control.openSUSE.glade.translations.glade:77
+#: control/control.openSUSE.glade.translations.glade:103
msgid "Preparation"
msgstr "Forberedelser"
-#: control/control.SLED.glade.translations.glade:26
-#: control/control.SLED.glade.translations.glade:50
-#: control/control.SLED.glade.translations.glade:64
+#: control/control.openSUSE.glade.translations.glade:36
+#: control/control.openSUSE.glade.translations.glade:63
#, fuzzy
#| msgid "Saving Network Configuration"
msgid "Load linuxrc Network Configuration"
msgstr "Lagrer nettverksoppsett"
-#: control/control.SLED.glade.translations.glade:27
-#: control/control.SLED.glade.translations.glade:51
-#: control/control.SLED.glade.translations.glade:65
+#: control/control.openSUSE.glade.translations.glade:37
+#: control/control.openSUSE.glade.translations.glade:64
#, fuzzy
#| msgid "Network Setup"
msgid "Network Autosetup"
msgstr "Nettverksinnstillinger"
-#: control/control.SLED.glade.translations.glade:28
-#: control/control.SLED.glade.translations.glade:52
-#: control/control.SLED.glade.translations.glade:66
+#: control/control.openSUSE.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:65
+#: control/control.openSUSE.glade.translations.glade:78
msgid "Welcome"
msgstr "Velkommen"
-#: control/control.SLED.glade.translations.glade:29
-#: control/control.SLED.glade.translations.glade:53
-#: control/control.SLED.glade.translations.glade:67
+#: control/control.openSUSE.glade.translations.glade:39
msgid "Network Activation"
msgstr "Nettverksaktivering"
-#: control/control.SLED.glade.translations.glade:30
-#: control/control.SLED.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:40
+#: control/control.openSUSE.glade.translations.glade:79
msgid "Disk Activation"
msgstr "Diskaktivering"
-#: 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
+#: 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
msgid "System Analysis"
msgstr "Systemanalyse"
-#: control/control.SLED.glade.translations.glade:33
-#: control/control.SLED.glade.translations.glade:71
-msgid "Add-On Products"
-msgstr "Tilleggsprodukter"
-
-#: control/control.SLED.glade.translations.glade:34
-#: control/control.SLED.glade.translations.glade:54
+#: control/control.openSUSE.glade.translations.glade:43
+#: control/control.openSUSE.glade.translations.glade:67
msgid "Disk"
msgstr "Disk"
-#: control/control.SLED.glade.translations.glade:35
-#: control/control.SLED.glade.translations.glade:55
+#: control/control.openSUSE.glade.translations.glade:44
+#: control/control.openSUSE.glade.translations.glade:66
msgid "Time Zone"
msgstr "Tidssone"
-#: control/control.SLED.glade.translations.glade:36
-#: control/control.SLED.glade.translations.glade:37
+#: control/control.openSUSE.glade.translations.glade:45
+#: control/control.openSUSE.glade.translations.glade:82
+msgid "Online Repositories"
+msgstr "online-pakkebrønner"
+
+#: control/control.openSUSE.glade.translations.glade:46
+#: control/control.openSUSE.glade.translations.glade:83
+msgid "Add-On Products"
+msgstr "Tilleggsprodukter"
+
+#: control/control.openSUSE.glade.translations.glade:47
+msgid "Desktop Selection"
+msgstr "Skrivebordsvalg"
+
+#: control/control.openSUSE.glade.translations.glade:48
+#: control/control.openSUSE.glade.translations.glade:49
+#: control/control.openSUSE.glade.translations.glade:68
+#: control/control.openSUSE.glade.translations.glade:69
msgid "User Settings"
msgstr "Brukerinnstillinger"
-#: control/control.SLED.glade.translations.glade:38
+#: control/control.openSUSE.glade.translations.glade:50
+#: control/control.openSUSE.glade.translations.glade:62
+msgid "Installation"
+msgstr "Installasjon"
+
+#: control/control.openSUSE.glade.translations.glade:51
msgid "Installation Overview"
msgstr "Installasjonsoversikt"
-#: 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
+#: 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
msgid "Perform Installation"
msgstr "Utfør installasjon"
-#: control/control.SLED.glade.translations.glade:49
-msgid "Installation"
-msgstr "Installasjon"
-
-#: control/control.SLED.glade.translations.glade:70
-#: control/control.SLED.glade.translations.glade:92
+#: control/control.openSUSE.glade.translations.glade:81
+#: control/control.openSUSE.glade.translations.glade:105
msgid "System for Update"
msgstr "System som skal oppgraderes"
-#: control/control.SLED.glade.translations.glade:72
-#: control/control.SLED.glade.translations.glade:95
+#: control/control.openSUSE.glade.translations.glade:84
+#: control/control.openSUSE.glade.translations.glade:108
msgid "Update"
msgstr "Oppgradering"
-#: 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
+#: 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
msgid "Perform Update"
msgstr "Utfør oppgradering"
-#: control/control.SLED.glade.translations.glade:79
+#: control/control.openSUSE.glade.translations.glade:91
+#: control/control.openSUSE.glade.translations.glade:120
+#: control/control.openSUSE.glade.translations.glade:124
+msgid "Configuration"
+msgstr "Konfigurasjon"
+
+#: control/control.openSUSE.glade.translations.glade:92
msgid "Base Installation"
msgstr "Grunninstallasjon"
-#: 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
+#: 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
msgid "AutoYaST Settings"
msgstr "AutoYaST-innstillinger"
-#: control/control.SLED.glade.translations.glade:107
-#: control/control.SLED.glade.translations.glade:111
-msgid "Configuration"
-msgstr "Konfigurasjon"
-
-#: control/control.SLED.glade.translations.glade:108
-#: control/control.SLED.glade.translations.glade:112
+#: control/control.openSUSE.glade.translations.glade:121
+#: control/control.openSUSE.glade.translations.glade:125
msgid "System Configuration"
msgstr "Systemkonfigurasjon"
#, fuzzy
#~| msgid ""
#~| "\n"
-#~| "<p><b>Congratulations!</b></p>\n"
-#~| "<p>The installation of openSUSE on your machine is complete.\n"
-#~| "After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-#~| "<p>Visit us at %1.</p>\n"
-#~| "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
-#~| "\t "
+#~| "<p>\n"
+#~| "The installation has completed successfully.\n"
+#~| "Your system is ready for use.\n"
+#~| "Click Finish to log in to the system.\n"
+#~| "</p>\n"
+#~| "<p>\n"
+#~| "Please visit us at http://www.suse.com/.\n"
+#~| "</p>\n"
+#~| "\t"
#~ msgid ""
#~ "\n"
-#~ "<p><b>Congratulations!</b></p>\n"
-#~ "<p>The installation of openSUSE on your machine is complete.\n"
-#~ "After clicking <b>Finish</b>, you can log in to the system.</p>\n"
-#~ "<p>Visit us at %1.</p>\n"
-#~ "<p>Have a lot of fun!<br>Your openSUSE Development Team</p>\n"
-#~ " "
+#~ "<p>\n"
+#~ "The installation has completed successfully.\n"
+#~ "Your system is ready for use.\n"
+#~ "Click Finish to log in to the system.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Please visit us at http://www.suse.com/.\n"
+#~ "</p>\n"
+#~ " "
#~ msgstr ""
#~ "\n"
-#~ "<p><b>Gratulerer!</b></p>\n"
-#~ "<p>Installasjonen av openSUSE på maskinen er fullført.\n"
-#~ "Etter at du har klikket på <b>Fullfør</b>, kan du logge på systemet.</p>\n"
-#~ "<p>Besøk oss på %1.</p>\n"
-#~ "<p>Ha det gøy!<br>openSUSE-utviklerne</p>\n"
+#~ "<p>\n"
+#~ "Installasjonen er fullført.\n"
+#~ "Systemet er klart til bruk.\n"
+#~ "Klikk Fullfør for å logge på systemet.\n"
+#~ "</p>\n"
+#~ "<p>\n"
+#~ "Besøk oss på http://www.suse.com/.\n"
+#~ "</p>\n"
#~ "\t"
-#~ msgid ""
-#~ "The desktop environment on your computer provides the graphical user\n"
-#~ "interface for your computer, as well as a suite of applications for\n"
-#~ "email, Web browsing, office productivity, games, and utilities to\n"
-#~ "manage your computer.\n"
-#~ "\n"
-#~ "openSUSE offers a choice of desktop environments. The most widely\n"
-#~ "used desktop environments are GNOME and KDE, and they are equally\n"
-#~ "supported under openSUSE. Both desktop environments are easy to use,\n"
-#~ "highly integrated, and have an attractive look and feel. Each desktop\n"
-#~ "environment has a distinct style, so personal taste determines which\n"
-#~ "is the most appropriate desktop for you."
-#~ msgstr ""
-#~ "Skrivebordsmiljøet for datamaskinen utgjør datamaskinens grafiske\n"
-#~ "brukergrensesnitt, og omfatter et sett programmer for\n"
-#~ "e-post, nettlesing, kontorarbeid, spill og verktøy for å\n"
-#~ "administrere datamaskinen.\n"
-#~ "\n"
-#~ "openSUSE tilbyr ulike skrivebordsmiljøer. De mest\n"
-#~ "brukte skrivebordsmiljøene er GNOME og KDE. Disse har like god\n"
-#~ "støtte i openSUSE. Begge disse skrivebordsmiljøene er enkle å bruke,\n"
-#~ "er godt integrert og har elegant utforming. De to\n"
-#~ "skrivebordsmiljøene har sitt særpreg, så det er opp til deg\n"
-#~ "hvilket skrivebord du foretrekker."
+#~ msgid "CIM Server"
+#~ msgstr "CIM-server"
-#~ msgid "GNOME Desktop"
-#~ msgstr "GNOME-skrivebord"
+#~ msgid "Overview"
+#~ msgstr "Oversikt"
-#~ msgid "KDE Desktop"
-#~ msgstr "KDE-skrivebord"
+#~ msgid "Expert"
+#~ msgstr "Avansert"
-#~ msgid "XFCE Desktop"
-#~ msgstr "XFCE-skrivebordet"
-
-#~ msgid "LXDE Desktop"
-#~ msgstr "LXDE-skrivebord"
-
-#~ msgid "Minimal X Window"
-#~ msgstr "Minimalt grafisk grensesnitt"
-
-#~ msgid "Enlightenment Desktop"
-#~ msgstr "Skrivebordsmiljøet Enlightenment"
-
-#~ msgid "Minimal Server Selection (Text Mode)"
-#~ msgstr "Server uten grafisk grensesnitt (tekstmodus)"
-
-#~ msgid "Online Repositories"
-#~ msgstr "online-pakkebrønner"
-
-#~ msgid "Desktop Selection"
-#~ msgstr "Skrivebordsvalg"
-
#~ msgid "Network Services Configuration"
#~ msgstr "Oppsett av nettverkstjenester"
#~ msgid "Installation Summary"
#~ msgstr "Installasjonssammendrag"
+#~ msgid "Update Summary"
+#~ msgstr "Oppgraderingssammendrag"
+
#~ msgid "Add-On Product Installation"
#~ msgstr "Installer tilleggsprodukt"
Modified: branches/plus-SLE12-SP2/yast/nb/po/country.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/country.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/country.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: country\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-10-08 12:44+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -855,8 +855,8 @@
"Ugyldig dato (DD-MM-ÅÅÅÅ) %1\n"
"Angi riktig dato.\n"
-#. TRANSLATORS: Button label
-#: timezone/src/include/timezone/dialogs.rb:535
+#. button text
+#: timezone/src/include/timezone/dialogs.rb:541
#, fuzzy
#| msgid "E&xpert Settings..."
msgid "Other &Settings..."
@@ -864,44 +864,44 @@
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:612
-#: timezone/src/include/timezone/dialogs.rb:916
+#: timezone/src/include/timezone/dialogs.rb:613
+#: timezone/src/include/timezone/dialogs.rb:910
msgid "Date and Time (NTP is configured)"
msgstr "Tid og dato (NTP er satt opp)"
#. frame label
#. frame label
-#: timezone/src/include/timezone/dialogs.rb:614
-#: timezone/src/include/timezone/dialogs.rb:699
-#: timezone/src/include/timezone/dialogs.rb:918
+#: timezone/src/include/timezone/dialogs.rb:615
+#: timezone/src/include/timezone/dialogs.rb:693
+#: timezone/src/include/timezone/dialogs.rb:912
msgid "Date and Time"
msgstr "Dato og tid"
#. check box label
-#: timezone/src/include/timezone/dialogs.rb:630
+#: timezone/src/include/timezone/dialogs.rb:631
msgid "&Hardware Clock Set to UTC"
msgstr "&Maskinvareklokken er innstilt på UTC"
#. label text
#. label text
-#: timezone/src/include/timezone/dialogs.rb:656
-#: timezone/src/include/timezone/dialogs.rb:690
+#: timezone/src/include/timezone/dialogs.rb:650
+#: timezone/src/include/timezone/dialogs.rb:684
msgid "&Region"
msgstr "&Region"
-#: timezone/src/include/timezone/dialogs.rb:663
-#: timezone/src/include/timezone/dialogs.rb:694
+#: timezone/src/include/timezone/dialogs.rb:657
+#: timezone/src/include/timezone/dialogs.rb:688
msgid "Time &Zone"
msgstr "Tids&sone"
-#: timezone/src/include/timezone/dialogs.rb:675
+#: timezone/src/include/timezone/dialogs.rb:669
#, fuzzy
#| msgid "Date and Time"
msgid "Date and Time:"
msgstr "Dato og tid"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:797
+#: timezone/src/include/timezone/dialogs.rb:791
msgid ""
"\n"
"<p><b><big>Time Zone and Clock Settings</big></b></p>"
@@ -910,7 +910,7 @@
"<p><b><big>Tidssone og tidsinnstillinger</big></b></p>"
#. help for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:799
+#: timezone/src/include/timezone/dialogs.rb:793
msgid ""
"<p>\n"
"To select the time zone to use in your system, first select the <b>Region</b>.\n"
@@ -925,7 +925,7 @@
"</p>\n"
#. general help trailer
-#: timezone/src/include/timezone/dialogs.rb:816
+#: timezone/src/include/timezone/dialogs.rb:810
msgid ""
"<p>\n"
"If the current time is not correct, use <b>Change</b> to adjust it.\n"
@@ -936,12 +936,12 @@
"</p>"
#. Screen title for timezone screen
-#: timezone/src/include/timezone/dialogs.rb:826
+#: timezone/src/include/timezone/dialogs.rb:820
msgid "Clock and Time Zone"
msgstr "Klokke og tidssone"
#. popup text
-#: timezone/src/include/timezone/dialogs.rb:951
+#: timezone/src/include/timezone/dialogs.rb:945
msgid "Select a valid time zone."
msgstr "Velg gyldig tidssone."
Modified: branches/plus-SLE12-SP2/yast/nb/po/crowbar.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/crowbar.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/crowbar.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
@@ -22,9 +22,19 @@
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 SP1"
+msgid "SLES 12"
msgstr ""
#. combobox label
@@ -38,11 +48,11 @@
msgid ""
"<p>Here you can edit the location of your <b>Update Repositories</b>.</p>\n"
"<p>\n"
-"If repositories are stored at SMT server or SUSE Manager server, it's enough to enter server's URL and the paths\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"
"<ul>\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://smt.example.com/repo/$RCE/SLES11-SP3-Pool/sle-11-x86_64/</i> for SMT server\n"
"<li><i>http://manager.example.com/ks/dist/child/suse-cloud-3.0-pool-x86_64/sles11-s...</i> for SUSE Manager Server.\n"
"</p><p>\n"
"For detailed description, check the Deployment Guide.\n"
@@ -183,36 +193,33 @@
msgstr "&IP-Adresse"
#. text entry label
-#: src/include/crowbar/complex.rb:516
+#: src/include/crowbar/complex.rb:520
msgid "Name"
msgstr "Navn"
#. text entry label
-#: src/include/crowbar/complex.rb:518 src/include/crowbar/complex.rb:704
+#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:695
msgid "URL"
msgstr "Nettadresse"
# error box title
#. text entry label
-#: src/include/crowbar/complex.rb:522 src/include/crowbar/complex.rb:705
+#: src/include/crowbar/complex.rb:526 src/include/crowbar/complex.rb:696
#, fuzzy
#| msgid "I/O Error"
msgid "Ask On Error"
msgstr "Inn/ut-feil"
-#: src/include/crowbar/complex.rb:527 src/include/crowbar/complex.rb:706
+#. frame label
+#: src/include/crowbar/complex.rb:531 src/include/crowbar/complex.rb:697
+#: src/include/crowbar/complex.rb:715
#, fuzzy
#| msgid "Target Name"
msgid "Target Platform"
msgstr "Målnavn"
-#. radiobutton label
-#: src/include/crowbar/complex.rb:542
-msgid "Architecture"
-msgstr "Arkitektur"
-
#. error popup
-#: src/include/crowbar/complex.rb:583
+#: src/include/crowbar/complex.rb:580
#, fuzzy
#| msgid ""
#| "Configuration name %1 already exists.\n"
@@ -225,14 +232,14 @@
"Velg et annet navn."
#. text entry label
-#: src/include/crowbar/complex.rb:685
+#: src/include/crowbar/complex.rb:676
#, fuzzy
#| msgid "LDAP Server &URL"
msgid "Server &URL"
msgstr "LDAP-server&adresse"
#. table header
-#: src/include/crowbar/complex.rb:703
+#: src/include/crowbar/complex.rb:694
#, fuzzy
#| msgid "&Repository Name"
msgid "Repository Name"
@@ -240,81 +247,74 @@
# error box title
#. checkbox label
-#: src/include/crowbar/complex.rb:710
+#: src/include/crowbar/complex.rb:701
#, fuzzy
#| msgid "I/O Error"
msgid "&Ask On Error"
msgstr "Inn/ut-feil"
#. text entry label
-#: src/include/crowbar/complex.rb:716
+#: src/include/crowbar/complex.rb:707
#, fuzzy
#| msgid "Repository URL"
msgid "Repository &URL"
msgstr "Pakkebrønnadresse"
#. label (hint for user)
-#: src/include/crowbar/complex.rb:719
+#: src/include/crowbar/complex.rb:710
msgid "Empty URL means that default value will be used."
msgstr ""
#. push button label
-#: src/include/crowbar/complex.rb:722
+#: src/include/crowbar/complex.rb:726
#, fuzzy
#| msgid "Add Repository"
msgid "A&dd Repository"
msgstr "Legg til pakkebrønn"
#. combobox item
-#: src/include/crowbar/complex.rb:792
+#: src/include/crowbar/complex.rb:793
#, fuzzy
-#| msgid "Local NTP Server"
-msgid "Local SMT Server"
-msgstr "Lokal NTP-server"
-
-#. combobox item
-#: src/include/crowbar/complex.rb:794
-#, fuzzy
#| msgid "Remote WINS Server"
msgid "Remote SMT Server"
msgstr "Ekstern WINS-server"
#. combobox item
-#: src/include/crowbar/complex.rb:796
+#: src/include/crowbar/complex.rb:795
#, fuzzy
#| msgid "Finger Server"
msgid "SUSE Manager Server"
msgstr "Finger-server"
#. combobox item
-#: src/include/crowbar/complex.rb:798
+#: src/include/crowbar/complex.rb:797
msgid "Custom"
msgstr "Egendefinert"
#. text entry label
-#: src/include/crowbar/complex.rb:854
+#: src/include/crowbar/complex.rb:866
msgid "User Name"
msgstr "Brukernavn"
#. text entry label
-#: src/include/crowbar/complex.rb:856
+#: src/include/crowbar/complex.rb:868
msgid "Password"
msgstr "Passord"
#. text entry label
-#: src/include/crowbar/complex.rb:858
+#: src/include/crowbar/complex.rb:870
msgid "Repeat the Password"
msgstr "Gjenta passordet"
#. error popup
-#: src/include/crowbar/complex.rb:888
+#: src/include/crowbar/complex.rb:900
#, fuzzy
#| msgid "Server name cannot be empty."
msgid "User name cannot be empty."
msgstr "Du må angi et servernavn."
#. error popup
-#: src/include/crowbar/complex.rb:895
+#: src/include/crowbar/complex.rb:907
msgid ""
"The passwords do not match.\n"
"Try again."
@@ -323,7 +323,7 @@
"Prøv igjen."
#. error popup
-#: src/include/crowbar/complex.rb:903
+#: src/include/crowbar/complex.rb:915
#, fuzzy
#| msgid ""
#| "Configuration name %1 already exists.\n"
@@ -336,19 +336,19 @@
"Velg et annet navn."
#. error popup
-#: src/include/crowbar/complex.rb:1006
+#: src/include/crowbar/complex.rb:1018
#, fuzzy
#| msgid "The entered URL is not valid."
msgid "The interface format '%1' is not valid"
msgstr "Den angitte nettadressen er ugyldig."
#. Returns broadcast address. Based on current netmask and subnet
-#: src/include/crowbar/complex.rb:1064
+#: src/include/crowbar/complex.rb:1076
msgid "disabled"
msgstr "deaktivert"
#. error popup
-#: src/include/crowbar/complex.rb:1161
+#: src/include/crowbar/complex.rb:1173
msgid ""
"The netmask '%1' is invalid.\n"
"%2"
@@ -358,7 +358,7 @@
#. error popup
#. error popup
-#: src/include/crowbar/complex.rb:1172 src/include/crowbar/complex.rb:1204
+#: src/include/crowbar/complex.rb:1184 src/include/crowbar/complex.rb:1216
msgid ""
"The IP address '%1' is invalid.\n"
"%2"
@@ -367,7 +367,7 @@
"%2"
#. error popup
-#: src/include/crowbar/complex.rb:1182
+#: src/include/crowbar/complex.rb:1194
msgid ""
"The router address '%1' is invalid.\n"
"%2"
@@ -376,19 +376,19 @@
"%2"
#. error popup
-#: src/include/crowbar/complex.rb:1191
+#: src/include/crowbar/complex.rb:1203
msgid "The router address '%1' is not part of network '%2'."
msgstr "Ruteradressen '%1' tilhører ikke nettverket '%2'."
#. error popup
-#: src/include/crowbar/complex.rb:1213
+#: src/include/crowbar/complex.rb:1225
#, fuzzy
#| msgid "The address '%1' is not part of network '%2'."
msgid "The IP address '%1' is not part of network '%2'."
msgstr "Adressen '%1' tilhører ikke nettverket '%2'."
#. popup message
-#: src/include/crowbar/complex.rb:1234
+#: src/include/crowbar/complex.rb:1246
msgid ""
"Some address ranges are not part of network '%1'.\n"
"Adapt them using 'Edit ranges' button."
@@ -397,70 +397,70 @@
"Tilpass dem ved å bruke 'Rediger områder'-knappen."
#. inputfield label
-#: src/include/crowbar/complex.rb:1326
+#: src/include/crowbar/complex.rb:1335
msgid "Min IP Address"
msgstr "Min. IP-adresse"
#. inputfield label
-#: src/include/crowbar/complex.rb:1333
+#: src/include/crowbar/complex.rb:1342
msgid "Max IP Address"
msgstr "Maks. IP-adresse"
-#: src/include/crowbar/complex.rb:1386
+#: src/include/crowbar/complex.rb:1395
msgid "The address '%1' is not part of network '%2'."
msgstr "Adressen '%1' tilhører ikke nettverket '%2'."
#. error message
-#: src/include/crowbar/complex.rb:1398
+#: src/include/crowbar/complex.rb:1407
msgid "The lowest address must be lower than the highest one."
msgstr "Den laveste adressen må være lavere enn den høyeste."
#. error message
-#: src/include/crowbar/complex.rb:1422
+#: src/include/crowbar/complex.rb:1431
msgid "Ranges '%1' and '%2' are overlapping."
msgstr "Områdene '%1' og '%2' overlapper hverandre."
#. tab header
-#: src/include/crowbar/complex.rb:1490
+#: src/include/crowbar/complex.rb:1499
#, fuzzy
#| msgid "User Settings"
msgid "&User Settings"
msgstr "Brukerinnstillinger"
#. label (hint for user)
-#: src/include/crowbar/complex.rb:1502
+#: src/include/crowbar/complex.rb:1511
msgid "If no user is present, user 'crowbar' with default password will be used."
msgstr ""
#. tab header
-#: src/include/crowbar/complex.rb:1518
+#: src/include/crowbar/complex.rb:1527
#, fuzzy
#| msgid "Network Mode"
msgid "N&etwork Mode"
msgstr "Nettverksmodus"
-#: src/include/crowbar/complex.rb:1526
+#: src/include/crowbar/complex.rb:1535
#, fuzzy
#| msgid "Bond Network"
msgid "Bastion Network"
msgstr "Bond-nettverk"
#. tab header
-#: src/include/crowbar/complex.rb:1569
+#: src/include/crowbar/complex.rb:1578
#, fuzzy
#| msgid "Networks"
msgid "Net&works"
msgstr "Nettverk"
#. tab header
-#: src/include/crowbar/complex.rb:1605
+#: src/include/crowbar/complex.rb:1614
#, fuzzy
#| msgid "Repositories"
msgid "Re&positories"
msgstr "Pakkebrønner"
#. popup message %1 is FQDN
-#: src/include/crowbar/complex.rb:1722
+#: src/include/crowbar/complex.rb:1731
#, fuzzy
#| msgid ""
#| "The SUSE Cloud Admin Server has been deployed. Changing the network is\n"
@@ -479,7 +479,7 @@
"Besøk web-grensesnittet for Crowbar på http://%1:3000/"
#. default dialog caption
-#: src/include/crowbar/complex.rb:1740
+#: src/include/crowbar/complex.rb:1749
msgid "Crowbar Configuration Overview"
msgstr "Oversikt over Crowbar-oppsett"
@@ -540,38 +540,38 @@
msgstr "Initialiserer ..."
#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:154
+#: src/modules/Crowbar.rb:142
msgid "Initializing crowbar Configuration"
msgstr "Initialiserer crowbar-oppsett"
#. Progress stage
-#: src/modules/Crowbar.rb:165
+#: src/modules/Crowbar.rb:153
msgid "Read the configuraton"
msgstr "Les oppsett"
#. Progress step
-#: src/modules/Crowbar.rb:169
+#: src/modules/Crowbar.rb:157
msgid "Reading the configuration..."
msgstr "Leser konfigurasjonen..."
#. Progress finished
#. Progress finished
-#: src/modules/Crowbar.rb:171 src/modules/Crowbar.rb:261
+#: src/modules/Crowbar.rb:159 src/modules/Crowbar.rb:249
msgid "Finished"
msgstr "Fullført"
#. Crowbar read dialog caption
-#: src/modules/Crowbar.rb:244
+#: src/modules/Crowbar.rb:232
msgid "Saving crowbar Configuration"
msgstr "Lagrer crowbar-oppsett"
#. Progress stage 1/2
-#: src/modules/Crowbar.rb:255
+#: src/modules/Crowbar.rb:243
msgid "Write the settings"
msgstr "Lagre innstillingene"
#. Progress step 1/2
-#: src/modules/Crowbar.rb:259
+#: src/modules/Crowbar.rb:247
msgid "Writing the settings..."
msgstr "Lagrer innstillingene..."
Modified: branches/plus-SLE12-SP2/yast/nb/po/dhcp-server.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/dhcp-server.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/dhcp-server.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: dhcp-server.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2008-09-20 21:42+0200\n"
"Last-Translator: Olav P. \n"
"Language-Team: Norwegian Bokmål <>\n"
@@ -65,7 +65,9 @@
msgstr "Administrer alternativer for DHCP-undernettverk"
#. command line help text for an option
+#. command line help text for an option
#: src/include/dhcp-server/commandline.rb:85
+#: src/include/dhcp-server/commandline.rb:138
msgid "List all defined hosts with a fixed address"
msgstr "Vis alle definerte vertsmaskiner med fast adresse"
@@ -105,249 +107,242 @@
msgstr "IP-adresse (eller vertsnavn) til vertsmaskin med fast adresse"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:138
+#: src/include/dhcp-server/commandline.rb:144
msgid "Select the network interface to use"
msgstr "Velg nettverksgrensesnittet som skal brukes"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:145
+#: src/include/dhcp-server/commandline.rb:151
msgid "Print the currently used interface and list other available interfaces"
msgstr "Skriv ut gjeldende grensesnitt og vis andre tilgjengelige grensesnitt"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:151
+#: src/include/dhcp-server/commandline.rb:157
msgid "Print current options"
msgstr "Skriv ut gjeldende alternativer"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:157
+#: src/include/dhcp-server/commandline.rb:163
msgid "Set a global option"
msgstr "Definer et globalt alternativ"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:163
+#: src/include/dhcp-server/commandline.rb:169
msgid "Option key (for example, ntp-servers)"
msgstr "Valgnøkkel (f.eks. ntp-servers)"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:170
+#: src/include/dhcp-server/commandline.rb:176
msgid "Option value (for example, IP address)"
msgstr "Valgverdi (f.eks. IP address)"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:177
+#: src/include/dhcp-server/commandline.rb:183
msgid "Lowest IP address of the dynamic address assigning range"
msgstr "Laveste IP-adresse i tildelingsområdet for dynamiske adresser"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:184
+#: src/include/dhcp-server/commandline.rb:190
msgid "Highest IP address of the dynamic address assigning range"
msgstr "Høyeste IP-adresse i tildelingsområdet for dynamiske adresser"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:191
+#: src/include/dhcp-server/commandline.rb:197
msgid "Default lease time in seconds"
msgstr "Standard tildelingstid i sekunder"
#. command line help text for an option
-#: src/include/dhcp-server/commandline.rb:198
+#: src/include/dhcp-server/commandline.rb:204
msgid "Maximum lease time in seconds"
msgstr "Maksimal tildelingstid i sekunder"
#. status information for command line
-#: src/include/dhcp-server/commandline.rb:239
+#: src/include/dhcp-server/commandline.rb:245
msgid "DHCP server is enabled"
msgstr "DHCP-serveren er aktivert"
#. status information for command line
-#: src/include/dhcp-server/commandline.rb:241
+#: src/include/dhcp-server/commandline.rb:247
msgid "DHCP server is disabled"
msgstr "DHCP-serveren er deaktivert"
#. command-line text output, %1 is host name
-#: src/include/dhcp-server/commandline.rb:294
+#: src/include/dhcp-server/commandline.rb:300
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:300
+#: src/include/dhcp-server/commandline.rb:306
msgid "Hardware: %1"
msgstr "Maskinvare: %1"
#. command-line text output, %1 is IP address
-#: src/include/dhcp-server/commandline.rb:306
+#: src/include/dhcp-server/commandline.rb:312
msgid "IP Address: %1"
msgstr "IP-adresse: %1"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:321
+#: src/include/dhcp-server/commandline.rb:327
msgid "Hostname not specified."
msgstr "Vertsnavn ikke spesifisert."
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:331
+#: src/include/dhcp-server/commandline.rb:337
msgid "Specified host does not exist."
msgstr "Den spesifiserte vertsmaskinen finnes ikke."
#. to be eventually pasted to "Selected interfaces: %1"
#. to be eventually pasted to "Other interfaces: %1"
-#: src/include/dhcp-server/commandline.rb:392
-#: src/include/dhcp-server/commandline.rb:396
+#: src/include/dhcp-server/commandline.rb:398
+#: src/include/dhcp-server/commandline.rb:402
msgid "None"
msgstr "Ingen"
#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:400
+#: src/include/dhcp-server/commandline.rb:406
msgid "Selected Interfaces: %1"
msgstr "Valgte grensesnitt: %1"
#. command-line text output, %1 is list of network interfaces
-#: src/include/dhcp-server/commandline.rb:403
+#: src/include/dhcp-server/commandline.rb:409
msgid "Other Interfaces: %1"
msgstr "Andre grensesnitt: %1"
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:411
+#: src/include/dhcp-server/commandline.rb:417
msgid "Specified interface does not exist."
msgstr "Det spesifiserte grensesnittet finnes ikke."
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:420
+#: src/include/dhcp-server/commandline.rb:426
msgid "Operation with the interface not specified."
msgstr "Operasjon med grensesnittet ikke spesifisert."
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:446
+#: src/include/dhcp-server/commandline.rb:452
msgid "Option key must be set."
msgstr "En alternativnøkkel må spesifiseres."
#. command-line error report
-#: src/include/dhcp-server/commandline.rb:451
+#: src/include/dhcp-server/commandline.rb:457
msgid "Value must be set."
msgstr "En verdi må spesifiseres."
#. command-line output text, %1 and %1 are IP addresses
-#: src/include/dhcp-server/commandline.rb:495
+#: src/include/dhcp-server/commandline.rb:501
msgid "Address Range: %1-%2"
msgstr "Adresseområde: %1-%2"
#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:504
+#: src/include/dhcp-server/commandline.rb:510
msgid "Default Lease Time: %1"
msgstr "Standard tildelingstid: %1"
#. command-line output text, %1 is integer
-#: src/include/dhcp-server/commandline.rb:512
+#: src/include/dhcp-server/commandline.rb:518
msgid "Maximum Lease Time: %1"
msgstr "Maksimal tildelingstid: %1"
#. yes-no popup
-#: src/include/dhcp-server/dialogs.rb:57
+#: src/include/dhcp-server/dialogs.rb:52
msgid "Saving the configuration failed. Change the settings?"
msgstr "Konfigurasjonen kunne ikke lagres. Vil du endre innstillingene?"
-#. Restart only if it's already running
-#: src/include/dhcp-server/dialogs.rb:76
-#, fuzzy
-#| msgid "Saving the Configuration"
-msgid "Saving the configuration failed"
-msgstr "Lagrer konfigurasjon"
-
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:118
+#: src/include/dhcp-server/dialogs.rb:84
msgid "DHCP Server Configuration"
msgstr "Konfigurasjon av DHCP-server"
#. dialog caption
#. Initialize the widget
#. @param [String] id any widget id
-#: src/include/dhcp-server/dialogs.rb:150
-#: src/include/dhcp-server/widgets.rb:477
+#: src/include/dhcp-server/dialogs.rb:116
+#: src/include/dhcp-server/widgets.rb:541
msgid "Global Options"
msgstr "Generelle alternativer"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:185
+#: src/include/dhcp-server/dialogs.rb:151
msgid "Subnet Configuration"
msgstr "Subnettkonfigurasjon"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:219
+#: src/include/dhcp-server/dialogs.rb:185
msgid "Host with Fixed Address"
msgstr "Vert med fast adresse"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:256
+#: src/include/dhcp-server/dialogs.rb:222
msgid "Shared Network"
msgstr "Delt nettverk"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:290
+#: src/include/dhcp-server/dialogs.rb:256
msgid "Pool of Addresses"
msgstr "Adresseutvalg"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:324
+#: src/include/dhcp-server/dialogs.rb:291
msgid "Group-Specific Options"
msgstr "Gruppespesifikke alternativer"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:358
+#: src/include/dhcp-server/dialogs.rb:325
msgid "Class"
msgstr "Klasse"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:406
+#: src/include/dhcp-server/dialogs.rb:374
msgid "&Subnet"
msgstr "&Subnett"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:408
+#: src/include/dhcp-server/dialogs.rb:376
msgid "&Host"
msgstr "&Vertsmaskin"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:410
+#: src/include/dhcp-server/dialogs.rb:378
msgid "Shared &Network"
msgstr "Delt &nettverk"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:412
+#: src/include/dhcp-server/dialogs.rb:380
msgid "&Group"
msgstr "&Gruppe"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:414
+#: src/include/dhcp-server/dialogs.rb:382
msgid "&Pool of Addresses"
msgstr "&Adresseutvalg"
#. radio button
-#: src/include/dhcp-server/dialogs.rb:416
+#: src/include/dhcp-server/dialogs.rb:384
msgid "&Class"
msgstr "&Klasse"
#. frame
-#: src/include/dhcp-server/dialogs.rb:431
+#: src/include/dhcp-server/dialogs.rb:399
msgid "Declaration Types"
msgstr "Deklarasjonstyper"
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:439
+#: src/include/dhcp-server/dialogs.rb:407
msgid "Declaration Type"
msgstr "Deklarasjonstype"
#. dialog caption
#. dialog caption
-#: src/include/dhcp-server/dialogs.rb:485
-#: src/include/dhcp-server/dialogs.rb:525
+#: src/include/dhcp-server/dialogs.rb:453
+#: src/include/dhcp-server/dialogs.rb:493
msgid "Interface Configuration"
msgstr "Grensesnittkonfigurasjon"
#. dialog caption
#. item of a menu button
-#: src/include/dhcp-server/dialogs.rb:554
-#: src/include/dhcp-server/widgets.rb:1106
+#: src/include/dhcp-server/dialogs.rb:522
+#: src/include/dhcp-server/widgets.rb:1118
msgid "TSIG Key Management"
msgstr "Administrasjon av TSIG-nøkkel"
@@ -372,150 +367,190 @@
msgstr "Sekunder"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:94
+#: src/include/dhcp-server/dialogs2.rb:93
msgid "DHCP Server: Start-Up"
msgstr "DHCP-server: Oppstart"
#. dialog caption
#. tree item
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:96
-#: src/include/dhcp-server/dialogs2.rb:98
-#: src/include/dhcp-server/dialogs2.rb:182
+#: src/include/dhcp-server/dialogs2.rb:95
+#: src/include/dhcp-server/dialogs2.rb:97
+#: src/include/dhcp-server/dialogs2.rb:181
msgid "Start-Up"
msgstr "Oppstart"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:116
+#: src/include/dhcp-server/dialogs2.rb:115
msgid "DHCP Server: Card Selection"
msgstr "DHCP-server: Valg av kort"
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:118
-#: src/include/dhcp-server/dialogs2.rb:120
+#: src/include/dhcp-server/dialogs2.rb:117
+#: src/include/dhcp-server/dialogs2.rb:119
msgid "Card Selection"
msgstr "Valg av kort"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:130
+#: src/include/dhcp-server/dialogs2.rb:129
msgid "DHCP Server: Global Settings"
msgstr "DHCP-server: Generelle innstillinger"
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:134
-#: src/include/dhcp-server/dialogs2.rb:136
+#: src/include/dhcp-server/dialogs2.rb:133
+#: src/include/dhcp-server/dialogs2.rb:135
msgid "Global Settings"
msgstr "Generelle innstillinger"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:142
+#: src/include/dhcp-server/dialogs2.rb:141
msgid "DHCP Server: Dynamic DHCP"
msgstr "DHCP-server: Dynamisk DHCP"
#. dialog caption
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:144
-#: src/include/dhcp-server/dialogs2.rb:146
+#: src/include/dhcp-server/dialogs2.rb:143
+#: src/include/dhcp-server/dialogs2.rb:145
msgid "Dynamic DHCP"
msgstr "Dynamisk DHCP"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:152
+#: src/include/dhcp-server/dialogs2.rb:151
msgid "DHCP Server: Host Management"
msgstr "DHCP-server: Vertsmaskinadministrasjon"
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:156
+#: src/include/dhcp-server/dialogs2.rb:155
msgid "Host Management"
msgstr "Vertsmaskinadministrasjon"
#. dialog caption
-#: src/include/dhcp-server/dialogs2.rb:161
+#: src/include/dhcp-server/dialogs2.rb:160
msgid "DHCP Server: Expert Settings"
msgstr "DHCP-server: Avanserte innstillinger"
#. tree item
-#: src/include/dhcp-server/dialogs2.rb:165
+#: src/include/dhcp-server/dialogs2.rb:164
msgid "Expert Settings"
msgstr "Avanserte innstillinger"
#. radio button
-#: src/include/dhcp-server/dialogs2.rb:206
+#: src/include/dhcp-server/dialogs2.rb:205
msgid "When &Booting"
msgstr "Under &oppstart"
#. radio button
-#: src/include/dhcp-server/dialogs2.rb:208
+#: src/include/dhcp-server/dialogs2.rb:207
msgid "&Manually"
msgstr "&Manuelt"
#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:212
+#: src/include/dhcp-server/dialogs2.rb:211
msgid "When Booting"
msgstr "Under oppstart"
#. part of help text - radio button label, NO SHORTCUT!!!
-#: src/include/dhcp-server/dialogs2.rb:214
+#: src/include/dhcp-server/dialogs2.rb:213
msgid "Manually"
msgstr "Manuelt"
-#: src/include/dhcp-server/dialogs2.rb:334
+#. label - service status
+#: src/include/dhcp-server/dialogs2.rb:221
+msgid "DHCP server is running"
+msgstr "DHCP-serveren kjører"
+
+#. label - service status
+#: src/include/dhcp-server/dialogs2.rb:225
+msgid "DHCP server is not running"
+msgstr "DHCP-serveren kjører ikke"
+
+#. push button
+#: src/include/dhcp-server/dialogs2.rb:229
+msgid "&Start DHCP Server Now"
+msgstr "&Start DHCP-serveren nå"
+
+#. push button
+#: src/include/dhcp-server/dialogs2.rb:233
+msgid "S&top DHCP Server Now"
+msgstr "S&topp DHCP-serveren nå"
+
+#. push button
+#: src/include/dhcp-server/dialogs2.rb:241
+msgid "Save Settings and Restart DHCP Server &Now"
+msgstr "Lagre innstillingene og start DHCP-serveren på nytt &nå"
+
+#. part of help text - push button label, NO SHORTCUT!!!
+#: src/include/dhcp-server/dialogs2.rb:247
+msgid "Start DHCP Server Now"
+msgstr "Start DHCP-serveren nå"
+
+#. part of help text - push button label, NO SHORTCUT!!!
+#: src/include/dhcp-server/dialogs2.rb:249
+msgid "Stop DHCP Server Now"
+msgstr "Stopp DHCP-serveren nå"
+
+#. part of help text - push button label, NO SHORTCUT!!!
+#: src/include/dhcp-server/dialogs2.rb:251
+msgid "Save Settings and Restart DHCP Server Now"
+msgstr "Lagre innstillingene og start DHCP-serveren på nytt nå"
+
+#: src/include/dhcp-server/dialogs2.rb:371
msgid "DHCP Server Start-up Arguments"
msgstr "Oppstartsargumenter for DHCP-server"
#. Table - listing available network cards
-#: src/include/dhcp-server/dialogs2.rb:404
+#: src/include/dhcp-server/dialogs2.rb:443
msgid "Network Cards for DHCP Server"
msgstr "Nettverkskort for DHCP-server"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:410
+#: src/include/dhcp-server/dialogs2.rb:449
msgid "Selected"
msgstr "Valgte"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:412
+#: src/include/dhcp-server/dialogs2.rb:451
msgid "Interface Name"
msgstr "Grensesnittnavn"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dialogs2.rb:414
+#: src/include/dhcp-server/dialogs2.rb:453
msgid "Device Name"
msgstr "Enhetsnavn"
#. TRANSLATORS: table header item
#. Table header item - IP of the host
-#: src/include/dhcp-server/dialogs2.rb:416
-#: src/include/dhcp-server/dialogs2.rb:1602
+#: src/include/dhcp-server/dialogs2.rb:455
+#: src/include/dhcp-server/dialogs2.rb:1650
msgid "IP"
msgstr "IP"
#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:423
+#: src/include/dhcp-server/dialogs2.rb:462
msgid "&Select"
msgstr "&Velg"
#. TRANSLATORS: a push-button
-#: src/include/dhcp-server/dialogs2.rb:425
+#: src/include/dhcp-server/dialogs2.rb:464
msgid "&Deselect"
msgstr "&Velg bort"
#. TRANSLATORS: Table items; Informs that the IP is a DHCP Address
-#: src/include/dhcp-server/dialogs2.rb:494
+#: src/include/dhcp-server/dialogs2.rb:533
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:569
+#: src/include/dhcp-server/dialogs2.rb:608
msgid "At least one network interface must be selected."
msgstr "Minst ett nettverksgrensesnitt må velges."
#. TRANSLATORS: popup error, DHCP Server requires selected interface to have
#. at least minimal configuration
-#: src/include/dhcp-server/dialogs2.rb:577
+#: src/include/dhcp-server/dialogs2.rb:616
#, fuzzy
#| msgid ""
#| "The selected network interface is not configured (no assigned IP address \n"
@@ -531,60 +566,60 @@
#. configuration will be saved in ldap?
#. check box
-#: src/include/dhcp-server/dialogs2.rb:593
-#: src/include/dhcp-server/widgets.rb:1058
+#: src/include/dhcp-server/dialogs2.rb:632
+#: src/include/dhcp-server/widgets.rb:1079
msgid "&LDAP Support"
msgstr "&LDAP-støtte"
#. FATE #227, comments #5 and #17
-#: src/include/dhcp-server/dialogs2.rb:600
+#: src/include/dhcp-server/dialogs2.rb:639
msgid "DHCP Server &Name (optional)"
msgstr "DHCP-server&navn (valgfritt)"
#. Textentry with name of the domain
-#: src/include/dhcp-server/dialogs2.rb:613
+#: src/include/dhcp-server/dialogs2.rb:652
msgid "&Domain Name"
msgstr "&Domenenavn"
#. Textentry with IP address of primary name server
-#: src/include/dhcp-server/dialogs2.rb:615
+#: src/include/dhcp-server/dialogs2.rb:654
msgid "&Primary Name Server IP"
msgstr "&Primær navneserver-IP"
#. Textentry with IP address of secondary name server
-#: src/include/dhcp-server/dialogs2.rb:618
+#: src/include/dhcp-server/dialogs2.rb:657
msgid "&Secondary Name Server IP"
msgstr "&Sekundær navneserver-IP"
#. Textentry with IP address of default router
-#: src/include/dhcp-server/dialogs2.rb:621
+#: src/include/dhcp-server/dialogs2.rb:660
msgid "Default &Gateway (Router) "
msgstr "Standard &systemport (ruter) "
#. Textentry with IP address of time server
-#: src/include/dhcp-server/dialogs2.rb:626
+#: src/include/dhcp-server/dialogs2.rb:665
msgid "NTP &Time Server"
msgstr "NTP-&tidsserver"
#. Textentry with IP address of print server
-#: src/include/dhcp-server/dialogs2.rb:628
+#: src/include/dhcp-server/dialogs2.rb:667
msgid "&Print Server"
msgstr "&Utskriftsserver"
#. Textentry with IP address of WINS (Windows Internet Naming Service) server
-#: src/include/dhcp-server/dialogs2.rb:630
+#: src/include/dhcp-server/dialogs2.rb:669
msgid "&WINS Server"
msgstr "&WINS-server"
#. Textentry with default lease time of IP address from dhcp server
-#: src/include/dhcp-server/dialogs2.rb:635
+#: src/include/dhcp-server/dialogs2.rb:674
msgid "Default &Lease Time"
msgstr "Standard tilde&lingstid"
#. Units for defaultleasetime
#. Combobox - type of units for lease time
-#: src/include/dhcp-server/dialogs2.rb:644
-#: src/include/dhcp-server/dialogs2.rb:1097
+#: src/include/dhcp-server/dialogs2.rb:683
+#: src/include/dhcp-server/dialogs2.rb:1139
msgid "&Units"
msgstr "&Enheter"
@@ -592,48 +627,48 @@
#. error popup
#. error popup
#. error popup
-#: 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
+#: src/include/dhcp-server/dialogs2.rb:1017
+#: src/include/dhcp-server/dialogs2.rb:1029
+#: src/include/dhcp-server/dialogs2.rb:1041
+#: src/include/dhcp-server/dialogs2.rb:1053
msgid "The specified value is not a valid hostname or IP address."
msgstr "Den spesifiserte verdien er ikke et gyldig vertsnavn eller IP-adresse."
#. frame
-#: src/include/dhcp-server/dialogs2.rb:1025
+#: src/include/dhcp-server/dialogs2.rb:1067
msgid "Subnet Information"
msgstr "Subnettkonfigurasjon"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1031
+#: src/include/dhcp-server/dialogs2.rb:1073
msgid "Current &Network"
msgstr "Gjeldende &nettverk"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1036
+#: src/include/dhcp-server/dialogs2.rb:1078
msgid "Current Net&mask"
msgstr "Gjeldende nettverks&maske"
#. TRANSLATORS: informative text entry (filled up, disabled)
-#: src/include/dhcp-server/dialogs2.rb:1041
+#: src/include/dhcp-server/dialogs2.rb:1083
msgid "Netmask Bi&ts"
msgstr "Nettverksmaskebi&ts"
#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1048
+#: src/include/dhcp-server/dialogs2.rb:1090
#: src/include/dhcp-server/dns-server-dialogs.rb:81
msgid "Min&imum IP Address"
msgstr "Laveste &IP-adresse"
#. text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1053
+#: src/include/dhcp-server/dialogs2.rb:1095
#: src/include/dhcp-server/dns-server-dialogs.rb:83
msgid "Ma&ximum IP Address"
msgstr "Hø&yeste IP-adresse"
-#: src/include/dhcp-server/dialogs2.rb:1061
+#: src/include/dhcp-server/dialogs2.rb:1103
msgid "IP Address Range"
msgstr "IP-adresseområde"
@@ -641,10 +676,10 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1067
+#: src/include/dhcp-server/dialogs2.rb:1109
#: src/include/dhcp-server/dns-server-dialogs.rb:93
-#: src/include/dhcp-server/dns-server-management.rb:355
-#: src/include/dhcp-server/dns-server-management.rb:915
+#: src/include/dhcp-server/dns-server-management.rb:356
+#: src/include/dhcp-server/dns-server-management.rb:917
msgid "&First IP Address"
msgstr "&Første IP-adresse"
@@ -652,61 +687,61 @@
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1072
+#: src/include/dhcp-server/dialogs2.rb:1114
#: src/include/dhcp-server/dns-server-dialogs.rb:95
-#: src/include/dhcp-server/dns-server-management.rb:357
-#: src/include/dhcp-server/dns-server-management.rb:917
+#: src/include/dhcp-server/dns-server-management.rb:358
+#: src/include/dhcp-server/dns-server-management.rb:919
msgid "&Last IP Address"
msgstr "&Siste IP-adresse"
#. checkbox
-#: src/include/dhcp-server/dialogs2.rb:1076
-#: src/include/dhcp-server/options.rb:1093
+#: src/include/dhcp-server/dialogs2.rb:1118
+#: src/include/dhcp-server/options.rb:1094
msgid "Allow Dynamic &BOOTP"
msgstr "Tillat dynamisk &BOOTP"
#. frame label
-#: src/include/dhcp-server/dialogs2.rb:1082
+#: src/include/dhcp-server/dialogs2.rb:1124
msgid "Lease Time"
msgstr "Tildelingstid"
#. Textentry label - lease time for IPs in the range
-#: src/include/dhcp-server/dialogs2.rb:1088
+#: src/include/dhcp-server/dialogs2.rb:1130
msgid "&Default"
msgstr "&Standard"
#. TextEntryLabel - max. time for leasing of IPs from the range
-#: src/include/dhcp-server/dialogs2.rb:1106
+#: src/include/dhcp-server/dialogs2.rb:1148
msgid "&Maximum"
msgstr "&Maks. tildelingstid"
#. Combobox - type of units for max lease time
-#: src/include/dhcp-server/dialogs2.rb:1116
+#: src/include/dhcp-server/dialogs2.rb:1158
msgid "Uni&ts"
msgstr "Enhe&ter"
#. zone is not maintained by the DNS server
#. zone is maintained and it is a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1318
-#: src/include/dhcp-server/dialogs2.rb:1327
+#: src/include/dhcp-server/dialogs2.rb:1360
+#: src/include/dhcp-server/dialogs2.rb:1369
msgid "Create New DNS Zone from Scratch"
msgstr "Opprett ny DNS-sone"
-#: src/include/dhcp-server/dialogs2.rb:1329
+#: src/include/dhcp-server/dialogs2.rb:1371
msgid "Edit Current DNS Zone"
msgstr "Rediger Gjeldende DNS-sone"
#. zone is maintained but it is not a 'master'
-#: src/include/dhcp-server/dialogs2.rb:1335
+#: src/include/dhcp-server/dialogs2.rb:1377
msgid "Get Current Zone Information"
msgstr "Hent informasjon om gjeldende sone"
-#: src/include/dhcp-server/dialogs2.rb:1343
+#: src/include/dhcp-server/dialogs2.rb:1385
msgid "&Synchronize DNS Server..."
msgstr "&Synkroniser DNS-server..."
#. Show DNS Zone Information
-#: src/include/dhcp-server/dialogs2.rb:1372
+#: src/include/dhcp-server/dialogs2.rb:1414
msgid ""
"DNS zone %1 is not a master zone.\n"
"Therefore, you cannot change it here.\n"
@@ -716,8 +751,8 @@
#. A popup error text
#. A popup error text
-#: src/include/dhcp-server/dialogs2.rb:1499
-#: src/include/dhcp-server/dialogs2.rb:1507
+#: src/include/dhcp-server/dialogs2.rb:1547
+#: src/include/dhcp-server/dialogs2.rb:1555
msgid "Enter values for both ends of the IP address range."
msgstr "Angi start- og sluttverdier for IP-adresseområdet."
@@ -725,8 +760,8 @@
#. %1 is the tested IP which should match network %2 and netmask %3
#. TRANSLATORS: popup error message
#. %1 is the tested IP which should match network %2 and netmask %3
-#: src/include/dhcp-server/dialogs2.rb:1546
-#: src/include/dhcp-server/dialogs2.rb:1569
+#: src/include/dhcp-server/dialogs2.rb:1594
+#: src/include/dhcp-server/dialogs2.rb:1617
msgid ""
"The dynamic DHCP address range must be in the same network as the DHCP server.\n"
"IP %1 does not match the network %2/%3."
@@ -735,127 +770,127 @@
"IP '%1' samsvarer ikke med nettverket %2/%3."
#. Label of the registered hosts table
-#: src/include/dhcp-server/dialogs2.rb:1594
+#: src/include/dhcp-server/dialogs2.rb:1642
msgid "Registered Host"
msgstr "Registrert vertsmaskin"
#. Table header item - Name of the host
-#: src/include/dhcp-server/dialogs2.rb:1600
+#: src/include/dhcp-server/dialogs2.rb:1648
msgid "Name"
msgstr "Navn"
#. MAC address of the host
-#: src/include/dhcp-server/dialogs2.rb:1604
+#: src/include/dhcp-server/dialogs2.rb:1652
msgid "Hardware Address"
msgstr "Maskinvareadresse"
#. Network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1606
+#: src/include/dhcp-server/dialogs2.rb:1654
msgid "Type"
msgstr "Type"
#. Frame label - configuration of particular host
-#: src/include/dhcp-server/dialogs2.rb:1613
+#: src/include/dhcp-server/dialogs2.rb:1661
msgid "List Setup"
msgstr "Oppsettliste"
#. Textentry label - name of the host
-#: src/include/dhcp-server/dialogs2.rb:1621
+#: src/include/dhcp-server/dialogs2.rb:1669
msgid "&Name"
msgstr "&Navn"
#. Textentry label - IP address of the host
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dialogs2.rb:1626
-#: src/include/dhcp-server/dns-server-management.rb:228
+#: src/include/dhcp-server/dialogs2.rb:1674
+#: src/include/dhcp-server/dns-server-management.rb:229
msgid "&IP Address"
msgstr "&IP-Adresse"
#. Textentry label - hardware (mac) address of the host
-#: src/include/dhcp-server/dialogs2.rb:1634
+#: src/include/dhcp-server/dialogs2.rb:1682
msgid "&Hardware Address"
msgstr "&Maskinvareadresse"
#. Radiobutton label - network type of the host
-#: src/include/dhcp-server/dialogs2.rb:1641
+#: src/include/dhcp-server/dialogs2.rb:1689
msgid "&Ethernet"
msgstr "&Ethernet"
-#: src/include/dhcp-server/dialogs2.rb:1643
+#: src/include/dhcp-server/dialogs2.rb:1691
msgid "&Token Ring"
msgstr "&Tokenring"
#. Pushbutton label - change host in list
-#: src/include/dhcp-server/dialogs2.rb:1658
+#: src/include/dhcp-server/dialogs2.rb:1706
msgid "C&hange in List"
msgstr "E&ndre i liste"
#. Pushbutton label - delete host from list
-#: src/include/dhcp-server/dialogs2.rb:1661
+#: src/include/dhcp-server/dialogs2.rb:1709
msgid "Dele&te from List"
msgstr "Slet&te fra liste"
#. now, fill the dialog
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1762
-#: src/include/dhcp-server/options.rb:1038
+#: src/include/dhcp-server/dialogs2.rb:1810
+#: src/include/dhcp-server/options.rb:1039
msgid "Ethernet"
msgstr "Ethernet"
#. combo box entry, networking technology name
-#: src/include/dhcp-server/dialogs2.rb:1763
-#: src/include/dhcp-server/options.rb:1040
+#: src/include/dhcp-server/dialogs2.rb:1811
+#: src/include/dhcp-server/options.rb:1041
msgid "Token Ring"
msgstr "Tokenring"
#. error popup
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1837
-#: src/include/dhcp-server/options.rb:934
+#: src/include/dhcp-server/dialogs2.rb:1885
+#: src/include/dhcp-server/options.rb:935
msgid "The hardware address is invalid.\n"
msgstr "Maskinvareadressen er ugyldig.\n"
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1883
+#: src/include/dhcp-server/dialogs2.rb:1931
msgid "The hardware address must be unique."
msgstr "Maskinvareadressen må være unik."
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1893
+#: src/include/dhcp-server/dialogs2.rb:1941
msgid "The hostname cannot be empty."
msgstr "Du må angi et vertsnavn."
#. error popup, %1 is host name
-#: src/include/dhcp-server/dialogs2.rb:1903
+#: src/include/dhcp-server/dialogs2.rb:1951
msgid "A host named %1 already exists."
msgstr "En vertsmaskin med navnet %1 finnes allerede."
#. error popup
#. FIXME: text?
-#: src/include/dhcp-server/dialogs2.rb:1921
-#: src/include/dhcp-server/dialogs2.rb:1985
+#: src/include/dhcp-server/dialogs2.rb:1969
+#: src/include/dhcp-server/dialogs2.rb:2033
msgid "Enter a host IP."
msgstr "Angi IP for vertsmaskin."
#. error popup
-#: src/include/dhcp-server/dialogs2.rb:1936
+#: src/include/dhcp-server/dialogs2.rb:1984
msgid "The hardware address must be defined."
msgstr "Maskinvareadressen må spesifiseres."
#. error popup
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:1957
-#: src/include/dhcp-server/dialogs2.rb:1972
+#: src/include/dhcp-server/dialogs2.rb:2005
+#: src/include/dhcp-server/dialogs2.rb:2020
msgid "Select a host first."
msgstr "Velg en vertsmaskin først."
#. checking new MAC
-#: src/include/dhcp-server/dialogs2.rb:1999
+#: src/include/dhcp-server/dialogs2.rb:2047
msgid "The input value must be defined."
msgstr "Verdien må spesifiseres."
#. yes-no popup
-#: src/include/dhcp-server/dialogs2.rb:2038
+#: src/include/dhcp-server/dialogs2.rb:2086
msgid ""
"If you enter the expert settings, you cannot return \n"
"to this dialog. You may be able to display this dialog \n"
@@ -875,15 +910,15 @@
"Vil du fortsette?"
#. remove leading '-'
-#: src/include/dhcp-server/dialogs2.rb:2085
+#: src/include/dhcp-server/dialogs2.rb:2133
msgid "\"-%1\" is not a valid DHCP server commandline option"
msgstr "\"-%1\" er ikke et gyldig kommandolinjevalg for DHCP-serveren"
-#: src/include/dhcp-server/dialogs2.rb:2096
+#: src/include/dhcp-server/dialogs2.rb:2144
msgid "DHCP server commandline option \"-%1\" requires an argument"
msgstr "Kommandolinjevalget \"-%1\" for DHCP-serveren krever et argument"
-#: src/include/dhcp-server/dialogs2.rb:2107
+#: src/include/dhcp-server/dialogs2.rb:2155
msgid ""
"You have specified an alternate configuration file for the DHCP server.\n"
"\n"
@@ -902,7 +937,7 @@
"Vil du fortsette likevel?\n"
#. dialog caption, %1 is step number
-#: src/include/dhcp-server/dialogs2.rb:2179
+#: src/include/dhcp-server/dialogs2.rb:2236
msgid "DHCP Server Wizard (%1 of 4)"
msgstr "Veiviser for DHCP-server (%1 av 4)"
@@ -1192,7 +1227,7 @@
#. TRANSLATORS: popup error
#. TRANSLATORS: popup error
#: src/include/dhcp-server/dns-server-dialogs.rb:228
-#: src/include/dhcp-server/dns-server-management.rb:454
+#: src/include/dhcp-server/dns-server-management.rb:455
msgid "The last IP address must be higher than the first one."
msgstr "Den siste IP-adressen må være høyere enn den første."
@@ -1219,7 +1254,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:255
+#: src/include/dhcp-server/dns-server-management.rb:256
msgid "Invalid hostname."
msgstr "Ugyldig vertsnavn."
@@ -1230,9 +1265,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:264
-#: src/include/dhcp-server/dns-server-management.rb:393
-#: src/include/dhcp-server/dns-server-management.rb:401
+#: 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
msgid "Invalid IP address."
msgstr "Ugyldig IP-adresse."
@@ -1250,44 +1285,44 @@
"IP-adresser (%2-%3) som er definert for DHCP-serveren.\n"
#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:156
+#: src/include/dhcp-server/dns-server-management.rb:157
msgid "Regenerating DNS zone entries..."
msgstr "Genererer DNS-soneoppføringer på nytt..."
#. TRANSLATORS: dialog frame label
-#: src/include/dhcp-server/dns-server-management.rb:223
+#: src/include/dhcp-server/dns-server-management.rb:224
msgid "Adding a New DNS Record"
msgstr "Legge til ny DNS-oppføring"
#. TRANSLATORS: text entry
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:226
+#: src/include/dhcp-server/dns-server-management.rb:227
#: src/include/dhcp-server/dns-server-wizard.rb:148
msgid "&Hostname"
msgstr "&Vertsmaskinnavn"
#. TRANSLATORS: busy message
#. %1 is the first IP address of the range, %2 is the last one
-#: src/include/dhcp-server/dns-server-management.rb:316
+#: src/include/dhcp-server/dns-server-management.rb:317
msgid "Adding DHCP range %1-%2 to the DNS server..."
msgstr "Legger til DHCP-område %1-%2 for DNS-server..."
#. TRANSLATORS: dialog frame label
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:352
-#: src/include/dhcp-server/dns-server-management.rb:953
+#: src/include/dhcp-server/dns-server-management.rb:353
+#: src/include/dhcp-server/dns-server-management.rb:955
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:464
+#: src/include/dhcp-server/dns-server-management.rb:465
msgid "Removing records in the range %1-%2 from the DNS server..."
msgstr "Fjerner oppføringer i området %1-%2 fra DNS-server..."
#. TRANSLATORS: popup error, %1 is the zone name
#. please, do not translate 'master' (exact DNS definition)
-#: src/include/dhcp-server/dns-server-management.rb:555
+#: src/include/dhcp-server/dns-server-management.rb:556
msgid ""
"Zone %1 is not of the type master.\n"
"The DNS server cannot write any records to it.\n"
@@ -1296,7 +1331,7 @@
"DNS-serveren kan ikke lagre oppføringer her.\n"
#. TRANSLATORS: popup question, %1 is a DNS zone name
-#: src/include/dhcp-server/dns-server-management.rb:569
+#: src/include/dhcp-server/dns-server-management.rb:570
msgid ""
"Zone %1 does not yet exist in the current DNS server configuration.\n"
"Create it?\n"
@@ -1306,18 +1341,18 @@
#. TRANSLATORS: popup error, %1 is a zone name
#. TRANSLATORS: error message, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:589
+#: src/include/dhcp-server/dns-server-management.rb:590
#: src/include/dhcp-server/dns-server-wizard.rb:1107
msgid "Cannot create zone %1."
msgstr "Kan ikke opprette sonen %1."
#. TRANSLATORS: busy message
-#: src/include/dhcp-server/dns-server-management.rb:813
+#: src/include/dhcp-server/dns-server-management.rb:815
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:858
+#: src/include/dhcp-server/dns-server-management.rb:860
msgid ""
"If you cancel, all changes made to the DNS server will be lost.\n"
"Really cancel this operation?\n"
@@ -1326,62 +1361,62 @@
"Vil du virkelig avbryte denne handlingen?\n"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:907
+#: src/include/dhcp-server/dns-server-management.rb:909
msgid "&Domain"
msgstr "&Domene"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:909
+#: src/include/dhcp-server/dns-server-management.rb:911
msgid "&Network"
msgstr "&Nettverk"
#. TRANSLATORS: text entry
-#: src/include/dhcp-server/dns-server-management.rb:911
+#: src/include/dhcp-server/dns-server-management.rb:913
msgid "Net&mask"
msgstr "Nettverks&maske"
#. TRANSLATORS: table label
-#: src/include/dhcp-server/dns-server-management.rb:921
+#: src/include/dhcp-server/dns-server-management.rb:923
msgid "DNS Zone Records"
msgstr "DNS-soneoppføringer"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:926
+#: src/include/dhcp-server/dns-server-management.rb:928
msgid "Hostname"
msgstr "Vertsnavn"
#. TRANSLATORS: table header item
-#: src/include/dhcp-server/dns-server-management.rb:928
+#: src/include/dhcp-server/dns-server-management.rb:930
msgid "Assigned IP"
msgstr "Tilordnet IP"
#. TRANSLATORS: push button
-#: src/include/dhcp-server/dns-server-management.rb:935
+#: src/include/dhcp-server/dns-server-management.rb:937
msgid "&Add..."
msgstr "Le&gg til..."
#. TRANSLATORS: menu button
-#: src/include/dhcp-server/dns-server-management.rb:943
+#: src/include/dhcp-server/dns-server-management.rb:945
msgid "&Special Tasks"
msgstr "&Spesielle oppgaver"
#. TRANSLATORS: menu entry
-#: src/include/dhcp-server/dns-server-management.rb:951
+#: src/include/dhcp-server/dns-server-management.rb:953
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:957
+#: src/include/dhcp-server/dns-server-management.rb:959
msgid "Run Wizard to Rewrite the DNS Zone from Scratch"
msgstr "Kjør veiviseren for å opprette DNS-sonen på nytt"
#. TRANSLATORS: checkbox, %1 is a zone name
-#: src/include/dhcp-server/dns-server-management.rb:1029
+#: src/include/dhcp-server/dns-server-management.rb:1031
msgid "Synchronize with Reverse Zone %1"
msgstr "Synkroniser med baklengssone %1"
#. TRANSLATORS: dialog caption
-#: src/include/dhcp-server/dns-server-management.rb:1082
+#: src/include/dhcp-server/dns-server-management.rb:1084
msgid "DHCP Server: DNS Server Synchronization"
msgstr "DHCP-server: Synkronisering av DNS-server"
@@ -1677,7 +1712,8 @@
"Vent...</p>"
#. help text 1/2
-#: src/include/dhcp-server/helps.rb:24
+#. help text 1/2
+#: src/include/dhcp-server/helps.rb:24 src/include/dhcp-server/helps.rb:233
msgid ""
"<p><b><big>Network Interfaces</big></b><br>\n"
"Select the network interfaces to which the DHCP server should listen from\n"
@@ -1704,9 +1740,20 @@
"Dette alternativet er tilgjengelig bare dersom brannmuren\n"
"er aktivert.</p>"
-#. help text 2/5
+#. help text 1/5
#: src/include/dhcp-server/helps.rb:39
msgid ""
+"<p><b><big>DHCP Server</big></b></p>\n"
+"<p>To run the DHCP server every time your computer is started, set\n"
+"<b>Start DHCP Server</b>.</p>"
+msgstr ""
+"<p><b><big>Start DHCP-server</big></b><br>\n"
+"For å kjøre DHCP-serveren hver gang datamaskinen starter opp, velg\n"
+"<b>Start DHCP-server</b>.</p>"
+
+#. help text 2/5
+#: src/include/dhcp-server/helps.rb:45
+msgid ""
"<p>\n"
"To run the DHCP server in chroot jail, set\n"
"<b>Run DHCP Server in Chroot Jail</b>. Starting any daemon in a chroot jail\n"
@@ -1718,7 +1765,7 @@
"øker sikkerheten og anbefales sterkt.</p>"
#. help text 3/5
-#: src/include/dhcp-server/helps.rb:46
+#: src/include/dhcp-server/helps.rb:52
msgid ""
"<p>\n"
"To store the DHCP configuration in LDAP,\n"
@@ -1729,7 +1776,7 @@
"aktiver <b>LDAP-støtte</b>.</p>"
#. help text 4/5
-#: src/include/dhcp-server/helps.rb:52
+#: src/include/dhcp-server/helps.rb:58
msgid ""
"<p><b>Configured Declarations</b> shows the configuration options in use.\n"
"To modify an existing declaration, select it and click <b>Edit</b>.\n"
@@ -1744,7 +1791,7 @@
"Velg en deklarasjon og klikk <b>Slett</b> for å slette den.</p>"
#. help text 5/5
-#: src/include/dhcp-server/helps.rb:60
+#: src/include/dhcp-server/helps.rb:66
msgid ""
"<p><b><big>Advanced Functions</big></b><br>\n"
"Use <b>Advanced</b> to display the log of the DHCP server,\n"
@@ -1759,7 +1806,7 @@
"dynamiske DNS-oppdateringer.</p>"
#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:68
+#: src/include/dhcp-server/helps.rb:74
msgid ""
"<p><b><big>Subnet Configuration</big></b><br>\n"
"Set the <b>Network Address</b> and <b>Network Mask</b> of the subnet.</p>"
@@ -1768,7 +1815,7 @@
"Angi <b>Nettverksadresse</b> og <b>Nettverksmaske</b>.</p>"
#. help text 1/3, alt. 1
-#: src/include/dhcp-server/helps.rb:72
+#: src/include/dhcp-server/helps.rb:78
msgid ""
"<p><b><big>Host with Fixed Address</big></b><br>\n"
"Set the name of the host for which to set the fixed address or other\n"
@@ -1779,7 +1826,7 @@
"spesielle valg.</p>"
#. help text 1/3, alt. 3
-#: src/include/dhcp-server/helps.rb:78
+#: src/include/dhcp-server/helps.rb:84
msgid ""
"<p><b><big>Group-Specific Options</big></b><br>\n"
"Set the name of the group of declarations in <b>Group Name</b>. \n"
@@ -1792,7 +1839,7 @@
"Navnet påvirker ikke funksjonen til DHCP-serveren.</p>"
#. help text 1/3, alt. 4
-#: src/include/dhcp-server/helps.rb:85
+#: src/include/dhcp-server/helps.rb:91
msgid ""
"<p><b><big>Pool of Addresses</big></b><br>\n"
"Set the name of the pool of addresses in <b>Pool Name</b>. \n"
@@ -1805,7 +1852,7 @@
"Navnet påvirker ikke funksjonen til DHCP-serveren.</p>"
#. help text 1/3, alt. 5
-#: src/include/dhcp-server/helps.rb:92
+#: src/include/dhcp-server/helps.rb:98
msgid ""
"<p><b><big>Shared Network</big></b><br>\n"
"Set the name for the shared network in <b>Shared Network Name</b>. \n"
@@ -1818,7 +1865,7 @@
"Navnet påvirker ikke funksjonen til DHCP-serveren.</p>"
#. help text 1/3, alt. 6
-#: src/include/dhcp-server/helps.rb:99
+#: src/include/dhcp-server/helps.rb:105
msgid ""
"<p><b><big>Class</big></b><br>\n"
"Set the name of the class of hosts in <b>Class Name</b>.</p>"
@@ -1827,7 +1874,7 @@
"Angi et navn for vertsmaskinklassen under <b>Klassenavn</b>.</p>"
#. help text 2/3
-#: src/include/dhcp-server/helps.rb:103
+#: src/include/dhcp-server/helps.rb:109
msgid ""
"<p>\n"
"To edit DHCP options, choose the appropriate\n"
@@ -1842,7 +1889,7 @@
"et alternativ, velg alternativet og klikk <b>Slett</b>.</p>"
#. help text 3/3
-#: src/include/dhcp-server/helps.rb:111
+#: src/include/dhcp-server/helps.rb:117
msgid ""
"<p>\n"
"To adjust dynamic DNS for hosts of this subnet, use <b>Dynamic DNS</b>.</p>"
@@ -1851,7 +1898,7 @@
"Bruk <b>Dynamisk DNS</b> for å justere dynamisk DNS for vertsmaskinene i subnettet.</p>"
#. help text 1/4
-#: src/include/dhcp-server/helps.rb:115
+#: src/include/dhcp-server/helps.rb:121
msgid ""
"<p><b><big>Enabling Dynamic DNS</big></b><br>\n"
"To enable Dynamic DNS updates for this subnet, set\n"
@@ -1862,7 +1909,7 @@
"<b>Aktiver dynamisk DNS for dette subnettet</b>.</p>"
#. help text 2/4
-#: src/include/dhcp-server/helps.rb:121
+#: src/include/dhcp-server/helps.rb:127
msgid ""
"<p><b><big>TSIG Key</big></b><br>\n"
"To make Dynamic DNS updates, the authentication key must be set. Use\n"
@@ -1877,7 +1924,7 @@
"og baklengs navnesone.</p>"
#. help text 3/4
-#: src/include/dhcp-server/helps.rb:129
+#: src/include/dhcp-server/helps.rb:135
msgid ""
"<p><b><big>Global DHCP Server Settings</big></b><br>\n"
"Global settings of DHCP server must be updated to make Dynamic\n"
@@ -1890,7 +1937,7 @@
"<b>Oppdater generelle innstillinger for dynamisk DNS</b>.</p>"
#. help text 4/4
-#: src/include/dhcp-server/helps.rb:136
+#: src/include/dhcp-server/helps.rb:142
msgid ""
"<p><b><big>Zones to Update</big></b><br>\n"
"Specify forward and reverse zones to update. For both, also specify \n"
@@ -1903,7 +1950,7 @@
"serveren, kan du la feltene være tomme.</p>"
#. help text
-#: src/include/dhcp-server/helps.rb:143
+#: src/include/dhcp-server/helps.rb:149
msgid ""
"<p><b><big>DHCP Server Start-Up Arguments</big></b><br>\n"
"Here you can specify parameters that you want DHCP Server to be started with \n"
@@ -1916,7 +1963,7 @@
"på manualsiden for dhcpd. Standardverdier vil bli brukt dersom ingen argumenter angis.</p>"
#. Wizard Installation - Step 1 (version for expert UI)
-#: src/include/dhcp-server/helps.rb:150
+#: src/include/dhcp-server/helps.rb:156
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"
@@ -1925,7 +1972,7 @@
"Velg ett eller flere nettverkskort som skal brukes for DHCP-serveren.</p>\n"
#. Optional field - used with LDAP support
-#: src/include/dhcp-server/helps.rb:154
+#: src/include/dhcp-server/helps.rb:160
msgid ""
"Optionally, you can also specify <b>DHCP Server Name</b>\n"
"(the name of dhcpServer LDAP object), if it differs from your hostname.\n"
@@ -1934,7 +1981,7 @@
"(navnet på LDAP-objektet dhcpServer) dersom dette avviker fra vertsnavnet.\n"
#. Wizard Installation - Step 2 1/9
-#: src/include/dhcp-server/helps.rb:158
+#: src/include/dhcp-server/helps.rb:164
msgid ""
"<p><b><big>Global Settings</big></b><br>\n"
"Here, make several DHCP settings.</p>"
@@ -1944,7 +1991,7 @@
#. Wizard Installation - Step 2 2/9
#. Wizard Installation - Step 2 3/9 (2 is removed)
-#: src/include/dhcp-server/helps.rb:165
+#: src/include/dhcp-server/helps.rb:171
msgid ""
"<p><b>Domain Name</b> sets the domain for which the DHCP server\n"
"leases IPs to clients.</p>"
@@ -1953,7 +2000,7 @@
"tildeler IP-adresser til klientene.</p>"
#. Wizard Installation - Step 2 4/9
-#: src/include/dhcp-server/helps.rb:169
+#: src/include/dhcp-server/helps.rb:175
msgid ""
"<p><b>Primary Name Server IP</b> and <b>Secondary Name Server IP</b> \n"
"offer these name servers to the DHCP clients.\n"
@@ -1964,7 +2011,7 @@
"Disse verdiene må være IP-adresser.</p>"
#. Wizard Installation - Step 2 5/9
-#: src/include/dhcp-server/helps.rb:175
+#: src/include/dhcp-server/helps.rb:181
msgid ""
"<p><b>Default Gateway</b> inserts this\n"
"value as the default route in the routing table of clients.</p>"
@@ -1973,19 +2020,19 @@
"verdien som standardrute i klientenes rutingtabell.</p>"
#. Wizard Installation - Step 2 6/9
-#: src/include/dhcp-server/helps.rb:179
+#: src/include/dhcp-server/helps.rb:185
msgid ""
"<p><b>Time Server</b> tells clients to use this server\n"
"for time synchronization.</p>"
msgstr "<p><b>Tidsserver</b> forteller klientene at de skal bruke denne serveren til tidssynkronisering.</p>"
#. Wizard Installation - Step 2 7/9
-#: src/include/dhcp-server/helps.rb:183
+#: src/include/dhcp-server/helps.rb:189
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:187
+#: src/include/dhcp-server/helps.rb:193
msgid ""
"<p><b>WINS Server</b> offers this server as the WINS server\n"
"(Windows Internet Naming Service).</p>"
@@ -1994,7 +2041,7 @@
"(Windows Internet Naming Service).</p>"
#. Wizard Installation - Step 2 9/9
-#: src/include/dhcp-server/helps.rb:191
+#: src/include/dhcp-server/helps.rb:197
msgid ""
"<p><b>Default Lease Time</b> sets the time after which the leased IP expires\n"
"and the client must ask for an IP again.</p>"
@@ -2003,7 +2050,7 @@
"slik at klienten må be om en ny IP-adresse.</p>"
#. Wizard Installation - Step 3 1/4
-#: src/include/dhcp-server/helps.rb:195
+#: src/include/dhcp-server/helps.rb:201
msgid ""
"<p><b><big>Subnet Information</big></b></br>\n"
"View information about the current subnet, such as its address,\n"
@@ -2016,7 +2063,7 @@
"</p>\n"
#. Wizard Installation - Step 3 2/4
-#: src/include/dhcp-server/helps.rb:202
+#: src/include/dhcp-server/helps.rb:208
msgid ""
"<p><b><big>IP Address Range</big></b><br>\n"
"Set the <b>First IP Address</b> and the <b>Last IP Address</b>\n"
@@ -2033,7 +2080,7 @@
"og ordinære DHCP-klienter.</p>\n"
#. Wizard Installation - Step 3 3/4
-#: src/include/dhcp-server/helps.rb:211
+#: src/include/dhcp-server/helps.rb:217
msgid ""
"<p><b><big>Lease Time</big></b><br>\n"
"Set the <b>Default</b> lease time for the current IP address range,\n"
@@ -2044,7 +2091,7 @@
"Dette definerer den optimale IP-oppdateringstiden for klientene.<br></p>"
#. Wizard Installation - Step 3 4/4
-#: src/include/dhcp-server/helps.rb:217
+#: src/include/dhcp-server/helps.rb:223
msgid ""
"<p><b>Maximum</b> (optional value) sets the maximum time period\n"
"for which this IP is blocked for the client on the DHCP server.</p>"
@@ -2053,7 +2100,7 @@
"når denne IP-adressen er sperret på DHCP-serveren for klienten.</p>"
#. Help text
-#: src/include/dhcp-server/helps.rb:221
+#: src/include/dhcp-server/helps.rb:227
msgid ""
"<p><b><big>Expert Configuration</big></b><br>\n"
"To enter the complete configuration of the DHCP server, click\n"
@@ -2064,7 +2111,7 @@
"<b>Avansert konfigurasjon av DHCP-server</b>.</p>"
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:227
+#: src/include/dhcp-server/helps.rb:239
msgid ""
"<p><b><big>Host Management</big></b><br>\n"
"Use this dialog to edit hosts with static address binding.</p>"
@@ -2073,7 +2120,7 @@
"Bruk denne dialogen for å redigere vertsmaskiner med statisk adressebinding.</p>"
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:231
+#: src/include/dhcp-server/helps.rb:243
msgid ""
"<p>To add a new new host, set its <b>Name</b>,\n"
"<b>Hardware Address</b>, and <b>IP Address</b>\n"
@@ -2088,17 +2135,17 @@
"rediger alle verdiene og klikk <b>Endre i liste</b>.</p>"
#. host management help 1/3
-#: src/include/dhcp-server/helps.rb:239
+#: src/include/dhcp-server/helps.rb:251
msgid "<p>To remove a host, select it and click <b>Delete from List</b>.</p>"
msgstr "<p>For å fjerne en vertsmaskin, velg den og klikk <b>Slett fra liste</b>.</p>"
#. help text 1/7
-#: src/include/dhcp-server/helps.rb:251
+#: src/include/dhcp-server/helps.rb:263
msgid "<p>Select the type of declaration to add.</p>"
msgstr "<p>Velg deklarasjonstypen som skal legges til.</p>"
#. help text 2/7, optional
-#: src/include/dhcp-server/helps.rb:257
+#: src/include/dhcp-server/helps.rb:269
msgid ""
"<p>To add a network declaration,\n"
"select <b>Subnet</b>.</p>"
@@ -2107,7 +2154,7 @@
"velg <b>Subnett</b>.</p>"
#. help text 3/7, optional
-#: src/include/dhcp-server/helps.rb:264
+#: src/include/dhcp-server/helps.rb:276
msgid ""
"<p>To add a host that needs special parameters\n"
"(usually a fixed address), select <b>Host</b>.</p>"
@@ -2116,7 +2163,7 @@
"(vanligvis en fast adresse), velg <b>Vertsmaskin</b>.</p>"
#. help text 4/7, optional
-#: src/include/dhcp-server/helps.rb:273
+#: src/include/dhcp-server/helps.rb:285
msgid ""
"<p>To add a shared network (physical network with\n"
"multiple logical networks), select <b>Shared Network</b>.</p>"
@@ -2125,7 +2172,7 @@
"flere logiske nettverk), velg <b>Delt nettverk</b>.</p>"
#. help text 5/7, optional
-#: src/include/dhcp-server/helps.rb:282
+#: src/include/dhcp-server/helps.rb:294
msgid ""
"<p>To add a group of other declarations (usually\n"
"if they should share some settings), select <b>Group</b>.</p>"
@@ -2134,7 +2181,7 @@
"fordi de deler noen innstillinger, velg <b>Gruppe</b>.</p>"
#. help text 6/7, optional
-#: src/include/dhcp-server/helps.rb:291
+#: src/include/dhcp-server/helps.rb:303
msgid ""
"<p>To add a pool of addresses that will be treated\n"
"differently than other address pools although they are in the same\n"
@@ -2145,7 +2192,7 @@
"subnett, velg <b>Adresseutvalg</b>.</p>"
#. help text 7/7, optional
-#: src/include/dhcp-server/helps.rb:302
+#: src/include/dhcp-server/helps.rb:314
msgid ""
"<p>To create a condition class that can be used for\n"
"handling clients differently depending on the class to which they belong,\n"
@@ -2158,23 +2205,23 @@
#. selection box
#. selection box
#. selection box
-#: 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
+#: 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
msgid "A&ddresses"
msgstr "A&dresser"
#. popup message
-#: src/include/dhcp-server/options.rb:469
+#: src/include/dhcp-server/options.rb:470
msgid "The entered address is not valid."
msgstr "Denne adressen er ikke gyldig."
#. message popup
#. message popup
-#: src/include/dhcp-server/options.rb:489
-#: src/include/dhcp-server/options.rb:542
+#: src/include/dhcp-server/options.rb:490
+#: src/include/dhcp-server/options.rb:543
msgid "At least one address must be specified."
msgstr "Minst én adresse må spesifiseres."
@@ -2184,94 +2231,94 @@
#. @param [String] key string option key
#. @param [Hash] event map event to be handled
#. selection box
-#: src/include/dhcp-server/options.rb:511
-#: src/include/dhcp-server/options.rb:527
-#: src/include/dhcp-server/options.rb:818
+#: src/include/dhcp-server/options.rb:512
+#: src/include/dhcp-server/options.rb:528
+#: src/include/dhcp-server/options.rb:819
msgid "&Values"
msgstr "&Verdier"
#. message popup
-#: src/include/dhcp-server/options.rb:562
+#: src/include/dhcp-server/options.rb:563
msgid "The entered addresses are not valid."
msgstr "Disse adressene er ikke gyldige."
#. message popup
-#: src/include/dhcp-server/options.rb:582
+#: src/include/dhcp-server/options.rb:583
msgid "At least one address pair must be specified."
msgstr "Minst ett adressepar må spesifiseres."
#. table item, means switched on
#. table item, means switched on
-#: src/include/dhcp-server/options.rb:619
-#: src/include/dhcp-server/options.rb:660
+#: src/include/dhcp-server/options.rb:620
+#: src/include/dhcp-server/options.rb:661
msgid "On"
msgstr "På"
#. table item, means switched off
#. table item, means switched off
-#: src/include/dhcp-server/options.rb:622
-#: src/include/dhcp-server/options.rb:663
+#: src/include/dhcp-server/options.rb:623
+#: src/include/dhcp-server/options.rb:664
msgid "Off"
msgstr "Av"
#. popup message
-#: src/include/dhcp-server/options.rb:693
+#: src/include/dhcp-server/options.rb:694
msgid "A value must be specified."
msgstr "En verdi må spesifiseres."
#. text entry
-#: src/include/dhcp-server/options.rb:785
+#: src/include/dhcp-server/options.rb:786
msgid "&New Address"
msgstr "&Ny adresse"
#. int field
-#: src/include/dhcp-server/options.rb:823
+#: src/include/dhcp-server/options.rb:824
msgid "&New Value"
msgstr "&Ny Verdi"
#. label (in role of help text)
-#: src/include/dhcp-server/options.rb:860
+#: src/include/dhcp-server/options.rb:861
msgid "Separate multiple addresses with spaces."
msgstr "Adressene må være adskilt av mellomrom."
#. push button
-#: src/include/dhcp-server/options.rb:863
+#: src/include/dhcp-server/options.rb:864
msgid "&Add Address Pair"
msgstr "&Legg til adressepar"
#. popup message
-#: src/include/dhcp-server/options.rb:1007
+#: src/include/dhcp-server/options.rb:1008
msgid "The lowest address must be lower than the highest one."
msgstr "Den laveste adressen må være lavere enn den høyeste."
#. label -- help text
-#: src/include/dhcp-server/options.rb:1023
+#: src/include/dhcp-server/options.rb:1024
msgid "If you change this, also update the syslog configuration."
msgstr "Hvis du endrer dette, må du også oppdatere syslog-konfigurasjonen."
#. combo box
-#: src/include/dhcp-server/options.rb:1035
+#: src/include/dhcp-server/options.rb:1036
msgid "&Hardware Type"
msgstr "&Maskinvaretype"
#. test entry, MAC better not to be translated,
#. translation would decrease the understandability
-#: src/include/dhcp-server/options.rb:1045
+#: src/include/dhcp-server/options.rb:1046
msgid "&MAC Address"
msgstr "&MAC-adresse"
#. text entry
-#: src/include/dhcp-server/options.rb:1088
+#: src/include/dhcp-server/options.rb:1089
msgid "&Lowest IP Address"
msgstr "&Laveste IP-adresse"
#. text entry
-#: src/include/dhcp-server/options.rb:1090
+#: src/include/dhcp-server/options.rb:1091
msgid "&Highest IP Address"
msgstr "&Høyeste IP-adresse"
#. Yes-No popup
-#: src/include/dhcp-server/widgets.rb:191
+#: src/include/dhcp-server/widgets.rb:174
msgid ""
"If you leave the DHCP server configuration without saving,\n"
"all changes will be lost. Really leave?"
@@ -2280,7 +2327,7 @@
"vil alle endringer vil gå tapt. Vil du avslutte likevel?"
#. yes-no popup
-#: src/include/dhcp-server/widgets.rb:311
+#: src/include/dhcp-server/widgets.rb:355
msgid ""
"The port in firewall is not open. The DHCP server\n"
"will not be able to serve your network.\n"
@@ -2291,7 +2338,7 @@
"Vil du fortsette?"
#. TRANSLATORS: popup error message, %1 is list of network interfaces
-#: src/include/dhcp-server/widgets.rb:339
+#: src/include/dhcp-server/widgets.rb:383
msgid ""
"The network interfaces listed below are not mentioned in any firewall zone.\n"
"%1\n"
@@ -2302,7 +2349,7 @@
"De kan tilordnes en sone i brannmurmodulen i YaST."
#. TRANSLATORS: popup error message, %1 a network interface name
-#: src/include/dhcp-server/widgets.rb:354
+#: src/include/dhcp-server/widgets.rb:398
msgid ""
"Network interface %1 is not mentioned in any firewall zone.\n"
"Run the YaST firewall configuration to assign it to a zone."
@@ -2312,8 +2359,8 @@
#. popup message
#. popup message
-#: src/include/dhcp-server/widgets.rb:374
-#: src/include/dhcp-server/widgets.rb:588
+#: src/include/dhcp-server/widgets.rb:424
+#: src/include/dhcp-server/widgets.rb:653
msgid ""
"This function is not available during\n"
"preparation for autoinstallation."
@@ -2321,190 +2368,199 @@
"Denne funksjonen er ikke tilgjengelig under\n"
"forberedelser til autoinstallasjon."
+#. menubutton entry, try to keep short
+#: src/include/dhcp-server/widgets.rb:445
+msgid "Restart DHCP Server"
+msgstr "Start DHCP-serveren på nytt"
+
+#. menubutton entry, try to keep short
+#: src/include/dhcp-server/widgets.rb:450
+msgid "Save Settings and Restart DHCP Server"
+msgstr "Lagre innstillingene og start DHCP-serveren på nytt"
+
#. tree widget
#. tree widget
-#: src/include/dhcp-server/widgets.rb:484
-#: src/include/dhcp-server/widgets.rb:1076
+#: src/include/dhcp-server/widgets.rb:548
+#: src/include/dhcp-server/widgets.rb:1097
msgid "&Configured Declarations"
msgstr "&Konfigurerte deklarasjoner"
#. push button
-#: src/include/dhcp-server/widgets.rb:572
+#: src/include/dhcp-server/widgets.rb:637
msgid "&Dynamic DNS"
msgstr "&Dynamisk DNS"
#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:668
-#: src/include/dhcp-server/widgets.rb:1219
+#: src/include/dhcp-server/widgets.rb:733
+#: src/include/dhcp-server/widgets.rb:1239
msgid "Forward Zone TSIG &Key"
msgstr "TSIG-&nøkkel for forlengssone"
#. combo box
#. combo box
-#: src/include/dhcp-server/widgets.rb:677
-#: src/include/dhcp-server/widgets.rb:1226
+#: src/include/dhcp-server/widgets.rb:742
+#: src/include/dhcp-server/widgets.rb:1246
msgid "Reverse Zone TSIG &Key"
msgstr "TSIG-&nøkkel for baklengssone"
#. popup headline
-#: src/include/dhcp-server/widgets.rb:796
+#: src/include/dhcp-server/widgets.rb:861
msgid "Select File with Authentication Key"
msgstr "Velg filen med autentiseringsnøkkelen"
-#. FIXME CWM should be able to handle virtual widgets
-#: src/include/dhcp-server/widgets.rb:1042
-#, fuzzy
-#| msgid "Apply Changes to Dialog"
-msgid "Apply Changes"
-msgstr "Lagre endringer for dialogboks"
+#. check box
+#: src/include/dhcp-server/widgets.rb:1060
+msgid "&Start DHCP Server"
+msgstr "&Start DHCP-serveren"
#. check box
-#: src/include/dhcp-server/widgets.rb:1049
+#: src/include/dhcp-server/widgets.rb:1070
msgid "&Run DHCP Server in Chroot Jail"
msgstr "&Kjør DHCP-serveren i Chroot-varetekt"
-#: src/include/dhcp-server/widgets.rb:1099
+#. menu button
+#: src/include/dhcp-server/widgets.rb:1111
msgid "Ad&vanced"
msgstr "A&vansert"
#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1102
+#: src/include/dhcp-server/widgets.rb:1114
msgid "Display &Log"
msgstr "Vis &logg"
#. item of a menu button
-#: src/include/dhcp-server/widgets.rb:1104
+#: src/include/dhcp-server/widgets.rb:1116
msgid "&Interface Configuration"
msgstr "&Grensesnittkonfigurasjon"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1116
+#: src/include/dhcp-server/widgets.rb:1136
msgid "&Network Address"
msgstr "&Nettverksadresse"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1118
+#: src/include/dhcp-server/widgets.rb:1138
msgid "Network &Mask"
msgstr "Nettverks&maske"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1136
+#: src/include/dhcp-server/widgets.rb:1156
msgid "Group &Name"
msgstr "Gruppe&navn"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1144
+#: src/include/dhcp-server/widgets.rb:1164
msgid "Pool &Name"
msgstr "&Navn på utvalg"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1152
+#: src/include/dhcp-server/widgets.rb:1172
msgid "Shared Network &Name"
msgstr "&Navn på delt nettverk"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1160
+#: src/include/dhcp-server/widgets.rb:1180
msgid "Class &Name"
msgstr "Klasse&navn"
#. multi selection box
-#: src/include/dhcp-server/widgets.rb:1170
+#: src/include/dhcp-server/widgets.rb:1190
msgid "Available Interfaces"
msgstr "Tilgjengelige grensesnitt"
#. check box
-#: src/include/dhcp-server/widgets.rb:1185
+#: src/include/dhcp-server/widgets.rb:1205
msgid "Open &Firewall for Selected Interfaces"
msgstr "Åpne &brannmur for valgte grensesnitt"
#. check box
-#: src/include/dhcp-server/widgets.rb:1211
+#: src/include/dhcp-server/widgets.rb:1231
msgid "&Enable Dynamic DNS for This Subnet"
msgstr "&Aktiver dynamisk DNS for dette subnettet"
#. check box
-#: src/include/dhcp-server/widgets.rb:1233
+#: src/include/dhcp-server/widgets.rb:1253
msgid "&Update Global Dynamic DNS Settings"
msgstr "&Oppdater globale dynamiske DNS-innstillinger"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1243
+#: src/include/dhcp-server/widgets.rb:1263
msgid "&Zone"
msgstr "&Sone"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1270
+#: src/include/dhcp-server/widgets.rb:1290
msgid "&Primary DNS Server"
msgstr "&Primær DNS-server"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1276
+#: src/include/dhcp-server/widgets.rb:1296
msgid "Re&verse Zone"
msgstr "&Baklengssone"
#. text entry
-#: src/include/dhcp-server/widgets.rb:1285
+#: src/include/dhcp-server/widgets.rb:1305
msgid "Pr&imary DNS Server"
msgstr "Pr&imær DNS-server"
#. push button
-#: src/include/dhcp-server/widgets.rb:1315
+#: src/include/dhcp-server/widgets.rb:1335
msgid "DHCP Server &Expert Configuration..."
msgstr "&Avansert konfigurasjon av DHCP-server..."
#. Dhcp-server read dialog caption
-#: src/modules/DhcpServer.pm:1401
+#: src/modules/DhcpServer.pm:1388
msgid "Initializing DHCP Server Configuration"
msgstr "Initialiserer oppsett av DHCP-server"
#. progress stage
-#: src/modules/DhcpServer.pm:1405
+#: src/modules/DhcpServer.pm:1392
msgid "Check the environment"
msgstr "Kontroller miljøet"
#. progress stage
-#: src/modules/DhcpServer.pm:1407
+#: src/modules/DhcpServer.pm:1394
msgid "Read firewall settings"
msgstr "Les brannmurinnstillinger"
#. progress stage
-#: src/modules/DhcpServer.pm:1409
+#: src/modules/DhcpServer.pm:1396
msgid "Read DHCP server settings"
msgstr "Les innstillinger for DHCP-server"
#. progress stage
-#: src/modules/DhcpServer.pm:1411
+#: src/modules/DhcpServer.pm:1398
msgid "Read DNS server settings"
msgstr "Les innstillinger for DNS-server"
#. progress step
-#: src/modules/DhcpServer.pm:1415
+#: src/modules/DhcpServer.pm:1402
msgid "Checking the environment..."
msgstr "Kontrollerer miljøet..."
#. progress step
-#: src/modules/DhcpServer.pm:1417
+#: src/modules/DhcpServer.pm:1404
msgid "Reading firewall settings..."
msgstr "Leser brannmurinnstillinger..."
#. progress step
-#: src/modules/DhcpServer.pm:1419
+#: src/modules/DhcpServer.pm:1406
msgid "Reading DHCP server settings..."
msgstr "Leser innstillinger for DHCP-server..."
#. progress step
-#: src/modules/DhcpServer.pm:1421
+#: src/modules/DhcpServer.pm:1408
msgid "Reading DNS server settings..."
msgstr "Leser innstillinger for DNS-server..."
#. progress step
-#: src/modules/DhcpServer.pm:1423 src/modules/DhcpServer.pm:1651
+#: src/modules/DhcpServer.pm:1410 src/modules/DhcpServer.pm:1638
msgid "Finished"
msgstr "Fullført"
#. TRANSLATORS: error report popup
-#: src/modules/DhcpServer.pm:1453
+#: src/modules/DhcpServer.pm:1440
msgid ""
"This server needs at least one\n"
"configured network device (besides loopback) to\n"
@@ -2521,7 +2577,7 @@
"Avslutter."
#. error report
-#: src/modules/DhcpServer.pm:1488
+#: src/modules/DhcpServer.pm:1475
msgid ""
"Cannot determine hostname. LDAP-based configuration of \n"
"DHCP server will not be available."
@@ -2530,7 +2586,7 @@
"DHCP-server vil ikke være tilgjengelig."
#. yes-no popup
-#: src/modules/DhcpServer.pm:1556
+#: src/modules/DhcpServer.pm:1543
msgid ""
"The DHCP server does not seem to have been\n"
"configured yet. Create a new configuration?"
@@ -2539,87 +2595,87 @@
"konfigurert ennå. Vil du opprette en ny konfigurasjon?"
#. Dhcp-server read dialog caption */
-#: src/modules/DhcpServer.pm:1629
+#: src/modules/DhcpServer.pm:1616
msgid "Saving DHCP Server Configuration"
msgstr "Lagrer konfigurasjon for DHCP-server"
#. progress stage
-#: src/modules/DhcpServer.pm:1634
+#: src/modules/DhcpServer.pm:1621
msgid "Write DHCP server settings"
msgstr "Les innstillinger for DHCP-server"
#. progress stage
-#: src/modules/DhcpServer.pm:1636
+#: src/modules/DhcpServer.pm:1623
msgid "Write firewall settings"
msgstr "Lagre brannmurinnstillinger"
#. progress stage
-#: src/modules/DhcpServer.pm:1638
+#: src/modules/DhcpServer.pm:1625
msgid "Restart DHCP server"
msgstr "Start DHCP-serveren på nytt"
#. progress stage
-#: src/modules/DhcpServer.pm:1640
+#: src/modules/DhcpServer.pm:1627
msgid "Write DNS server settings"
msgstr "Lagre innstillinger for DNS-server"
#. progress step
-#: src/modules/DhcpServer.pm:1643
+#: src/modules/DhcpServer.pm:1630
msgid "Writing DHCP server settings..."
msgstr "Lagrer innstillinger for DHCP-server..."
#. progress step
-#: src/modules/DhcpServer.pm:1645
+#: src/modules/DhcpServer.pm:1632
msgid "Writing firewall settings..."
msgstr "Lagrer brannmurinnstillinger..."
#. progress step
-#: src/modules/DhcpServer.pm:1647
+#: src/modules/DhcpServer.pm:1634
msgid "Restarting DHCP server..."
msgstr "Starter DHCP-serveren på nytt..."
#. progress step
-#: src/modules/DhcpServer.pm:1649
+#: src/modules/DhcpServer.pm:1636
msgid "Writing DNS server settings..."
msgstr "Lagrer innstillinger for DNS-server..."
#. error report
-#: src/modules/DhcpServer.pm:1762
+#: src/modules/DhcpServer.pm:1749
msgid "Error occurred while restarting the DHCP daemon."
msgstr "Det oppstod en feil under omstart av DHCP-nissen."
#. summary string
-#: src/modules/DhcpServer.pm:1901
+#: src/modules/DhcpServer.pm:1888
msgid "The DHCP server is started at boot time"
msgstr "DHCP-serveren starter når systemet startes opp"
#. summary string
-#: src/modules/DhcpServer.pm:1906
+#: src/modules/DhcpServer.pm:1893
msgid "The DHCP server is not started at boot time"
msgstr "DHCP-en starter ikke når systemet startes opp"
#. summary string, %1 is list of network interfaces
-#: src/modules/DhcpServer.pm:1914
+#: src/modules/DhcpServer.pm:1901
msgid "Listen On: %1"
msgstr "Lytt på: %1"
#. summary string, %1 is IP address range
-#: src/modules/DhcpServer.pm:1933
+#: src/modules/DhcpServer.pm:1920
msgid "Dynamic Address Range: %1"
msgstr "Dynamisk adresseområde: %1"
#. error message
-#: src/modules/DhcpServer.pm:2328
+#: src/modules/DhcpServer.pm:2313
msgid "Invalid LDAP configuration. Cannot use LDAP."
msgstr "Ugyldig LDAP-konfigurasjon. Kan ikke bruke LDAP."
#. error report
-#: src/modules/DhcpServer.pm:2568 src/modules/DhcpServer.pm:2609
+#: src/modules/DhcpServer.pm:2553 src/modules/DhcpServer.pm:2594
msgid "Support for multiple dhcpServiceDN not implemented."
msgstr "Støtte for flere dhcpServiceDN er ikke implementert."
#. error report
-#: src/modules/DhcpServer.pm:2574
+#: src/modules/DhcpServer.pm:2559
msgid "DHCP service DN is not defined."
msgstr "DN for DHCP-tjeneste ikke spesifisert."
@@ -2627,69 +2683,27 @@
#. Error report, %1 is LDAP record key
#. Error report
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2689 src/modules/DhcpServer.pm:2723
-#: src/modules/DhcpServer.pm:2787 src/modules/DhcpServer.pm:2862
+#: src/modules/DhcpServer.pm:2674 src/modules/DhcpServer.pm:2708
+#: src/modules/DhcpServer.pm:2772 src/modules/DhcpServer.pm:2847
msgid "Error occurred while creating %1."
msgstr "Det oppstod en feil under uppretting av %1."
#. error report, %1 is LDAP record key
-#: src/modules/DhcpServer.pm:2754
+#: src/modules/DhcpServer.pm:2739
msgid "Error occurred while updating %1."
msgstr "Det oppstod en feil under oppdatering av %1."
#. error report, %1=ldap domain, %2=dhcp server
-#: src/modules/DhcpServer.pm:2825
+#: src/modules/DhcpServer.pm:2810
msgid "Error occurred while creating cn=%2,ou=DHCP,%1."
msgstr "Det oppstod en feil under oppretting av cn=%2,ou=DHCP,%1."
#. error report, /etc/dhcpd.conf is filename
-#: src/modules/DhcpServer.pm:2922
+#: src/modules/DhcpServer.pm:2907
msgid "Error occurred while writing /etc/dhcpd.conf."
msgstr "Det oppstod en feil under lagring av /etc/dhcpd.conf."
-#~ msgid "DHCP server is running"
-#~ msgstr "DHCP-serveren kjører"
-
-#~ msgid "DHCP server is not running"
-#~ msgstr "DHCP-serveren kjører ikke"
-
-#~ msgid "&Start DHCP Server Now"
-#~ msgstr "&Start DHCP-serveren nå"
-
-#~ msgid "S&top DHCP Server Now"
-#~ msgstr "S&topp DHCP-serveren nå"
-
-#~ msgid "Save Settings and Restart DHCP Server &Now"
-#~ msgstr "Lagre innstillingene og start DHCP-serveren på nytt &nå"
-
-#~ msgid "Start DHCP Server Now"
-#~ msgstr "Start DHCP-serveren nå"
-
-#~ msgid "Stop DHCP Server Now"
-#~ msgstr "Stopp DHCP-serveren nå"
-
-#~ msgid "Save Settings and Restart DHCP Server Now"
-#~ msgstr "Lagre innstillingene og start DHCP-serveren på nytt nå"
-
#~ msgid ""
-#~ "<p><b><big>DHCP Server</big></b></p>\n"
-#~ "<p>To run the DHCP server every time your computer is started, set\n"
-#~ "<b>Start DHCP Server</b>.</p>"
-#~ msgstr ""
-#~ "<p><b><big>Start DHCP-server</big></b><br>\n"
-#~ "For å kjøre DHCP-serveren hver gang datamaskinen starter opp, velg\n"
-#~ "<b>Start DHCP-server</b>.</p>"
-
-#~ msgid "Restart DHCP Server"
-#~ msgstr "Start DHCP-serveren på nytt"
-
-#~ msgid "Save Settings and Restart DHCP Server"
-#~ msgstr "Lagre innstillingene og start DHCP-serveren på nytt"
-
-#~ msgid "&Start DHCP Server"
-#~ msgstr "&Start DHCP-serveren"
-
-#~ msgid ""
#~ "IP address %1 does not match\n"
#~ "the current network %2/%3\n"
#~ msgstr ""
Modified: branches/plus-SLE12-SP2/yast/nb/po/dns-server.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/dns-server.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/dns-server.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: dns-server.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-08-08 08:44+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -426,8 +426,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:441
-#: src/include/dns-server/dialog-main.rb:444
+#: src/include/dns-server/dialog-main.rb:443
+#: src/include/dns-server/dialog-main.rb:446
msgid "Forwarders"
msgstr "Videresendere"
@@ -560,8 +560,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:515
-#: src/include/dns-server/dialog-main.rb:518
+#: src/include/dns-server/dialog-main.rb:517
+#: src/include/dns-server/dialog-main.rb:520
msgid "DNS Zones"
msgstr "DNS-soner"
@@ -583,7 +583,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:289
+#: src/include/dns-server/dialog-main.rb:291
msgid "&LDAP Support Active"
msgstr "&LDAP-støtte aktivert"
@@ -608,12 +608,12 @@
msgstr "&Avansert konfigurasjon av DNS-server..."
#. Dialog label DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:259
+#: src/include/dns-server/dialog-main.rb:261
msgid "DNS Server"
msgstr "DNS-server"
#. FIXME: new startup
-#: src/include/dns-server/dialog-main.rb:417
+#: src/include/dns-server/dialog-main.rb:419
#, fuzzy
#| msgid "Apply Changes to Dialog"
msgid "Apply Changes"
@@ -621,21 +621,21 @@
#. Dialog Label - DNS - expert settings
#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:423
-#: src/include/dns-server/dialog-main.rb:426
+#: src/include/dns-server/dialog-main.rb:425
+#: src/include/dns-server/dialog-main.rb:428
msgid "Start-Up"
msgstr "Oppstart"
#. Dialog Label - DNS - expert settings
#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:454
-#: src/include/dns-server/dialog-main.rb:457
+#: src/include/dns-server/dialog-main.rb:456
+#: src/include/dns-server/dialog-main.rb:459
msgid "Basic Options"
msgstr "Grunnleggende valg"
#. Dialog Label - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:467
#: src/include/dns-server/dialog-main.rb:469
+#: src/include/dns-server/dialog-main.rb:471
msgid "Logging"
msgstr "Logging"
@@ -643,8 +643,8 @@
#. Tree Menu Item - DNS - expert settings
#. multi selection box
#. multi selection box
-#: src/include/dns-server/dialog-main.rb:480
-#: src/include/dns-server/dialog-main.rb:483
+#: src/include/dns-server/dialog-main.rb:482
+#: src/include/dns-server/dialog-main.rb:485
#: src/include/dns-server/dialog-masterzone.rb:163
#: src/include/dns-server/dialog-masterzone.rb:2729
msgid "ACLs"
@@ -652,8 +652,8 @@
#. Dialog Label - DNS - expert settings
#. Tree Menu Item - DNS - expert settings
-#: src/include/dns-server/dialog-main.rb:497
-#: src/include/dns-server/dialog-main.rb:500
+#: src/include/dns-server/dialog-main.rb:499
+#: src/include/dns-server/dialog-main.rb:502
msgid "TSIG Keys"
msgstr "TSIG-nøkler"
Modified: branches/plus-SLE12-SP2/yast/nb/po/docker.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/docker.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/docker.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/drbd.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/drbd.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/drbd.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2008-09-21 10:37+0200\n"
"Last-Translator: Olav P. \n"
"Language-Team: Norwegian Bokmål <>\n"
@@ -240,7 +240,7 @@
msgstr ""
#: src/include/drbd/helps.rb:66 src/include/drbd/helps.rb:72
-#: src/include/drbd/helps.rb:86
+#: src/include/drbd/helps.rb:85
#, fuzzy
#| msgid "<p><b><big>Global Configuration of DRBD</big></b></p>"
msgid "<p><b><big>Resource Configuration of DRBD</big></b></p>"
@@ -261,11 +261,10 @@
"\t\tLike: '/dev/drbd{service} minor {minor drbd number [0...255]}' or '/dev/drbd{minor drbd number [0...255]}'</p>\n"
"\t\t<p>\"Disk\": DRBD uses this block device to actually store and retrieve the data. Never access such a device while DRBD is running on top of it.</p>\n"
"\t\t<p>\"Meta-disk\": internal. Internal means that the last part of the backing device is used to store the meta-data.</p>\n"
-"\t\t<p>\"Node-id\": Node id is an internal value for drbd, will be generated by yast automatically. A host can have different \"node-id\" in different resources.</p>\n"
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:89
+#: src/include/drbd/helps.rb:88
msgid ""
"\n"
"\t\t<p><b>Protocol</b></p>\n"
@@ -291,13 +290,13 @@
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:113
+#: src/include/drbd/helps.rb:112
#, fuzzy
#| msgid "<p><b><big>s390 reIPL Configuration</big></b></p>"
msgid "<p><b><big>LVM Configuration</big></b></p>"
msgstr "<p><b><big>reiIPL-oppsett for s390</big></b></p>"
-#: src/include/drbd/helps.rb:116
+#: src/include/drbd/helps.rb:115
msgid ""
"\n"
"\t\t<p><b>LVM configuration file /etc/lvm/lvm.conf</b></p>\n"
@@ -306,22 +305,20 @@
"\t\t<p><b>Device Filter</b>: This masks the underlying block device from the list of devices LVM scans for Physical Volume signatures. This way, LVM is instructed to read Physical Volume signatures from DRBD devices, rather than from the underlying backing block devices.</p>\t\t<p><b>AutoFilter</b>: According to the configuration of drbd, LVM filter will always be changed automatically. To change it manually, disable the checkbox of AutoFilter.</p>\n"
"\t\t<p>The filter consists of an array of regular expressions. These expressions can be delimited by a character of your choice, and prefixed with either an 'a' (for accept) or 'r' (for reject).</p>\t\t<p>For example, setting filter as [\"r|/dev/sda.*|\"]</p>\n"
"\n"
-"\t\t<p><b>LVM cache</b>: Enable/turn on writing the LVM cache is default. Should disable the LVM cache when combined drbd with LVM.</p>\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<p><b>LVMetad</b>: When lvmetad is enabled, the volume group metadata and PV state flags are obtained from the lvmetad instance and no scanning is done by the individual commands. Because lvmetad's cache cannot be synchronized between nodes, users are advised to disable lvmetad in cluster environments.</p>\n"
-"\n"
"\t\t"
msgstr ""
-#: src/include/drbd/helps.rb:133
+#: src/include/drbd/helps.rb:130
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:136
+#: src/include/drbd/helps.rb:133
msgid "<p>Check <b>\"Disable IP Verification\"</b> to disable one of drbdadm's sanity check</p>"
msgstr "<p>Kryss av for <b>Deaktiver IP-verifisering\"</b> for å deaktivere en av gyldighetskontrollene i drbdadm</p>"
-#: src/include/drbd/helps.rb:139
+#: src/include/drbd/helps.rb:136
msgid ""
"<p><b>Dialog Refresh:</b> The user dialog counts and displays the seconds it waited so\n"
" far. You might want to disable this if you have the console\n"
@@ -337,7 +334,7 @@
" Dialogen vil oppdatere telleverdien i henhold til sekundverdien i 'Oppdater dialog'.\n"
" Bruk 0 for å deaktivere oppdatering av skjermen helt. </p>"
-#: src/include/drbd/helps.rb:147
+#: src/include/drbd/helps.rb:144
msgid ""
"<p><b>Minor Count:</b>\n"
" use this if you want to define more resources later\n"
@@ -352,7 +349,7 @@
" som denne filen angir. </p>"
#. Summary dialog help 1/3
-#: src/include/drbd/helps.rb:155
+#: src/include/drbd/helps.rb:152
#, fuzzy
#| msgid ""
#| "<p><b><big>Drbd Configuration</big></b><br>\n"
@@ -365,7 +362,7 @@
"Sett opp drbd her.<br></p>\n"
#. Summary dialog help 2/3
-#: src/include/drbd/helps.rb:159
+#: src/include/drbd/helps.rb:156
msgid ""
"<p><b><big>Adding a drbd:</big></b><br>\n"
"Choose an drbd from the list of detected drbds.\n"
@@ -378,7 +375,7 @@
"Klikk deretter <b>Sett opp</b>.</p>\n"
#. Summary dialog help 3/3
-#: src/include/drbd/helps.rb:166
+#: src/include/drbd/helps.rb:163
msgid ""
"<p><b><big>Editing or Deleting:</big></b><br>\n"
"If you press <b>Edit</b>, an additional dialog in which to change\n"
@@ -389,7 +386,7 @@
"du kan endre konfigurasjonen.</p>\n"
#. Ovreview dialog help 1/3
-#: src/include/drbd/helps.rb:172
+#: src/include/drbd/helps.rb:169
#, fuzzy
#| msgid ""
#| "<p><b><big>Drbd Configuration Overview</big></b><br>\n"
@@ -405,7 +402,7 @@
"redigere oppsettene.<br></p>\n"
#. Ovreview dialog help 2/3
-#: src/include/drbd/helps.rb:178
+#: src/include/drbd/helps.rb:175
msgid ""
"<p><b><big>Adding a drbd:</big></b><br>\n"
"Press <b>Add</b> to configure a drbd.</p>"
@@ -414,7 +411,7 @@
"Klikk <b>Legg til</b> for å sette opp en drbd.</p>"
#. Ovreview dialog help 3/3
-#: src/include/drbd/helps.rb:182
+#: src/include/drbd/helps.rb:179
msgid ""
"<p><b><big>Editing or Deleting:</big></b><br>\n"
"Choose a drbd to change or remove.\n"
@@ -425,7 +422,7 @@
"Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter ønske.</p>\n"
#. Configure1 dialog help 1/2
-#: src/include/drbd/helps.rb:188
+#: src/include/drbd/helps.rb:185
msgid ""
"<p><b><big>Configuration Part One</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -437,7 +434,7 @@
#. Configure1 dialog help 2/2
#. Configure2 dialog help 2/2
-#: src/include/drbd/helps.rb:194 src/include/drbd/helps.rb:206
+#: src/include/drbd/helps.rb:191 src/include/drbd/helps.rb:203
msgid ""
"<p><b><big>Selecting Something</big></b><br>\n"
"It is not possible. You must code it first. :-)\n"
@@ -448,7 +445,7 @@
"</p>"
#. Configure2 dialog help 1/2
-#: src/include/drbd/helps.rb:200
+#: src/include/drbd/helps.rb:197
msgid ""
"<p><b><big>Configuration Part Two</big></b><br>\n"
"Press <b>Next</b> to continue.\n"
@@ -459,126 +456,60 @@
"<br></p>\n"
#. Default is always true (auto)
-#: src/include/drbd/lvm_conf.rb:44
+#: src/include/drbd/lvm_conf.rb:36
#, fuzzy
#| msgid "Configuration of DRBD"
msgid "LVM Filter Configuration of DRBD"
msgstr "Oppsett av DRBD"
-#: src/include/drbd/lvm_conf.rb:52
+#: src/include/drbd/lvm_conf.rb:44
msgid "Modify LVM Device filter Automatically"
msgstr ""
-#: src/include/drbd/lvm_conf.rb:62
+#: src/include/drbd/lvm_conf.rb:54
#, fuzzy
#| msgid "Device type"
msgid "Device Filter"
msgstr "Enhetstype"
-#: src/include/drbd/lvm_conf.rb:72
+#: src/include/drbd/lvm_conf.rb:64
#, fuzzy
#| msgid "Writing the SCPM database..."
msgid "Writing the LVM cache"
msgstr "Lagrer SCPM-database..."
-#: src/include/drbd/lvm_conf.rb:81
+#: src/include/drbd/lvm_conf.rb:73
#, fuzzy
#| msgid "Enable Microphone."
msgid "Enable LVM Cache"
msgstr "Aktiver mikrofon."
-#: src/include/drbd/lvm_conf.rb:86
-msgid "Warning! Should disable LVM cache for using drbd."
-msgstr ""
-
-#: src/include/drbd/lvm_conf.rb:97
-msgid "Use lvmetad for LVM"
-msgstr ""
-
-#: src/include/drbd/lvm_conf.rb:106
-msgid "Use LVM metad"
-msgstr ""
-
-#: src/include/drbd/lvm_conf.rb:111
-msgid "Warning! Should not use lvmetad for cluster."
-msgstr ""
-
#. encoding: utf-8
-#: src/include/drbd/resource_conf.rb:143
+#: src/include/drbd/resource_conf.rb:134
msgid "Resource Name"
msgstr "Ressursnavn"
-#: src/include/drbd/resource_conf.rb:150
-msgid "Nodes"
-msgstr "Noder"
-
-#: src/include/drbd/resource_conf.rb:153
-msgid "Add"
-msgstr "Legg til"
-
-#: src/include/drbd/resource_conf.rb:154
-msgid "Edit"
-msgstr "Rediger"
-
-#: src/include/drbd/resource_conf.rb:155
-msgid "Delete"
-msgstr "Slett"
-
-#: src/include/drbd/resource_conf.rb:187
-msgid "Save"
-msgstr "Lagre"
-
-#. Since n_name can't be edit, so set direct is OK
-#: src/include/drbd/resource_conf.rb:329
+#. Update new add disk used of drbd res for LVM filter
+#. Ignore the removed disk
+#: src/include/drbd/resource_conf.rb:326
msgid "Protocol"
msgstr "Protokoll"
-#. return `cancel or a string
-#: src/include/drbd/resource_conf.rb:569
-msgid "OK"
-msgstr "OK"
-
-#: src/include/drbd/resource_conf.rb:570
-msgid "Cancel"
-msgstr "Avbryt"
-
-#
-#: src/include/drbd/resource_conf.rb:584
-#, fuzzy
-#| msgid "Host name cannot be empty."
-msgid "Node name can not be empty."
-msgstr "Du må angi et vertsmaskinnavn."
-
#. myHelp("basic_conf");
-#: src/include/drbd/resource_conf.rb:687
+#: src/include/drbd/resource_conf.rb:572
+msgid "Node names must be different."
+msgstr "Andre nodenavn må angis."
+
+#: src/include/drbd/resource_conf.rb:578
msgid "Node names must not include \".\" , using the local hostname."
msgstr ""
-#: src/include/drbd/resource_conf.rb:707
+#: src/include/drbd/resource_conf.rb:608
#, fuzzy
#| msgid "Fill out all fields."
msgid "Please fill out all fields."
msgstr "Fyll ut alle felter."
-#: src/include/drbd/resource_conf.rb:716
-#, fuzzy
-#| msgid "Configure authentication of the nodes."
-msgid "Please configure at least two nodes."
-msgstr "Sett opp autentisering av nodene."
-
-#. No need to check integrity since it will disabled when configuring
-#: src/include/drbd/resource_conf.rb:751
-#, fuzzy
-#| msgid "Enter the module name."
-msgid "Enter the node name:"
-msgstr "Angi modulnavnet."
-
-#: src/include/drbd/resource_conf.rb:757
-#, fuzzy
-#| msgid "Node names must be different."
-msgid "Node name must be different."
-msgstr "Andre nodenavn må angis."
-
#. encoding: utf-8
#. Package: Configuration of heartbeat
#. Authors: Martin Lazar
@@ -688,80 +619,80 @@
#.
#. Representation of the configuration of drbd.
#. Input and output routines.
-#: src/modules/Drbd.rb:115
+#: src/modules/Drbd.rb:110
msgid "Failed to merge separated DRBD conf files\n"
msgstr ""
-#: src/modules/Drbd.rb:137
+#: src/modules/Drbd.rb:132
#, fuzzy
#| msgid "Unable to write to idmapd.conf."
msgid "Failed to write drbd.conf.YaST2prepare"
msgstr "Kan ikke skrive til idmapd.conf."
#. DRBD read dialog caption
-#: src/modules/Drbd.rb:192
+#: src/modules/Drbd.rb:185
msgid "Initializing DRBD Configuration"
msgstr "Initialiserer DRBD-oppsett"
#. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:200
+#: src/modules/Drbd.rb:193
msgid "Read global settings"
msgstr "Les globale innstillinger"
-#: src/modules/Drbd.rb:201
+#: src/modules/Drbd.rb:194
msgid "Read resources"
msgstr "Les ressurser"
-#: src/modules/Drbd.rb:202
+#: src/modules/Drbd.rb:195
#, fuzzy
#| msgid "Read configurations"
msgid "Read LVM configurations"
msgstr "Les oppsett"
-#: src/modules/Drbd.rb:203
+#: src/modules/Drbd.rb:196
msgid "Read daemon status"
msgstr "Les nissestatus"
-#: src/modules/Drbd.rb:204 src/modules/Drbd.rb:211
+#: src/modules/Drbd.rb:197 src/modules/Drbd.rb:204
#, fuzzy
#| msgid "Read Firewall Settings."
msgid "Read SuSEFirewall Settings"
msgstr "Les brannmurinnstillinger."
-#: src/modules/Drbd.rb:207
+#: src/modules/Drbd.rb:200
msgid "Reading global settings..."
msgstr "Leser globale innstillinger..."
-#: src/modules/Drbd.rb:208
+#: src/modules/Drbd.rb:201
msgid "Reading resources..."
msgstr "Leser ressurser..."
-#: src/modules/Drbd.rb:209
+#: src/modules/Drbd.rb:202
#, fuzzy
#| msgid "Reading the configurations..."
msgid "Reading LVM configurations..."
msgstr "Leser oppsett..."
-#: src/modules/Drbd.rb:210
+#: src/modules/Drbd.rb:203
msgid "Reading daemon status..."
msgstr "Leser nissestatus..."
-#: src/modules/Drbd.rb:212 src/modules/Drbd.rb:662
+#: src/modules/Drbd.rb:205 src/modules/Drbd.rb:629
msgid "Finished"
msgstr "Fullført"
#. new_map = remove(new_map, key);
-#: src/modules/Drbd.rb:515
+#: src/modules/Drbd.rb:497
#, fuzzy
#| msgid "Failed to save ipsec.conf:"
msgid "Failed to backup drbd.conf"
msgstr "Kunne ikke lagre ipsec.conf:"
-#: src/modules/Drbd.rb:524
+#: src/modules/Drbd.rb:506
msgid "Failed to clean drbd.conf for drbdadm test"
msgstr ""
-#: src/modules/Drbd.rb:548
+#: src/modules/Drbd.rb:530
#, fuzzy
#| msgid "Configuration of Resource Groups"
msgid ""
@@ -769,12 +700,12 @@
"%2"
msgstr "Konfigurasjon av ressursgrupper"
-#: src/modules/Drbd.rb:567
+#: src/modules/Drbd.rb:549
msgid "Failed to bring drbd.conf back"
msgstr ""
#. DRBD write dialog caption
-#: src/modules/Drbd.rb:638
+#: src/modules/Drbd.rb:605
msgid "Writing DRBD Configuration"
msgstr "Lagrer DRBD-oppsett"
@@ -782,55 +713,55 @@
#. won't change modified flag
#. return true if !@modified
#. We do not set help text here, because it was set outside
-#: src/modules/Drbd.rb:650
+#: src/modules/Drbd.rb:617
msgid "Write global settings"
msgstr "Lagre generelle innstillinger"
-#: src/modules/Drbd.rb:651
+#: src/modules/Drbd.rb:618
msgid "Write resources"
msgstr "Lagre ressursene"
-#: src/modules/Drbd.rb:652
+#: src/modules/Drbd.rb:619
#, fuzzy
#| msgid "Write configuration"
msgid "Write LVM configurations"
msgstr "Lagre oppsett"
-#: src/modules/Drbd.rb:653
+#: src/modules/Drbd.rb:620
msgid "Set daemon status"
msgstr "Definer nissestatus"
-#: src/modules/Drbd.rb:654
+#: src/modules/Drbd.rb:621
#, fuzzy
#| msgid "Write the firewall settings"
msgid "Write the SuSEfirewall settings"
msgstr "Lagre brannmurinnstillinger"
-#: src/modules/Drbd.rb:657
+#: src/modules/Drbd.rb:624
msgid "Writing global settings..."
msgstr "Lagrer generelle innstillinger..."
-#: src/modules/Drbd.rb:658
+#: src/modules/Drbd.rb:625
msgid "Writing resources..."
msgstr "Lagrer ressurser..."
-#: src/modules/Drbd.rb:659
+#: src/modules/Drbd.rb:626
#, fuzzy
#| msgid "Writing configuration..."
msgid "Writing LVM configurations..."
msgstr "Lagrer oppsett..."
-#: src/modules/Drbd.rb:660
+#: src/modules/Drbd.rb:627
msgid "Setting daemon status..."
msgstr "Definerer nissestatus..."
-#: src/modules/Drbd.rb:661
+#: src/modules/Drbd.rb:628
#, fuzzy
#| msgid "Writing the firewall settings..."
msgid "Writing the SuSEFirewall settings"
msgstr "Lagrer brannmurinnstillinger..."
-#: src/modules/Drbd.rb:672
+#: src/modules/Drbd.rb:639
#, fuzzy
#| msgid "Unable to create directory '%1'."
msgid "Failed to make directory /etc/drbd.d"
Modified: branches/plus-SLE12-SP2/yast/nb/po/fcoe-client.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/fcoe-client.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/fcoe-client.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/firewall-services.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/firewall-services.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/firewall-services.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: firewall-services\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2015-08-25 18:38+0200\n"
"PO-Revision-Date: 2008-10-31 00:11+0100\n"
"Last-Translator: Olav P. \n"
"Language-Team: Norwegian Bokmål <>\n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/firewall.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/firewall.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/firewall.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: firewall\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-08-08 08:45+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/firstboot.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/firstboot.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/firstboot.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: firstboot\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-10-01 12:23+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -122,13 +122,13 @@
msgstr "Betegnelse"
#: src/clients/firstboot_config.rb:68
+msgid "Module Name"
+msgstr "Modulnavn"
+
+#: src/clients/firstboot_config.rb:68
msgid "Status"
msgstr "Status"
-#: src/clients/firstboot_config.rb:68
-msgid "Module Name"
-msgstr "Modulnavn"
-
#. translators: dialog text
#: src/clients/firstboot_desktop.rb:90
msgid ""
Modified: branches/plus-SLE12-SP2/yast/nb/po/fonts.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/fonts.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/fonts.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
@@ -20,63 +20,63 @@
#. in case of changing profiles, please reflect
#. edits in test/data/sysconfig.fonts-config.*
#. otherwise testsuite will fail
-#: src/lib/fonts/fonts-config-state.rb:59
+#: src/lib/fonts/fonts-config-state.rb:58
#, fuzzy
#| msgid "Bitmap Editors"
msgid "Bitmap Fonts"
msgstr "Bitmap-redigering"
-#: src/lib/fonts/fonts-config-state.rb:104
+#: src/lib/fonts/fonts-config-state.rb:103
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:107
+#: src/lib/fonts/fonts-config-state.rb:106
msgid "Black and White Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:124
+#: src/lib/fonts/fonts-config-state.rb:123
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:127
+#: src/lib/fonts/fonts-config-state.rb:126
msgid "Black and White Rendering for Monospaced Fonts"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:144
+#: src/lib/fonts/fonts-config-state.rb:143
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:147
+#: src/lib/fonts/fonts-config-state.rb:146
msgid "Default"
msgstr "Standard"
-#: src/lib/fonts/fonts-config-state.rb:164
+#: src/lib/fonts/fonts-config-state.rb:163
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:167
+#: src/lib/fonts/fonts-config-state.rb:166
#, fuzzy
#| msgid "Fonts"
msgid "CFF Fonts"
msgstr "Skrifter"
-#: src/lib/fonts/fonts-config-state.rb:207
+#: src/lib/fonts/fonts-config-state.rb:206
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:210
+#: src/lib/fonts/fonts-config-state.rb:209
msgid "Exclusive Autohinter Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:227
+#: src/lib/fonts/fonts-config-state.rb:226
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:230 src/lib/fonts/fonts-dialog.rb:818
+#: src/lib/fonts/fonts-config-state.rb:229 src/lib/fonts/fonts-dialog.rb:818
msgid "Subpixel Rendering"
msgstr ""
-#: src/lib/fonts/fonts-config-state.rb:255
+#: src/lib/fonts/fonts-config-state.rb:254
msgid "Use subpixel rendering capability of LCD monitor. Requires subpixel rendering enabled FreeType library."
msgstr ""
Modified: branches/plus-SLE12-SP2/yast/nb/po/ftp-server.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/ftp-server.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/ftp-server.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: base\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2010-05-19 21:34+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/geo-cluster.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/geo-cluster.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/geo-cluster.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -61,8 +61,8 @@
#. $Id: wizards.ycp 27914 2006-02-13 14:32:08Z locilka $
#. Initialization dialog caption
#: src/include/geo-cluster/complex.rb:83
-#: src/include/geo-cluster/dialogs.rb:470
-#: src/include/geo-cluster/dialogs.rb:819
+#: 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
#, fuzzy
@@ -121,17 +121,17 @@
msgstr ""
#: src/include/geo-cluster/dialogs.rb:74 src/include/geo-cluster/dialogs.rb:85
-#: src/include/geo-cluster/dialogs.rb:809
+#: src/include/geo-cluster/dialogs.rb:804
msgid "Add"
msgstr "Legg til"
#: src/include/geo-cluster/dialogs.rb:75 src/include/geo-cluster/dialogs.rb:86
-#: src/include/geo-cluster/dialogs.rb:810
+#: src/include/geo-cluster/dialogs.rb:805
msgid "Edit"
msgstr "Rediger"
#: src/include/geo-cluster/dialogs.rb:76 src/include/geo-cluster/dialogs.rb:87
-#: src/include/geo-cluster/dialogs.rb:811
+#: src/include/geo-cluster/dialogs.rb:806
msgid "Delete"
msgstr "Slett"
@@ -140,16 +140,18 @@
msgstr ""
#: src/include/geo-cluster/dialogs.rb:93
-#: src/include/geo-cluster/dialogs.rb:240
+#: src/include/geo-cluster/dialogs.rb:235
msgid "ticket"
msgstr ""
#: src/include/geo-cluster/dialogs.rb:106
-msgid "Authentication"
+#, fuzzy
+#| msgid "Authentication"
+msgid "Authentification"
msgstr "Autentisering"
#: src/include/geo-cluster/dialogs.rb:108
-#: src/include/geo-cluster/dialogs.rb:161
+#: src/include/geo-cluster/dialogs.rb:156
#, fuzzy
#| msgid "Cancel"
msgid "Ca&ncel"
@@ -157,9 +159,9 @@
#. return `cancel or a string
#: src/include/geo-cluster/dialogs.rb:109
-#: src/include/geo-cluster/dialogs.rb:162
-#: src/include/geo-cluster/dialogs.rb:182
-#: src/include/geo-cluster/dialogs.rb:259
+#: src/include/geo-cluster/dialogs.rb:157
+#: src/include/geo-cluster/dialogs.rb:177
+#: src/include/geo-cluster/dialogs.rb:254
msgid "OK"
msgstr "OK"
@@ -172,203 +174,195 @@
#: src/include/geo-cluster/dialogs.rb:128
#, fuzzy
#| msgid "Authentication Key"
-msgid "Authentication file"
+msgid "Authentification file"
msgstr "Autentiseringsnøkkel"
#: src/include/geo-cluster/dialogs.rb:132
-#, fuzzy
-#| msgid "The kernel will be written to slot B."
-msgid "The file will be written to /etc/booth."
-msgstr "Kjernen vil bli lagret på diskplass B."
+msgid "A relative path will be saved in /etc/booth, or using absolute path directly."
+msgstr ""
#: src/include/geo-cluster/dialogs.rb:137
-#, fuzzy
-#| msgid "The Disk Image Directory must be an absolute path."
-msgid "To write it to a different directory, enter an absolute path."
-msgstr "Diskbildekatalogen må være en absolutt sti."
-
-#: src/include/geo-cluster/dialogs.rb:142
msgid "For a newly created geo cluster, push the button below to generate /etc/booth/<key>."
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:147
-msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other nodes manually."
+#: src/include/geo-cluster/dialogs.rb:142
+msgid "To join a existing geo cluster, please copy /etc/booth/<key> from other node manually."
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:151
+#: src/include/geo-cluster/dialogs.rb:146
#, fuzzy
#| msgid "Authentication Key"
-msgid "Generate Authentication Key File"
+msgid "Generate Authentification Key File"
msgstr "Autentiseringsnøkkel"
-#: src/include/geo-cluster/dialogs.rb:159
+#: src/include/geo-cluster/dialogs.rb:154
#, fuzzy
#| msgid "&Basics"
msgid "Basic"
msgstr "&Grunnleggende"
-#: src/include/geo-cluster/dialogs.rb:183
-#: src/include/geo-cluster/dialogs.rb:260
+#: src/include/geo-cluster/dialogs.rb:178
+#: src/include/geo-cluster/dialogs.rb:255
msgid "Cancel"
msgstr "Avbryt"
-#: src/include/geo-cluster/dialogs.rb:197
+#: src/include/geo-cluster/dialogs.rb:192
#, fuzzy
#| msgid "Please enter a password"
msgid "Please enter a valid ip address"
msgstr "Angi et passord"
-#: src/include/geo-cluster/dialogs.rb:238
+#: src/include/geo-cluster/dialogs.rb:233
msgid "Enter ticket and timeout"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:244
+#: src/include/geo-cluster/dialogs.rb:239
msgid "timeout"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:246
+#: src/include/geo-cluster/dialogs.rb:241
#, fuzzy
#| msgid "No entries."
msgid "retries"
msgstr "Ingen oppføringer."
-#: src/include/geo-cluster/dialogs.rb:248
+#: src/include/geo-cluster/dialogs.rb:243
#, fuzzy
#| msgid "Height"
msgid "weights"
msgstr "Høyde"
-#: src/include/geo-cluster/dialogs.rb:250
+#: src/include/geo-cluster/dialogs.rb:245
#, fuzzy
#| msgid "Expired"
msgid "expire"
msgstr "Utløpt"
-#: src/include/geo-cluster/dialogs.rb:252
+#: src/include/geo-cluster/dialogs.rb:247
#, fuzzy
#| msgid "Required patterns"
msgid "acquire-after"
msgstr "Nødvendige mønstre"
-#: src/include/geo-cluster/dialogs.rb:254
+#: src/include/geo-cluster/dialogs.rb:249
msgid "before-acquire-handler"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:291
+#: src/include/geo-cluster/dialogs.rb:286
#, fuzzy
#| msgid "Action is invalid."
msgid "timeout is invalid"
msgstr "Handlingen er ugyldig."
-#: src/include/geo-cluster/dialogs.rb:293
+#: src/include/geo-cluster/dialogs.rb:288
#, fuzzy
#| msgid "' is not valid."
msgid "expire is invalid"
msgstr "' er ikke gyldig."
#
-#: src/include/geo-cluster/dialogs.rb:295
+#: src/include/geo-cluster/dialogs.rb:290
#, fuzzy
#| msgid "URL entered is not valid"
msgid "acquireafter is invalid"
msgstr "Den angitte nettadressen er ikke gyldig"
#
-#: src/include/geo-cluster/dialogs.rb:297
+#: src/include/geo-cluster/dialogs.rb:292
#, fuzzy
#| msgid "URL entered is not valid"
msgid "retries is invalid"
msgstr "Den angitte nettadressen er ikke gyldig"
-#: src/include/geo-cluster/dialogs.rb:299
+#: src/include/geo-cluster/dialogs.rb:294
msgid "retries values lower than 3 is illegal"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:301
+#: src/include/geo-cluster/dialogs.rb:296
#, fuzzy
#| msgid "' is not valid."
msgid "weights is invalid"
msgstr "' er ikke gyldig."
-#: src/include/geo-cluster/dialogs.rb:303
+#: src/include/geo-cluster/dialogs.rb:298
#, fuzzy
#| msgid "Port field cannot be empty"
msgid "ticket can not be empty"
msgstr "Port-feltet kan ikke være tomt"
#. fill confs with global_files
-#: src/include/geo-cluster/dialogs.rb:412
+#: src/include/geo-cluster/dialogs.rb:407
#: src/include/geo-cluster/wizards.rb:48
msgid "Firewall Configuration"
msgstr "Brannmurkonfigurasjon"
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:559
+#: src/include/geo-cluster/dialogs.rb:554
#, fuzzy
#| msgid "&Local IP address of your machine"
msgid "Enter an IP address of your arbitrator"
msgstr "&Lokal IP-adresse for maskinen"
-#: src/include/geo-cluster/dialogs.rb:570
+#: src/include/geo-cluster/dialogs.rb:565
#, fuzzy
#| msgid "&Local IP address of your machine"
msgid "Edit IP address of your arbitrator"
msgstr "&Lokal IP-adresse for maskinen"
-#: src/include/geo-cluster/dialogs.rb:586
+#: src/include/geo-cluster/dialogs.rb:581
msgid "Enter an IP address of your site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:597
+#: src/include/geo-cluster/dialogs.rb:592
msgid "Edit IP address of your site"
msgstr ""
-#: src/include/geo-cluster/dialogs.rb:619
+#: src/include/geo-cluster/dialogs.rb:614
#, fuzzy
#| msgid "Zone name %1 already exists."
msgid "Ticket name already exist!"
msgstr "Sonenavnet %1 finnes allerede."
-#. Validation check before switch to authentication
-#. Still fall to :authentication or :ok
-#: src/include/geo-cluster/dialogs.rb:651
+#. Validation check before switch to authentification
+#. Still fall to :authentification or :ok
+#: src/include/geo-cluster/dialogs.rb:646
#, fuzzy
#| msgid "Configuration name cannot be empty."
msgid "Configuration name can not be empty."
msgstr "Du må angi et navn på oppsettet."
-#: src/include/geo-cluster/dialogs.rb:654
+#: src/include/geo-cluster/dialogs.rb:649
#, fuzzy
#| msgid "Configuration name cannot be empty."
msgid "Configuration name can not be duplicated."
msgstr "Du må angi et navn på oppsettet."
#. "5405d4" will show like "5405"
-#: src/include/geo-cluster/dialogs.rb:662
+#: src/include/geo-cluster/dialogs.rb:657
#, fuzzy
#| msgid "Key is invalid."
msgid "port is invalid!"
msgstr "Nøkkelen er ugyldig."
-#: src/include/geo-cluster/dialogs.rb:668
+#: src/include/geo-cluster/dialogs.rb:663
msgid "transport have to be filled!"
msgstr ""
#. Same to UI.QueryWidget(:arbitrator_box, :Value).to_s == ""
-#: src/include/geo-cluster/dialogs.rb:674
+#: src/include/geo-cluster/dialogs.rb:669
#, fuzzy
#| msgid "Software to be installed:"
msgid "arbitrator have to be filled!"
msgstr "Programvare som skal installeres:"
-#: src/include/geo-cluster/dialogs.rb:679
+#: src/include/geo-cluster/dialogs.rb:674
#, fuzzy
#| msgid "Software to be installed:"
msgid "site have to be filled!"
msgstr "Programvare som skal installeres:"
-#: src/include/geo-cluster/dialogs.rb:684
+#: src/include/geo-cluster/dialogs.rb:679
#, fuzzy
#| msgid "Software to be installed:"
msgid "ticket have to be filled!"
@@ -376,26 +370,20 @@
#. Validation check before switch to basic
#. Still fall to :basic or :ok
-#: src/include/geo-cluster/dialogs.rb:738
+#: src/include/geo-cluster/dialogs.rb:733
#, fuzzy
#| msgid "Failed to create the installation RAM disk."
-msgid "Failed to create authentication file "
+msgid "Failed to create authentification file "
msgstr "Kan ikke opprette RAM-disk for installasjon."
-#: src/include/geo-cluster/dialogs.rb:741
+#: src/include/geo-cluster/dialogs.rb:736
#, fuzzy
-#| msgid "Authentication Key"
-msgid "Authentication file "
-msgstr "Autentiseringsnøkkel"
+#| msgid "Set the authentication for proxy"
+msgid "Succeed to created authentification file "
+msgstr "Definer autentisering for mellomserver"
-#: src/include/geo-cluster/dialogs.rb:741
-#, fuzzy
-#| msgid "Image created successfully"
-msgid " created successfully."
-msgstr "Diskbildet er opprettet"
-
#. GeoCluster choose configure dialog caption
-#: src/include/geo-cluster/dialogs.rb:800
+#: src/include/geo-cluster/dialogs.rb:795
#, fuzzy
#| msgid "Host Configuration Summary:"
msgid "GeoCluster Configuration Select"
@@ -403,7 +391,7 @@
#. Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
#. Label::BackButton(), Label::NextButton());
-#: src/include/geo-cluster/dialogs.rb:806
+#: src/include/geo-cluster/dialogs.rb:801
#, fuzzy
#| msgid "Read configuration file"
msgid "Choose configuration file:"
@@ -412,7 +400,7 @@
#: src/include/geo-cluster/wizards.rb:47
#, fuzzy
#| msgid "Autoinstallation - Configuration"
-msgid "Authentication Configuration"
+msgid "Authentification Configuration"
msgstr "Oppsett av autoinstallasjon"
#. Initialization dialog contents
@@ -569,16 +557,6 @@
msgstr "Konfigurasjonssammendrag..."
#, fuzzy
-#~| msgid "Authentication"
-#~ msgid "Authentification"
-#~ msgstr "Autentisering"
-
-#, fuzzy
-#~| msgid "Set the authentication for proxy"
-#~ msgid "Succeed to created authentification file "
-#~ msgstr "Definer autentisering for mellomserver"
-
-#, fuzzy
#~| msgid "Software to be installed:"
#~ msgid "site have to be filled"
#~ msgstr "Programvare som skal installeres:"
Modified: branches/plus-SLE12-SP2/yast/nb/po/http-server.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/http-server.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/http-server.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: http-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-08-11 18:45+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/inetd.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/inetd.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/inetd.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: inetd\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2008-12-11 08:27+0100\n"
"Last-Translator: Olav P. \n"
"Language-Team: Norwegian Bokmål <>\n"
@@ -110,11 +110,11 @@
msgid "The 'id' option cannot be combined with other options."
msgstr "Alternativet 'id' kan ikke kombineres med andre alternativer."
-#: src/clients/inetd.rb:401 src/include/inetd/dialogs.rb:353
+#: src/clients/inetd.rb:401 src/include/inetd/dialogs.rb:356
msgid "Status"
msgstr "Status"
-#: src/clients/inetd.rb:402 src/include/inetd/dialogs.rb:354
+#: src/clients/inetd.rb:402 src/include/inetd/dialogs.rb:357
msgid "Service"
msgstr "Tjeneste"
@@ -126,15 +126,15 @@
msgid "Prot."
msgstr "Prot."
-#: src/clients/inetd.rb:405 src/include/inetd/dialogs.rb:357
+#: src/clients/inetd.rb:405 src/include/inetd/dialogs.rb:360
msgid "Wait"
msgstr "Vent"
-#: src/clients/inetd.rb:406 src/include/inetd/dialogs.rb:358
+#: src/clients/inetd.rb:406 src/include/inetd/dialogs.rb:361
msgid "User"
msgstr "Bruker"
-#: src/clients/inetd.rb:407 src/include/inetd/dialogs.rb:359
+#: src/clients/inetd.rb:407 src/include/inetd/dialogs.rb:362
msgid "Server"
msgstr "Server"
@@ -149,12 +149,12 @@
msgstr "Av"
#. determine wait mode (convert to string)
-#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:851
+#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:855
#: src/include/inetd/routines.rb:211
msgid "Yes"
msgstr "Ja"
-#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:851
+#: src/clients/inetd.rb:442 src/include/inetd/dialogs.rb:855
#: src/include/inetd/routines.rb:213
msgid "No"
msgstr "Nei"
@@ -170,127 +170,127 @@
#. Translators: In autoinstallation mode:
#. The package name is stored in %1. This is Popup::ContinueCancel.
-#: src/include/inetd/dialogs.rb:160
+#: src/include/inetd/dialogs.rb:164
msgid "Package %1 will be installed during the write process."
msgstr "Pakken %1 vil bli installert under lagringsprosessen."
#. if (true) { // for debugging
#. Translators: The package name is stored in %1. This is Popup::Message.
-#: src/include/inetd/dialogs.rb:179
+#: src/include/inetd/dialogs.rb:183
msgid "Package %1 was not installed. The service cannot be edited."
msgstr "Pakken %1 ble ikke installert. Tjenesten kan ikke redigeres."
#. Translators: The package name is stored in %1
-#: src/include/inetd/dialogs.rb:201
+#: src/include/inetd/dialogs.rb:205
msgid "Package %1 was successfully installed."
msgstr "Pakken %1 ble installert."
#. This is main inetd module dialog.
#. @return dialog result
-#: src/include/inetd/dialogs.rb:299
+#: src/include/inetd/dialogs.rb:303
msgid "&Activate All Services"
msgstr "&Aktiver alle tjenester"
-#: src/include/inetd/dialogs.rb:300
+#: src/include/inetd/dialogs.rb:304
msgid "&Deactivate All Services"
msgstr "&Deaktiver alle tjenester"
#. Translators: Initial and target state of xinetd (or inetd)
-#: src/include/inetd/dialogs.rb:334
+#: src/include/inetd/dialogs.rb:339
msgid "D&isable"
msgstr "D&eaktiver"
-#: src/include/inetd/dialogs.rb:336
+#: src/include/inetd/dialogs.rb:340
msgid "Enab&le"
msgstr "Akti&ver"
#. Main dialog edit inetd.conf
#. Translators: Name of table with services (echo, chargen, ...)
-#: src/include/inetd/dialogs.rb:344
+#: src/include/inetd/dialogs.rb:347
msgid "Currently Available Services"
msgstr "Tilgjengelige tjenester"
#. `opt(`notify),
#. `opt(`keepSorting),
-#: src/include/inetd/dialogs.rb:352
+#: src/include/inetd/dialogs.rb:355
msgid "Ch"
msgstr "Endr"
-#: src/include/inetd/dialogs.rb:355
+#: src/include/inetd/dialogs.rb:358
msgid "Type "
msgstr "Type "
-#: src/include/inetd/dialogs.rb:356
+#: src/include/inetd/dialogs.rb:359
msgid "Protocol"
msgstr "Protokoll"
-#: src/include/inetd/dialogs.rb:360
+#: src/include/inetd/dialogs.rb:363
msgid "Server / Args"
msgstr "Server / Argm"
#. Translators: Add service
-#: src/include/inetd/dialogs.rb:370
+#: src/include/inetd/dialogs.rb:373
msgid "&Add"
msgstr "&Legg til"
#. Translators: Edit service
-#: src/include/inetd/dialogs.rb:373
+#: src/include/inetd/dialogs.rb:376
msgid "&Edit"
msgstr "&Rediger"
#. Translators: Delete service
-#: src/include/inetd/dialogs.rb:376
+#: src/include/inetd/dialogs.rb:379
msgid "&Delete"
msgstr "&Slett"
#. Translators: Change service status
-#: src/include/inetd/dialogs.rb:384
+#: src/include/inetd/dialogs.rb:387
msgid "&Toggle Status (On or Off)"
msgstr "&Endre status (På eller Av)"
-#: src/include/inetd/dialogs.rb:396
+#: src/include/inetd/dialogs.rb:399
msgid "Status for All &Services"
msgstr "Status for alle &tjenester"
#. Inetd configure dialog caption
-#: src/include/inetd/dialogs.rb:410
+#: src/include/inetd/dialogs.rb:413
msgid "Network Service Configuration (xinetd)"
msgstr "Oppsett av nettverkstjenester (xinetd)"
#. execute dialog
#. Translators: Caption for EditOrCreateServiceDlg()
-#: src/include/inetd/dialogs.rb:498
+#: src/include/inetd/dialogs.rb:504
msgid "Add a New Service Entry"
msgstr "Legg til en ny tjenesteoppføring"
#. Translators: Popup::Error
-#: src/include/inetd/dialogs.rb:528
+#: src/include/inetd/dialogs.rb:534
msgid "Cannot delete the service. It is not installed."
msgstr "Kan ikke slette tjenesten. Den er ikke installert."
#. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:552
+#: src/include/inetd/dialogs.rb:558
msgid "To delete a service, select one in the main dialog"
msgstr "Velg en tjeneste i hoveddialogen for å slette den"
#. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:599
+#: src/include/inetd/dialogs.rb:605
msgid "To activate or deactivate a service, select one in the main dialog."
msgstr "Velg en tjeneste i hoveddialogen for å aktivere eller deaktivere den."
#. y2milestone("Current line %1", current_line);
#. Translators: Caption of EditOrCreateServiceDlg()
-#: src/include/inetd/dialogs.rb:736
+#: src/include/inetd/dialogs.rb:742
msgid "Edit a service entry"
msgstr "Rediger en tjenesteoppføring"
#. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:751
+#: src/include/inetd/dialogs.rb:757
msgid "To edit a service, select one in the main dialog"
msgstr "Velg en tjeneste i hoveddialogen for å redigere den"
#. Translators: Popup::Warning
-#: src/include/inetd/dialogs.rb:782
+#: src/include/inetd/dialogs.rb:788
msgid ""
"All services are marked as disabled (locked).\n"
"Internet super-server will be disabled."
@@ -299,54 +299,54 @@
"Superserveren for Internett vil bli deaktivert."
#. service name
-#: src/include/inetd/dialogs.rb:807
+#: src/include/inetd/dialogs.rb:811
msgid "&Service"
msgstr "&Tjeneste"
-#: src/include/inetd/dialogs.rb:809
+#: src/include/inetd/dialogs.rb:813
msgid "RPC Versio&n"
msgstr "RPC-versjo&n"
#. service status (running or stopped)
-#: src/include/inetd/dialogs.rb:815
+#: src/include/inetd/dialogs.rb:819
msgid "Service is acti&ve."
msgstr "Tjenesten er akti&vert."
#. service socket type
-#: src/include/inetd/dialogs.rb:828
+#: src/include/inetd/dialogs.rb:832
msgid "Socket T&ype"
msgstr "Sokkelt&ype"
#. for protocol option - ediatble ComboBox
-#: src/include/inetd/dialogs.rb:839
+#: src/include/inetd/dialogs.rb:843
msgid "&Protocol"
msgstr "&Protokoll"
#. for flags (wait/nowait) - noneditable ComboBox
-#: src/include/inetd/dialogs.rb:850
+#: src/include/inetd/dialogs.rb:854
msgid "&Wait"
msgstr "&Vent"
#. user and group ComboBoxes
-#: src/include/inetd/dialogs.rb:860
+#: src/include/inetd/dialogs.rb:864
msgid "&User"
msgstr "&Bruker"
-#: src/include/inetd/dialogs.rb:862
+#: src/include/inetd/dialogs.rb:866
msgid "&Group"
msgstr "&Gruppe"
#. Server arguments
-#: src/include/inetd/dialogs.rb:865
+#: src/include/inetd/dialogs.rb:869
msgid "S&erver"
msgstr "S&erver"
-#: src/include/inetd/dialogs.rb:866
+#: src/include/inetd/dialogs.rb:870
msgid "Server Argumen&ts"
msgstr "Serverargumen&ter"
#. Comment above the service line in inetd.conf
-#: src/include/inetd/dialogs.rb:868
+#: src/include/inetd/dialogs.rb:872
msgid "Co&mment"
msgstr "Ko&mmentar"
@@ -360,14 +360,14 @@
#. It does not get the NIS entries.
#. "+" is filtered out.
#. @return [Array] groups
-#: 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/dialogs.rb:918 src/include/inetd/dialogs.rb:956
+#: src/include/inetd/dialogs.rb:961 src/include/inetd/dialogs.rb:1000
#: src/include/inetd/routines.rb:333 src/include/inetd/routines.rb:353
msgid "--default--"
msgstr "--standard--"
#. Translators: Popup::Message
-#: src/include/inetd/dialogs.rb:942
+#: src/include/inetd/dialogs.rb:946
msgid ""
"Service is empty.\n"
"Enter valid values.\n"
@@ -376,12 +376,12 @@
"Angi gyldige verdier.\n"
#. Error message
-#: src/include/inetd/dialogs.rb:948
+#: src/include/inetd/dialogs.rb:952
msgid "Service name contains disallowed character \"/\"."
msgstr "Tjenestenavnet inneholder ugyldige tegn \"/\"."
#. Translators: sformat-ed() 3 strings
-#: src/include/inetd/dialogs.rb:956
+#: src/include/inetd/dialogs.rb:960
msgid "The user %1 is reserved for internal server processes only."
msgstr "Brukeren %1 er reservert for interne serverprosesser."
@@ -658,57 +658,57 @@
msgstr "Initialiserer ..."
#. Inetd read dialog caption
-#: src/modules/Inetd.rb:185
+#: src/modules/Inetd.rb:188
msgid "Initializing inetd Configuration"
msgstr "Initialiserer oppsett av inetd"
-#: src/modules/Inetd.rb:193
+#: src/modules/Inetd.rb:196
msgid "Read the Configuration"
msgstr "Les oppsettet"
-#: src/modules/Inetd.rb:194
+#: src/modules/Inetd.rb:197
msgid "Reading the configuration..."
msgstr "Leser oppsettet..."
#. read database
-#: src/modules/Inetd.rb:194 src/modules/Inetd.rb:212 src/modules/Inetd.rb:276
-#: src/modules/Inetd.rb:340
+#: src/modules/Inetd.rb:197 src/modules/Inetd.rb:214 src/modules/Inetd.rb:278
+#: src/modules/Inetd.rb:306
msgid "Finished"
msgstr "Fullført"
#. Inetd read dialog caption
-#: src/modules/Inetd.rb:267
+#: src/modules/Inetd.rb:269
msgid "Saving inetd Configuration"
msgstr "Lagrer inetd-oppsett"
-#: src/modules/Inetd.rb:275
+#: src/modules/Inetd.rb:277
msgid "Write the settings"
msgstr "Lagre innstillingene"
-#: src/modules/Inetd.rb:276
+#: src/modules/Inetd.rb:278
msgid "Writing the settings..."
msgstr "Lagrer innstillingene..."
#. in future: catch errors
-#: src/modules/Inetd.rb:337
+#: src/modules/Inetd.rb:303
msgid "Cannot write settings!"
msgstr "Kan ikke lagre innstillingene!"
#. "enabled" defaults to true
-#: src/modules/Inetd.rb:607
+#: src/modules/Inetd.rb:598
msgid "<p><ul><i>All services are marked as stopped.</i></ul></p>"
msgstr "<p><ul><i>All tjenester er markert som deaktivert.</i></ul></p>"
#. Translators: Summary head, if nothing configured
-#: src/modules/Inetd.rb:618
+#: src/modules/Inetd.rb:609
msgid "Network services"
msgstr "Nettverkstjenester"
#. Translators: Summary head, if something configured
-#: src/modules/Inetd.rb:623
+#: src/modules/Inetd.rb:613
msgid "Network services are managed via %1"
msgstr "Nettverkstjenester administreres via %1"
-#: src/modules/Inetd.rb:627
+#: src/modules/Inetd.rb:616
msgid "These services will be enabled"
msgstr "Disse tjenestene vil bli aktivert"
Modified: branches/plus-SLE12-SP2/yast/nb/po/installation.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/installation.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/installation.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: installation\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-27 10:52+0200\n"
"PO-Revision-Date: 2011-01-13 22:52+0100\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -45,7 +45,7 @@
#. dialog caption
#. TRANSLATORS: progress message
#: src/include/installation/inst_inc_all.rb:64
-#: src/lib/installation/clients/inst_installation_options.rb:151
+#: src/lib/installation/clients/inst_installation_options.rb:154
msgid "Initializing..."
msgstr "Initialiserer ..."
@@ -213,28 +213,28 @@
#. Text for confirmation popup before the update really starts 3/3
#. Text for confirmation popup before the update really starts 3/3
#: src/include/installation/misc.rb:204 src/include/installation/misc.rb:222
-#: src/lib/installation/proposal_runner.rb:133
+#: src/lib/installation/proposal_runner.rb:136
msgid "<p>Go back and check the settings if you are unsure.</p>"
msgstr "<p>Hvis du er usikker, kan du gå tilbake og kontrollere innstillingene.</p>"
#. Heading for confirmation popup before the update really starts
#. Heading for confirmation popup before the update really starts
#: src/include/installation/misc.rb:210
-#: src/lib/installation/proposal_runner.rb:121
+#: src/lib/installation/proposal_runner.rb:124
msgid "Confirm Update"
msgstr "Bekreft oppgradering"
#. Text for confirmation popup before the update really starts 1/3
#. Text for confirmation popup before the update really starts 1/3
#: src/include/installation/misc.rb:214
-#: src/lib/installation/proposal_runner.rb:125
+#: src/lib/installation/proposal_runner.rb:128
msgid "<p>Information required to perform an update is now complete.</p>"
msgstr "<p>All nødvendig informasjon for å utføre oppgraderingen er nå fullført.</p>"
#. Text for confirmation popup before the update really starts 2/3
#. Text for confirmation popup before the update really starts 2/3
#: src/include/installation/misc.rb:216
-#: src/lib/installation/proposal_runner.rb:127
+#: src/lib/installation/proposal_runner.rb:130
msgid ""
"\n"
"<p>If you continue now, data on your hard disk will be overwritten\n"
@@ -247,7 +247,7 @@
#. Label for the button that confirms startint the installation
#. Label for the button that confirms startint the installation
#: src/include/installation/misc.rb:225
-#: src/lib/installation/proposal_runner.rb:136
+#: src/lib/installation/proposal_runner.rb:139
msgid "Start &Update"
msgstr "Start &oppgradering"
@@ -290,7 +290,61 @@
msgstr "Starter tjenesten %1..."
#. progress step title
-#: src/lib/installation/clients/copy_files_finish.rb:82
+#: src/lib/installation/clients/clone_finish.rb:43
+msgid "Generating AutoYaST profile if needed..."
+msgstr ""
+
+#. TRANSLATORS: help text
+#: src/lib/installation/clients/clone_proposal.rb:39
+#, fuzzy
+#| msgid ""
+#| "<p>Use <b>Clone</b> if you want to create an AutoYaST profile.\n"
+#| "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
+#| "needs a profile to know what the installed system should look like. If this option is\n"
+#| "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>"
+msgid ""
+"<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n"
+"AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
+"needs a profile to know what the installed system should look like. If this option is\n"
+"selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>"
+msgstr ""
+"<p>Bruk <b>Klon</b> hvis du vil opprette en AutoYaST-profil.\n"
+"Med AutoYaST kan hele SUSE Linux-installasjonen utføres uten medvirkning fra brukeren. AutoYaST\n"
+"trenger en profil for å vite hvordan det installerte systemet skal se ut. Når du krysser av for dette,\n"
+"blir en profil for gjeldende system lagret i <tt>/root/autoinst.xml</tt>.</p>"
+
+#: src/lib/installation/clients/clone_proposal.rb:60
+msgid "Write AutoYaST profile to /root/autoinst.xmlat the end of installation?"
+msgstr ""
+
+#. this is a heading
+#: src/lib/installation/clients/clone_proposal.rb:71
+#, fuzzy
+#| msgid "Writing the system configuration..."
+msgid "Clone System Configuration"
+msgstr "Lagrer systemoppsettet..."
+
+#. this is a menu entry
+#: src/lib/installation/clients/clone_proposal.rb:73
+#, fuzzy
+#| msgid "&Skip Configuration"
+msgid "&Clone System Configuration"
+msgstr "&Hopp over konfigurasjon"
+
+#. TRANSLATORS: Installation overview
+#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
+#: src/lib/installation/clients/clone_proposal.rb:101
+msgid "The AutoYaST profile will be written under /root/autoinst.xml (do not write it</a>)."
+msgstr ""
+
+#. TRANSLATORS: Installation overview
+#. IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text
+#: src/lib/installation/clients/clone_proposal.rb:110
+msgid "The AutoYaST profile will not be saved (write it</a>)."
+msgstr ""
+
+#. progress step title
+#: src/lib/installation/clients/copy_files_finish.rb:81
msgid "Copying files to installed system..."
msgstr "Kopierer filer til installert system..."
@@ -487,7 +541,7 @@
msgstr "Oppdateringer for %1 %2"
#: src/lib/installation/clients/inst_addon_update_sources.rb:172
-#: src/lib/installation/clients/inst_system_analysis.rb:306
+#: src/lib/installation/clients/inst_system_analysis.rb:304
msgid "Unknown Product"
msgstr "Ukjent produkt"
@@ -516,28 +570,54 @@
"Velg om du vil kjøre en online-oppgradering nå.\n"
"Du kan hoppe over dette trinnet nå, og kjøre oppgraderingen senere.\n"
-#. This client shows main dialog for choosing the language,
-#. keyboard and accepting the license.
-#: src/lib/installation/clients/inst_complex_welcome.rb:33
+#. ----------------------------------------------------------------------
+#. Build dialog
+#. ----------------------------------------------------------------------
+#. heading text
+#: src/lib/installation/clients/inst_complex_welcome.rb:65
msgid "Language, Keyboard and License Agreement"
msgstr ""
-#. 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
+#. combo box label
+#. combobox
+#. TRANSLATORS: Combo box
+#: src/lib/installation/clients/inst_complex_welcome.rb:71
+#: src/lib/installation/clients/inst_release_notes.rb:217
+#: src/lib/installation/clients/inst_release_notes.rb:431
+msgid "&Language"
+msgstr "&Språk"
+
+#. combo box label
+#: src/lib/installation/clients/inst_complex_welcome.rb:79
+msgid "&Keyboard Layout"
+msgstr "&Tastaturoppsett"
+
+#. bnc #359456
+#. TRANSLATORS: check-box
+#: src/lib/installation/clients/inst_complex_welcome.rb:91
+msgid "I &Agree to the License Terms."
+msgstr "Jeg godkjenner lisens&avtalen."
+
+#. this type of contents will be shown only for initial installation dialog
+#: src/lib/installation/clients/inst_complex_welcome.rb:110
#, fuzzy
-#| msgid "Release Notes"
-msgid "Re&lease Notes..."
-msgstr "Versjonsmerknader"
+#| msgid "Keyboard &test:"
+msgid "K&eyboard Test"
+msgstr "&Test tastaturet"
+#. TRANSLATORS: dialog caption
+#: src/lib/installation/clients/inst_complex_welcome.rb:119
+#: src/lib/installation/clients/inst_complex_welcome.rb:299
+msgid "License Agreement"
+msgstr "Lisensavtale"
+
+#. TRANSLATORS: button label
+#: src/lib/installation/clients/inst_complex_welcome.rb:141
+msgid "License &Translations..."
+msgstr "Lisensoverse&ttelser..."
+
#. help text for initial (first time) language screen
-#: src/lib/installation/clients/inst_complex_welcome.rb:169
+#: src/lib/installation/clients/inst_complex_welcome.rb:153
msgid ""
"<p>\n"
"Choose the <b>Language</b> and the <b>Keyboard layout</b> to be used during\n"
@@ -551,7 +631,7 @@
#. help text, continued
#. Describes the #ICW_B1 button
-#: src/lib/installation/clients/inst_complex_welcome.rb:177
+#: src/lib/installation/clients/inst_complex_welcome.rb:161
msgid ""
"<p>\n"
"The license must be accepted before the installation continues.\n"
@@ -564,7 +644,7 @@
"</p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:184
+#: src/lib/installation/clients/inst_complex_welcome.rb:168
msgid ""
"<p>\n"
"Click <b>Next</b> to proceed to the next dialog.\n"
@@ -575,7 +655,7 @@
"</p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:190
+#: src/lib/installation/clients/inst_complex_welcome.rb:174
msgid ""
"<p>\n"
"Nothing will happen to your computer until you confirm\n"
@@ -588,7 +668,7 @@
"</p>\n"
#. help text, continued
-#: src/lib/installation/clients/inst_complex_welcome.rb:197
+#: src/lib/installation/clients/inst_complex_welcome.rb:181
msgid ""
"<p>\n"
"Select <b>Abort</b> to abort the\n"
@@ -600,50 +680,24 @@
"installasjonen når som helst.\n"
"</p>\n"
-#. 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"
+#. In case of going back, Release Notes button may be shown, retranslate it (bnc#886660)
+#. Assure that relnotes have been downloaded first
+#. exit codes (see "man curl"):
+#. 7 = Failed to connect to host.
+#. 28 = Operation timeout.
+#. push button
+#: src/lib/installation/clients/inst_complex_welcome.rb:211
+#: src/lib/installation/clients/inst_download_release_notes.rb:126
+#: src/lib/installation/clients/inst_system_analysis.rb:302
+#, fuzzy
+#| msgid "Release Notes"
+msgid "Re&lease Notes..."
+msgstr "Versjonsmerknader"
-#. 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 "Jeg godkjenner lisens&avtalen."
-
-#. 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
+#: src/lib/installation/clients/inst_complex_welcome.rb:323
msgid "You must accept the license to install this product"
msgstr ""
-#. this type of contents will be shown only for initial installation dialog
-#: src/lib/installation/clients/inst_complex_welcome.rb:406
-#, fuzzy
-#| msgid "Keyboard &test:"
-msgid "K&eyboard Test"
-msgstr "&Test tastaturet"
-
-#. TRANSLATORS: button label
-#: src/lib/installation/clients/inst_complex_welcome.rb:436
-msgid "License &Translations..."
-msgstr "Lisensoverse&ttelser..."
-
#. TRANSLATORS: check box, see #ZMD
#: src/lib/installation/clients/inst_congratulate.rb:107
msgid "&Disable ZMD Service"
@@ -746,7 +800,7 @@
msgstr "Pakken autoyast2 er ikke installert. Kloning deaktivert."
#. OEM image if target disk is defined
-#: src/lib/installation/clients/inst_deploy_image.rb:49
+#: src/lib/installation/clients/inst_deploy_image.rb:46
msgid "The system will reboot now..."
msgstr "Maskinen vil bli startet på nytt nå..."
@@ -755,8 +809,8 @@
#. twice more steps
#. FIXME: 2 minutes
#. own workflow for OEM image deployment
-#: src/lib/installation/clients/inst_deploy_image.rb:109
-#: src/lib/installation/clients/inst_deploy_image.rb:354
+#: src/lib/installation/clients/inst_deploy_image.rb:106
+#: src/lib/installation/clients/inst_deploy_image.rb:351
#: src/lib/installation/clients/inst_prepareprogress.rb:110
#: src/lib/installation/clients/inst_prepareprogress.rb:152
msgid "Deploying Images..."
@@ -764,7 +818,7 @@
#. BNC #444209
#. false == error
-#: src/lib/installation/clients/inst_deploy_image.rb:170
+#: src/lib/installation/clients/inst_deploy_image.rb:167
msgid ""
"Deploying images has failed.\n"
"Aborting the installation...\n"
@@ -773,7 +827,7 @@
"Avbryter installasjonen...\n"
#. TRANSLATORS: pop-up message
-#: src/lib/installation/clients/inst_deploy_image.rb:202
+#: src/lib/installation/clients/inst_deploy_image.rb:199
msgid ""
"Debugging has been turned on.\n"
"YaST will open a software manager for you to check the current status of packages."
@@ -782,20 +836,20 @@
"YaST vil åpne en pakkebehandler slik at du kan kontrollere gjeldende status for pakkene."
#. unknown image
-#: src/lib/installation/clients/inst_deploy_image.rb:378
+#: src/lib/installation/clients/inst_deploy_image.rb:375
msgid "Downloading image at speed %1/s"
msgstr "Laster ned diskbilde med hastigheten %1/s"
-#: src/lib/installation/clients/inst_deploy_image.rb:383
+#: src/lib/installation/clients/inst_deploy_image.rb:380
msgid "Downloading image %1 at speed %2/s"
msgstr "Laster ned diskbildet %1 med hastigheten %2/s"
#. reset the label
-#: src/lib/installation/clients/inst_deploy_image.rb:445
+#: src/lib/installation/clients/inst_deploy_image.rb:442
msgid "Deploying image..."
msgstr "Bruker diskbilde..."
-#: src/lib/installation/clients/inst_deploy_image.rb:448
+#: src/lib/installation/clients/inst_deploy_image.rb:445
msgid "Deploying image %1..."
msgstr "Bruker diskbildet %1..."
@@ -821,37 +875,36 @@
msgstr ""
#. popup label
-#: src/lib/installation/clients/inst_disks_activate.rb:65
+#: src/lib/installation/clients/inst_disks_activate.rb:60
msgid "Detecting Available Controllers"
msgstr "Søker etter tilgjengelige kontrollere"
#. dialog caption
-#: src/lib/installation/clients/inst_disks_activate.rb:81
+#: src/lib/installation/clients/inst_disks_activate.rb:76
msgid "Disk Activation"
msgstr "Diskaktivering"
-#: src/lib/installation/clients/inst_disks_activate.rb:91
+#: src/lib/installation/clients/inst_disks_activate.rb:86
msgid "Configure &DASD Disks"
msgstr "Konfigurer &DASD-disker"
-#: src/lib/installation/clients/inst_disks_activate.rb:97
+#: src/lib/installation/clients/inst_disks_activate.rb:92
msgid "Configure &ZFCP Disks"
msgstr "Konfigurer &ZFCP-disker"
-#: src/lib/installation/clients/inst_disks_activate.rb:103
+#: src/lib/installation/clients/inst_disks_activate.rb:98
msgid "Configure &FCoE Interfaces"
msgstr "Sett opp &FCoE-grensesnitt"
-#: src/lib/installation/clients/inst_disks_activate.rb:117
+#: src/lib/installation/clients/inst_disks_activate.rb:110
msgid "Configure &iSCSI Disks"
msgstr "Konfigurer &iSCSI-disker"
-#. Finish
-#: src/lib/installation/clients/inst_disks_activate.rb:178
+#: src/lib/installation/clients/inst_disks_activate.rb:111
#, fuzzy
-#| msgid "Network Configuration"
-msgid "Net&work Configuration..."
-msgstr "Nettverkskonfigurasjon"
+#| msgid "Saving network configuration..."
+msgid "Change Net&work Configuration"
+msgstr "Lagrer nettverkskonfigurasjon..."
#. TRANSLATORS: dialog caption
#: src/lib/installation/clients/inst_doit.rb:56
@@ -869,7 +922,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:149
+#: src/lib/installation/clients/inst_installation_options.rb:152
msgid "Initializing"
msgstr "Initialiserer"
@@ -909,53 +962,53 @@
msgstr "Oppretter liste over fullføringsskript som skal kjøres..."
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:203
+#: src/lib/installation/clients/inst_finish.rb:204
msgid "Copy files to installed system"
msgstr "Kopier filer til installert system"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:210
+#: src/lib/installation/clients/inst_finish.rb:211
msgid "Save configuration"
msgstr "Lagre konfigurasjon"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:217
+#: src/lib/installation/clients/inst_finish.rb:218
msgid "Save installation settings"
msgstr "Lagre installasjonsinnstillinger"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:226
+#: src/lib/installation/clients/inst_finish.rb:227
msgid "Install boot manager"
msgstr "Installer oppstartslaster"
#. progress stage
-#: src/lib/installation/clients/inst_finish.rb:233
+#: src/lib/installation/clients/inst_finish.rb:234
msgid "Prepare system for initial boot"
msgstr "Klargjør systemet for første oppstart"
#. merge steps from add-on products
#. bnc #438678
-#: src/lib/installation/clients/inst_finish.rb:337
+#: src/lib/installation/clients/inst_finish.rb:338
msgid "Checking stage: %1..."
msgstr "Kontrollerer trinn: %1..."
#. a fallback busy message
-#: src/lib/installation/clients/inst_finish.rb:424
+#: src/lib/installation/clients/inst_finish.rb:425
msgid "Calling step %1..."
msgstr "Kjører trinn %1..."
#. use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log
-#: src/lib/installation/clients/inst_finish.rb:444
+#: src/lib/installation/clients/inst_finish.rb:445
msgid " * %1"
msgstr " * %1"
#. Anything else
-#: src/lib/installation/clients/inst_finish.rb:481
+#: src/lib/installation/clients/inst_finish.rb:482
msgid "Finished"
msgstr "Fullført"
#. get the latest errors
-#: src/lib/installation/clients/inst_finish.rb:613
+#: src/lib/installation/clients/inst_finish.rb:614
msgid "Installation Error"
msgstr "Installasjonsfeil"
@@ -980,24 +1033,24 @@
msgstr "Klargjør første systemkonfigurasjon..."
#. dialog caption
-#: src/lib/installation/clients/inst_installation_options.rb:80
+#: src/lib/installation/clients/inst_installation_options.rb:83
#, fuzzy
#| msgid "Installation Mode"
msgid "Installation Options"
msgstr "Installasjonsmodus"
#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:177
+#: src/lib/installation/clients/inst_installation_options.rb:181
msgid "&Add Online Repositories Before Installation"
msgstr "Legg til online-p&akkebrønner før installasjon"
#. check box
-#: src/lib/installation/clients/inst_installation_options.rb:189
+#: src/lib/installation/clients/inst_installation_options.rb:193
msgid "In&clude Add-on Products from Separate Media"
msgstr "In&kluder tilleggsprodukter fra separate medier"
#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:200
+#: src/lib/installation/clients/inst_installation_options.rb:204
#, fuzzy
#| msgid ""
#| "<p><big><b>Installation Mode</b></big><br>\n"
@@ -1008,7 +1061,7 @@
"Velg hva du vil gjøre:</p>"
#. help text for installation option
-#: src/lib/installation/clients/inst_installation_options.rb:203
+#: src/lib/installation/clients/inst_installation_options.rb:207
msgid ""
"<p>\n"
"To use suggested remote repositories during installation or update, select\n"
@@ -1019,7 +1072,7 @@
"<b>Legg til online-pakkebrønner før installasjon</b>.</p>"
#. help text for installation method
-#: src/lib/installation/clients/inst_installation_options.rb:209
+#: src/lib/installation/clients/inst_installation_options.rb:213
msgid ""
"<p>\n"
"To install an add-on product from separate media together with &product;, select\n"
@@ -1030,7 +1083,7 @@
"<b>Inkluder tilleggsprodukter fra separate medier</b>.</p>\n"
#. help text: additional help for installation
-#: src/lib/installation/clients/inst_installation_options.rb:212
+#: src/lib/installation/clients/inst_installation_options.rb:216
msgid "<p>If you need specific hardware drivers for installation, see <i>http://drivers.suse.com</i> site.</p>"
msgstr "<p>Hvis du trenger spesifikke maskinvaredrivere for å installere, se <i>http://drivers.suse.com</i> site.</p>"
@@ -1297,7 +1350,7 @@
msgstr "YaST søker etter maskinvare og installerte systemer."
#. additonal error when HW was not found
-#: src/lib/installation/clients/inst_system_analysis.rb:242
+#: src/lib/installation/clients/inst_system_analysis.rb:240
msgid ""
"\n"
"Check 'drivers.suse.com' if you need specific hardware drivers for installation."
@@ -1306,7 +1359,7 @@
"Se «drivers.suse.com» hvis du trenger spesielle maskinvaredrivere for å installere."
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:256
+#: src/lib/installation/clients/inst_system_analysis.rb:254
msgid ""
"No hard disks were found for the installation.\n"
"Please check your hardware!\n"
@@ -1316,7 +1369,7 @@
"Kontroller maskinvaren!\n"
"%1\n"
-#: src/lib/installation/clients/inst_system_analysis.rb:266
+#: src/lib/installation/clients/inst_system_analysis.rb:264
msgid ""
"No hard disks were found for the installation.\n"
"During an automatic installation, they might be detected later.\n"
@@ -1327,7 +1380,7 @@
"(spesielt på S/390- eller iSCSI-systemer).\n"
#. pop-up error report
-#: src/lib/installation/clients/inst_system_analysis.rb:277
+#: src/lib/installation/clients/inst_system_analysis.rb:275
msgid ""
"No hard disks and no hard disk controllers were\n"
"found for the installation.\n"
@@ -1340,7 +1393,7 @@
"%1\n"
#. popup message
-#: src/lib/installation/clients/inst_system_analysis.rb:322
+#: src/lib/installation/clients/inst_system_analysis.rb:320
msgid ""
"Failed to initialize the software repositories.\n"
"Aborting the installation."
@@ -1348,36 +1401,6 @@
"Kunne ikke initialisere pakkebrønner.\n"
"Avbryter installasjonen."
-#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:184
-#, fuzzy
-#| msgid "The /var partition %1 could not be mounted.\n"
-msgid ""
-"A valid update could not be found at\n"
-"%s.\n"
-"\n"
-msgstr "/var-partisjonen %1 kunne ikke monteres.\n"
-
-#. TRANSLATORS: %s is an URL
-#: src/lib/installation/clients/inst_update_installer.rb:190
-#, fuzzy
-#| msgid "Could not set patterns: %1."
-msgid ""
-"Could not fetch update from\n"
-"%s.\n"
-"\n"
-msgstr "Kunne ikke definere mønstre: %1."
-
-#. 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"
@@ -1431,8 +1454,8 @@
#. menu button
#. menu button
#: src/lib/installation/clients/inst_upgrade_urls.rb:247
-#: src/lib/installation/proposal_runner.rb:647
-#: src/lib/installation/proposal_runner.rb:762
+#: src/lib/installation/proposal_runner.rb:659
+#: src/lib/installation/proposal_runner.rb:783
msgid "&Change..."
msgstr "&Endre..."
@@ -1667,7 +1690,7 @@
msgstr "Setter opp kommunikasjonsbuffer..."
#. progress step title
-#: src/lib/installation/clients/network_finish.rb:60
+#: src/lib/installation/clients/network_finish.rb:68
msgid "Saving network configuration..."
msgstr "Lagrer nettverkskonfigurasjon..."
@@ -1796,22 +1819,35 @@
msgstr "Søker etter Linux-partisjoner..."
#. question in a popup box
-#: src/lib/installation/proposal_runner.rb:204
+#: src/lib/installation/proposal_runner.rb:207
msgid "Really reset everything to default values?"
msgstr "Er du sikker på at du vil tilbakestille alt til standardinnstillinger?"
#. explain consequences of a decision
-#: src/lib/installation/proposal_runner.rb:206
+#: src/lib/installation/proposal_runner.rb:209
msgid "You will lose all changes."
msgstr "Alle endringer vil gå tapt."
+#. while input loop
+#: src/lib/installation/proposal_runner.rb:251
+#, fuzzy
+#| msgid "Automatic Configuration"
+msgid "Location of Stored Configuration"
+msgstr "Automatisk oppsett"
+
+#. force write, so it always write profile even if user do not want
+#. to store profile after installation
+#: src/lib/installation/proposal_runner.rb:257
+msgid "Failed to store configuration. Details can be found in log."
+msgstr ""
+
#. message show when user has disabled the configuration
-#: src/lib/installation/proposal_runner.rb:252
+#: src/lib/installation/proposal_runner.rb:268
msgid "Skipping configuration upon user request"
msgstr "Hopper over konfigurasjon etter ønske fra bruker"
#. error message is a popup
-#: src/lib/installation/proposal_runner.rb:272
+#: src/lib/installation/proposal_runner.rb:288
msgid ""
"The proposal contains an error that must be\n"
"resolved before continuing.\n"
@@ -1820,25 +1856,25 @@
"rettes før du fortsetter.\n"
#. busy message
-#: src/lib/installation/proposal_runner.rb:381
+#: src/lib/installation/proposal_runner.rb:394
msgid "Adapting the proposal to the current settings..."
msgstr "Tilpasser forslaget til gjeldende innstillinger..."
#. busy message;
#. Initial contents of proposal subwindow while proposals are calculated
-#: src/lib/installation/proposal_runner.rb:385
-#: src/lib/installation/proposal_runner.rb:667
+#: src/lib/installation/proposal_runner.rb:398
+#: src/lib/installation/proposal_runner.rb:687
msgid "Analyzing your system..."
msgstr "Analyserer systemet..."
#. fallback proposal, means usually an internal error
-#: src/lib/installation/proposal_runner.rb:487
+#: src/lib/installation/proposal_runner.rb:500
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:526
+#: src/lib/installation/proposal_runner.rb:539
msgid ""
"Configuration saved.\n"
"There were errors."
@@ -1851,38 +1887,46 @@
#. Translators: About 40 characters max,
#. use newlines for longer translations.
#. radio button
-#: src/lib/installation/proposal_runner.rb:621
+#: src/lib/installation/proposal_runner.rb:634
msgid "&Skip Configuration"
msgstr "&Hopp over konfigurasjon"
#. radio button
-#: src/lib/installation/proposal_runner.rb:630
+#: src/lib/installation/proposal_runner.rb:643
msgid "&Use Following Configuration"
msgstr "&Bruk følgende konfigurasjon"
+#. menu button
+#: src/lib/installation/proposal_runner.rb:667
+#: src/lib/installation/proposal_runner.rb:778
+#, fuzzy
+#| msgid "&Skip Configuration"
+msgid "&Export Configuration"
+msgstr "&Hopp over konfigurasjon"
+
#. Help message between headline and installation proposal / settings summary.
#. May contain newlines, but don't make it very much longer than the original.
-#: src/lib/installation/proposal_runner.rb:693
+#: src/lib/installation/proposal_runner.rb:713
msgid "Click a headline to make changes or use the \"Change...\" menu below."
msgstr "Klikk på en overskrift for å endre, eller bruk menyen \"Endre...\" nedenfor."
-#: src/lib/installation/proposal_runner.rb:697
+#: src/lib/installation/proposal_runner.rb:717
#, fuzzy
#| msgid "Click a headline to make changes or use the \"Change...\" menu below."
msgid "Click a headline to make changes."
msgstr "Klikk på en overskrift for å endre, eller bruk menyen \"Endre...\" nedenfor."
#. menu button item
-#: src/lib/installation/proposal_runner.rb:757
+#: src/lib/installation/proposal_runner.rb:777
msgid "&Reset to defaults"
msgstr "&Tilbakestill til standardinnstillinger"
#. FATE #120373
-#: src/lib/installation/proposal_runner.rb:779
+#: src/lib/installation/proposal_runner.rb:800
msgid "&Update"
msgstr "&Oppgradering"
-#: src/lib/installation/proposal_runner.rb:779
+#: src/lib/installation/proposal_runner.rb:800
msgid "&Install"
msgstr "&Installer"
@@ -1917,7 +1961,7 @@
#. Help text for installation proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:426
+#: src/lib/installation/proposal_store.rb:417
msgid ""
"<p>\n"
"Select <b>Install</b> to perform a new installation with the values displayed.\n"
@@ -1930,7 +1974,7 @@
#. so update
#. Help text for update proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:434
+#: src/lib/installation/proposal_store.rb:425
msgid ""
"<p>\n"
"Select <b>Update</b> to perform an update with the values displayed.\n"
@@ -1942,7 +1986,7 @@
#. Help text for network configuration proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:443
+#: src/lib/installation/proposal_store.rb:434
msgid ""
"<p>\n"
"Put the network settings into effect by pressing <b>Next</b>.\n"
@@ -1954,7 +1998,7 @@
#. Help text for service configuration proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:451
+#: src/lib/installation/proposal_store.rb:442
msgid ""
"<p>\n"
"Put the service settings into effect by pressing <b>Next</b>.\n"
@@ -1966,7 +2010,7 @@
#. Help text for hardware configuration proposal
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:459
+#: src/lib/installation/proposal_store.rb:450
msgid ""
"<p>\n"
"Put the hardware settings into effect by pressing <b>Next</b>.\n"
@@ -1977,12 +2021,12 @@
"</p>\n"
#. Proposal in uml module
-#: src/lib/installation/proposal_store.rb:466
+#: src/lib/installation/proposal_store.rb:457
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:468
+#: src/lib/installation/proposal_store.rb:459
msgid ""
"<P>UML (User Mode Linux) installation allows you to start independent\n"
"Linux virtual machines in the host system.</P>"
@@ -1993,7 +2037,7 @@
#. Generic help text for other proposals (not basic installation or
#. hardhware configuration.
#. General part ("You can change values...") is added as the next paragraph.
-#: src/lib/installation/proposal_store.rb:482
+#: src/lib/installation/proposal_store.rb:473
msgid ""
"<p>\n"
"To use the settings as displayed, press <b>Next</b>.\n"
@@ -2012,18 +2056,6 @@
msgid "Enabling remote administration..."
msgstr "Ekstern administrasjon"
-#. skip forward or backward
-#: src/lib/installation/select_system_role.rb:48
-#, fuzzy
-#| msgid "System Profile"
-msgid "System Role"
-msgstr "Systemprofil"
-
-#. 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
@@ -2031,73 +2063,12 @@
#.
#. @return [TrueClass,FalseClass] True if snapshot was created;
#. otherwise it returns false.
-#: src/lib/installation/snapshots_finish.rb:41
+#: src/lib/installation/snapshots_finish.rb:40
#, fuzzy
#| msgid "Copying root filesystem..."
msgid "Creating root filesystem snapshot..."
msgstr "Kopierer rotfilsystem..."
-#. 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 "Kan ikke finne nettadressen '%1' via protokollen HTTP(S). Serveren rapporterte koden %2."
-
-#. 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 "Kan ikke finne nettadressen '%1' via protokollen FTP. Serveren rapporterte koden %2."
-
-#. 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 "Lesing av filen på %1/%2 mislyktes.\n"
-
-#: src/lib/transfer/file_from_url.rb:208
-msgid "Reading file on %1 failed.\n"
-msgstr "Lesing av filen på %1 mislyktes.\n"
-
-#. autoyast tried to mount the CD but had no success.
-#. autoyast tried to mount a NFS directory which failed
-#. autoyast tried to mount a NFS directory which failed
-#: src/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 "Montering av %1 mislyktes."
-
-#. 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 "Lesing av fil fra CD mislyktes. Filsti: %1/%2."
-
-#. autoyast tried to copy a file via NFS which failed
-#. autoyast tried to copy a file via NFS which failed
-#: src/lib/transfer/file_from_url.rb:350 src/lib/transfer/file_from_url.rb:394
-msgid "Remote file %1 cannot be retrieved"
-msgstr "Den eksterne filen %1 kan ikke hentes"
-
-#. this is workaround for bnc#849767
-#. because of changes in autoyast startup this code is now
-#. called much sooner (before Storage stuff is initialized)
-#. call dummy method to trigger Storage initialization
-#: src/lib/transfer/file_from_url.rb:519
-msgid "%1 is not mounted and mount failed"
-msgstr "%1 er ikke montert og montering mislyktes"
-
-#. autoyast tried to copy a file but that file can't be found
-#: src/lib/transfer/file_from_url.rb:539
-msgid "File %1 cannot be found"
-msgstr "Filen %1 ble ikke funnet"
-
-#. Device
-#: src/lib/transfer/file_from_url.rb:561
-msgid "Cannot find URL '%1' via protocol TFTP."
-msgstr "Kan ikke finne nettadressen '%1' via protokollen TFTP."
-
-#. the user wanted autoyast to fetch it's profile via an unknown protocol
-#: src/lib/transfer/file_from_url.rb:568
-msgid "Unknown protocol %1."
-msgstr "Ukjent protokoll %1."
-
#. checking whether images are supported
#. BNC #409927
#. Checking files for signatures
@@ -2134,48 +2105,6 @@
"Installasjonsprogrammet kunne ikke løse pakkekonfliktene automatisk.\n"
"Pakkebehandleren vil bli åpnet, slik at du kan løse dem manuelt."
-#, fuzzy
-#~| msgid ""
-#~| "<p>Use <b>Clone</b> if you want to create an AutoYaST profile.\n"
-#~| "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
-#~| "needs a profile to know what the installed system should look like. If this option is\n"
-#~| "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>"
-#~ msgid ""
-#~ "<p>Use <b>Clone System Settings</b> if you want to create an AutoYaST profile.\n"
-#~ "AutoYaST is a way to do a complete SUSE Linux installation without user interaction. AutoYaST\n"
-#~ "needs a profile to know what the installed system should look like. If this option is\n"
-#~ "selected, a profile of the current system is stored in <tt>/root/autoinst.xml</tt>.</p>"
-#~ msgstr ""
-#~ "<p>Bruk <b>Klon</b> hvis du vil opprette en AutoYaST-profil.\n"
-#~ "Med AutoYaST kan hele SUSE Linux-installasjonen utføres uten medvirkning fra brukeren. AutoYaST\n"
-#~ "trenger en profil for å vite hvordan det installerte systemet skal se ut. Når du krysser av for dette,\n"
-#~ "blir en profil for gjeldende system lagret i <tt>/root/autoinst.xml</tt>.</p>"
-
-#, fuzzy
-#~| msgid "Writing the system configuration..."
-#~ msgid "Clone System Configuration"
-#~ msgstr "Lagrer systemoppsettet..."
-
-#, fuzzy
-#~| msgid "&Skip Configuration"
-#~ msgid "&Clone System Configuration"
-#~ msgstr "&Hopp over konfigurasjon"
-
-#, fuzzy
-#~| msgid "Saving network configuration..."
-#~ msgid "Change Net&work Configuration"
-#~ msgstr "Lagrer nettverkskonfigurasjon..."
-
-#, fuzzy
-#~| msgid "Automatic Configuration"
-#~ msgid "Location of Stored Configuration"
-#~ msgstr "Automatisk oppsett"
-
-#, fuzzy
-#~| msgid "&Skip Configuration"
-#~ msgid "&Export Configuration"
-#~ msgstr "&Hopp over konfigurasjon"
-
#~ msgid "ERROR: Missing Title"
#~ msgstr "FEIL: Tittel mangler"
Modified: branches/plus-SLE12-SP2/yast/nb/po/instserver.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/instserver.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/instserver.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: instserver\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-10-01 12:30+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -69,25 +69,25 @@
msgstr "Endre medium"
#. %1 is the current cd number
-#: src/include/instserver/dialogs.rb:241
+#: src/include/instserver/dialogs.rb:230
msgid "Insert CD %1 then press continue."
msgstr "Sett inn CD %1 og klikk Fortsett."
-#: src/include/instserver/dialogs.rb:246
+#: src/include/instserver/dialogs.rb:235
msgid "Select ISO image %1 then press continue."
msgstr "Velg ISO-diskbildet %1 og klikk Fortsett."
#. %2 is the product name and version
-#: src/include/instserver/dialogs.rb:252
+#: src/include/instserver/dialogs.rb:241
msgid "Insert CD %1 of %2."
msgstr "Sett inn CD %1 av %2."
-#: src/include/instserver/dialogs.rb:253
+#: src/include/instserver/dialogs.rb:242
msgid "Select ISO image %1 of %2."
msgstr "Velg ISO-diskbilde %1 av %2."
#. popup request, %1 is CD medium name
-#: src/include/instserver/dialogs.rb:292
+#: src/include/instserver/dialogs.rb:281
msgid ""
"Insert\n"
"%1"
@@ -96,12 +96,12 @@
"%1"
#. popup request, %1 is ISO name
-#: src/include/instserver/dialogs.rb:321
+#: src/include/instserver/dialogs.rb:310
msgid "Select %1"
msgstr "Velg %1"
#. add-on medium (e.g. service pack) doesn't match configured repository
-#: src/include/instserver/dialogs.rb:573
+#: src/include/instserver/dialogs.rb:551
msgid ""
"The medium requires product %1, which is not provided\n"
"by the current repository.\n"
@@ -114,63 +114,63 @@
"Velg først grunnproduktmediet."
#. else, we create CD1, CD2, etc. (for code10 always)
-#: src/include/instserver/dialogs.rb:697
+#: src/include/instserver/dialogs.rb:669
msgid "Copying CD contents to local directory"
msgstr "Kopierer CD-innhold til lokal katalog"
-#: src/include/instserver/dialogs.rb:698
+#: src/include/instserver/dialogs.rb:670
msgid "This may take a while..."
msgstr "Dette kan ta en stund..."
#. TODO: report more details (stderr)
#. rename the directory
-#: src/include/instserver/dialogs.rb:755 src/modules/Instserver.rb:1361
+#: src/include/instserver/dialogs.rb:727 src/modules/Instserver.rb:1341
msgid "Error while moving repository content."
msgstr "Feil under overføring av innhold i pakkebrønn."
#. Instserver configuration dialog caption
#. Instserver configuration dialog caption
-#: src/include/instserver/dialogs.rb:978
-#: src/include/instserver/dialogs.rb:1191
+#: src/include/instserver/dialogs.rb:949
+#: src/include/instserver/dialogs.rb:1162
msgid "Repository Configuration"
msgstr "Pakkebrønnoppsett"
#. Instserver configure1 dialog contents
-#: src/include/instserver/dialogs.rb:994
+#: src/include/instserver/dialogs.rb:965
msgid "Read &CD or DVD Medium"
msgstr "Les &CD- eller DVD-medium"
-#: src/include/instserver/dialogs.rb:1000
+#: src/include/instserver/dialogs.rb:971
msgid "Data &Source"
msgstr "Data&kilde"
-#: src/include/instserver/dialogs.rb:1008
+#: src/include/instserver/dialogs.rb:979
msgid "Use &ISO Images"
msgstr "Bruk &ISO-diskbilder"
-#: src/include/instserver/dialogs.rb:1017
+#: src/include/instserver/dialogs.rb:988
msgid "Di&rectory with CD Images:"
msgstr "Ka&talog med CD-diskbilder:"
-#: src/include/instserver/dialogs.rb:1020
-#: src/include/instserver/dialogs.rb:1400
+#: src/include/instserver/dialogs.rb:991
+#: src/include/instserver/dialogs.rb:1371
msgid "Select &Directory"
msgstr "Velg &katalog"
#. abort?
#. abort?
-#: src/include/instserver/dialogs.rb:1063
-#: src/include/instserver/dialogs.rb:1469
+#: src/include/instserver/dialogs.rb:1034
+#: src/include/instserver/dialogs.rb:1440
msgid "Select Directory"
msgstr "Velg katalog"
#. abort?
-#: src/include/instserver/dialogs.rb:1080
-#: src/include/instserver/dialogs.rb:1244
+#: src/include/instserver/dialogs.rb:1051
+#: src/include/instserver/dialogs.rb:1215
msgid "Installation server name missing."
msgstr "Installasjonsservernavn mangler."
-#: src/include/instserver/dialogs.rb:1095
+#: src/include/instserver/dialogs.rb:1066
msgid ""
"Contents already exist in this directory.\n"
"Not copying CDs."
@@ -179,7 +179,7 @@
"CDene blir ikke kopiert."
#. for translators: popup question (prefer more shorter lines than few long lines)
-#: src/include/instserver/dialogs.rb:1123
+#: src/include/instserver/dialogs.rb:1094
msgid ""
"Add an additional product (Service Pack, Additional\n"
"Package CD, etc.) to the repository?"
@@ -188,20 +188,20 @@
"flere pakker osv.) i pakkebrønnen?"
#. Instserver configure1 dialog contents
-#: src/include/instserver/dialogs.rb:1199
+#: src/include/instserver/dialogs.rb:1170
msgid "Repository &Name:"
msgstr "Pakkebrønn&navn:"
-#: src/include/instserver/dialogs.rb:1204
+#: src/include/instserver/dialogs.rb:1175
msgid "A&nnounce as Installation Service with SLP"
msgstr "A&ngi som installasjonstjeneste med SLP"
-#: src/include/instserver/dialogs.rb:1252
+#: src/include/instserver/dialogs.rb:1223
msgid "Invalid repository name."
msgstr "Ugyldig pakkebrønnnavn."
#. an error message - entered repository name already exists
-#: src/include/instserver/dialogs.rb:1260
+#: src/include/instserver/dialogs.rb:1231
msgid ""
"Repository '%1' already exists,\n"
"enter another name."
@@ -210,7 +210,7 @@
"Velg et annet navn."
#. create directory only for a new repository
-#: src/include/instserver/dialogs.rb:1273
+#: src/include/instserver/dialogs.rb:1244
msgid ""
"Error while creating <tt>repository</tt> directory.\n"
"Verify that the directory \n"
@@ -223,7 +223,7 @@
"ikke 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:1292
+#: src/include/instserver/dialogs.rb:1263
msgid ""
"Repository '%1' has been marked to delete.\n"
"When adding a new repository with the same name\n"
@@ -238,87 +238,87 @@
"Vil du virkelig slette det gamle innholdet og opprette det på nytt?"
#. Instserver server dialog caption
-#: src/include/instserver/dialogs.rb:1376
+#: src/include/instserver/dialogs.rb:1347
msgid "Initial Setup -- Initial Setup"
msgstr "Første oppsett -- Første oppsett"
-#: src/include/instserver/dialogs.rb:1392
+#: src/include/instserver/dialogs.rb:1363
msgid "Do Not Configure Any Net&work Services"
msgstr "Ikke sett opp noen nett&verkstjenester"
-#: src/include/instserver/dialogs.rb:1397
+#: src/include/instserver/dialogs.rb:1368
msgid "Di&rectory to Contain Repositories:"
msgstr "Katalog som skal inneholde a&rkiver:"
#. radio button label
-#: src/include/instserver/dialogs.rb:1412
+#: src/include/instserver/dialogs.rb:1383
msgid "&Configure as HTTP Repository"
msgstr "&Sett opp som HTTP-pakkebrønn"
#. radio button label
-#: src/include/instserver/dialogs.rb:1420
+#: src/include/instserver/dialogs.rb:1391
msgid "&Configure as FTP Repository"
msgstr "&Sett opp som FTP-pakkebrønn"
#. radio button label
-#: src/include/instserver/dialogs.rb:1428
+#: src/include/instserver/dialogs.rb:1399
msgid "&Configure as NFS Repository"
msgstr "&Sett opp som NFS-pakkebrønn"
-#: src/include/instserver/dialogs.rb:1480
+#: src/include/instserver/dialogs.rb:1451
msgid "Directory path for the installation server missing."
msgstr "Velg en gyldig adresse for den manglende installasjonsserveren."
#. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1507
+#: src/include/instserver/dialogs.rb:1478
msgid "Installation Server -- NFS"
msgstr "Installasjonsserver -- NFS"
#. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1525
+#: src/include/instserver/dialogs.rb:1496
msgid "&Host Wild Card"
msgstr "&Jokertegn for vertsmaskin"
-#: src/include/instserver/dialogs.rb:1527
+#: src/include/instserver/dialogs.rb:1498
msgid "&Options"
msgstr "&Alternativer"
#. store the firewall setting, (activation is in SetupNFS())
-#: src/include/instserver/dialogs.rb:1585
+#: src/include/instserver/dialogs.rb:1556
msgid "Error occurred while configuring NFS."
msgstr "Det oppstod en feil under NFS-oppsettet."
#. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1617
+#: src/include/instserver/dialogs.rb:1588
msgid "Installation Server -- FTP"
msgstr "Installasjonsserver -- FTP"
#. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1625
+#: src/include/instserver/dialogs.rb:1596
msgid "&FTP Server Root Directory:"
msgstr "&FTP-serverens rotkatalog:"
-#: src/include/instserver/dialogs.rb:1627
+#: src/include/instserver/dialogs.rb:1598
msgid "&Directory Alias:"
msgstr "&Katalogalias:"
#. store the firewall setting, (activation is in SetupFTP())
-#: src/include/instserver/dialogs.rb:1684
+#: src/include/instserver/dialogs.rb:1655
msgid "Error occurred while configuring FTP."
msgstr "Det oppstod en feil under FTP-oppsettet."
#. Instserver configure2 dialog caption
-#: src/include/instserver/dialogs.rb:1704
+#: src/include/instserver/dialogs.rb:1675
msgid "Installation Server -- HTTP"
msgstr "Installasjonsserver -- HTTP"
#. Instserver nfs dialog contents
-#: src/include/instserver/dialogs.rb:1720
+#: src/include/instserver/dialogs.rb:1691
msgid "&Directory Alias"
msgstr "&Katalogalias"
#. store the firewall setting, (activation is in SetupHTTP())
-#: src/include/instserver/dialogs.rb:1777
+#: src/include/instserver/dialogs.rb:1748
msgid "Error creating HTTPD configuration."
msgstr "Feil under opprettelse av HTTPD-oppsettet."
@@ -646,7 +646,7 @@
"Klikk deretter <b>Rediger</b> eller <b>Slett</b> etter behov.</p>\n"
#. Read service data using _auto
-#: src/modules/Instserver.rb:308
+#: src/modules/Instserver.rb:306
msgid ""
"The FTP installation server requires an FTP server package. The vsftpd package\n"
"will now be installed.\n"
@@ -673,7 +673,7 @@
#. @param string directory
#. @param [String] options
#. @return [Boolean]
-#: src/modules/Instserver.rb:570
+#: src/modules/Instserver.rb:569
msgid ""
"Directory is already exported via NFS.\n"
"Leave NFS exports unmodified?\n"
@@ -682,73 +682,73 @@
"Vil du la NFS-eksportene være uendret?\n"
#. Instserver read dialog caption
-#: src/modules/Instserver.rb:1152
+#: src/modules/Instserver.rb:1155
msgid "Initializing Configuration"
msgstr "Initialiserer oppsett"
#. Progress stage 1/2
-#: src/modules/Instserver.rb:1166
+#: src/modules/Instserver.rb:1165
msgid "Read configuration file"
msgstr "Les oppsettfil"
#. Progress stage 2/2
-#: src/modules/Instserver.rb:1168
+#: src/modules/Instserver.rb:1167
msgid "Search for a new repository"
msgstr "Søk etter ny pakkebrønn"
#. Progress step 1/2
-#: src/modules/Instserver.rb:1172
+#: src/modules/Instserver.rb:1171
msgid "Reading configuration file..."
msgstr "Leser oppsettfil..."
#. Progress step 2/2
-#: src/modules/Instserver.rb:1174
+#: src/modules/Instserver.rb:1173
msgid "Searching for a new repository..."
msgstr "Søker etter ny pakkebrønn..."
#. Progress finished
#. Progress finished
-#: src/modules/Instserver.rb:1176 src/modules/Instserver.rb:1278
+#: src/modules/Instserver.rb:1175 src/modules/Instserver.rb:1260
msgid "Finished"
msgstr "Fullført"
-#. Error message
-#: src/modules/Instserver.rb:1224
+#. TRANSLATORS: Error message
+#: src/modules/Instserver.rb:1188
msgid "Cannot read current settings."
msgstr "Kan ikke lese gjeldende innstillinger."
#. Instserver read dialog caption
-#: src/modules/Instserver.rb:1254
+#: src/modules/Instserver.rb:1240
msgid "Saving Installation Server Configuration"
msgstr "Lagrer oppsett for installasjonsserver"
#. Progress stage 1/2
-#: src/modules/Instserver.rb:1268
+#: src/modules/Instserver.rb:1250
msgid "Write the settings"
msgstr "Lagre innstillingene"
#. Progress stage 2/2
-#: src/modules/Instserver.rb:1270
+#: src/modules/Instserver.rb:1252
msgid "Run SuSEconfig"
msgstr "Kjør SuSEconfig"
#. Progress step 1/2
-#: src/modules/Instserver.rb:1274
+#: src/modules/Instserver.rb:1256
msgid "Writing the settings..."
msgstr "Lagrer innstillingene..."
#. Progress step 2/2
-#: src/modules/Instserver.rb:1276
+#: src/modules/Instserver.rb:1258
msgid "Running SuSEconfig..."
msgstr "Kjører SuSEconfig..."
#. Error message
-#: src/modules/Instserver.rb:1292
+#: src/modules/Instserver.rb:1274
msgid "Cannot write settings."
msgstr "Kan ikke lagre innstillingene."
#. Configuration summary text for autoyast
-#: src/modules/Instserver.rb:1465
+#: src/modules/Instserver.rb:1441
msgid "Configured Repositories"
msgstr "Valgte pakkebrønner"
Modified: branches/plus-SLE12-SP2/yast/nb/po/iplb.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/iplb.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/iplb.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/iscsi-client.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/iscsi-client.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/iscsi-client.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: iscsi-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-08-11 22:34+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -122,8 +122,10 @@
msgstr "Rediger"
#: src/include/iscsi-client/dialogs.rb:161
-msgid "Log Out"
-msgstr "Logg ut"
+#, fuzzy
+#| msgid "Disconnected"
+msgid "Disconnect"
+msgstr "Frakoblet"
#: src/include/iscsi-client/dialogs.rb:186
msgid "Connected"
@@ -134,9 +136,6 @@
msgstr "Søk"
#: src/include/iscsi-client/dialogs.rb:193
-msgid "Log In"
-msgstr "Logg inn"
-
#: src/include/iscsi-client/dialogs.rb:223
msgid "Connect"
msgstr "Koble til"
@@ -218,8 +217,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:107 src/include/iscsi-client/helps.rb:119
-#: src/include/iscsi-client/helps.rb:126
+#: src/include/iscsi-client/helps.rb:110 src/include/iscsi-client/helps.rb:122
+#: src/include/iscsi-client/helps.rb:129
msgid "<h1>iSCSI Initiator</h1>"
msgstr "<h1>iSCSI-initiator</h1>"
@@ -333,34 +332,32 @@
#. table of connected targets
#: src/include/iscsi-client/helps.rb:90
-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"
+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>"
msgstr ""
-"Liste over gjeldende økter. Legg til et mål ved å klikke <b>Legg til</b>.\n"
-"Fjern et mål ved å velge det og klikke <b>Logg ut</b>.\n"
-"Klikk <b>Bytt</b> for å endre oppstartsstatus.\n"
#. Warning
#. Warning
-#: src/include/iscsi-client/helps.rb:96 src/include/iscsi-client/helps.rb:114
+#: src/include/iscsi-client/helps.rb:99 src/include/iscsi-client/helps.rb:117
msgid "<h1>Warning</h1>"
msgstr "<h1>Advarsel</h1>"
-#: src/include/iscsi-client/helps.rb:97 src/include/iscsi-client/helps.rb:115
+#: src/include/iscsi-client/helps.rb:100 src/include/iscsi-client/helps.rb:118
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 bruker en iSCSI-enhet med <b>LESE</b>/<b>SKRIVE</b>-rettigheter, må disse rettighetene være eksklusive for å unngå risiko for ødelagte data.</p>\n"
-#: src/include/iscsi-client/helps.rb:100
+#: src/include/iscsi-client/helps.rb:103
+#, fuzzy
+#| msgid ""
+#| "<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>"
msgid ""
-"<p><b>InitiatorName</b> is a value from <tt>/etc/iscsi/initiatorname.iscsi</tt>. \n"
+"<p><b>Initiator Name</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 en verdi fra <tt>/etc/initiatorname.iscsi</tt>.\n"
"Hvis du har iBFT, vil denne verdien bli lagt til derfra, og du vil bare kunne endre den i BIOS-oppsettet.</p>"
-#: src/include/iscsi-client/helps.rb:103
+#: src/include/iscsi-client/helps.rb:106
msgid ""
"If you want to use <b>iSNS</b> (Internet Storage Name Service) for discovering targets instead of the default SendTargets method,\n"
"fill in the IP address of the iSNS server and port. The default port should be 3205.\n"
@@ -368,9 +365,14 @@
"Hvis du vil bruke <b>iSNS</b> (Internet Storage Name Service) for å finne mål i stedet for vanlige SendTargets-metoder,\n"
"angi IP-adressen for iSNS-serveren og porten. Standardporten skal være 3205.\n"
-#: src/include/iscsi-client/helps.rb:108
+#: src/include/iscsi-client/helps.rb:111
+#, fuzzy
+#| msgid ""
+#| "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"
msgid ""
-"Enter the <b>IP Address</b> of the discovered server.\n"
+"Enter the <b>IP Address</b> of the iSCSI target 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 ""
@@ -378,14 +380,10 @@
"<b>Port</b> bør bare endres hvis det er nødvendig. Bruk <b>Brukernavn</b> og <b>Passord</b> for autentisering. Hvis du ikke trenger autentisering,\n"
"velg <b>Ingen autentisering</b>.\n"
-#: src/include/iscsi-client/helps.rb:122
+#: src/include/iscsi-client/helps.rb:125
msgid "List of nodes offered by the iSCSI target. Select one item and click <b>Connect</b>. "
msgstr "Liste over tilgjengelige noder på iSCSI-målet. Velg ett element, og klikk <b>Koble til</b>. "
-#: src/include/iscsi-client/helps.rb:129
-msgid "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>."
-msgstr "Velg autentiseringstypen og angi <b>Brukernavn</b>og<b>Passord</b>."
-
#: src/include/iscsi-client/helps.rb:132
msgid "<h1>Startup</h1>"
msgstr "<h1>Oppstart</h1>"
@@ -405,12 +403,22 @@
"<p><b>automatic</b> innebærer at iSCSI-mål tilkobles når selve iSCSI-tjenesten\n"
"starter.</p>\n"
-#. list of discovered targets
+#: src/include/iscsi-client/helps.rb:141
+#, fuzzy
+#| msgid "<h4>Authentication</h4>"
+msgid "<h1>Authentication</h1>"
+msgstr "<h4>Autentisering</h4>"
+
#: src/include/iscsi-client/helps.rb:142
-msgid "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target."
-msgstr "Liste over mål som ble funnet. Start et nytt <b>Søk</b> eller <b>Koble til</b> et mål."
+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 ""
-#: src/include/iscsi-client/helps.rb:145
+#. 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
msgid "<h1>iBTF</h1>"
msgstr "<h1>iBTF</h1>"
@@ -461,15 +469,32 @@
msgstr "Port-feltet kan ikke være tomt"
#. regexp for "cz.suse" or just "suse", "cz.su-se"
-#: src/include/iscsi-client/widgets.rb:423
+#: src/include/iscsi-client/widgets.rb:428
+#, fuzzy
+#| msgid "Initiator Name"
+msgid "Incorrect Initiator Name"
+msgstr "Initiatornavn"
+
+#: src/include/iscsi-client/widgets.rb:429
+#, fuzzy
+#| msgid ""
+#| "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"
msgid ""
-"Incorrect InitiatorName.\n"
+"\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"
@@ -480,12 +505,12 @@
"iqn.2007-04.no.server:storage.disk.sdb\n"
#. brackets needed around IPv6
-#: src/include/iscsi-client/widgets.rb:625
+#: src/include/iscsi-client/widgets.rb:635
msgid "Insert the IP address."
msgstr "Angi IP-adressen."
#. validate port number
-#: src/include/iscsi-client/widgets.rb:631
+#: src/include/iscsi-client/widgets.rb:641
msgid "Insert the port."
msgstr "Angi porten."
@@ -493,37 +518,37 @@
#. ******************* target table *************************
#. initialize dialog for all targets from portal (connected/disconnected)
#. enable/disable connect button according target is or not already connected
-#: src/include/iscsi-client/widgets.rb:733
-#: src/include/iscsi-client/widgets.rb:838
-#: src/include/iscsi-client/widgets.rb:866
+#: src/include/iscsi-client/widgets.rb:754
+#: src/include/iscsi-client/widgets.rb:859
+#: src/include/iscsi-client/widgets.rb:887
msgid "True"
msgstr "Sann"
-#: src/include/iscsi-client/widgets.rb:733
-#: src/include/iscsi-client/widgets.rb:838
+#: src/include/iscsi-client/widgets.rb:754
+#: src/include/iscsi-client/widgets.rb:859
msgid "False"
msgstr "Usann"
#. check if not already connected
#. check if not already connected
-#: src/include/iscsi-client/widgets.rb:771
-#: src/include/iscsi-client/widgets.rb:891
+#: src/include/iscsi-client/widgets.rb:792
+#: src/include/iscsi-client/widgets.rb:912
msgid "The target with this TargetName is already connected. Make sure that multipathing is enabled to prevent data corruption."
msgstr "Målet med dette målnavnet er allerede tilkoblet. Pass på at Multipath er aktivert for å unngå ødelagte data."
# continue button label
-#: src/include/iscsi-client/widgets.rb:774
-#: src/include/iscsi-client/widgets.rb:894
+#: src/include/iscsi-client/widgets.rb:795
+#: src/include/iscsi-client/widgets.rb:915
msgid "Continue"
msgstr "Fortsett"
-#: src/include/iscsi-client/widgets.rb:775
-#: src/include/iscsi-client/widgets.rb:895
+#: src/include/iscsi-client/widgets.rb:796
+#: src/include/iscsi-client/widgets.rb:916
msgid "Cancel"
msgstr "Avbryt"
#. check if is not already connected
-#: src/include/iscsi-client/widgets.rb:885
+#: src/include/iscsi-client/widgets.rb:906
msgid "The target is already connected."
msgstr "Målet er allerede tilkoblet."
@@ -615,7 +640,7 @@
msgstr "alle"
#. }
-#: src/modules/IscsiClientLib.rb:694
+#: src/modules/IscsiClientLib.rb:698
msgid ""
"InitiatorName from iBFT and from <tt>/etc/iscsi/initiatorname.iscsi</tt>\n"
"differ. The old initiator name will be replaced by the value of iBFT and a \n"
@@ -626,84 +651,39 @@
"Gammelt initiatornavn vil bli erstattet med verdien fra iBFT, og det vil bli opprettet en sikkerhetskopi.\n"
"Hvis du vil bruke et annet initiatornavn, kan du endre det i BIOS.\n"
+#. change startup status (manual/onboot) for target
+#: src/modules/IscsiClientLib.rb:1013
+#, fuzzy
+#| msgid "Image creation failed."
+msgid "Target connection failed.\n"
+msgstr "Feil under oppretting av diskbilde."
+
#. do discovery first
-#: src/modules/IscsiClientLib.rb:1147
+#: src/modules/IscsiClientLib.rb:1156
msgid "Configuration summary..."
msgstr "Oppsettsammendrag..."
-#, fuzzy
-#~| msgid "Disconnected"
-#~ msgid "Disconnect"
-#~ msgstr "Frakoblet"
+#~ msgid "Log Out"
+#~ msgstr "Logg ut"
-#, fuzzy
-#~| msgid ""
-#~| "<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>"
-#~ msgid ""
-#~ "<p><b>Initiator Name</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 en verdi fra <tt>/etc/initiatorname.iscsi</tt>.\n"
-#~ "Hvis du har iBFT, vil denne verdien bli lagt til derfra, og du vil bare kunne endre den i BIOS-oppsettet.</p>"
+#~ msgid "Log In"
+#~ msgstr "Logg inn"
-#, fuzzy
-#~| msgid ""
-#~| "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"
#~ msgid ""
-#~ "Enter the <b>IP Address</b> of the iSCSI target 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"
+#~ "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 ""
-#~ "Angi <b>IP-addresse</b> for serveren som ble funnet.\n"
-#~ "<b>Port</b> bør bare endres hvis det er nødvendig. Bruk <b>Brukernavn</b> og <b>Passord</b> for autentisering. Hvis du ikke trenger autentisering,\n"
-#~ "velg <b>Ingen autentisering</b>.\n"
+#~ "Liste over gjeldende økter. Legg til et mål ved å klikke <b>Legg til</b>.\n"
+#~ "Fjern et mål ved å velge det og klikke <b>Logg ut</b>.\n"
+#~ "Klikk <b>Bytt</b> for å endre oppstartsstatus.\n"
-#, fuzzy
-#~| msgid "<h4>Authentication</h4>"
-#~ msgid "<h1>Authentication</h1>"
-#~ msgstr "<h4>Autentisering</h4>"
+#~ msgid "Select the type of authentication and enter the <b>Username</b> and <b>Password</b>."
+#~ msgstr "Velg autentiseringstypen og angi <b>Brukernavn</b>og<b>Passord</b>."
-#, fuzzy
-#~| msgid "Initiator Name"
-#~ msgid "Incorrect Initiator Name"
-#~ msgstr "Initiatornavn"
+#~ msgid "List of discovered targets. Start a new <b>Discovery</b> or <b>Connect</b> to any target."
+#~ msgstr "Liste over mål som ble funnet. Start et nytt <b>Søk</b> eller <b>Koble til</b> et mål."
-#, fuzzy
-#~| msgid ""
-#~| "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"
-#~ msgid ""
-#~ "\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"
-#~ "iqn.åååå-mm.baklengs.domenenavn[:identifikator]\n"
-#~ "eller eui.åååå-mm.baklengs.domenenavn[:identifier]\n"
-#~ "\n"
-#~ "Eksempel:\n"
-#~ "iqn.2007-04.no.server:storage.disk.sdb\n"
-
-#, fuzzy
-#~| msgid "Image creation failed."
-#~ msgid "Target connection failed.\n"
-#~ msgstr "Feil under oppretting av diskbilde."
-
#~ msgid "(Software)"
#~ msgstr "(programvare)"
Modified: branches/plus-SLE12-SP2/yast/nb/po/iscsi-lio-server.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/iscsi-lio-server.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/iscsi-lio-server.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
@@ -46,7 +46,7 @@
#. third tab - targets / luns
#. targets dialog
#: src/include/iscsi-lio-server/dialogs.rb:89
-#: src/include/iscsi-lio-server/dialogs.rb:321
+#: src/include/iscsi-lio-server/dialogs.rb:320
#: src/modules/IscsiLioServer.rb:443
msgid "Targets"
msgstr "Mål"
@@ -63,7 +63,7 @@
#: src/include/iscsi-lio-server/dialogs.rb:128
#: src/include/iscsi-lio-server/dialogs.rb:189
-#: src/include/iscsi-lio-server/dialogs.rb:321
+#: src/include/iscsi-lio-server/dialogs.rb:320
msgid "Portal group"
msgstr "Portalgruppe"
@@ -99,167 +99,153 @@
msgstr "Sti"
#: src/include/iscsi-lio-server/dialogs.rb:154
-#: 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/dialogs.rb:198
+#: src/include/iscsi-lio-server/dialogs.rb:237
+#: src/include/iscsi-lio-server/dialogs.rb:325
+#: src/include/iscsi-lio-server/dialogs.rb:372
#: src/include/iscsi-lio-server/widgets.rb:442
msgid "Add"
msgstr "Legg til"
#: src/include/iscsi-lio-server/dialogs.rb:155
-#: 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:238
+#: src/include/iscsi-lio-server/dialogs.rb:326
+#: src/include/iscsi-lio-server/dialogs.rb:373
msgid "Edit"
msgstr "Rediger"
#: src/include/iscsi-lio-server/dialogs.rb:156
-#: 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/dialogs.rb:201
+#: src/include/iscsi-lio-server/dialogs.rb:239
+#: src/include/iscsi-lio-server/dialogs.rb:327
+#: src/include/iscsi-lio-server/dialogs.rb:374
#: src/include/iscsi-lio-server/widgets.rb:443
msgid "Delete"
msgstr "Slett"
-#. table header (Initiator: iSCSI client, LUN Mapping: logical unit client/target mapping, Auth: authorization)
-#: src/include/iscsi-lio-server/dialogs.rb:194
-#, fuzzy
-#| msgid "Initiator Name"
-msgid "Initiator"
-msgstr "Initiatornavn"
+#: src/include/iscsi-lio-server/dialogs.rb:193
+msgid "Client"
+msgstr "Klient"
-#: src/include/iscsi-lio-server/dialogs.rb:194
-#, fuzzy
-#| msgid "Lun Mapping"
-msgid "LUN Mapping"
+#: src/include/iscsi-lio-server/dialogs.rb:193
+msgid "Lun Mapping"
msgstr "LUN-mapping"
-#: src/include/iscsi-lio-server/dialogs.rb:194
+#: src/include/iscsi-lio-server/dialogs.rb:193
msgid "Auth"
msgstr "Aut."
-#: src/include/iscsi-lio-server/dialogs.rb:200
+#: src/include/iscsi-lio-server/dialogs.rb:199
msgid "Edit LUN"
msgstr "Rediger LUN"
-#: src/include/iscsi-lio-server/dialogs.rb:201
+#: src/include/iscsi-lio-server/dialogs.rb:200
msgid "Edit Auth"
msgstr "Rediger aut."
-#: src/include/iscsi-lio-server/dialogs.rb:203
+#: src/include/iscsi-lio-server/dialogs.rb:202
msgid "Copy"
msgstr "Kopier"
#. enable/disable none/incoming/outgoing authentication
-#: src/include/iscsi-lio-server/dialogs.rb:217
+#: src/include/iscsi-lio-server/dialogs.rb:216
#: src/include/iscsi-lio-server/widgets.rb:207
#: src/modules/IscsiLioServer.rb:434
msgid "No Authentication"
msgstr "Ingen autentisering"
-#: src/include/iscsi-lio-server/dialogs.rb:226
+#: src/include/iscsi-lio-server/dialogs.rb:225
#: src/include/iscsi-lio-server/widgets.rb:218
#: src/modules/IscsiLioServer.rb:437
msgid "Incoming Authentication"
msgstr "Innkommende autentisering"
#. dialog to add/modify user and password
-#: src/include/iscsi-lio-server/dialogs.rb:233
-#: src/include/iscsi-lio-server/dialogs.rb:254
+#: src/include/iscsi-lio-server/dialogs.rb:232
+#: src/include/iscsi-lio-server/dialogs.rb:253
#: src/include/iscsi-lio-server/widgets.rb:223
#: src/include/iscsi-lio-server/widgets.rb:236
#: src/include/iscsi-lio-server/widgets.rb:721
msgid "Username"
msgstr "Brukernavn"
-#: src/include/iscsi-lio-server/dialogs.rb:233
-#: src/include/iscsi-lio-server/dialogs.rb:255
+#: src/include/iscsi-lio-server/dialogs.rb:232
+#: src/include/iscsi-lio-server/dialogs.rb:254
#: src/include/iscsi-lio-server/widgets.rb:224
#: src/include/iscsi-lio-server/widgets.rb:237
#: src/include/iscsi-lio-server/widgets.rb:722
msgid "Password"
msgstr "Passord"
-#: src/include/iscsi-lio-server/dialogs.rb:249
+#: src/include/iscsi-lio-server/dialogs.rb:248
#: src/include/iscsi-lio-server/widgets.rb:231
#: src/modules/IscsiLioServer.rb:440
msgid "Outgoing Authentication"
msgstr "Utgående autentisering"
#. radio button (starting LIO target service - option 1)
-#: src/include/iscsi-lio-server/dialogs.rb:275
+#: src/include/iscsi-lio-server/dialogs.rb:274
msgid "When &Booting"
msgstr "Under &oppstart"
#. radio button (starting LIO target service - option 2)
-#: src/include/iscsi-lio-server/dialogs.rb:279
+#: src/include/iscsi-lio-server/dialogs.rb:278
msgid "&Manually"
msgstr "&Manuelt"
#. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:285
+#: src/include/iscsi-lio-server/dialogs.rb:284
#: src/modules/IscsiLioServer.rb:429
msgid "When Booting"
msgstr "Under oppstart"
#. part of help text, used to describe radiobuttons (matching starting LIO target service but without "&")
-#: src/include/iscsi-lio-server/dialogs.rb:287
+#: src/include/iscsi-lio-server/dialogs.rb:286
#: src/modules/IscsiLioServer.rb:431
msgid "Manually"
msgstr "Manuelt"
-#: src/include/iscsi-lio-server/dialogs.rb:321
-#, fuzzy
-#| msgid "Test Status"
-msgid "TPG Status"
-msgstr "Kontroller status"
-
#. dialog for expert settings
-#: src/include/iscsi-lio-server/dialogs.rb:370
+#: src/include/iscsi-lio-server/dialogs.rb:369
msgid "Key"
msgstr "Nøkkel"
-#: src/include/iscsi-lio-server/dialogs.rb:370
+#: src/include/iscsi-lio-server/dialogs.rb:369
msgid "Value"
msgstr "Verdi"
#. Summary dialog
#. @return dialog result
#. Main dialog - tabbed
-#: src/include/iscsi-lio-server/dialogs.rb:431
+#: src/include/iscsi-lio-server/dialogs.rb:430
msgid "iSCSI LIO Target Overview"
msgstr "Oversikt over iSCSI LIO-mål"
#. expert dialog
#. LUN details
-#: src/include/iscsi-lio-server/dialogs.rb:439
-#: src/include/iscsi-lio-server/helps.rb:179
-#: src/include/iscsi-lio-server/helps.rb:184
+#: src/include/iscsi-lio-server/dialogs.rb:438
+#: src/include/iscsi-lio-server/helps.rb:178
+#: src/include/iscsi-lio-server/helps.rb:183
msgid "<h1>iSCSI Target</h1>"
msgstr "<h1>iSCSI-mål</h1>"
#. dialog for add target
-#: src/include/iscsi-lio-server/dialogs.rb:474
+#: src/include/iscsi-lio-server/dialogs.rb:473
msgid "Add iSCSI Target"
msgstr "Legg til iSCSI-mål"
-#. dialog for modifying initiator setup for a target
-#. (includes authentication)
-#: src/include/iscsi-lio-server/dialogs.rb:509
-#, fuzzy
-#| msgid "Modify iSCSI Target Lun Setup"
-msgid "Modify iSCSI Target Initiator Setup"
-msgstr "Endre LUN-oppsett for iSCSI-mål"
+#. discovery authentication dialog
+#: src/include/iscsi-lio-server/dialogs.rb:507
+msgid "Modify iSCSI Target Client Setup"
+msgstr "Endre klientoppsett for iSCSI-mål"
#. edit target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:543
+#: src/include/iscsi-lio-server/dialogs.rb:541
msgid "Modify iSCSI Target Lun Setup"
msgstr "Endre LUN-oppsett for iSCSI-mål"
#. expert target dialog
-#: src/include/iscsi-lio-server/dialogs.rb:576
+#: src/include/iscsi-lio-server/dialogs.rb:574
msgid "iSCSI Target Expert Settings"
msgstr "Avansert innstillinger for iSCSI-mål"
@@ -417,26 +403,21 @@
#. target client setup.
#: src/include/iscsi-lio-server/helps.rb:124
-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>"
+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>"
msgstr ""
#: src/include/iscsi-lio-server/helps.rb:130
#, fuzzy
#| msgid "With <b>Edit LUN</b> on can modify which LUNs the client can access.After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>.If <b>Use Authentication</b> is disabled in previous dialog, <b>Edit Auth</b> is disabled here."
-msgid ""
-"<p>With <b>Edit LUN</b> one can modify the LUN mapping. Please note that LUN target number must be unique.<br>After pressing <b>Edit Auth</b>, select the type of authentication. Use <b>Incoming</b>, <b>Outgoing</b> or both together. Then insert <b>User</b> and <b>Password</b>. 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>"
+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>"
msgstr "Med <b>Rediger LUN</b> kan du endre hvilke LUN-er klienten har tilgang til. Velg <b>Rediger aut.</b>, og velg autentiseringstype. Bruk <b>Innkommende</b>, <b>Utgående</b> eller begge sammen. Angi deretter<b>Bruker</b> og <b>Passord</b>. Hvis <b>Bruk autentisering</b> var dektivert i forrige dialog, vil <b>Rediger autentisering</b> være deaktivert her."
-#: src/include/iscsi-lio-server/helps.rb:137
-msgid "<p><b>Copy</b> offers the possibility to give an additional initiator access to the LUN.</p>"
+#: 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>"
msgstr ""
#. target dialog
-#: src/include/iscsi-lio-server/helps.rb:139
+#: src/include/iscsi-lio-server/helps.rb:138
#, fuzzy
#| msgid ""
#| "List of offered targets and target portal groups. Create a new target by clicking <b>Add</b>. \n"
@@ -450,12 +431,12 @@
#. edit target
#. add target
-#: src/include/iscsi-lio-server/helps.rb:144
-#: src/include/iscsi-lio-server/helps.rb:160
+#: src/include/iscsi-lio-server/helps.rb:143
+#: src/include/iscsi-lio-server/helps.rb:159
msgid "<h1>iSCSI Target IP/Port and LUN setup</h1>"
msgstr "<h1>IP/Port og LUN-oppsett for iSCSI-mål</h1>"
-#: src/include/iscsi-lio-server/helps.rb:147
+#: src/include/iscsi-lio-server/helps.rb:146
#, fuzzy
#| msgid ""
#| "It is possible to make arbitary block devices or files available under a lun.\n"
@@ -476,8 +457,8 @@
"Navnet må være unikt innenfor målportalgruppen. Hvis brukeren\n"
"ikke angir et nav for LUN, blir det generert automatisk."
-#: src/include/iscsi-lio-server/helps.rb:154
-#: src/include/iscsi-lio-server/helps.rb:173
+#: src/include/iscsi-lio-server/helps.rb:153
+#: src/include/iscsi-lio-server/helps.rb:172
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"
@@ -487,11 +468,11 @@
"og port tjenesten vil være tilgjengelige. Standard portnummer er 3260.\n"
"Bare IP-adresser som er tilordnet et av nettverkskortene, kan brukes."
-#: src/include/iscsi-lio-server/helps.rb:163
+#: src/include/iscsi-lio-server/helps.rb:162
msgid "Create a new target. Replace template values with the correct values."
msgstr "Opprett et nytt mål. Bytt ut verdiene i malen med riktige verdier."
-#: src/include/iscsi-lio-server/helps.rb:166
+#: src/include/iscsi-lio-server/helps.rb:165
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"
@@ -505,11 +486,11 @@
"Navnet må være unikt innenfor målportalgruppen. Hvis brukeren\n"
"ikke angir et nav for LUN, blir det generert automatisk."
-#: src/include/iscsi-lio-server/helps.rb:180
+#: src/include/iscsi-lio-server/helps.rb:179
msgid "It is possible to <b>add</b>, <b>edit</b> or <b>delete</b> all additional configuration options."
msgstr "Det er mulig å <b>legge til</b>, <b>redigere</b> eller <b>slette</b> alle tilleggsinnstilinger."
-#: src/include/iscsi-lio-server/helps.rb:185
+#: src/include/iscsi-lio-server/helps.rb:184
#, fuzzy
#| msgid ""
#| "Edit <b>LUN</b> number if needed, set <b>Type</b> (nullio is for testing purposes). \n"
@@ -538,9 +519,7 @@
msgstr "Ugyldig passord."
#: src/include/iscsi-lio-server/widgets.rb:251
-#, fuzzy
-#| msgid "Selected Lun is already in use!"
-msgid "Selected LUN is already in use!"
+msgid "Selected Lun is already in use!"
msgstr "Valgt LUN er i bruk!"
#: src/include/iscsi-lio-server/widgets.rb:260
@@ -568,10 +547,8 @@
msgstr "Velg fil eller enhet"
#: src/include/iscsi-lio-server/widgets.rb:436
-#, fuzzy
-#| msgid "Initiator Name"
-msgid "Initiator LUN"
-msgstr "Initiatornavn"
+msgid "Client Lun"
+msgstr "Klient-LUN"
#: src/include/iscsi-lio-server/widgets.rb:436
msgid "Target LUN"
@@ -591,9 +568,9 @@
#: src/include/iscsi-lio-server/widgets.rb:619
#, fuzzy
-#| msgid "Initiator Name"
-msgid "Initiator name:"
-msgstr "Initiatornavn"
+#| msgid "New client name:"
+msgid "Client name:"
+msgstr "Nytt klientnavn:"
#: src/include/iscsi-lio-server/widgets.rb:622
msgid "Import LUNs from TPG"
@@ -601,27 +578,21 @@
#: src/include/iscsi-lio-server/widgets.rb:638
#: src/include/iscsi-lio-server/widgets.rb:695
-#, fuzzy
-#| msgid "Client name must not be empty!"
-msgid "Initiator name must not be empty!"
+msgid "Client name must not be empty!"
msgstr "Et klientnavn må angis!"
#. Don't check IscsiLioData.GetClntList(@curr_target, @curr_tpg) for existing
-#. initiator name. It's allowed to have several LUNs accessable for same initiator.
+#. client name. It's allowed to have several LUNs accessable for same client.
#. 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
-#, fuzzy
-#| msgid "Configuration name already exists!"
-msgid "Initiator name already exists!"
-msgstr "Oppsettnavnet finnes allerede!"
+msgid "Client name already exists!"
+msgstr "Klientnavnet finnes allerede!"
-#. Copy exisiting LUN, i.e. give additional initiator access to the LUN
+#. Copy exisiting LUN, i.e. give additional client access to the LUN
#. (which is allowed, makes sense e.g. with multipath)
#: src/include/iscsi-lio-server/widgets.rb:678
-#, fuzzy
-#| msgid "New client name:"
-msgid "New initiator name:"
+msgid "New client name:"
msgstr "Nytt klientnavn:"
#: src/include/iscsi-lio-server/widgets.rb:724
@@ -632,109 +603,93 @@
msgid "Cancel"
msgstr "Avbryt"
-#. create items from targets
-#: src/include/iscsi-lio-server/widgets.rb:785
-msgid "Enabled"
-msgstr "Aktivert"
-
-#: 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 "Deaktivert"
-
#. remove a item
#. **************** Edit Dialog *****************************
#. init values for modifying target (read it from stored map)
-#: src/include/iscsi-lio-server/widgets.rb:822
-#: src/include/iscsi-lio-server/widgets.rb:936
-#: src/include/iscsi-lio-server/widgets.rb:1290
+#: src/include/iscsi-lio-server/widgets.rb:820
+#: src/include/iscsi-lio-server/widgets.rb:934
+#: src/include/iscsi-lio-server/widgets.rb:1288
msgid "Really delete the selected item?"
msgstr "Er du sikker på at du vil slette valg oppføring?"
-#: src/include/iscsi-lio-server/widgets.rb:1004
+#: src/include/iscsi-lio-server/widgets.rb:1002
msgid "Problem creating target %1 with tpg %2"
msgstr "Problem under oppretting av målet %1 med tpg %2"
-#: src/include/iscsi-lio-server/widgets.rb:1026
+#: src/include/iscsi-lio-server/widgets.rb:1024
msgid "Problem setting network portal to %1"
msgstr "Problem under definisjon av nettverksportalen %1"
-#: src/include/iscsi-lio-server/widgets.rb:1047
+#: src/include/iscsi-lio-server/widgets.rb:1045
msgid "Problem removing lun %1"
msgstr "Problem under fjerning av LUN %1"
-#: src/include/iscsi-lio-server/widgets.rb:1072
+#: src/include/iscsi-lio-server/widgets.rb:1070
msgid "Problem setting lun %1 (name:%2) to path %3"
msgstr "Problem under definisjon av LUN %1 (navn:%2) med filstien %3"
-#: src/include/iscsi-lio-server/widgets.rb:1086
+#: src/include/iscsi-lio-server/widgets.rb:1084
msgid "Problem setting auth on %1:%2 to %3"
msgstr "Problem under definisjona av autorisajson for %1:%2 til %3"
#. validate function checks if target/tpg are unique and not empty
-#: src/include/iscsi-lio-server/widgets.rb:1200
+#: src/include/iscsi-lio-server/widgets.rb:1198
msgid "The target cannot be empty."
msgstr "Målet kan ikke være blankt."
-#: src/include/iscsi-lio-server/widgets.rb:1204
+#: src/include/iscsi-lio-server/widgets.rb:1202
msgid "The target portal group cannot be empty."
msgstr "Det må angis en målportalgruppe."
-#: src/include/iscsi-lio-server/widgets.rb:1215
+#: src/include/iscsi-lio-server/widgets.rb:1213
msgid "The target already exists."
msgstr "Målet eksisterer allerede."
-#: src/include/iscsi-lio-server/widgets.rb:1235
+#: src/include/iscsi-lio-server/widgets.rb:1233
msgid "Incoming"
msgstr "Innkommende"
-#: src/include/iscsi-lio-server/widgets.rb:1238
+#: src/include/iscsi-lio-server/widgets.rb:1236
msgid "Outgoing"
msgstr "Utgående"
-#: src/include/iscsi-lio-server/widgets.rb:1240
+#: src/include/iscsi-lio-server/widgets.rb:1238
msgid "None"
msgstr "Ingen"
-#: src/include/iscsi-lio-server/widgets.rb:1452
+#: src/include/iscsi-lio-server/widgets.rb:1261
+#: src/include/iscsi-lio-server/widgets.rb:1364
+#: src/include/iscsi-lio-server/widgets.rb:1401
+msgid "Disabled"
+msgstr "Deaktivert"
+
+#: src/include/iscsi-lio-server/widgets.rb:1450
msgid ""
-"There isn't any initiator specified.\n"
-"To allow an initiator login to the target, please\n"
+"There isn't any client specified.\n"
+"To allow a client 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 initiator access?"
+"Really want to continue without client access?"
msgstr ""
-#: src/include/iscsi-lio-server/widgets.rb:1466
-#, fuzzy
-#| msgid "Problem removing lun %4 for client %3 in %1:%2"
-msgid "Problem removing LUN %4 for initiator %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1464
+msgid "Problem removing lun %4 for client %3 in %1:%2"
msgstr "Problem med å fjerne LUN %4 for klienten %3 i %1:%2"
-#: src/include/iscsi-lio-server/widgets.rb:1481
-#, fuzzy
-#| msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
-msgid "Problem adding LUN %4:%5 for initiator %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1479
+msgid "Problem adding lun %4:%5 for client %3 in %1:%2"
msgstr "Problem med å legge til lun %4:%5 for klienten %3 i %1:%2"
-#: src/include/iscsi-lio-server/widgets.rb:1502
-#, fuzzy
-#| msgid "Problem removing client %3 from %1:%2"
-msgid "Problem removing initiator %3 from %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1500
+msgid "Problem removing client %3 from %1:%2"
msgstr "Problem med å fjerne klienten %3 fra %1:%2"
-#: src/include/iscsi-lio-server/widgets.rb:1526
-#, fuzzy
-#| msgid "Problem creating client %3 for %1:%2"
-msgid "Problem creating initiator %3 for %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1524
+msgid "Problem creating client %3 for %1:%2"
msgstr "Problem med å opprette klienten %3 for %1:%2"
-#: src/include/iscsi-lio-server/widgets.rb:1561
-#, fuzzy
-#| msgid "Problem changing auth for client %3 in %1:%2"
-msgid "Problem changing auth for initiator %3 in %1:%2"
+#: src/include/iscsi-lio-server/widgets.rb:1559
+msgid "Problem changing auth for client %3 in %1:%2"
msgstr "Problem med å endre autorisasjone for klienten %3 i %1:%2"
#. Initialization dialog caption
@@ -748,11 +703,11 @@
msgstr "Initialiserer ..."
#. scope link IPv6
-#: src/modules/IscsiLioData.rb:1428
+#: src/modules/IscsiLioData.rb:1424
msgid "Cannot save lio setup"
msgstr ""
-#: src/modules/IscsiLioData.rb:1432
+#: src/modules/IscsiLioData.rb:1428
msgid "Cannot save tcm setup"
msgstr ""
@@ -857,23 +812,6 @@
msgid "Configuration summary..."
msgstr "Konfigurasjonssammendrag..."
-#~ msgid "Client"
-#~ msgstr "Klient"
-
-#~ msgid "Modify iSCSI Target Client Setup"
-#~ msgstr "Endre klientoppsett for iSCSI-mål"
-
-#~ msgid "Client Lun"
-#~ msgstr "Klient-LUN"
-
-#, fuzzy
-#~| msgid "New client name:"
-#~ msgid "Client name:"
-#~ msgstr "Nytt klientnavn:"
-
-#~ msgid "Client name already exists!"
-#~ msgstr "Klientnavnet finnes allerede!"
-
#~ msgid "Run SuSEconfig"
#~ msgstr "Kjør SuSEconfig"
Modified: branches/plus-SLE12-SP2/yast/nb/po/isns.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/isns.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/isns.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-08-11 22:37+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/journal.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/journal.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/journal.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/kdump.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/kdump.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/kdump.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: kdump\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-09-28 18:16+0200\n"
"PO-Revision-Date: 2009-08-12 10:04+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -380,8 +380,10 @@
#. 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:496
+#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487
+#: src/modules/Kdump.rb:500
msgid "To apply changes a reboot is necessary."
msgstr "Maskinen må startes på nytt for å aktivere endringer."
@@ -1240,181 +1242,154 @@
#. several ranges and ask user about rewritting
#.
#. "KdumpMemory"
-#: src/include/kdump/uifunctions.rb:1454
+#: src/include/kdump/uifunctions.rb:1449
#, fuzzy
#| msgid "Kernel option includes several ranges. Rewrite it?"
msgid "Kernel option includes several ranges or redundant values. Rewrite it?"
msgstr "Kjernevalget inkluderer flere områder. Vil du lagre på nytt?"
#. T: Checkbox label
-#: src/include/kdump/uifunctions.rb:1487
+#: src/include/kdump/uifunctions.rb:1482
msgid "Use &Firmware-Assisted Dump"
msgstr ""
-#. Function validates options in
-#. "Dump Format"
-#. install makedumpfile if KDUMP_DUMPFORMAT == "compressed"
-#: src/include/kdump/uifunctions.rb:1849
-#, fuzzy
-#| msgid ""
-#| "This module must be run as root.\n"
-#| "If you continue now, the module may not function properly.\n"
-#| "For example, some settings can be read improperly\n"
-#| "and it is unlikely that settings can be written.\n"
-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 ""
-"Denne modulen må kjøres som rot.\n"
-"Hvis du fortsetter, vil kanskje ikke modulen fungere som den skal.\n"
-"Noen innstillinger blir kanskje ikke lest riktig,\n"
-"og det vil sannsynligvis være umulig å lagre innstillingene.\n"
-
-#: src/include/kdump/uifunctions.rb:1855
-#, fuzzy
-#| msgid "currently not supported"
-msgid "Kdump not supported"
-msgstr "støttes foreløpig ikke"
-
#. See FATE#315780
#. See https://www.suse.com/support/kb/doc.php?id=7012786
#. FIXME what about dracut?
-#: src/modules/Kdump.rb:398
+#: src/modules/Kdump.rb:412
msgid ""
"Error updating initrd while calling '%{cmd}'.\n"
"See %{log} for details."
msgstr ""
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:506
+#: src/modules/Kdump.rb:514
msgid "Initializing kdump Configuration"
msgstr "Initialiserer kdump-oppsett"
#. Progress stage 1/4
#. Progress step 1/4
-#: src/modules/Kdump.rb:515 src/modules/Kdump.rb:523
+#: src/modules/Kdump.rb:523 src/modules/Kdump.rb:531
msgid "Reading the config file..."
msgstr "Leser oppsettsfil..."
#. Progress stage 3/4
-#: src/modules/Kdump.rb:517
+#: src/modules/Kdump.rb:525
msgid "Reading kernel boot options..."
msgstr "Leser oppstartsvalg for kjernen..."
#. Progress stage 4/4
-#: src/modules/Kdump.rb:519
+#: src/modules/Kdump.rb:527
msgid "Calculating memory limits..."
msgstr ""
#. Progress step 2/4
-#: src/modules/Kdump.rb:525
+#: src/modules/Kdump.rb:533
msgid "Reading partitions of disks..."
msgstr "Leser diskenes partisjoner..."
#. Progress finished 3/4
-#: src/modules/Kdump.rb:527
+#: src/modules/Kdump.rb:535
#, fuzzy
#| msgid "Reading available memory..."
msgid "Reading available memory and calibrating usage..."
msgstr "Leser tilgjengelig minne..."
#. Error message
-#: src/modules/Kdump.rb:539
+#: src/modules/Kdump.rb:547
msgid "Cannot read config file /etc/sysconfig/kdump"
msgstr "Kan ikke lese oppsettsfilen /etc/sysconfig/kdump"
#. Error message
-#: src/modules/Kdump.rb:547
+#: src/modules/Kdump.rb:555
msgid "Cannot read kernel boot options."
msgstr "Kan ikke lese oppstartsvalg for kjerne."
#. Error message
-#: src/modules/Kdump.rb:555
+#: src/modules/Kdump.rb:563
msgid "Cannot read available memory."
msgstr "Kan ikke lese tilgjengelig minne."
#. Kdump read dialog caption
-#: src/modules/Kdump.rb:581
+#: src/modules/Kdump.rb:589
msgid "Saving kdump Configuration"
msgstr "Lagrer kdump-oppsett"
#. Progress stage 1/2
-#: src/modules/Kdump.rb:610
+#: src/modules/Kdump.rb:618
msgid "Write the settings"
msgstr "Lagre innstillingene"
#. Progress stage 2/2
-#: src/modules/Kdump.rb:612
+#: src/modules/Kdump.rb:620
msgid "Update boot options"
msgstr "Oppdater oppstartsvalg"
#. Progress step 1/2
-#: src/modules/Kdump.rb:616
+#: src/modules/Kdump.rb:624
msgid "Writing the settings..."
msgstr "Lagrer innstillingene..."
#. Progress step 2/2
-#: src/modules/Kdump.rb:618
+#: src/modules/Kdump.rb:626
msgid "Updating boot options..."
msgstr "Oppdaterer oppstartsvalg..."
#. Progress finished
-#: src/modules/Kdump.rb:620
+#: src/modules/Kdump.rb:628
msgid "Finished"
msgstr "Fullført"
#. Error message
-#: src/modules/Kdump.rb:630
+#: src/modules/Kdump.rb:638
msgid "Cannot write settings."
msgstr "Kan ikke lagre innstillingene."
#. Error message
-#: src/modules/Kdump.rb:639
+#: src/modules/Kdump.rb:647
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:750
+#: src/modules/Kdump.rb:758
msgid "Kdump status: %1"
msgstr "Kdump-status: %1"
-#: src/modules/Kdump.rb:751
+#: src/modules/Kdump.rb:759
msgid "enabled"
msgstr "aktivert"
-#: src/modules/Kdump.rb:751
+#: src/modules/Kdump.rb:759
msgid "disabled"
msgstr "deaktivert"
-#: src/modules/Kdump.rb:758
+#: src/modules/Kdump.rb:766
#, fuzzy
#| msgid "Value of crashkernel option: %1"
msgid "Value(s) of crashkernel option: %1"
msgstr "Verdi for crashkernel-valg: %1"
-#: src/modules/Kdump.rb:765
+#: src/modules/Kdump.rb:773
msgid "Dump format: %1"
msgstr "Dump-format: %1"
-#: src/modules/Kdump.rb:772
+#: src/modules/Kdump.rb:780
msgid "Target of dumps: %1"
msgstr "Dump-mål: %1"
-#: src/modules/Kdump.rb:779
+#: src/modules/Kdump.rb:787
msgid "Number of dumps: %1"
msgstr "Antall dumper: %1"
#. TRANSLATORS: warning message in installation proposal,
#. do not translate %{requested} and %{available} - they are replaced with actual sizes later
-#: src/modules/Kdump.rb:871
+#: src/modules/Kdump.rb:879
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:958
+#: src/modules/Kdump.rb:974
msgid ""
"Cannot use Firmware-assisted dump.\n"
"It is not supported on this hardware."
Modified: branches/plus-SLE12-SP2/yast/nb/po/languages_db.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/languages_db.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/languages_db.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: languages_db\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2008-10-11 00:37+0200\n"
"Last-Translator: Olav P. \n"
"Language-Team: Norwegian Bokmål <>\n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/ldap-client.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/ldap-client.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/ldap-client.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: ldap-client.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-08-12 10:19+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/ldap.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/ldap.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/ldap.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2014-05-19 09:34+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/live-installer.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/live-installer.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/live-installer.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: live-installer\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-10-01 12:31+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -43,27 +43,27 @@
#.
#. Progress::NextStage ();
#. Progress::Title (_("Evaluating filesystems to copy..."));
-#: src/clients/inst_live_doit.rb:58 src/clients/inst_live_doit.rb:59
+#: src/clients/inst_live_doit.rb:57 src/clients/inst_live_doit.rb:58
msgid "Evaluating filesystems to copy..."
msgstr "Evaulerer filsystemer som skal kopieres..."
-#: src/clients/inst_live_doit.rb:61 src/clients/inst_live_doit.rb:62
+#: src/clients/inst_live_doit.rb:60 src/clients/inst_live_doit.rb:61
msgid "Copying root filesystem..."
msgstr "Kopierer rotfilsystem..."
-#: src/clients/inst_live_doit.rb:63
+#: src/clients/inst_live_doit.rb:62
msgid "Copying live image..."
msgstr "Kopierer live-diskbilde..."
#. Copy all the symlinks as needed
#. @param [Hash{String => String}] symlinks a map of resolved symlinks
#. @return [Boolean] true on success
-#: src/clients/inst_live_doit.rb:149 src/clients/inst_live_doit.rb:151
+#: src/clients/inst_live_doit.rb:152 src/clients/inst_live_doit.rb:154
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:226
+#: src/clients/inst_live_doit.rb:222
msgid ""
"Copying the live image to hard disk failed.\n"
"\n"
@@ -78,53 +78,71 @@
"av live-systemet."
#. generic error report
-#: src/clients/inst_live_doit.rb:254
+#: src/clients/inst_live_doit.rb:250
msgid "Copying the live image to hard disk failed."
msgstr "Kopiering av Live-diskbilde til harddisk mislyktes."
#. dialog caption
-#: src/clients/inst_live_simple_proposal.rb:44
-#: src/clients/inst_live_simple_proposal.rb:179
+#: src/clients/inst_live_simple_proposal.rb:45
+#: src/clients/inst_live_simple_proposal.rb:211
msgid "Installation Settings"
msgstr "Installasjonsinnstillinger"
#. label
-#: src/clients/inst_live_simple_proposal.rb:46
+#: src/clients/inst_live_simple_proposal.rb:47
msgid "Analyzing the system..."
msgstr "Analyserer systemet..."
#. partitioning summary
-#: src/clients/inst_live_simple_proposal.rb:110
+#: src/clients/inst_live_simple_proposal.rb:111
msgid "Use %1%% of disk %2 for Linux"
msgstr "Bruk %1%% av disken %2 for Linux"
-#: src/clients/inst_live_simple_proposal.rb:119
+#: src/clients/inst_live_simple_proposal.rb:120
msgid "Do not use disk %1"
msgstr "Ikke bruk disken %1"
-#: src/clients/inst_live_simple_proposal.rb:126
+#: src/clients/inst_live_simple_proposal.rb:127
msgid "Partitioning"
msgstr "Partisjonering"
#. end of partitioning summary
+#. bootloader summary
+#: src/clients/inst_live_simple_proposal.rb:143
+msgid "System start-up"
+msgstr "Oppstart av systemet"
+
+#: src/clients/inst_live_simple_proposal.rb:149
+msgid "Ask whether to boot Linux or existing system"
+msgstr "Spør om Linux eller det eksisterende systemet skal startes opp"
+
+#: src/clients/inst_live_simple_proposal.rb:150
+msgid "Boot only Linux"
+msgstr "Start bare opp Linux"
+
+#: src/clients/inst_live_simple_proposal.rb:158
+msgid "System start time-out: %1 seconds"
+msgstr "Tidsavbrudd for systemoppstart: %1 sekunder"
+
+#. end of bootloader summary
#. keyboard entry
-#: src/clients/inst_live_simple_proposal.rb:135
+#: src/clients/inst_live_simple_proposal.rb:167
msgid "Keyboard"
msgstr "Tastatur"
#. end of keyboard entry
#. timezone entry
-#: src/clients/inst_live_simple_proposal.rb:145
+#: src/clients/inst_live_simple_proposal.rb:177
msgid "Time Zone"
msgstr "Tidssone"
#. end of timezone entry
-#: src/clients/inst_live_simple_proposal.rb:155
+#: src/clients/inst_live_simple_proposal.rb:187
msgid "Change Installation Settings"
msgstr "Endre installasjonsinnstillinger"
#. help text 1/3
-#: src/clients/inst_live_simple_proposal.rb:160
+#: src/clients/inst_live_simple_proposal.rb:192
msgid ""
"<p>\n"
"Use <b>Accept</b> to perform a new installation with the values displayed.</p>"
@@ -133,7 +151,7 @@
"Velg <b>Bekreft</b> for å utføre en ny installasjon med disse verdiene.</p>"
#. help text 2/3
-#: src/clients/inst_live_simple_proposal.rb:164
+#: src/clients/inst_live_simple_proposal.rb:196
msgid ""
"<p>\n"
"To change the values, click the respective headline\n"
@@ -144,7 +162,7 @@
"eller på <b>Endre installasjonsinnstillinger.</b></p>\n"
#. help text 3/3
-#: src/clients/inst_live_simple_proposal.rb:170
+#: src/clients/inst_live_simple_proposal.rb:202
msgid ""
"<p>\n"
"Your hard disk has not been modified, you can still safely abort.\n"
@@ -259,7 +277,7 @@
"nytt med 'Reset'-knappen."
#. progress step title
-#: src/clients/live_copy_files_finish.rb:75
+#: src/clients/live_copy_files_finish.rb:76
msgid "Copying files to installed system..."
msgstr "Kopierer filer til installert system..."
@@ -283,18 +301,6 @@
msgid "Saving time zone..."
msgstr "Lagrer tidssone..."
-#~ msgid "System start-up"
-#~ msgstr "Oppstart av systemet"
-
-#~ msgid "Ask whether to boot Linux or existing system"
-#~ msgstr "Spør om Linux eller det eksisterende systemet skal startes opp"
-
-#~ msgid "Boot only Linux"
-#~ msgstr "Start bare opp Linux"
-
-#~ msgid "System start time-out: %1 seconds"
-#~ msgstr "Tidsavbrudd for systemoppstart: %1 sekunder"
-
#~ msgid "Installation settings"
#~ msgstr "Installasjonsinnstillinger"
Modified: branches/plus-SLE12-SP2/yast/nb/po/mail.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/mail.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/mail.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: mail\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-10-08 12:48+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/multipath.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/multipath.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/multipath.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-08-12 12:28+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/network.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/network.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/network.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: network\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-10-08 12:56+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -248,7 +248,7 @@
#. Command line output Headline
#. configuration of hosts
-#: src/clients/host.rb:114
+#: src/clients/host.rb:123
msgid "Host Configuration Summary:"
msgstr "Vertsmaskiner, oppsettssammendrag:"
@@ -521,7 +521,7 @@
#. in case keep_install_network is set to true (in AY)
#. we'll keep values from installation
#. and merge with XML data (bnc#712864)
-#: src/clients/lan_auto.rb:108
+#: src/clients/lan_auto.rb:136
msgid "Configuration Error: uninitialized interface."
msgstr "Oppsettfeil: Grensesnitt er ikke initialisert."
@@ -610,7 +610,7 @@
#. Commandline help title
#. Main routing dialog
#. @return dialog result
-#: src/clients/routing.rb:57 src/include/network/services/routing.rb:480
+#: src/clients/routing.rb:57 src/include/network/services/routing.rb:468
msgid "Routing Configuration"
msgstr "Rutingoppsett"
@@ -797,13 +797,13 @@
#. interface summary: WiFi without encryption
#. interface summary: WiFi without encryption
-#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1367
+#: src/include/network/complex.rb:101 src/modules/LanItems.rb:1363
msgid "Warning: no encryption is used."
msgstr "Advarsel: ingen kryptering benyttes."
#. Hyperlink: Change the configuration of an interface
#. Hyperlink: Change the configuration of an interface
-#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1369
+#: src/include/network/complex.rb:107 src/modules/LanItems.rb:1365
msgid "Change."
msgstr "Endre."
@@ -1120,7 +1120,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:129
+#: src/include/network/services/host.rb:128
msgid "IP Address"
msgstr "IP-adresse"
@@ -1128,7 +1128,7 @@
#. PushButton label
#. PushButton label
#: src/include/network/lan/address.rb:106
-#: src/include/network/services/host.rb:140
+#: src/include/network/services/host.rb:139
#: src/include/network/services/routing.rb:100
msgid "Ad&d"
msgstr "Le&gg til"
@@ -1138,7 +1138,7 @@
#. PushButton label
#. Pushbutton label
#: src/include/network/lan/address.rb:108
-#: src/include/network/services/host.rb:142
+#: src/include/network/services/host.rb:141
#: src/include/network/services/routing.rb:102
#: src/include/network/summary.rb:69
msgid "&Edit"
@@ -1149,7 +1149,7 @@
#. PushButton label
#. Pushbutton label
#: src/include/network/lan/address.rb:110
-#: src/include/network/services/host.rb:144
+#: src/include/network/services/host.rb:143
#: src/include/network/services/routing.rb:104
#: src/include/network/summary.rb:71
msgid "De&lete"
@@ -1196,7 +1196,7 @@
msgstr "Tunnelgruppe"
#: src/include/network/lan/address.rb:191
-#: src/include/network/lan/address.rb:1315
+#: src/include/network/lan/address.rb:1297
msgid "Bridged Devices"
msgstr "Bro-enheter"
@@ -1236,7 +1236,7 @@
#. if (LanItems::type=="br") UI::ReplaceWidget(`rp, `Empty());
#. else
#: src/include/network/lan/address.rb:283
-#: src/include/network/lan/address.rb:816
+#: src/include/network/lan/address.rb:798
msgid "No Link and IP Setup (Bonding Slaves)"
msgstr "Tilkoblings- og IP-oppsett mangler (bonding-slaver)"
@@ -1273,7 +1273,7 @@
#. TextEntry label
#: src/include/network/lan/address.rb:325
#: src/include/network/lan/virtual.rb:213
-#: src/include/network/services/host.rb:334
+#: src/include/network/services/host.rb:341
msgid "&IP Address"
msgstr "&IP-Adresse"
@@ -1301,7 +1301,7 @@
msgstr "&S/390"
#. validate device type, misdetection
-#: src/include/network/lan/address.rb:1036
+#: src/include/network/lan/address.rb:1018
msgid ""
"You have changed the interface type from the one\n"
"that has been detected. This only makes sense\n"
@@ -1312,13 +1312,13 @@
"du er sikker på at feil grensesnittype ble funnet."
#. Popup text
-#: src/include/network/lan/address.rb:1056
+#: src/include/network/lan/address.rb:1038
msgid "Configuration %1 already present."
msgstr "Oppsettet %1 finnes allerede."
#. If firewall is active and interface in no zone, nothing
#. gets through (#62309) so warn and redirect to details
-#: src/include/network/lan/address.rb:1080
+#: src/include/network/lan/address.rb:1062
msgid ""
"The firewall is active, but this interface is not\n"
"in any zone. All its traffic would be blocked.\n"
@@ -1332,20 +1332,20 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/lan/address.rb:1100
+#: src/include/network/lan/address.rb:1082
msgid "No valid IP address."
msgstr "Ugyldig IP-adresse."
-#: src/include/network/lan/address.rb:1107
+#: src/include/network/lan/address.rb:1089
msgid "No valid netmask or prefix length."
msgstr "Ugyldig nettverksmaske eller prefikslengde."
-#: src/include/network/lan/address.rb:1115
+#: src/include/network/lan/address.rb:1097
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:1123
+#: src/include/network/lan/address.rb:1105
msgid ""
"No hostname has been specified. We recommend to associate \n"
"a hostname with a static IP, otherwise the machine name will \n"
@@ -1360,7 +1360,7 @@
"Vil du likevel ikke angi noe vertsnavn?\n"
#. Popup text
-#: src/include/network/lan/address.rb:1142
+#: src/include/network/lan/address.rb:1124
msgid ""
"Duplicate IP address detected.\n"
"Really continue?\n"
@@ -1370,54 +1370,54 @@
#. @param [Array<String>] types network card types
#. @return their descriptions for CWM
-#: src/include/network/lan/address.rb:1195
+#: src/include/network/lan/address.rb:1177
msgid "&General"
msgstr "&Generelt"
#. TODO: "MANDATORY",
-#: src/include/network/lan/address.rb:1206
+#: src/include/network/lan/address.rb:1188
msgid "Device Activation"
msgstr "Enhetsaktivering"
-#: src/include/network/lan/address.rb:1210
+#: src/include/network/lan/address.rb:1192
msgid "Firewall Zone"
msgstr "Brannmursone"
-#: src/include/network/lan/address.rb:1215
+#: src/include/network/lan/address.rb:1197
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:1225
+#: src/include/network/lan/address.rb:1207
msgid "<p>Configure the detailed network card settings here.</p>"
msgstr "<p>Velg detaljerte innstillinger for nettverkskort her.</p>"
#. FIXME: here it does not complain about missing
#. shortcuts
-#: src/include/network/lan/address.rb:1292
+#: src/include/network/lan/address.rb:1274
msgid "&Address"
msgstr "&Adresse"
#. Address tab help
-#: src/include/network/lan/address.rb:1295
+#: src/include/network/lan/address.rb:1277
msgid "<p>Configure your IP address.</p>"
msgstr "<p>Sett opp IP-adressen din.</p>"
-#: src/include/network/lan/address.rb:1301
+#: src/include/network/lan/address.rb:1283
msgid "&Hardware"
msgstr "&Maskinvare"
-#: src/include/network/lan/address.rb:1308
+#: src/include/network/lan/address.rb:1290
msgid "&Bond Slaves"
msgstr "&Bond-slaver"
-#: src/include/network/lan/address.rb:1322
+#: src/include/network/lan/address.rb:1304
msgid "&Wireless"
msgstr "&Trådløst"
#. Combo box label - when to activate device (e.g. on boot, manually, never,..)
-#: src/include/network/lan/address.rb:1406
+#: src/include/network/lan/address.rb:1388
#, fuzzy
#| msgid "Ifplugd priority"
msgid "Ifplugd Priority"
@@ -1425,7 +1425,7 @@
#. Device activation main help. The individual parts will be
#. substituted as %1
-#: src/include/network/lan/address.rb:1412
+#: src/include/network/lan/address.rb:1394
msgid ""
"<p><b><big>IFPLUGD PRIORITY</big></b></p> \n"
"<p> All interfaces configured with <b>On Cable Connection</b> and with IFPLUGD_PRIORITY != 0 will be\n"
@@ -1440,12 +1440,12 @@
" det angis en prioritet for hvert grensesnitt. </p>\n"
#. Address dialog caption
-#: src/include/network/lan/address.rb:1494
+#: src/include/network/lan/address.rb:1476
msgid "Network Card Setup"
msgstr "Nettverkskortoppsett"
#. remove all aliases (bnc#590167)
-#: src/include/network/lan/bridge.rb:86
+#: src/include/network/lan/bridge.rb:103
#, fuzzy
#| msgid ""
#| "At least one selected device is already configured.\n"
@@ -1780,12 +1780,12 @@
"vil det ikke lenger kunne styres via NetworkManager.\n"
#. warn user when device to delete has STARTMODE=nfsroot (bnc#433867)
-#: src/include/network/lan/complex.rb:454
+#: src/include/network/lan/complex.rb:456
msgid "Device you select has STARTMODE=nfsroot. Really delete?"
msgstr "Den valgte enheten har STARTMODE=nfsroot. Vil du virkelig slette den?"
#. Network setup method dialog caption
-#: src/include/network/lan/complex.rb:485 src/include/network/widgets.rb:363
+#: src/include/network/lan/complex.rb:487 src/include/network/widgets.rb:363
msgid "Network Setup Method"
msgstr "Oppsettsmetode for nettverk"
@@ -1794,7 +1794,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:517
+#: src/include/network/lan/complex.rb:519
msgid "Network Settings"
msgstr "Nettverksinnstillinger"
@@ -2856,7 +2856,7 @@
#. Popup::Error text
#. Popup::Error text
#: src/include/network/lan/virtual.rb:257
-#: src/include/network/services/host.rb:379
+#: src/include/network/services/host.rb:386
msgid "The IP address is invalid."
msgstr "IP-adressen er ugyldig."
@@ -3121,47 +3121,47 @@
msgstr "&WEP-nøkler"
#. Popup text
-#: src/include/network/lan/wireless.rb:561
+#: src/include/network/lan/wireless.rb:560
msgid "WPA authentication mode is only possible in managed operating mode."
msgstr "WPA-autentiseringsmodus er bare mulig i styrt driftsmodus."
#. Popup text
#. modes: combination of operation and authentication
-#: src/include/network/lan/wireless.rb:572
+#: src/include/network/lan/wireless.rb:571
msgid "Specify the network name for this mode."
msgstr "Angi nettverksnavnet for denne modusen."
#. Popup text
-#: src/include/network/lan/wireless.rb:579
+#: src/include/network/lan/wireless.rb:578
msgid "The network name must be shorter than 32 characters."
msgstr "Nettverksnavnet må ikke inneholde mer enn 32 tegn."
#. Error popup
-#: src/include/network/lan/wireless.rb:599
+#: src/include/network/lan/wireless.rb:598
msgid "The passphrase must have between 8 and 63 characters (inclusively)."
msgstr "Passfrasen må inneholde mellom 8 og 63 tegn (totalt)."
#. Error popup
-#: src/include/network/lan/wireless.rb:610
+#: src/include/network/lan/wireless.rb:609
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:622
-#: src/include/network/lan/wireless.rb:941
+#: src/include/network/lan/wireless.rb:621
+#: src/include/network/lan/wireless.rb:939
msgid "The encryption key is invalid."
msgstr "Krypteringsnøkkelen er ugyldig."
#. error
#. Popup text
-#: src/include/network/lan/wireless.rb:630
+#: src/include/network/lan/wireless.rb:629
msgid "The encryption key must be specified for this authentication mode."
msgstr "Krypteringsnøkkelen må angis for denne autentiseringsmodusen."
#. warning only
#. Popup text
-#: src/include/network/lan/wireless.rb:637
+#: src/include/network/lan/wireless.rb:636
msgid ""
"Using no encryption is a security risk.\n"
"Really continue?\n"
@@ -3171,13 +3171,13 @@
#. Wireless expert dialog caption
#. Frame label
-#: src/include/network/lan/wireless.rb:695
-#: src/include/network/lan/wireless.rb:776
+#: src/include/network/lan/wireless.rb:694
+#: src/include/network/lan/wireless.rb:775
msgid "Wireless Expert Settings"
msgstr "Avanserte innstillinger for trådløst nettverk"
#. Wireless expert dialog help 1/5
-#: src/include/network/lan/wireless.rb:698
+#: src/include/network/lan/wireless.rb:697
msgid ""
"<p>Here, set additional configuration parameters\n"
"(rarely needed).</p>"
@@ -3186,7 +3186,7 @@
"(sjelden nødvendig).</p>"
#. Wireless expert dialog help 2/5
-#: src/include/network/lan/wireless.rb:702
+#: src/include/network/lan/wireless.rb:701
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"
@@ -3199,7 +3199,7 @@
"i denne modusen.</p>\n"
#. Wireless expert dialog help 3/5
-#: src/include/network/lan/wireless.rb:709
+#: src/include/network/lan/wireless.rb:708
msgid ""
"<p>In some rare cases, you may want to set a transmission\n"
"<b>Bit Rate</b> explicitly. The default is to go as fast as possible.</p>"
@@ -3208,7 +3208,7 @@
"<b>overføringshastighet</b>. Standardinnstillingen er å bruke så høy hastighet som mulig.</p>"
#. Wireless expert dialog help 4/5
-#: src/include/network/lan/wireless.rb:713
+#: src/include/network/lan/wireless.rb:712
msgid ""
"<p>In an environment with multiple <b>Access Points</b>, you may want to\n"
"define the one to which to connect by entering its MAC address.</p>"
@@ -3217,7 +3217,7 @@
"definere hvilket punkt du vil kople deg til ved å legge inn aksesspunktets MAC-adresse.</p>"
#. Wireless expert dialog help 5/5
-#: src/include/network/lan/wireless.rb:717
+#: src/include/network/lan/wireless.rb:716
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"
@@ -3229,57 +3229,57 @@
#. Combobox item
#. Combobox item
-#: src/include/network/lan/wireless.rb:745
-#: src/include/network/lan/wireless.rb:767
+#: src/include/network/lan/wireless.rb:744
+#: src/include/network/lan/wireless.rb:766
msgid "Automatic"
msgstr "Automatisk"
#. Combobox label
-#: src/include/network/lan/wireless.rb:782
+#: src/include/network/lan/wireless.rb:781
msgid "&Channel"
msgstr "&Kanal"
#. Combobox label
-#: src/include/network/lan/wireless.rb:785
+#: src/include/network/lan/wireless.rb:784
msgid "B&it Rate"
msgstr "O&verføringshastighet"
#. Text entry label
-#: src/include/network/lan/wireless.rb:791
+#: src/include/network/lan/wireless.rb:790
msgid "&Access Point"
msgstr "&Aksesspunkt"
#. CheckBox label
-#: src/include/network/lan/wireless.rb:799
+#: src/include/network/lan/wireless.rb:798
msgid "Use &Power Management"
msgstr "Bruk &strømsparing"
-#: src/include/network/lan/wireless.rb:808
+#: src/include/network/lan/wireless.rb:807
msgid "AP ScanMode"
msgstr "AP ScanMode"
#. Translators: popup dialog heading
-#: src/include/network/lan/wireless.rb:899
+#: src/include/network/lan/wireless.rb:897
msgid "Enter Encryption Key"
msgstr "Angi krypteringsnøkkel"
#. Translators: text entry label
-#: src/include/network/lan/wireless.rb:903
+#: src/include/network/lan/wireless.rb:901
msgid "&Key"
msgstr "&Nøkkel"
#. Translators: popup title
-#: src/include/network/lan/wireless.rb:927
+#: src/include/network/lan/wireless.rb:925
msgid "Help"
msgstr "Hjelp"
#. Wireless keys dialog caption
-#: src/include/network/lan/wireless.rb:976
+#: src/include/network/lan/wireless.rb:974
msgid "Wireless Keys"
msgstr "Trådløsnøkler"
#. Wireless keys dialog help 1/3
-#: src/include/network/lan/wireless.rb:979
+#: src/include/network/lan/wireless.rb:977
msgid ""
"<p>In this dialog, define your WEP keys used\n"
"to encrypt your data before it is transmitted. You can have up to four keys,\n"
@@ -3294,7 +3294,7 @@
"én nøkkel.</p>"
#. Wireless keys dialog help 2/3
-#: src/include/network/lan/wireless.rb:987
+#: src/include/network/lan/wireless.rb:985
msgid ""
"<p><b>Key Length</b> defines the bit length of your WEP keys.\n"
"Possible are 64 and 128 bit, sometimes also referred to as 40 and 104 bit.\n"
@@ -3309,43 +3309,43 @@
"verdien til 64.</p>"
#. Frame label
-#: src/include/network/lan/wireless.rb:1012
+#: src/include/network/lan/wireless.rb:1010
msgid "WEP Keys"
msgstr "WEP-nøkler"
#. ComboBox label
-#: src/include/network/lan/wireless.rb:1018
+#: src/include/network/lan/wireless.rb:1016
msgid "&Key Length"
msgstr "&Nøkkellengde"
#. Table header label
#. Abbreviation of Number
-#: src/include/network/lan/wireless.rb:1026
+#: src/include/network/lan/wireless.rb:1024
msgid "No."
msgstr "Nr."
#. Table header label
-#: src/include/network/lan/wireless.rb:1028
+#: src/include/network/lan/wireless.rb:1026
msgid "Key"
msgstr "Nøkkel"
#. Table header label
-#: src/include/network/lan/wireless.rb:1030
+#: src/include/network/lan/wireless.rb:1028
msgid "Default"
msgstr "Standard"
#. PushButton label
-#: src/include/network/lan/wireless.rb:1040
+#: src/include/network/lan/wireless.rb:1038
msgid "&Set as Default"
msgstr "Definer som st&andard"
#. file browser dialog headline
-#: src/include/network/lan/wireless.rb:1213
+#: src/include/network/lan/wireless.rb:1210
msgid "Choose a Certificate"
msgstr "Velg et sertifikat"
#. validated in ValidateWpaEap
-#: src/include/network/lan/wireless.rb:1258
+#: src/include/network/lan/wireless.rb:1255
msgid ""
"Not using a Certificate Authority (CA) certificate can result in connections\n"
"to insecure, rogue wireless networks. Continue without CA ?"
@@ -3354,7 +3354,7 @@
"som er usikkert og sårbart. Vil du fortsette uten CA ?"
#. error popup text
-#: src/include/network/lan/wireless.rb:1286
+#: src/include/network/lan/wireless.rb:1283
msgid ""
"Enter either the identity and password\n"
"or the client certificate."
@@ -3363,47 +3363,47 @@
"eller klientsertifikatet."
#. dialog caption
-#: src/include/network/lan/wireless.rb:1332
+#: src/include/network/lan/wireless.rb:1329
msgid "WPA-EAP"
msgstr "WPA-EAP"
#. combo box item, any of EAP authentication methods
-#: src/include/network/lan/wireless.rb:1354
+#: src/include/network/lan/wireless.rb:1351
msgid "Any"
msgstr "Udefinert"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1358
+#: src/include/network/lan/wireless.rb:1355
msgid "MD5"
msgstr "MD5"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1360
+#: src/include/network/lan/wireless.rb:1357
msgid "GTC"
msgstr "GTC"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1362
+#: src/include/network/lan/wireless.rb:1359
msgid "CHAP"
msgstr "CHAP"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1364
+#: src/include/network/lan/wireless.rb:1361
msgid "PAP"
msgstr "PAP"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1366
+#: src/include/network/lan/wireless.rb:1363
msgid "MSCHAPv1"
msgstr "MSCHAPv1"
#. combo box item, an EAP authentication method
-#: src/include/network/lan/wireless.rb:1370
+#: src/include/network/lan/wireless.rb:1367
msgid "MSCHAPv2"
msgstr "MSCHAPv2"
#. dialog caption
-#: src/include/network/lan/wireless.rb:1393
+#: src/include/network/lan/wireless.rb:1390
msgid "WPA-EAP Details"
msgstr "WPA-EAP-informasjon"
@@ -3450,12 +3450,12 @@
msgstr "Innstillinger for ekstern administrasjon"
#. Popup text
-#: src/include/network/routines.rb:129
+#: src/include/network/routines.rb:144
msgid "These packages need to be installed:"
msgstr "Følgende pakker må installeres:"
#. Popup text
-#: src/include/network/routines.rb:147
+#: src/include/network/routines.rb:162
msgid ""
"The required packages are not installed.\n"
"The configuration will be aborted.\n"
@@ -3467,61 +3467,111 @@
"\n"
"Vil du forsøke igjen?\n"
-#. 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
+#. Table field (Unknown device)
+#: src/include/network/routines.rb:255
msgid "Unknown"
msgstr "Ukjent"
+#. Popup headline
+#: src/include/network/routines.rb:279
+msgid "Configuration Successfully Saved"
+msgstr "Oppsettet er lagret"
+
+#. Popup headline
+#: src/include/network/routines.rb:284
+msgid "DNS Configuration Successfully Saved"
+msgstr "DNS-oppsettet er lagret"
+
+#. Popup headline
+#: src/include/network/routines.rb:286
+msgid "DSL Configuration Successfully Saved"
+msgstr "DSL-oppsettet er lagret"
+
+#. Popup headline
+#: src/include/network/routines.rb:288
+msgid "Hosts Configuration Successfully Saved"
+msgstr "Vertsmaskinoppsettet er lagret"
+
+#. Popup headline
+#: src/include/network/routines.rb:292
+msgid "ISDN Configuration Successfully Saved"
+msgstr "ISDN-oppsettet er lagret"
+
+#. Popup headline
+#: src/include/network/routines.rb:296
+msgid "Network Card Configuration Successfully Saved"
+msgstr "Oppsettet for nettverkskort er lagret"
+
+#. Popup headline
+#: src/include/network/routines.rb:300
+msgid "Modem Configuration Successfully Saved"
+msgstr "Modemoppsettet er lagret"
+
+#. Popup headline
+#: src/include/network/routines.rb:304
+msgid "Proxy Configuration Successfully Saved"
+msgstr "Mellomserveroppsettet er lagret"
+
+#. Popup headline
+#: src/include/network/routines.rb:308
+msgid "Provider Configuration Successfully Saved"
+msgstr "Leverandøroppsettet er lagret"
+
+#. Popup headline
+#: src/include/network/routines.rb:312
+msgid "Routing Configuration Successfully Saved"
+msgstr "Rutingoppsettet er lagret"
+
+#. Popup text
+#: src/include/network/routines.rb:321
+msgid "Configure mail now?"
+msgstr "Vil du sette opp e-postsystemet nå?"
+
+#. Popup text
+#: src/include/network/routines.rb:326
+msgid "Run configuration of %1?"
+msgstr "Vil du sette opp %1?"
+
#. Disables all widgets which cannot be configured with current network service
#.
#. see bnc#433084
#. if listed any items, disable them, if show_popup, show warning popup
#.
#. returns true if items were disabled
-#: src/include/network/routines.rb:807
+#: src/include/network/routines.rb:1004
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:867
+#: src/include/network/routines.rb:1064
msgid "Network Cards"
msgstr "Nettverkskort"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:871
+#: src/include/network/routines.rb:1068
msgid "Modems"
msgstr "Modemer"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:875
+#: src/include/network/routines.rb:1072
msgid "ISDN Cards"
msgstr "ISDN-kort"
#. Confirmation: label text (detecting hardware: xxx)
-#: src/include/network/routines.rb:879
+#: src/include/network/routines.rb:1076
msgid "DSL Devices"
msgstr "DSL-enheter"
-#: src/include/network/routines.rb:884
+#: src/include/network/routines.rb:1081
msgid "All Network Devices"
msgstr "Alle nettverksenheter"
#. validation error popup
#. Popup::Error text
#: src/include/network/services/dns.rb:92
-#: src/include/network/services/host.rb:391
+#: src/include/network/services/host.rb:398
msgid "The hostname is invalid."
msgstr "Vertsnavnet er ugyldig."
@@ -3595,8 +3645,8 @@
#. Frame label
#. dialog caption
#: src/include/network/services/dns.rb:234
-#: src/include/network/services/dns.rb:677
-#: src/include/network/services/dns.rb:690
+#: src/include/network/services/dns.rb:684
+#: src/include/network/services/dns.rb:697
msgid "Hostname and Domain Name"
msgstr "Vertsmaskin- og domenenavn"
@@ -3622,28 +3672,28 @@
#. @param [String] key the widget being validated
#. @param [Hash] event the event being handled
#. @return whether valid
-#: src/include/network/services/dns.rb:495
+#: src/include/network/services/dns.rb:496
msgid "It's not recommended to use .local as domainname due to Multicast DNS. Use it at your own risk?"
msgstr "På grunn av multikast-DNS anbefales det ikke å bruke .local som domenenavn. Vil du bruke det likevel?"
#. Popup::Error text
-#: src/include/network/services/dns.rb:513
+#: src/include/network/services/dns.rb:520
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:519
+#: src/include/network/services/dns.rb:526
msgid "The search list can have at most %1 characters."
msgstr "Søkelisten kan ha maksimalt %1 tegn."
#. Popup::Error text
-#: src/include/network/services/dns.rb:528
+#: src/include/network/services/dns.rb:535
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:718
+#: src/include/network/services/dns.rb:725
msgid "Hostname and Name Server Configuration"
msgstr "Vertsnavn- og navneserveroppsett"
@@ -3677,27 +3727,27 @@
"<b>vertsmaskinaliaser</b> (valgfritt) adskilt av mellomrom.</p>\n"
#. Frame label
-#: src/include/network/services/host.rb:119
+#: src/include/network/services/host.rb:118
msgid "Current Hosts"
msgstr "Gjeldende vertsmaskiner"
#. Table header label
-#: src/include/network/services/host.rb:131
+#: src/include/network/services/host.rb:130
msgid "Hostnames"
msgstr "Vertsnavn"
#. Table header label
-#: src/include/network/services/host.rb:133
+#: src/include/network/services/host.rb:132
msgid "Host Aliases"
msgstr "Vertsmaskinaliaser"
#. TextEntry label
-#: src/include/network/services/host.rb:344
+#: src/include/network/services/host.rb:351
msgid "Hos&t Aliases"
msgstr "Ver&tsmaskinaliaser"
#. Popup::Error text
-#: src/include/network/services/host.rb:407
+#: src/include/network/services/host.rb:414
msgid "Alias name \"%1\" is invalid."
msgstr "Aliasnavnet \"%1\" er ugyldig."
@@ -3737,40 +3787,40 @@
#. @param [Yast::Term] entry edited entry
#. @param [Array] devs available devices
#. @return route or nil, if canceled
-#: src/include/network/services/routing.rb:163
+#: src/include/network/services/routing.rb:161
msgid "&Destination"
msgstr "&Bestemmelsessted"
-#: src/include/network/services/routing.rb:172
+#: src/include/network/services/routing.rb:167
msgid "Ge&nmask"
msgstr "Ge&nmaske"
-#: src/include/network/services/routing.rb:182
+#: src/include/network/services/routing.rb:175
msgid "&Gateway"
msgstr "&Systemport"
-#: src/include/network/services/routing.rb:191
+#: src/include/network/services/routing.rb:181
msgid "De&vice"
msgstr "En&het"
#. Popup::Error text
-#: src/include/network/services/routing.rb:252
+#: src/include/network/services/routing.rb:240
msgid "Destination is invalid."
msgstr "Destinasjonen er ugyldig."
#. Popup::Error text
-#: src/include/network/services/routing.rb:260
+#: src/include/network/services/routing.rb:248
msgid "Gateway IP address is invalid."
msgstr "Systemportens IP-adresse er ugyldig."
#. Popup::Error text
-#: src/include/network/services/routing.rb:268
+#: src/include/network/services/routing.rb:256
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:426
+#: src/include/network/services/routing.rb:414
msgid "The default gateway is invalid."
msgstr "Standard systemport er ugyldig."
@@ -4036,7 +4086,7 @@
msgstr "IPv6-protokollinnstillinger"
#. enable ipv6 support
-#: src/include/network/widgets.rb:403 src/modules/Lan.rb:783
+#: src/include/network/widgets.rb:403 src/modules/Lan.rb:810
msgid "Enable IPv6"
msgstr "Aktiver IPv6"
@@ -4136,7 +4186,7 @@
#. Progress stage 2
#. Progress stage 10
-#: src/modules/DNS.rb:379 src/modules/Lan.rb:533
+#: src/modules/DNS.rb:379 src/modules/Lan.rb:534
msgid "Update configuration"
msgstr "Oppdater konfigurasjon"
@@ -4159,7 +4209,7 @@
#. Progress step 2/3
#. Progress step 10
-#: src/modules/DNS.rb:411 src/modules/Lan.rb:621
+#: src/modules/DNS.rb:411 src/modules/Lan.rb:622
msgid "Updating configuration..."
msgstr "Oppdaterer konfigurasjon..."
@@ -4171,100 +4221,100 @@
msgstr "Oppdaterer /etc/resolve.conf..."
#. Summary text
-#: src/modules/DNS.rb:543
+#: src/modules/DNS.rb:538
msgid "Hostname: Set by DHCP"
msgstr "Vertsnavn: Definert av DHCP"
#. Summary text
-#: src/modules/DNS.rb:549
+#: src/modules/DNS.rb:544
msgid "Hostname: %1"
msgstr "Vertsnavn: %1"
-#: src/modules/DNS.rb:557
+#: src/modules/DNS.rb:552
msgid "Hostname will not be written to /etc/hosts"
msgstr "Vertsnavnet vil ikke bli lagret i /etc/hosts"
#. Summary text
-#: src/modules/DNS.rb:578
+#: src/modules/DNS.rb:573
msgid "Name Servers: %1"
msgstr "Navneservere: %1"
#. Summary text
-#: src/modules/DNS.rb:588
+#: src/modules/DNS.rb:583
msgid "Search List: %1"
msgstr "Søkeliste: %1"
#. Check if there is anything to do
-#: src/modules/Host.rb:165
+#: src/modules/Host.rb:138
msgid "Update /etc/hosts"
msgstr "Oppdater /etc/hosts"
-#: src/modules/Host.rb:167
+#: src/modules/Host.rb:140
msgid "Saving Hostname Configuration"
msgstr "Lagrer vertsnavnoppsett"
#. sleep for longer time, so that progress does not disappear right afterwards
-#: src/modules/Host.rb:172
+#: src/modules/Host.rb:145
msgid "Updating /etc/hosts ..."
msgstr "Oppdaterer /etc/hosts..."
#. Read dialog caption
-#: src/modules/Lan.rb:271
+#: src/modules/Lan.rb:272
msgid "Initializing Network Configuration"
msgstr "Initialiserer nettverksoppsett"
#. Progress stage 1/9
-#: src/modules/Lan.rb:284
+#: src/modules/Lan.rb:285
msgid "Detect network devices"
msgstr "Søk etter nettverksenheter"
#. Progress stage 2/9
-#: src/modules/Lan.rb:286
+#: src/modules/Lan.rb:287
msgid "Read driver information"
msgstr "Les driverinformasjon"
#. Progress stage 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:288
+#: src/modules/Lan.rb:289
msgid "Read device configuration"
msgstr "Les enhetsoppsett"
#. Progress stage 4/9
-#: src/modules/Lan.rb:290
+#: src/modules/Lan.rb:291
msgid "Read network configuration"
msgstr "Les nettverksoppsett"
#. Progress stage 5/9
-#: src/modules/Lan.rb:292
+#: src/modules/Lan.rb:293
msgid "Read firewall settings"
msgstr "Les brannmurinnstillinger"
#. Progress stage 6/9
-#: src/modules/Lan.rb:294
+#: src/modules/Lan.rb:295
msgid "Read hostname and DNS configuration"
msgstr "Les vertsnavn og DNS-oppsett"
#. Progress stage 7/9
-#: src/modules/Lan.rb:296
+#: src/modules/Lan.rb:297
msgid "Read installation information"
msgstr "Les installasjonsinformasjon"
#. Progress stage 8/9
-#: src/modules/Lan.rb:298
+#: src/modules/Lan.rb:299
msgid "Read routing configuration"
msgstr "Les rutingoppsett"
#. Progress stage 9/9
-#: src/modules/Lan.rb:300
+#: src/modules/Lan.rb:301
msgid "Detect current status"
msgstr "Søk etter gjeldende status"
#. Progress step 1/9
-#: src/modules/Lan.rb:314
+#: src/modules/Lan.rb:315
msgid "Detecting ndiswrapper..."
msgstr "Søker etter ndiswrapper..."
#. modprobe ndiswrapper before hwinfo when needed (#343893)
-#: src/modules/Lan.rb:333
+#: src/modules/Lan.rb:334
msgid ""
"Detected a ndiswrapper configuration,\n"
"but the kernel module was not modprobed.\n"
@@ -4274,7 +4324,7 @@
"men det ble ikke kjørt modprobe for kjernemodulen.\n"
"Vil du kjøre modprobe for ndiswrapper?\n"
-#: src/modules/Lan.rb:341
+#: src/modules/Lan.rb:342
msgid ""
"ndiswrapper kernel module has not been loaded.\n"
"Check configuration manually.\n"
@@ -4283,240 +4333,247 @@
"Kontroller oppsettet manuelt.\n"
#. Progress step 2/9
-#: src/modules/Lan.rb:355
+#: src/modules/Lan.rb:356
msgid "Detecting network devices..."
msgstr "Søker etter nettverksenheter..."
#. Progress step 3/9 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:363
+#: src/modules/Lan.rb:364
msgid "Reading device configuration..."
msgstr "Leser enhetsoppsett..."
#. Progress step 4/9
-#: src/modules/Lan.rb:369
+#: src/modules/Lan.rb:370
msgid "Reading network configuration..."
msgstr "Leser nettverksoppsett..."
#. Progress step 5/9
-#: src/modules/Lan.rb:378
+#: src/modules/Lan.rb:379
msgid "Reading firewall settings..."
msgstr "Leser brannmurinnstillinger..."
#. Progress step 6/9
-#: src/modules/Lan.rb:386
+#: src/modules/Lan.rb:387
msgid "Reading hostname and DNS configuration..."
msgstr "Leser vertsnavn og DNS-oppsett..."
#. Progress step 7/9
-#: src/modules/Lan.rb:393
+#: src/modules/Lan.rb:394
msgid "Reading installation information..."
msgstr "Leser installasjonsinformasjon..."
#. Progress step 8/9
-#: src/modules/Lan.rb:399
+#: src/modules/Lan.rb:400
msgid "Reading routing configuration..."
msgstr "Leser rutinginformasjon..."
#. Progress step 9/9
-#: src/modules/Lan.rb:405
+#: src/modules/Lan.rb:406
msgid "Detecting current status..."
msgstr "Søker etter gjeldende status..."
#. Final progress step
#. Final progress step
-#: src/modules/Lan.rb:411 src/modules/Lan.rb:642
+#: src/modules/Lan.rb:412 src/modules/Lan.rb:643
msgid "Finished"
msgstr "Fullført"
#. (a specialization used when a parameterless function is needed)
#. @return Read(`cache)
-#: src/modules/Lan.rb:437
+#: src/modules/Lan.rb:438
msgid "To apply this change, a reboot is needed."
msgstr "Start maskinen på nytt for å aktivere denne endringen."
#. Write dialog caption
-#: src/modules/Lan.rb:505
+#: src/modules/Lan.rb:506
msgid "Saving Network Configuration"
msgstr "Lagrer nettverksoppsett"
#. Progress stage 2
-#: src/modules/Lan.rb:512
+#: src/modules/Lan.rb:513
msgid "Write drivers information"
msgstr "Lagre driverinformasjon"
#. Progress stage 3 - multiple devices may be present,really plural
-#: src/modules/Lan.rb:514
+#: src/modules/Lan.rb:515
msgid "Write device configuration"
msgstr "Lagre enhetsoppsett"
#. Progress stage 4
-#: src/modules/Lan.rb:516
+#: src/modules/Lan.rb:517
msgid "Write network configuration"
msgstr "Lagre nettverksoppsett"
#. Progress stage 5
-#: src/modules/Lan.rb:518
+#: src/modules/Lan.rb:519
msgid "Write routing configuration"
msgstr "Lagre rutingoppsett"
#. Progress stage 6
-#: src/modules/Lan.rb:520
+#: src/modules/Lan.rb:521
msgid "Write hostname and DNS configuration"
msgstr "Lagre vertsnavn og DNS-oppsett"
#. Progress stage 7
-#: src/modules/Lan.rb:522
+#: src/modules/Lan.rb:523
msgid "Set up network services"
msgstr "Sett opp nettverkstjenester"
#. Progress stage 8
#. Progress stage 1
-#: src/modules/Lan.rb:526 src/modules/Remote.rb:197
+#: src/modules/Lan.rb:527 src/modules/Remote.rb:293
msgid "Write firewall settings"
msgstr "Lagre brannmurinnstillinger"
#. Progress stage 9
-#: src/modules/Lan.rb:530
+#: src/modules/Lan.rb:531
msgid "Activate network services"
msgstr "Aktiver nettverkstjenester"
#. Progress step 2
-#: src/modules/Lan.rb:546
+#: src/modules/Lan.rb:547
msgid "Writing /etc/modprobe.conf..."
msgstr "Lagrer /etc/modprobe.conf..."
#. Progress step 3 - multiple devices may be present, really plural
-#: src/modules/Lan.rb:551
+#: src/modules/Lan.rb:552
msgid "Writing device configuration..."
msgstr "Lagrer enhetsoppsett..."
#. Progress step 4
-#: src/modules/Lan.rb:557
+#: src/modules/Lan.rb:558
msgid "Writing network configuration..."
msgstr "Lagrer nettverksoppsett..."
#. Progress step 5
-#: src/modules/Lan.rb:563
+#: src/modules/Lan.rb:564
msgid "Writing routing configuration..."
msgstr "Lagrer rutinginformasjon..."
#. Progress step 6
-#: src/modules/Lan.rb:571
+#: src/modules/Lan.rb:572
msgid "Writing hostname and DNS configuration..."
msgstr "Lagrer vertsnavn og DNS-oppsett..."
#. Progress step 7
-#: src/modules/Lan.rb:584
+#: src/modules/Lan.rb:585
msgid "Setting up network services..."
msgstr "Setter opp nettverkstjenester..."
#. Progress step 8
-#: src/modules/Lan.rb:592 src/modules/Remote.rb:211
+#: src/modules/Lan.rb:593 src/modules/Remote.rb:307
msgid "Writing firewall settings..."
msgstr "Lagrer brannmurinnstillinger..."
#. Progress step 9
-#: src/modules/Lan.rb:602
+#: src/modules/Lan.rb:603
msgid "Activating network services..."
msgstr "Aktiverer nettverkstjenester..."
-#: src/modules/Lan.rb:638
+#: src/modules/Lan.rb:639
msgid "No network running"
msgstr "Ingen nettverk er aktivert"
+#. Import data
+#. @param [Hash] settings settings to be imported
+#. @return true on success
+#: src/modules/Lan.rb:698
+msgid "AutoYaST setting networking/managed: NetworkManager is not available, Wicked will be used."
+msgstr ""
+
#. Create a textual summary for the general network settings
#. proposal (NetworkManager + ipv6)
#. @return [rich text, links]
-#: src/modules/Lan.rb:755
+#: src/modules/Lan.rb:782
msgid "Network Mode"
msgstr "Nettverksmodus"
#. network mode: the interfaces are controlled by the user
-#: src/modules/Lan.rb:760
+#: src/modules/Lan.rb:787
msgid "Interfaces controlled by NetworkManager"
msgstr "Grensesnitt som kontrolleres av NetworkManager"
#. disable NetworkManager applet
-#: src/modules/Lan.rb:762
+#: src/modules/Lan.rb:789
msgid "Disable NetworkManager"
msgstr "Deaktiver NetworkManager"
#. network mode
-#: src/modules/Lan.rb:766
+#: src/modules/Lan.rb:793
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:769
+#: src/modules/Lan.rb:796
msgid "Enable NetworkManager"
msgstr "Aktiver NetworkManager"
#. ipv6 support is enabled
-#: src/modules/Lan.rb:775
+#: src/modules/Lan.rb:802
msgid "Support for IPv6 protocol is enabled"
msgstr "Støtte for IPv6-protokollen er aktivert"
#. disable ipv6 support
-#: src/modules/Lan.rb:777
+#: src/modules/Lan.rb:804
msgid "Disable IPv6"
msgstr "Deaktiver IPv6"
#. ipv6 support is disabled
-#: src/modules/Lan.rb:781
+#: src/modules/Lan.rb:808
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:199
+#: src/modules/LanItems.rb:193
#, fuzzy
#| msgid "Not connected"
msgid "connected"
msgstr "Ikke tilkoblet"
-#: src/modules/LanItems.rb:200
+#: src/modules/LanItems.rb:194
msgid "datagram"
msgstr ""
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=auto
#. summary description of STARTMODE=hotplug
-#: src/modules/LanItems.rb:1264 src/modules/LanItems.rb:1268
-#: src/modules/LanItems.rb:1272
+#: src/modules/LanItems.rb:1260 src/modules/LanItems.rb:1264
+#: src/modules/LanItems.rb:1268
msgid "Started automatically at boot"
msgstr "Startet automatisk ved oppstart"
#. summary description of STARTMODE=ifplugd
-#: src/modules/LanItems.rb:1276
+#: src/modules/LanItems.rb:1272
msgid "Started automatically on cable connection"
msgstr "Startet automatisk via kabelforbindelse"
#. summary description of STARTMODE=managed
-#: src/modules/LanItems.rb:1280
+#: src/modules/LanItems.rb:1276
msgid "Managed by NetworkManager"
msgstr "Bruk NetworkManager"
#. summary description of STARTMODE=off
-#: src/modules/LanItems.rb:1284
+#: src/modules/LanItems.rb:1280
msgid "Will not be started at all"
msgstr "Vil ikke bli startet i det hele tatt"
-#: src/modules/LanItems.rb:1290
+#: src/modules/LanItems.rb:1286
msgid "Started manually"
msgstr "Startet manuelt"
#. do nothing
-#: src/modules/LanItems.rb:1302
+#: src/modules/LanItems.rb:1298
msgid "IP address assigned using"
msgstr "IP-adresse tildelt via"
-#: src/modules/LanItems.rb:1306
+#: src/modules/LanItems.rb:1302
#, fuzzy
#| msgid "IP address: %1/%2"
msgid "IP address: %s/%s"
msgstr "IP-adresse: %1/%2"
-#: src/modules/LanItems.rb:1309
+#: src/modules/LanItems.rb:1305
#, fuzzy
#| msgid "IP address: %1, subnet mask %2"
msgid "IP address: %s, subnet mask %s"
@@ -4524,46 +4581,46 @@
#. FIXME: side effect: sets @type. No reason for that. It should only build item
#. overview. Check and remove.
-#: src/modules/LanItems.rb:1333
+#: src/modules/LanItems.rb:1329
msgid "Not configured"
msgstr "Ikke satt opp"
#. display it only if we need it, don't duplicate "ifcfg_name" above
-#: src/modules/LanItems.rb:1355 src/modules/LanItems.rb:1415
+#: src/modules/LanItems.rb:1351 src/modules/LanItems.rb:1411
#, fuzzy
#| msgid "Device Name: %1"
msgid "Device Name: %s"
msgstr "Enhetsnavn: %1"
-#: src/modules/LanItems.rb:1376
+#: src/modules/LanItems.rb:1372
msgid "Bonding slaves"
msgstr "Bonding-slaver"
-#: src/modules/LanItems.rb:1390
+#: src/modules/LanItems.rb:1386
#, fuzzy
#| msgid "enslaved in %1"
msgid "enslaved in %s"
msgstr "slave i %1"
-#: src/modules/LanItems.rb:1391
+#: src/modules/LanItems.rb:1387
msgid "Bonding master"
msgstr "Bonding-master"
-#: src/modules/LanItems.rb:1405
+#: src/modules/LanItems.rb:1401
msgid "Not connected"
msgstr "Ikke tilkoblet"
-#: src/modules/LanItems.rb:1406
+#: src/modules/LanItems.rb:1402
msgid "No hwinfo"
msgstr "Ingen maskinvareinfo"
-#: src/modules/LanItems.rb:1421
+#: src/modules/LanItems.rb:1417
#, fuzzy
#| msgid "<p>Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details.</p>"
msgid "Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details."
msgstr "<p>Kunne ikke sette opp nettverkskortet fordi kjerneenheten (eth0, wlan0) ikke finnes. Dette skyldes vanligvis manglende fastvare (for wlan-enheter). Se resultatet av dmesg-kommandoen.</p>"
-#: src/modules/LanItems.rb:1427
+#: src/modules/LanItems.rb:1423
#, fuzzy
#| msgid ""
#| "<p>The device is not configured. Press <b>Edit</b>\n"
@@ -4575,17 +4632,17 @@
"<p>Enheten er ikke satt opp. Klikk <b>Rediger</b>\n"
"for å gå til oppsett.</p>\n"
-#: src/modules/LanItems.rb:1434
+#: src/modules/LanItems.rb:1430
msgid "Needed firmware"
msgstr "Nødvendig fastvare"
-#: src/modules/LanItems.rb:1434
+#: src/modules/LanItems.rb:1430
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:159
+#: src/modules/Remote.rb:243
#, fuzzy
#| msgid "SuSEfirewall2 package is not installed, firewall will be disabled."
msgid ""
@@ -4594,37 +4651,37 @@
msgstr "SuSEfirewall2-pakken er ikke installert, brannveggsfunksjonalitet vil bli deaktivert."
#. Progress stage 2
-#: src/modules/Remote.rb:199
+#: src/modules/Remote.rb:295
msgid "Configure display manager"
msgstr "Sett opp vindusbehandler"
#. Progress stage 3
-#: src/modules/Remote.rb:204
+#: src/modules/Remote.rb:300
msgid "Restart the services"
msgstr "Start tjenesten på nytt"
-#: src/modules/Remote.rb:207
+#: src/modules/Remote.rb:303
msgid "Saving Remote Administration Configuration"
msgstr "Lagrer oppsett av ekstern administrasjon"
-#: src/modules/Remote.rb:216
+#: src/modules/Remote.rb:312
msgid "Configuring display manager..."
msgstr "Setter opp vindusbehandler..."
-#: src/modules/Remote.rb:220
+#: src/modules/Remote.rb:316
msgid "Restarting the service..."
msgstr "Starter tjenesten på nytt..."
#. Enable xinetd
#. Enable XDM
-#: src/modules/Remote.rb:246 src/modules/Remote.rb:254
+#: src/modules/Remote.rb:342 src/modules/Remote.rb:350
#, fuzzy
#| msgid "Enabling service 'uml' failed."
msgid "Enabling service %{service} has failed"
msgstr "Aktivering av tjenesten'uml' mislyktes."
#. Do this only if package xinetd is installed (#256385)
-#: src/modules/Remote.rb:281
+#: src/modules/Remote.rb:377
msgid ""
"Your display manager must be restarted.\n"
"To take the changes in remote administration into account, \n"
@@ -4632,30 +4689,30 @@
msgstr ""
#. description in proposal
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:408
msgid "Remote administration is enabled."
msgstr "Ekstern administrasjon er aktivert."
-#: src/modules/Remote.rb:312
+#: src/modules/Remote.rb:408
msgid "Remote administration is disabled."
msgstr "Ekstern administrasjon is deaktivert."
#. Progress stage 1
-#: src/modules/Routing.rb:264
+#: src/modules/Routing.rb:261
msgid "Write IP forwarding settings"
msgstr "Lagre oppsett for IP-overføring"
#. Progress stage 2
-#: src/modules/Routing.rb:266
+#: src/modules/Routing.rb:263
msgid "Write routing settings"
msgstr "Lagre oppsett for ruter"
-#: src/modules/Routing.rb:269
+#: src/modules/Routing.rb:266
msgid "Saving Routing Configuration"
msgstr "Lagrer oppsett for ruter"
#. Progress stage 1/2
-#: src/modules/Routing.rb:274
+#: src/modules/Routing.rb:271
msgid "Writing IP forwarding settings..."
msgstr "Lagrer oppsett for IP-overføring..."
@@ -4664,26 +4721,26 @@
#. sysconfig does not support restarting routes only,
#. so we let our caller do it together with other things
#. Progress stage 2/2
-#: src/modules/Routing.rb:284
+#: src/modules/Routing.rb:281
msgid "Writing routing settings..."
msgstr "Lagrer oppsett for ruter..."
#. Summary text
-#: src/modules/Routing.rb:454
+#: src/modules/Routing.rb:434
#, fuzzy
#| msgid "Gateway: %1"
msgid "Gateway: %s"
msgstr "Systemport: %1"
#. Summary text
-#: src/modules/Routing.rb:458
+#: src/modules/Routing.rb:438
#, fuzzy
#| msgid "IP Forwarding:"
msgid "IP Forwarding for IPv4: %s"
msgstr "IP-overføring:"
#. Summary text
-#: src/modules/Routing.rb:462
+#: src/modules/Routing.rb:442
#, fuzzy
#| msgid "IP Forwarding:"
msgid "IP Forwarding for IPv6: %s"
@@ -4704,42 +4761,6 @@
msgid "(Unprotected)"
msgstr "(ubeskyttet"
-#~ msgid "Configuration Successfully Saved"
-#~ msgstr "Oppsettet er lagret"
-
-#~ msgid "DNS Configuration Successfully Saved"
-#~ msgstr "DNS-oppsettet er lagret"
-
-#~ msgid "DSL Configuration Successfully Saved"
-#~ msgstr "DSL-oppsettet er lagret"
-
-#~ msgid "Hosts Configuration Successfully Saved"
-#~ msgstr "Vertsmaskinoppsettet er lagret"
-
-#~ msgid "ISDN Configuration Successfully Saved"
-#~ msgstr "ISDN-oppsettet er lagret"
-
-#~ msgid "Network Card Configuration Successfully Saved"
-#~ msgstr "Oppsettet for nettverkskort er lagret"
-
-#~ msgid "Modem Configuration Successfully Saved"
-#~ msgstr "Modemoppsettet er lagret"
-
-#~ msgid "Proxy Configuration Successfully Saved"
-#~ msgstr "Mellomserveroppsettet er lagret"
-
-#~ msgid "Provider Configuration Successfully Saved"
-#~ msgstr "Leverandøroppsettet er lagret"
-
-#~ msgid "Routing Configuration Successfully Saved"
-#~ msgstr "Rutingoppsettet er lagret"
-
-#~ msgid "Configure mail now?"
-#~ msgstr "Vil du sette opp e-postsystemet nå?"
-
-#~ msgid "Run configuration of %1?"
-#~ msgstr "Vil du sette opp %1?"
-
#~ msgid "Device boot protocol"
#~ msgstr "Enhetsoppstartsprotokoll"
Modified: branches/plus-SLE12-SP2/yast/nb/po/nfs.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/nfs.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/nfs.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: nfs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-08-12 12:50+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/nfs_server.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/nfs_server.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/nfs_server.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: nfs_server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-08-12 12:54+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -81,27 +81,27 @@
msgstr "Ja/Nei-valg for aktivering/deaktivering av sikker NFS."
#. summary text
-#: src/clients/nfs_server.rb:202
+#: src/clients/nfs_server.rb:196
msgid "NFS server is enabled"
msgstr "NFS-serveren er aktivert"
#. summary text
-#: src/clients/nfs_server.rb:205
+#: src/clients/nfs_server.rb:199
msgid "NFS server is disabled"
msgstr "NFS-serveren er deaktivert"
#. error message
-#: src/clients/nfs_server.rb:221
+#: src/clients/nfs_server.rb:215
msgid "Required packages (%1) are not installed."
msgstr "Nødvendige pakker (%1) er ikke installert."
#. error
#. error
-#: src/clients/nfs_server.rb:261 src/clients/nfs_server.rb:291
+#: src/clients/nfs_server.rb:255 src/clients/nfs_server.rb:285
msgid "No mount point specified."
msgstr "Monteringspunkt er ikke spesifisert."
-#: src/clients/nfs_server.rb:266
+#: src/clients/nfs_server.rb:260
msgid ""
"The exports table already\n"
"contains this directory."
@@ -112,11 +112,11 @@
#. CLI action handler.
#. @param [Hash] options command options
#. @return whether successful
-#: src/clients/nfs_server.rb:325
+#: src/clients/nfs_server.rb:319
msgid "Domain cannot be set without enabling NFSv4. Use the 'set enablev4' command."
msgstr "Domene kan ikke angis uten å aktivere NFSv4. Bruk 'set enablev4'-kommandoen."
-#: src/clients/nfs_server.rb:336
+#: src/clients/nfs_server.rb:330
msgid "Command 'set' must be used in the form 'set option=value'. Use 'set help' to get information about available options."
msgstr "Kommandoen må angis i formatet 'set valg=verdi'. Bruk 'set help' for å få informasjon om valgene."
@@ -177,59 +177,48 @@
"Det mangler sannsynligvis informasjon i oppsettfilen.\n"
#. text entry label
-#: src/include/nfs_server/ui.rb:68
+#: src/include/nfs_server/ui.rb:58
msgid "&Directory to Export"
msgstr "&Katalog som skal eksporteres"
#. button label
-#: src/include/nfs_server/ui.rb:74
+#: src/include/nfs_server/ui.rb:64
msgid "&Browse..."
msgstr "&Bla igjennom..."
-#: src/include/nfs_server/ui.rb:97
+#: src/include/nfs_server/ui.rb:87
msgid "Enter a non-empty export path. For example, /exports."
msgstr "Angi en eksporteringssti, f.eks /exports."
#. error popup message
-#: src/include/nfs_server/ui.rb:105
+#: src/include/nfs_server/ui.rb:95
msgid "The exports table already contains this directory."
msgstr "Eksporttabellen inneholder allerede denne katalogen."
-#. message popup; %1, %2 are package names
-#: src/include/nfs_server/ui.rb:113
-msgid ""
-"The user mode NFS server (%1) cannot export directories\n"
-"with spaces in their names.\n"
-"Use the kernel-based server (%2) to do that."
-msgstr ""
-"Brukermodus-NFS-serveren (%1) kan ikke eksportere kataloger\n"
-"med mellomrom i navnet.\n"
-"Bruk den kjernebaserte serveren (%2) for å gjøre dette."
-
#. the dir does not exist
-#: src/include/nfs_server/ui.rb:126
+#: src/include/nfs_server/ui.rb:101
msgid "The directory does not exist. Create it?"
msgstr "Katalogen finnes ikke. Vil du opprette den?"
#. title in the file selection dialog
-#: src/include/nfs_server/ui.rb:136
+#: src/include/nfs_server/ui.rb:111
msgid "Select the Directory to Export"
msgstr "Velg katalog som skal eksporteres"
#. text entry label
-#: src/include/nfs_server/ui.rb:193
+#: src/include/nfs_server/ui.rb:168
msgid "&Host Wild Card"
msgstr "&Jokertegn for vertsmaskin"
#. text entry label
-#: src/include/nfs_server/ui.rb:195
+#: src/include/nfs_server/ui.rb:170
msgid "O&ptions"
msgstr "A<ernativer"
#. check to see if user has changed options entry in the dialogue
#. thrown due to a "Add Hosts" (as opposed to editing existing ones).
#. If yes, suggest the user with a suitable default option set.
-#: src/include/nfs_server/ui.rb:250
+#: src/include/nfs_server/ui.rb:222
msgid ""
"'fsid=0' is not a valid option unless \n"
"NFSv4 is enabled (previous page).\n"
@@ -238,7 +227,7 @@
"ikke NFSv4 er aktivert (forrige side).\n"
#. error popup message
-#: src/include/nfs_server/ui.rb:268
+#: src/include/nfs_server/ui.rb:240
msgid ""
"Options for this wild card\n"
"are already set."
@@ -248,12 +237,12 @@
#. Opening NFS server dialog
#. @return `back, `abort, `next `or finish
-#: src/include/nfs_server/ui.rb:300
+#: src/include/nfs_server/ui.rb:272
msgid "Unable to read the /etc/idmapd.conf file. Setting the default setting for the domain to 'localdomain'."
msgstr "Kan ikke lese /etc/idmapd.conf-filen. Bruker standardinnstillingen 'localdomain' for domene."
#. Help, part 1 of 2
-#: src/include/nfs_server/ui.rb:323
+#: src/include/nfs_server/ui.rb:295
msgid ""
"<P>Here, choose whether to start an NFS server on your computer\n"
"and export some of your directories to others.</P>"
@@ -262,7 +251,7 @@
"og eksportere noen av katalogene dine til andre.</P>"
#. Help, part 2 of 2
-#: src/include/nfs_server/ui.rb:330
+#: src/include/nfs_server/ui.rb:302
msgid ""
"<P>If you choose <B>Start NFS Server</B>, clicking <B>Next</B> opens\n"
"a configuration dialog in which to specify the directories to export.</P>"
@@ -270,7 +259,7 @@
"<P>Velg <B>Start NFS-server</B> og klikk <B>Neste</B> for å åpne\n"
"en konfigurasjonsdialog der kan du velge hvilke kataloger du vil eksportere.</P>"
-#: src/include/nfs_server/ui.rb:339
+#: src/include/nfs_server/ui.rb:311
msgid ""
"<P>If the server needs to handle NFSv4 clients, check <B>Enable NFSv4</B>\n"
"and fill in the NFSv4 domain name you want the ID mapping daemon to use. Leave\n"
@@ -281,7 +270,7 @@
"'localdomain' eller se manualsiden for 'idmapd' og 'idmapd.conf' hvis du er usikker.</p>\n"
#. FIXME: use %1 as nfs-utils.src.rpm produces nfs-kernel-server.rpm
-#: src/include/nfs_server/ui.rb:349
+#: src/include/nfs_server/ui.rb:321
msgid ""
"<P>If the server and client must authenticate using GSS library, check the\n"
"<B>Enable GSS Security</B> box. To use GSS API, you currently need to have Kerberos and gssapi (nfs-utils > 1.0.7) on your system.</P>\n"
@@ -290,44 +279,44 @@
"Kerberos og gssapi (nfs-utils > 1.0.7) er kreves for å benytte GSS API.</p>\n"
#. frame label
-#: src/include/nfs_server/ui.rb:359
+#: src/include/nfs_server/ui.rb:331
msgid "NFS Server"
msgstr "NFS-server"
#. radio button label
-#: src/include/nfs_server/ui.rb:370
+#: src/include/nfs_server/ui.rb:342
msgid "&Start"
msgstr "&Start"
#. radio button label
-#: src/include/nfs_server/ui.rb:379
+#: src/include/nfs_server/ui.rb:351
msgid "Do &Not Start"
msgstr "&Ikke start"
#. frame label
-#: src/include/nfs_server/ui.rb:397
+#: src/include/nfs_server/ui.rb:369
msgid "Enable NFSv4"
msgstr "Aktiver NFSv4"
-#: src/include/nfs_server/ui.rb:404
+#: src/include/nfs_server/ui.rb:376
msgid "Enable NFS&v4"
msgstr "Aktiver NFS&v4"
-#: src/include/nfs_server/ui.rb:409
+#: src/include/nfs_server/ui.rb:381
msgid "Enter NFSv4 do&main name:"
msgstr "Fyll inn NFSv4-do&menenavn:"
-#: src/include/nfs_server/ui.rb:419
+#: src/include/nfs_server/ui.rb:391
msgid "Enable &GSS Security"
msgstr "Aktiver &GSS-sikkerhet"
#. dialog title
-#: src/include/nfs_server/ui.rb:439
+#: src/include/nfs_server/ui.rb:411
msgid "NFS Server Configuration"
msgstr "Konfigurasjon av NFS-server"
#. Help, part 1 of 4
-#: src/include/nfs_server/ui.rb:515
+#: src/include/nfs_server/ui.rb:487
msgid ""
"<P>The upper box contains all the directories to export.\n"
"If a directory is selected, the lower box shows the hosts allowed to\n"
@@ -338,7 +327,7 @@
"å montere denne katalogen.</P>\n"
#. Help, part 2 of 4
-#: src/include/nfs_server/ui.rb:524
+#: src/include/nfs_server/ui.rb:495
msgid ""
"<P><b>Host Wild Card</b> sets which hosts can access the selected directory.\n"
"It can be a single host, groups, wild cards, or\n"
@@ -348,68 +337,63 @@
"Det kan være enkle vertsmaskiner, grupper, jokertegn eller\n"
"IP-nettverk.</P>\n"
-#. Help, part 3 of 4, variant for kernel space server
-#: src/include/nfs_server/ui.rb:536
+#. Help, part 3 of 4
+#: src/include/nfs_server/ui.rb:503
msgid "<p>Enter an asterisk (<tt>*</tt>) instead of a name to specify all hosts.</p>"
msgstr "<p>Bruk en stjerne (<tt>*</tt>) i stedet for et navn for å velge alle vertsmaskiner.</p>"
-#. Help, part 3 of 4, variant for user space server
-#: src/include/nfs_server/ui.rb:544
-msgid "<p>Leave the field empty to specify all hosts.</p>"
-msgstr "<p>La feltet være tomt for å velge alle vertsmaskiner.</p>"
-
#. Help, part 4 of 4
-#: src/include/nfs_server/ui.rb:551
+#: src/include/nfs_server/ui.rb:509
msgid "<P>Refer to <tt>man exports</tt> for more information.</P>\n"
msgstr "<P>Skriv <tt>man exports</tt> i en terminal for å lese mer informasjon.</P>\n"
#. push button label
-#: src/include/nfs_server/ui.rb:567
+#: src/include/nfs_server/ui.rb:524
msgid "Add &Directory"
msgstr "Legg til &katalog"
#. push button label
-#: src/include/nfs_server/ui.rb:569
+#: src/include/nfs_server/ui.rb:526
msgid "&Edit"
msgstr "&Rediger"
#. push button label
-#: src/include/nfs_server/ui.rb:571
+#: src/include/nfs_server/ui.rb:528
msgid "De&lete"
msgstr "&Slett"
#. table header
-#: src/include/nfs_server/ui.rb:584
+#: src/include/nfs_server/ui.rb:541
msgid "Host Wild Card"
msgstr "Jokertegn for vertsmaskin"
#. table header
-#: src/include/nfs_server/ui.rb:586
+#: src/include/nfs_server/ui.rb:543
msgid "Options"
msgstr "Alternativer"
#. push button label
-#: src/include/nfs_server/ui.rb:597
+#: src/include/nfs_server/ui.rb:554
msgid "Add &Host"
msgstr "Legg til &vertsmaskin"
#. push button label
-#: src/include/nfs_server/ui.rb:599
+#: src/include/nfs_server/ui.rb:556
msgid "Ed&it"
msgstr "&Rediger"
#. push button label
-#: src/include/nfs_server/ui.rb:601
+#: src/include/nfs_server/ui.rb:558
msgid "Dele&te"
msgstr "S&lett"
#. dialog title
-#: src/include/nfs_server/ui.rb:608
+#: src/include/nfs_server/ui.rb:565
msgid "Directories to Export"
msgstr "Kataloger som skal eksporteres"
#. not fatal - write other dirs.
-#: src/modules/NfsServer.rb:181
+#: src/modules/NfsServer.rb:158
msgid ""
"Unable to create a missing directory:\n"
"%1"
@@ -418,7 +402,7 @@
"%1"
#. error popup message
-#: src/modules/NfsServer.rb:193
+#: src/modules/NfsServer.rb:170
msgid ""
"Unable to write to /etc/exports.\n"
"No changes will be made to the\n"
@@ -429,72 +413,62 @@
"eksporterte katalogene.\n"
#. dialog label
-#: src/modules/NfsServer.rb:228
+#: src/modules/NfsServer.rb:192
msgid "Writing NFS Server Configuration"
msgstr "Lagrer konfigurasjon for NFS-server"
#. progress stage label
-#: src/modules/NfsServer.rb:233
+#: src/modules/NfsServer.rb:197
msgid "Save /etc/exports"
msgstr "Lagre /etc/exports"
#. progress stage label
-#: src/modules/NfsServer.rb:235
+#: src/modules/NfsServer.rb:199
msgid "Restart services"
msgstr "Start tjenester på nytt"
#. progress step label
-#: src/modules/NfsServer.rb:239
+#: src/modules/NfsServer.rb:203
msgid "Saving /etc/exports..."
msgstr "Lagrer /etc/exports..."
#. progress step label
-#: src/modules/NfsServer.rb:241
+#: src/modules/NfsServer.rb:205
msgid "Restarting services..."
msgstr "Starter tjenester på nytt..."
#. final progress step label
-#: src/modules/NfsServer.rb:243
+#: src/modules/NfsServer.rb:207
msgid "Finished"
msgstr "Fullført"
#. help text
-#: src/modules/NfsServer.rb:251
+#: src/modules/NfsServer.rb:215
msgid "Writing NFS server settings. Please wait..."
msgstr "Lagrer innstillinger for NFS-server. Vent..."
#. Independent of @ref start because of Heartbeat (#27001).
-#: src/modules/NfsServer.rb:265
+#: src/modules/NfsServer.rb:229
msgid "Unable to write to idmapd.conf."
msgstr "Kan ikke skrive til idmapd.conf."
-#: src/modules/NfsServer.rb:314
-msgid "Unable to start idmapd. Check your domain setting."
-msgstr "Feil ved start av idmapd. Sjekk domeneinstillingen."
-
-#: src/modules/NfsServer.rb:321
-msgid "Unable to restart idmapd."
-msgstr "Kan ikke starte idmapd på nytt."
-
-#: src/modules/NfsServer.rb:328
-msgid "Unable to stop idmapd."
-msgstr "Kan ikke stoppe idmapd."
-
#. FIXME svcgssd is gone! (only nfsserver is left)
-#: src/modules/NfsServer.rb:339
+#: src/modules/NfsServer.rb:266
msgid "Unable to start svcgssd. Ensure your kerberos and gssapi (nfs-utils) setup is correct."
msgstr "Kan ikke starte svcgssd. Kontroller at kerberos og gssapi (nfs-utils) er riktig satt opp."
-#: src/modules/NfsServer.rb:349
-msgid "'svcgssd' is already running. Unable to restart it."
-msgstr "'svcgssd' kjører allerede. Feil ved omstart."
+#: src/modules/NfsServer.rb:275
+#, fuzzy
+#| msgid "Unable to restart idmapd."
+msgid "Unable to restart 'svcgssd' service."
+msgstr "Kan ikke starte idmapd på nytt."
-#: src/modules/NfsServer.rb:357
+#: src/modules/NfsServer.rb:283
msgid "'svcgssd' is running. Unable to stop it."
msgstr "'svcgssd' kjører allerede. Feil ved stop."
#. error popup message
-#: src/modules/NfsServer.rb:376
+#: src/modules/NfsServer.rb:299
msgid ""
"Unable to restart the NFS server.\n"
"Your changes will be active after reboot.\n"
@@ -503,20 +477,39 @@
"Endringene vil bli aktivert etter omstart av maskinen.\n"
#. summary header; directories exported by NFS
-#: src/modules/NfsServer.rb:399
+#: src/modules/NfsServer.rb:322
msgid "NFS Exports"
msgstr "NFS-eksporter"
#. add information reg NFSv4 support, domain and security
-#: src/modules/NfsServer.rb:417
+#: src/modules/NfsServer.rb:340
msgid "The NFSv4 domain for idmapping is %1."
msgstr "NFSv4-domene for idmapping er %1."
-#, fuzzy
-#~| msgid "Unable to restart idmapd."
-#~ msgid "Unable to restart 'svcgssd' service."
+#~ msgid ""
+#~ "The user mode NFS server (%1) cannot export directories\n"
+#~ "with spaces in their names.\n"
+#~ "Use the kernel-based server (%2) to do that."
+#~ msgstr ""
+#~ "Brukermodus-NFS-serveren (%1) kan ikke eksportere kataloger\n"
+#~ "med mellomrom i navnet.\n"
+#~ "Bruk den kjernebaserte serveren (%2) for å gjøre dette."
+
+#~ msgid "<p>Leave the field empty to specify all hosts.</p>"
+#~ msgstr "<p>La feltet være tomt for å velge alle vertsmaskiner.</p>"
+
+#~ msgid "Unable to start idmapd. Check your domain setting."
+#~ msgstr "Feil ved start av idmapd. Sjekk domeneinstillingen."
+
+#~ msgid "Unable to restart idmapd."
#~ msgstr "Kan ikke starte idmapd på nytt."
+#~ msgid "Unable to stop idmapd."
+#~ msgstr "Kan ikke stoppe idmapd."
+
+#~ msgid "'svcgssd' is already running. Unable to restart it."
+#~ msgstr "'svcgssd' kjører allerede. Feil ved omstart."
+
#~ msgid "Directories"
#~ msgstr "Kataloger"
Modified: branches/plus-SLE12-SP2/yast/nb/po/nis.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/nis.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/nis.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: nis\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2008-09-25 07:30+0200\n"
"Last-Translator: Olav P. \n"
"Language-Team: Norwegian Bokmål <>\n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/nis_server.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/nis_server.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/nis_server.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: nis_server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-08-12 12:55+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/ntp-client.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/ntp-client.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/ntp-client.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: ntp-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-08-12 12:57+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -80,7 +80,7 @@
msgstr "&Konfigurer..."
#. Otherwise, prompt user for confirming pkg installation
-#: src/clients/ntp-client_proposal.rb:381
+#: src/clients/ntp-client_proposal.rb:380
msgid ""
"Synchronization with NTP server is not possible\n"
"without package %1 installed."
@@ -89,12 +89,12 @@
"uten at pakken %1 er installert."
#. Only if network is running try to synchronize the ntp server
-#: src/clients/ntp-client_proposal.rb:393
+#: src/clients/ntp-client_proposal.rb:392
msgid "Synchronizing with NTP server..."
msgstr "Synkroniserer med NTP-server..."
#. update time widgets
-#: src/clients/ntp-client_proposal.rb:439
+#: src/clients/ntp-client_proposal.rb:438
#, fuzzy
#| msgid "Connection to the LDAP server cannot be established."
msgid "Connection to selected NTP server failed."
@@ -102,7 +102,7 @@
#. Translators: yes-no popup,
#. ntpdate is a command, %1 is the server address
-#: src/clients/ntp-client_proposal.rb:470
+#: src/clients/ntp-client_proposal.rb:469
#, fuzzy
#| msgid "'Test query to server '%1' failed. If server is not yet accessible or network is not configured click 'No' to ignore. Revisit NTP server configuration?"
msgid ""
Modified: branches/plus-SLE12-SP2/yast/nb/po/oneclickinstall.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/oneclickinstall.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/oneclickinstall.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/online-update-configuration.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/online-update-configuration.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/online-update-configuration.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/online-update.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/online-update.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/online-update.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: online-update\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-10-01 12:35+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/opensuse_mirror.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/opensuse_mirror.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/opensuse_mirror.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/packager.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/packager.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/packager.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: packager.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-10-06 16:04+0200\n"
"PO-Revision-Date: 2009-10-01 12:36+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -205,8 +205,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:674
-#: src/clients/repositories.rb:687
+#: src/clients/inst_mediacopy.rb:65 src/clients/repositories.rb:703
+#: src/clients/repositories.rb:716
#: src/include/packager/key_manager_dialogs.rb:306
msgid "Name"
msgstr "Navn"
@@ -416,7 +416,7 @@
#. TRANSLATORS: dialog help
#. TRANSLATORS: dialog help
#: src/clients/inst_productsources.rb:1380
-#: src/include/packager/repositories_include.rb:91
+#: src/include/packager/repositories_include.rb:93
msgid "<p>The repository manager is downloading repository details...</p>"
msgstr "<p>Pakkebrønnbehandleren laster ned informasjon om pakkebrønner.../p>"
@@ -486,7 +486,7 @@
#. re-initialize package information
#. force reinitialization
-#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:744
+#: src/clients/inst_rpmcopy.rb:129 src/clients/sw_single.rb:739
msgid "Installing Packages..."
msgstr "Installerer pakker..."
@@ -526,8 +526,8 @@
#. dialog caption
#. dialog caption
#. dialog caption
-#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1810
-#: src/modules/AddOnProduct.rb:682
+#: src/clients/key_manager.rb:70 src/clients/repositories.rb:1845
+#: src/modules/AddOnProduct.rb:684
msgid "Initializing..."
msgstr "Initialiserer ..."
@@ -557,85 +557,102 @@
msgstr "Lagrer oppsett for pakkebehandler..."
#. default (minimal) priority of a repository
-#: src/clients/repositories.rb:55
+#: src/clients/repositories.rb:58
msgid "&Priority"
msgstr "&Prioritet"
-#: src/clients/repositories.rb:57
+#: src/clients/repositories.rb:60
msgid "Keep Downloaded Packages"
msgstr "Behold nedlastede pakker"
#. Command line help text for the repository module, %1 is "zypper"
-#: src/clients/repositories.rb:72
+#: src/clients/repositories.rb:75
msgid "Installation Repositories - This module does not support the command line interface, use '%1' instead."
msgstr "Installasjonspakkebrønner - denne modulen har ikke støtte for kommandolinjemodus, bruk '%1' i stedet."
#. pad to 3 characters
-#: src/clients/repositories.rb:166
+#: src/clients/repositories.rb:169
msgid "Default"
msgstr "Standard"
#. 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:195 src/clients/repositories.rb:260
+#: src/clients/repositories.rb:199 src/clients/repositories.rb:264
msgid "Unknown Name"
msgstr "Ukjent navn"
#. displaye only repositories from the selected service
-#: src/clients/repositories.rb:326 src/clients/repositories.rb:362
-#: src/clients/repositories.rb:368 src/modules/SourceManager.rb:436
+#: 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
msgid "Unknown"
msgstr "Ukjent"
#. label to be used instead of URL if not found
-#: src/clients/repositories.rb:328 src/clients/repositories.rb:361
-#: src/modules/AddOnProduct.rb:1334
+#: src/clients/repositories.rb:337 src/clients/repositories.rb:376
+#: src/modules/AddOnProduct.rb:1336
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 "URL: %1"
+msgid "Raw URL: %s"
+msgstr "Nettadresse: %1"
+
#. heading - in case repo name not found
-#: src/clients/repositories.rb:357
+#: src/clients/repositories.rb:372
msgid "Unknown Repository Name"
msgstr "Ukjent pakkebrønnnavn"
#. label, %1 is repo category (eg. YUM)
-#: src/clients/repositories.rb:367
+#: src/clients/repositories.rb:382
msgid "Category: %1"
msgstr "Kategori: %1"
#. label, %1 is repo category (eg. YUM)
-#: src/clients/repositories.rb:377
+#: src/clients/repositories.rb:392
msgid "Service: %1"
msgstr "Tjeneste: %1"
#. #176013
-#: src/clients/repositories.rb:625
+#: src/clients/repositories.rb:640
msgid "All repositories"
msgstr "Alle pakkebrønner"
-#: src/clients/repositories.rb:628
+#: src/clients/repositories.rb:643
msgid "All services"
msgstr "Alle tjenester"
-#: src/clients/repositories.rb:637
+#: src/clients/repositories.rb:652
msgid "Service '%1'"
msgstr "Tjenesten '%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:652
+#: src/clients/repositories.rb:681
msgid "View"
msgstr "Vis"
#. table header - priority of the repository - keep the translation as short as possible!
-#: src/clients/repositories.rb:667
+#: src/clients/repositories.rb:696
msgid "Priority"
msgstr "Prioritet"
#. 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:669 src/clients/repositories.rb:682
+#: src/clients/repositories.rb:698 src/clients/repositories.rb:711
#: src/modules/SourceManager.rb:393
msgid "Enabled"
msgstr "Aktivert"
@@ -644,88 +661,88 @@
#. 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:672 src/clients/repositories.rb:685
+#: src/clients/repositories.rb:701 src/clients/repositories.rb:714
msgid "Autorefresh"
msgstr "Oppdater automatisk"
#. table header - service to which the repo belongs
-#: src/clients/repositories.rb:676
+#: src/clients/repositories.rb:705
msgid "Service"
msgstr "Tjeneste"
#. table header - URL of the repo
#. table header - URL of the repo
-#: src/clients/repositories.rb:678 src/clients/repositories.rb:689
+#: src/clients/repositories.rb:707 src/clients/repositories.rb:718
msgid "URL"
msgstr "Nettadresse"
#. push button - change URL of the selected repository
-#: src/clients/repositories.rb:789
+#: src/clients/repositories.rb:818
msgid "&Replace..."
msgstr "&Erstatt..."
#. push button - refresh the selected repository now
-#: src/clients/repositories.rb:791
+#: src/clients/repositories.rb:820
msgid "Re&fresh Selected"
msgstr "Oppdater &valgte pakker"
#. push button - disable/enable the selected repository
-#: src/clients/repositories.rb:793
+#: src/clients/repositories.rb:822
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:795
+#: src/clients/repositories.rb:824
msgid "Refre&sh on or off"
msgstr "&Oppdater på eller av"
#. push button - set name of the selected repository
-#: src/clients/repositories.rb:797
+#: src/clients/repositories.rb:826
msgid "Set &Name..."
msgstr "Angi &navn..."
#. label
-#: src/clients/repositories.rb:804
+#: src/clients/repositories.rb:833
msgid "Properties"
msgstr "Egenskaper"
#. check box
-#: src/clients/repositories.rb:809
+#: src/clients/repositories.rb:838
msgid "&Enabled"
msgstr "&Aktivert"
#. check box
-#: src/clients/repositories.rb:815
+#: src/clients/repositories.rb:844
msgid "Automatically &Refresh"
msgstr "Oppdate&r automatisk"
#. push button label
-#: src/clients/repositories.rb:853
+#: src/clients/repositories.rb:882
msgid "&GPG Keys..."
msgstr "&GPG-nøkler..."
#. menu button label
-#: src/clients/repositories.rb:858
+#: src/clients/repositories.rb:887
msgid "Refresh"
msgstr "Oppdater"
#. menu button label
-#: src/clients/repositories.rb:862
+#: src/clients/repositories.rb:891
msgid "Refresh all Autor&efreshed"
msgstr "Oppdater all&e automatisk"
#. menu button label
-#: src/clients/repositories.rb:864
+#: src/clients/repositories.rb:893
msgid "Refresh all &Enabled"
msgstr "Oppdater all&e aktivert"
#. dialog caption
-#: src/clients/repositories.rb:871
+#: src/clients/repositories.rb:900
msgid "Configured Software Repositories"
msgstr "Valgte pakkebrønner"
#. help
-#: src/clients/repositories.rb:874
+#: src/clients/repositories.rb:903
msgid ""
"<p>\n"
"Manage configured software repositories and services.</p>\n"
@@ -733,11 +750,11 @@
"<p>\n"
"I denne dialogen kan du administrere pakkebrønner og tjenester.</p>\n"
-#: src/clients/repositories.rb:880
+#: src/clients/repositories.rb:909
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>En<B>tjeneste</B> eller <B>pakkebrønnindekstjeneste</B> er en protokoll for administrasjon av pakkebrønner. En tjeneste kan inneholde én eller flere pakkebrønner som kan endres dynamisk av tjenesteadministrator.</P>"
-#: src/clients/repositories.rb:887
+#: src/clients/repositories.rb:916
msgid ""
"<p>\n"
"<b>Adding a new Repository or a Service</b><br>\n"
@@ -752,7 +769,7 @@
"</p>\n"
#. help, continued
-#: src/clients/repositories.rb:899
+#: src/clients/repositories.rb:928
msgid ""
"<p>\n"
"To install packages from <b>CD</b>,\n"
@@ -765,7 +782,7 @@
"</p>\n"
#. help, continued
-#: src/clients/repositories.rb:910
+#: src/clients/repositories.rb:939
msgid ""
"<p>\n"
"The CDs can be copied to <b>hard disk</b>\n"
@@ -786,7 +803,7 @@
"</p>\n"
#. help, continued
-#: src/clients/repositories.rb:926
+#: src/clients/repositories.rb:955
msgid ""
"<p>\n"
"<b>Modifying Status of a Repository or a Service</b><br>\n"
@@ -802,7 +819,7 @@
"</p>\n"
#. help text, continued
-#: src/clients/repositories.rb:938
+#: src/clients/repositories.rb:967
msgid ""
"<P><B>Priority of a Repository</B><BR>\n"
"Priority of a repository is an integer value between 0 (the highest priority) and 200 (the lowest priority). Default is 99. If a package is available in more repositories, the repository with the highest priority is used.</P>\n"
@@ -811,12 +828,12 @@
"Pakkebrønnprioritet er en heltallverdi mellom 0 (høyeste prioritet) og 200 (laveste prioritet). Standardprioriteten er 99. Hvis en pakke er tilgjengelig fra flere pakkebrønner, vil pakkebrønnen med høyest prioritet bli brukt.</P>\n"
#. help text, continued
-#: src/clients/repositories.rb:946
+#: src/clients/repositories.rb:975
msgid "<P>Select the appropriate option on top of the window for navigation in repositories and services.</P>"
msgstr "<P>Velg ønsket alternativ øverst i vinduet for å navigere i pakkebrønner og tjenester.</P>"
#. help text, continued
-#: src/clients/repositories.rb:954
+#: src/clients/repositories.rb:983
msgid ""
"<P><B>Keep Downloaded Packages</B><BR>Check this option to keep downloaded\n"
"packages in a local cache so they can be reused later when the packages are\n"
@@ -826,12 +843,12 @@
"pakker i et lokalt minne, slik at de kan gjenbrukes hvis pakker senere skal installeres\n"
"på nytt. Hvis dette valget ikke er avkrysset, vil nedlastede pakker bli slettet etter installasjon.</P>"
-#: src/clients/repositories.rb:960
+#: src/clients/repositories.rb:989
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 maskinen er <B>/var/cache/zypp/packages</B>, men plasseringen kan endres i filen <B>/etc/zypp/zypp.conf</B>.</P>"
#. popup message part 1
-#: src/clients/repositories.rb:1005
+#: src/clients/repositories.rb:1034
msgid ""
"Unable to save changes to the repository\n"
"configuration."
@@ -841,7 +858,7 @@
#. popup message part 2 followed by other info
#. popup message, after message header, header of details
-#: src/clients/repositories.rb:1011 src/modules/Packages.rb:1329
+#: src/clients/repositories.rb:1040 src/modules/Packages.rb:1329
#: src/modules/SourceManager.rb:162 src/modules/SourceManager.rb:310
msgid "Details:"
msgstr "Detaljer:"
@@ -849,18 +866,18 @@
#. popup message part 3
#. end of popup message, question
#. end of popup message, question
-#: src/clients/repositories.rb:1013 src/modules/Packages.rb:1337
+#: src/clients/repositories.rb:1042 src/modules/Packages.rb:1337
#: src/modules/SourceManager.rb:164 src/modules/SourceManager.rb:312
msgid "Try again?"
msgstr "Vil du prøve igjen?"
#. popup headline
-#: src/clients/repositories.rb:1030
+#: src/clients/repositories.rb:1059
msgid "Abort Repository Configuration"
msgstr "Avbryt pakkebrønnoppsett"
#. popup message
-#: src/clients/repositories.rb:1032
+#: src/clients/repositories.rb:1061
msgid ""
"Abort the repository configuration?\n"
"All changes will be lost."
@@ -869,7 +886,7 @@
"Alle endringer vil gå tapt."
#. refresh also the combobox widget
-#: src/clients/repositories.rb:1329
+#: src/clients/repositories.rb:1364
msgid ""
"There is no service at URL:\n"
"%1"
@@ -878,40 +895,40 @@
"
%1"
#. TODO: add help text
-#: src/clients/repositories.rb:1440
+#: src/clients/repositories.rb:1475
msgid "Refreshing Repositories"
msgstr "Oppdaterer pakkebrønner "
-#: src/clients/repositories.rb:1441
+#: src/clients/repositories.rb:1476
msgid "Refreshing Services"
msgstr "Oppdaterer tjenester"
-#: src/clients/repositories.rb:1446
+#: src/clients/repositories.rb:1481
msgid "Refresh Repositories"
msgstr "Oppdater pakkebrønner"
-#: src/clients/repositories.rb:1447
+#: src/clients/repositories.rb:1482
msgid "Refresh Services"
msgstr "Oppdater tjenester"
#. progress bar label
-#: src/clients/repositories.rb:1479
+#: src/clients/repositories.rb:1514
msgid "Refreshing Repository %1..."
msgstr "Oppdaterer pakkebrønnen %1..."
#. refreshing services
#. progress bar label
-#: src/clients/repositories.rb:1505
+#: src/clients/repositories.rb:1540
msgid "Refreshing Service %1..."
msgstr "Oppdaterer tjenesten %1..."
#. yes-no popup
-#: src/clients/repositories.rb:1524
+#: src/clients/repositories.rb:1559
msgid "Delete the selected repository from the list?"
msgstr "Vil du slette den valgte pakkebrønnen fra listen?"
#. yes-no popup
-#: src/clients/repositories.rb:1538
+#: src/clients/repositories.rb:1573
msgid ""
"Delete service %1\n"
"and its repositories?"
@@ -920,7 +937,7 @@
"
med tilhørende kataloger?"
#. popup message
-#: src/clients/repositories.rb:1606
+#: src/clients/repositories.rb:1641
msgid ""
"For the selected repository, refresh\n"
"cannot be set."
@@ -929,7 +946,7 @@
"for denne pakkebrønnen."
#. popup question, %1 is repository URL
-#: src/clients/repositories.rb:1768
+#: src/clients/repositories.rb:1803
msgid ""
"Repository %1\n"
"has been already added. Each repository should be added only once.\n"
@@ -942,7 +959,7 @@
"Vil du virkelig legge til denne pakkebrønnen på nytt?"
#. Error popup
-#: src/clients/repositories.rb:1836
+#: src/clients/repositories.rb:1871
msgid "<p>Errors occurred while restoring the repository configuration.</p>\n"
msgstr "<p>Feil under gjenoppretting av pakkebrønnoppsett.</p>\n"
@@ -1055,7 +1072,7 @@
"Vil du installere dem nå?\n"
#. start the repository manager
-#: src/clients/sw_single.rb:619
+#: src/clients/sw_single.rb:614
msgid ""
"Cannot configure online update repository \n"
"without having package %1 installed"
@@ -1063,7 +1080,7 @@
"Pakkebrønnen på nettet kan ikke velges \n"
"uten at pakken %1 er installert"
-#: src/clients/sw_single.rb:645
+#: src/clients/sw_single.rb:640
msgid ""
"Cannot search packages in online repositories\n"
"without having package %1 installed"
@@ -1072,7 +1089,7 @@
"må pakken %1 være installert"
#. error report, %1 is a list of packages
-#: src/clients/sw_single.rb:673
+#: src/clients/sw_single.rb:668
msgid ""
"The following packages have not been found on the medium:\n"
"%1\n"
@@ -1416,42 +1433,42 @@
"'%2'?"
#. TRANSLATORS: dialog caption
-#: src/include/packager/repositories_include.rb:77
+#: src/include/packager/repositories_include.rb:79
msgid "Adding a New Repository"
msgstr "Legger til ny pakkebrønn"
-#: src/include/packager/repositories_include.rb:81
+#: src/include/packager/repositories_include.rb:83
msgid "Check Repository Type"
msgstr "Kontroller pakkebrønntype"
-#: src/include/packager/repositories_include.rb:82
+#: src/include/packager/repositories_include.rb:84
msgid "Add Repository"
msgstr "Legg til pakkebrønn"
-#: src/include/packager/repositories_include.rb:83
+#: src/include/packager/repositories_include.rb:85
msgid "Read Repository License"
msgstr "Leser pakkebrønnlisens"
-#: src/include/packager/repositories_include.rb:86
+#: src/include/packager/repositories_include.rb:88
msgid "Checking Repository Type"
msgstr "Kontrollerer pakkebrønntype"
-#: src/include/packager/repositories_include.rb:87
+#: src/include/packager/repositories_include.rb:89
msgid "Adding Repository"
msgstr "Legger til pakkebrønn"
-#: src/include/packager/repositories_include.rb:88
+#: src/include/packager/repositories_include.rb:90
msgid "Reading Repository License"
msgstr "Leser pakkebrønnlisens"
#. add at least one product if the scan result is empty (no product info available)
-#: src/include/packager/repositories_include.rb:152
+#: src/include/packager/repositories_include.rb:154
msgid "Repository"
msgstr "Pakkebrønn"
#. continue-back popup
#. continue-back popup
-#: src/include/packager/repositories_include.rb:224
+#: src/include/packager/repositories_include.rb:226
#: src/modules/SourceManager.rb:330
msgid ""
"There is no product information available at the given location.\n"
@@ -1468,7 +1485,7 @@
#. popup message part 1
#. Import GPG keys found in the inst-sys
-#: src/include/packager/repositories_include.rb:319
+#: src/include/packager/repositories_include.rb:321
#: src/modules/Packages.rb:1324 src/modules/SourceManager.rb:306
msgid ""
"Unable to create repository\n"
@@ -1478,7 +1495,7 @@
"fra adressen '%1'."
#. error message
-#: src/include/packager/repositories_include.rb:331
+#: src/include/packager/repositories_include.rb:333
msgid ""
"Using an ISO image over ftp or http protocol is not possible.\n"
"Change the protocol or unpack the ISO image on the server side."
@@ -1487,12 +1504,12 @@
"Velg en annen protokoll eller pakk ut ISO-diskbildet på serveren."
#. popup message part 2
-#: src/include/packager/repositories_include.rb:341
+#: src/include/packager/repositories_include.rb:343
msgid "Change the URL and try again?"
msgstr "Vil du endre adressen og forsøke igjen?"
#. popup error message, %1 is the package name
-#: src/include/packager/repositories_include.rb:418
+#: src/include/packager/repositories_include.rb:420
msgid ""
"Cannot search for SLP repositories\n"
"without having %1 package installed.\n"
@@ -1507,19 +1524,19 @@
#. error report
#. popup error
#. popup error
-#: src/modules/AddOnProduct.rb:516 src/modules/AddOnProduct.rb:618
+#: src/modules/AddOnProduct.rb:518 src/modules/AddOnProduct.rb:620
#: src/modules/ProductLicense.rb:539 src/modules/ProductLicense.rb:730
msgid "An error occurred while preparing the installation system."
msgstr "Det oppstod en feil under klargjøring av installasjonssystemet."
#. error report
-#: src/modules/AddOnProduct.rb:653
+#: src/modules/AddOnProduct.rb:655
msgid "Control file %1 not found on media."
msgstr "Kontrollfilen %1 ble ikke funnet på mediet."
#. FATE #305578: Add-On Product Requiring Registration
#. or check the content file
-#: src/modules/AddOnProduct.rb:894
+#: src/modules/AddOnProduct.rb:896
#, fuzzy
#| msgid "Package %1 was not installed. The service cannot be edited."
msgid ""
@@ -1529,26 +1546,26 @@
#. TRANSLATORS: error report
#. TRANSLATORS: error report
-#: src/modules/AddOnProduct.rb:1261 src/modules/AddOnProduct.rb:1425
+#: src/modules/AddOnProduct.rb:1263 src/modules/AddOnProduct.rb:1427
msgid "Unable to use additional products."
msgstr "Kan ikke bruke tilleggsprodukter."
#. fill up internal map (used later when item selected)
-#: src/modules/AddOnProduct.rb:1312 src/modules/AddOnProduct.rb:1318
+#: src/modules/AddOnProduct.rb:1314 src/modules/AddOnProduct.rb:1320
msgid "%1, URL: %2"
msgstr "%1, adresse: %2"
-#: src/modules/AddOnProduct.rb:1328
+#: src/modules/AddOnProduct.rb:1330
msgid "URL: %1, Path: %2"
msgstr "Adresse: %1, Sti: %2"
#. TRANSLATORS: popup heading
-#: src/modules/AddOnProduct.rb:1359
+#: src/modules/AddOnProduct.rb:1361
msgid "Additional Products"
msgstr "Tilleggsprodukter"
#. TRANSLATORS: additional dialog information
-#: src/modules/AddOnProduct.rb:1365
+#: src/modules/AddOnProduct.rb:1367
msgid ""
"The installation repository also contains the listed additional repositories.\n"
"Select the ones you want to use.\n"
@@ -1556,33 +1573,33 @@
"Installasjsonspakkebrønnen inneholder også de angitte tilleggspakkebrønnene.\n"
"Velg dem du vil bruke.\n"
-#: src/modules/AddOnProduct.rb:1376
+#: src/modules/AddOnProduct.rb:1378
msgid "Additional Products to Select"
msgstr "Tilleggsprodukter som kan velges"
#. push button label
-#: src/modules/AddOnProduct.rb:1383
+#: src/modules/AddOnProduct.rb:1385
msgid "Add Selected &Products"
msgstr "Legg til valgte &produkter"
#. %1 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1515
+#: src/modules/AddOnProduct.rb:1517
msgid "Insert the addon %1 medium"
msgstr "Sett inn mediet med tilleggsproduktet %1"
#. %1 is the product name, %2 is either "CD" or "DVD"
-#: src/modules/AddOnProduct.rb:1520
+#: src/modules/AddOnProduct.rb:1522
msgid "Insert the %1 %2 medium"
msgstr "Sett inn mediet %1 %2"
#. TRANSLATORS: error message, %1 is replaced with product URL
-#: src/modules/AddOnProduct.rb:1572
+#: src/modules/AddOnProduct.rb:1574
msgid "Unable to add product %1."
msgstr "Kan ikke legge til produktet %1."
#. adding the product to the list of products (BNC #269625)
#. no such products
-#: src/modules/AddOnProduct.rb:1764 src/modules/AddOnProduct.rb:1770
+#: src/modules/AddOnProduct.rb:1766 src/modules/AddOnProduct.rb:1772
#: src/modules/Packages.rb:471
msgid "Unknown Product"
msgstr "Ukjent produkt"
@@ -2132,7 +2149,7 @@
#. radio button
#. radio button
-#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1750
+#: src/modules/SourceDialogs.rb:47 src/modules/SourceDialogs.rb:1757
#, fuzzy
#| msgid "&SMB/CIFS"
msgid "S&MB/CIFS"
@@ -2205,7 +2222,7 @@
#. text entry
#. text entry
-#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1614
+#: src/modules/SourceDialogs.rb:143 src/modules/SourceDialogs.rb:1621
msgid "&Path to Directory or ISO Image"
msgstr "&Sti til katalog eller ISO-bilde"
@@ -2273,7 +2290,7 @@
#. label / dialog caption
#. dialog caption
-#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:919
+#: src/modules/SourceDialogs.rb:220 src/modules/SourceDialogs.rb:926
msgid "Local Directory"
msgstr "Lokal katalog"
@@ -2294,17 +2311,17 @@
msgstr "Server og katalog"
#. popup message
-#: src/modules/SourceDialogs.rb:461
+#: src/modules/SourceDialogs.rb:468
msgid "The name of the repository cannot be empty."
msgstr "Et pakkebrønnnavn må angis."
#. text entry
-#: src/modules/SourceDialogs.rb:473
+#: src/modules/SourceDialogs.rb:480
msgid "&Repository Name"
msgstr "Pakkeb&rønnavn"
#. help text
-#: src/modules/SourceDialogs.rb:488
+#: src/modules/SourceDialogs.rb:495
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"
@@ -2313,12 +2330,12 @@
"Bruk <b>Pakkebrønnnavn</b> for å angi pakkebrønnens navn. Hvis feltet er tomt, vil Yast bruke produktnavnet (hvis det er tilgjengelig) eller nettadressen.</p>\n"
#. text entry
-#: src/modules/SourceDialogs.rb:502
+#: src/modules/SourceDialogs.rb:509
msgid "&Service Name"
msgstr "Navn på tjene&ste"
#. help text
-#: src/modules/SourceDialogs.rb:510
+#: src/modules/SourceDialogs.rb:517
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"
@@ -2327,17 +2344,17 @@
"Bruk <b>Navn på tjeneste</b> for å angi tjenestenavnet. Hvis feltet er tomt, vil Yast bruke en del av tjenestens nettadresse.</p>\n"
#. popup message
-#: src/modules/SourceDialogs.rb:545
+#: src/modules/SourceDialogs.rb:552
msgid "URL cannot be empty."
msgstr "Du må angi en nettadresse."
#. text entry
-#: src/modules/SourceDialogs.rb:559
+#: src/modules/SourceDialogs.rb:566
msgid "&URL"
msgstr "&Nettadresse"
#. help text
-#: src/modules/SourceDialogs.rb:573
+#: src/modules/SourceDialogs.rb:580
msgid ""
"<p><big><b>Repository URL</b></big><br>\n"
"Use <b>URL</b> to specify the URL of the repository.</p>"
@@ -2349,16 +2366,16 @@
#. @return widget description map
#. Get widget description map
#. @return widget description map
-#: src/modules/SourceDialogs.rb:746 src/modules/SourceDialogs.rb:1886
+#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
msgid "Edit Parts of the URL"
msgstr "Rediger deler av adressen"
-#: src/modules/SourceDialogs.rb:753 src/modules/SourceDialogs.rb:1893
+#: src/modules/SourceDialogs.rb:760 src/modules/SourceDialogs.rb:1900
msgid "Edit Complete URL"
msgstr "Rediger hele adressen"
#. help text
-#: src/modules/SourceDialogs.rb:765
+#: src/modules/SourceDialogs.rb:772
msgid ""
"<p><big><b>NFS Server</b></big><br>\n"
"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
@@ -2368,7 +2385,7 @@
"Bruk <b>Servernavn</b> og <b>Sti til katalog eller ISO-bilde</b>\n"
"for å angi NFS-serverens vertsnavn og stien på serveren.<p>"
-#: src/modules/SourceDialogs.rb:772
+#: src/modules/SourceDialogs.rb:779
msgid ""
"<p><big><b>Mount Options</b></big><br>\n"
"You can specify extra options used for mounting the NFS volume.\n"
@@ -2381,16 +2398,16 @@
"for mer informasjon og en liste over gyldige valg."
#. radio button
-#: src/modules/SourceDialogs.rb:827
+#: src/modules/SourceDialogs.rb:834
msgid "&CD-ROM"
msgstr "&CD-ROM"
#. radio button
-#: src/modules/SourceDialogs.rb:829
+#: src/modules/SourceDialogs.rb:836
msgid "&DVD-ROM"
msgstr "&DVD-ROM"
-#: src/modules/SourceDialogs.rb:834
+#: src/modules/SourceDialogs.rb:841
msgid ""
"<p><big><b>CD or DVD Media</b></big><br>\n"
"Set <b>CD-ROM</b> or <b>DVD-ROM</b> to specify the type of media.</p>"
@@ -2399,12 +2416,12 @@
"Velg <b>CD-ROM</b> eller <b>DVD-ROM</b> for å angi medietypen.</p>"
#. dialog caption
-#: src/modules/SourceDialogs.rb:934
+#: src/modules/SourceDialogs.rb:941
msgid "ISO Image File"
msgstr "ISO-bildefil"
#. error popup - the entered path is not a directory
-#: src/modules/SourceDialogs.rb:957
+#: src/modules/SourceDialogs.rb:964
msgid ""
"The entered path is not a directory\n"
"or the directory does not exist.\n"
@@ -2413,7 +2430,7 @@
"eller katalogen finnes ikke.\n"
#. error popup - the entered path is not a regular file
-#: src/modules/SourceDialogs.rb:987
+#: src/modules/SourceDialogs.rb:994
msgid ""
"The entered path is not a file\n"
"or the file does not exist.\n"
@@ -2422,7 +2439,7 @@
"eller filen finnes ikke.\n"
#. continue/cancel popup, %1 is a file name
-#: src/modules/SourceDialogs.rb:1011
+#: src/modules/SourceDialogs.rb:1018
msgid ""
"File '%1'\n"
"does not seem to be an ISO image.\n"
@@ -2433,17 +2450,17 @@
"Vil du bruke den likevel?\n"
#. text entry
-#: src/modules/SourceDialogs.rb:1032
+#: src/modules/SourceDialogs.rb:1039
msgid "&Path to Directory"
msgstr "&Sti til katalog"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1040 src/modules/SourceDialogs.rb:1298
-#: src/modules/SourceDialogs.rb:1365
+#: src/modules/SourceDialogs.rb:1047 src/modules/SourceDialogs.rb:1305
+#: src/modules/SourceDialogs.rb:1372
msgid "&Plain RPM Directory"
msgstr "&Ren RPM-katalog"
-#: src/modules/SourceDialogs.rb:1055
+#: src/modules/SourceDialogs.rb:1062
msgid ""
"<p><big><b>Local Directory</b></big><br>\n"
"Use <b>Path to Directory</b> to specify the path to the\n"
@@ -2458,20 +2475,20 @@
"<b>Ren RPM-katalog</b> velges.</p>\n"
#. `opt(`hstretch),
-#: src/modules/SourceDialogs.rb:1291
+#: src/modules/SourceDialogs.rb:1298
msgid "&USB Mass Storage Device"
msgstr "&USB masselagringsenhet"
#. the spacing is added to make the widget wider
-#: src/modules/SourceDialogs.rb:1296 src/modules/SourceDialogs.rb:1363
+#: src/modules/SourceDialogs.rb:1303 src/modules/SourceDialogs.rb:1370
msgid "&File System"
msgstr "&Filsystem"
-#: src/modules/SourceDialogs.rb:1297 src/modules/SourceDialogs.rb:1364
+#: src/modules/SourceDialogs.rb:1304 src/modules/SourceDialogs.rb:1371
msgid "Dire&ctory"
msgstr "&Katalog"
-#: src/modules/SourceDialogs.rb:1302
+#: src/modules/SourceDialogs.rb:1309
msgid ""
"<p><big><b>USB Stick or Disk</b></big><br>\n"
"Select the USB device on which the repository is located.\n"
@@ -2491,7 +2508,7 @@
#. 'auto' is a value in the combo box widget, do not translate it!
#. 'auto' is a value in the combo box widget, do not translate it!
-#: src/modules/SourceDialogs.rb:1312 src/modules/SourceDialogs.rb:1379
+#: src/modules/SourceDialogs.rb:1319 src/modules/SourceDialogs.rb:1386
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"
@@ -2502,11 +2519,11 @@
"eller hvis du vil bruke et spesielt filsystem, velger du dette fra listen.</p>\n"
#. combobox title
-#: src/modules/SourceDialogs.rb:1362
+#: src/modules/SourceDialogs.rb:1369
msgid "&Disk Device"
msgstr "&Diskenhet"
-#: src/modules/SourceDialogs.rb:1369
+#: src/modules/SourceDialogs.rb:1376
msgid ""
"<p><big><b>Disk</b></big><br>\n"
"Select the disk on which the repository is located.\n"
@@ -2525,12 +2542,12 @@
"<b>Ren RPM-katalog</b>.</p>\n"
#. text entry
-#: src/modules/SourceDialogs.rb:1395
+#: src/modules/SourceDialogs.rb:1402
msgid "&Path to ISO Image"
msgstr "&Sti til ISO-bilde"
#. push button
-#: src/modules/SourceDialogs.rb:1415
+#: src/modules/SourceDialogs.rb:1422
msgid ""
"<p><big><b>Local ISO Image</b></big><br>\n"
"Use <b>Path to ISO Image</b> to specify the path to the\n"
@@ -2541,71 +2558,71 @@
"filen som inneholder ISO-bildet av installasjonsmediet.</p>"
#. text entry
-#: src/modules/SourceDialogs.rb:1596
+#: src/modules/SourceDialogs.rb:1603
msgid "Server &Name"
msgstr "Server&navn"
-#: src/modules/SourceDialogs.rb:1600
+#: src/modules/SourceDialogs.rb:1607
msgid "&Port"
msgstr "&Port"
#. text entry
-#: src/modules/SourceDialogs.rb:1605
+#: src/modules/SourceDialogs.rb:1612
msgid "&Share"
msgstr "&Delt ressurs"
#. checkbox label
-#: src/modules/SourceDialogs.rb:1618
+#: src/modules/SourceDialogs.rb:1625
msgid "ISO &Image"
msgstr "&ISO-bilde"
#. text entry
-#: src/modules/SourceDialogs.rb:1621
+#: src/modules/SourceDialogs.rb:1628
msgid "&Directory on Server"
msgstr "&Katalog på server"
#. frame
-#: src/modules/SourceDialogs.rb:1626
+#: src/modules/SourceDialogs.rb:1633
msgid "Au&thentication"
msgstr "Au&tentisering"
#. check box
-#: src/modules/SourceDialogs.rb:1633
+#: src/modules/SourceDialogs.rb:1640
msgid "&Anonymous"
msgstr "&Anonym"
#. text entry
-#: src/modules/SourceDialogs.rb:1642
+#: src/modules/SourceDialogs.rb:1649
msgid "&Workgroup or Domain"
msgstr "&Arbeidsgruppe eller domene"
#. text entry
-#: src/modules/SourceDialogs.rb:1651
+#: src/modules/SourceDialogs.rb:1658
msgid "&User Name"
msgstr "&Brukernavn"
#. password entry
-#: src/modules/SourceDialogs.rb:1658
+#: src/modules/SourceDialogs.rb:1665
msgid "&Password"
msgstr "&Passord"
#. radio button
-#: src/modules/SourceDialogs.rb:1733
+#: src/modules/SourceDialogs.rb:1740
msgid "&FTP"
msgstr "&FTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1736
+#: src/modules/SourceDialogs.rb:1743
msgid "H&TTP"
msgstr "H&TTP"
#. radio button
-#: src/modules/SourceDialogs.rb:1743
+#: src/modules/SourceDialogs.rb:1750
msgid "HTT&PS"
msgstr "HTT&PS"
#. help text - server dialog
-#: src/modules/SourceDialogs.rb:1917
+#: src/modules/SourceDialogs.rb:1924
msgid ""
"<p><big><b>Server and Directory</b></big><br>\n"
"Use <b>Server Name</b> and <b>Path to Directory or ISO Image</b>\n"
@@ -2630,7 +2647,7 @@
"av mediet, velg <b>ISO-diskbilde</b>.</p>\n"
#. help text - server dialog, there is a "Port" widget
-#: src/modules/SourceDialogs.rb:1930
+#: src/modules/SourceDialogs.rb:1937
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"
@@ -2641,12 +2658,12 @@
#. Returns whether Community Repositories are defined in the control file.
#.
#. @return [Boolean] whether defined
-#: src/modules/SourceDialogs.rb:1992
+#: src/modules/SourceDialogs.rb:1999
msgid "I would like to install an additional Add On Product"
msgstr ""
#. help text
-#: src/modules/SourceDialogs.rb:2119
+#: src/modules/SourceDialogs.rb:2126
msgid ""
"<p><big><b>Media Type</b></big><br>\n"
"The software repository can be located on CD, on a network server,\n"
@@ -2657,7 +2674,7 @@
"eller på harddisken.</p>"
#. help, continued
-#: src/modules/SourceDialogs.rb:2128
+#: src/modules/SourceDialogs.rb:2135
msgid ""
"<p>\n"
"To add <b>CD</b> or <b>DVD</b>,\n"
@@ -2668,7 +2685,7 @@
"må du ha en CD eller DVD med produktet tilgjengelig.</p>"
#. help, continued
-#: src/modules/SourceDialogs.rb:2138
+#: src/modules/SourceDialogs.rb:2145
msgid ""
"<p>\n"
"The product CDs can be copied to the hard disk.\n"
@@ -2684,7 +2701,7 @@
"til samme katalog.</p>\n"
#. help, continued
-#: src/modules/SourceDialogs.rb:2150
+#: src/modules/SourceDialogs.rb:2157
msgid ""
"<p>\n"
"Network installation requires a working network connection.\n"
@@ -2697,25 +2714,25 @@
"første CD er plassert, for eksempel /data1/CD1.</p>\n"
#. error popup
-#: src/modules/SourceDialogs.rb:2165
+#: src/modules/SourceDialogs.rb:2172
msgid "Select the media type"
msgstr "Velg medietype"
-#: src/modules/SourceDialogs.rb:2171
+#: src/modules/SourceDialogs.rb:2178
msgid "Insert the add-on product CD"
msgstr "Sett inn CD-en med tilleggsproduktet"
-#: src/modules/SourceDialogs.rb:2172
+#: src/modules/SourceDialogs.rb:2179
msgid "Insert the add-on product DVD"
msgstr "Sett inn DVD-en med tilleggsproduktet"
#. ask for a medium
-#: src/modules/SourceDialogs.rb:2190
+#: src/modules/SourceDialogs.rb:2197
msgid "No USB disk was detected."
msgstr "Ingen USB-disk ble funnet."
-#. TODO: disable "download" option when CD or DVD source is selected
-#: src/modules/SourceDialogs.rb:2393
+#. use three slashes as third slash means path
+#: src/modules/SourceDialogs.rb:2403
msgid ""
"<p><b>Download Files</b><br>\n"
"Each repository has description files which describe the content of the\n"
@@ -2730,12 +2747,12 @@
"automatisk laste ned filene når det er behov for dem senere. </p>\n"
#. dialog caption
-#: src/modules/SourceDialogs.rb:2613
+#: src/modules/SourceDialogs.rb:2623
msgid "Media Type"
msgstr "Medietype"
#. dialog caption
-#: src/modules/SourceDialogs.rb:2637
+#: src/modules/SourceDialogs.rb:2647
#, fuzzy
#| msgid "Add-On Product"
msgid "Add On Product"
@@ -2745,7 +2762,7 @@
#. Returns boolean whether user confirmed to abort the configuration
#.
#. @return [Boolean] whether to abort
-#: src/modules/SourceDialogs.rb:2668
+#: src/modules/SourceDialogs.rb:2678
#, fuzzy
#| msgid "URL entered is not valid"
msgid "URL scheme '%s' is not valid."
@@ -2957,11 +2974,6 @@
msgid "Deselect some packages."
msgstr "Fjern noen pakker fra utvalget."
-#, fuzzy
-#~| msgid "URL: %1"
-#~ msgid "Raw URL: %s"
-#~ msgstr "Nettadresse: %1"
-
#~ msgid "Downloading patch RPM %1 (download size %2)"
#~ msgstr "Laster ned pakkeoppdaterings-RPM %1 (nedlastingsstørrelse %2)"
Modified: branches/plus-SLE12-SP2/yast/nb/po/pam.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/pam.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/pam.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: pam\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2006-01-03 15:43+0100\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/pkg-bindings.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/pkg-bindings.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/pkg-bindings.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: pkg-bindings\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-08-12 17:54+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -50,12 +50,12 @@
msgstr "<P><BIG><B>Oppdaterer pakkebrønn</B></BIG></P><P>Pakkebehandleren oppdaterer innholdet i pakkebrønnen...</P>"
#. error message
-#: src/Package.cc:658
+#: src/Package.cc:655
msgid "The package cannot be selected to install."
msgstr "Pakken kan ikke velges for installasjon."
#. error message
-#: src/Package.cc:664
+#: src/Package.cc:661
msgid "The package is not available."
msgstr "Pakken er ikke tilgjengelig."
Modified: branches/plus-SLE12-SP2/yast/nb/po/printer.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/printer.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/printer.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: printer\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-08-12 23:45+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -203,7 +203,7 @@
#. where %1 will be replaced by the server name:
#. where %1 will be replaced by the server name:
#. where %1 will be replaced by the server name:
-#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1101
+#: src/include/printer/autoconfig.rb:97 src/include/printer/overview.rb:1098
#: src/include/printer/policies.rb:135
#: src/include/printer/printingvianetwork.rb:463
#: src/include/printer/sharing.rb:639
@@ -219,8 +219,8 @@
#. Only a simple message because this error does not happen on a normal system
#. (i.e. a system which is not totally broken or totally messed up).
#. Remove the 'ServerName' entry in /etc/cups/client.conf:
-#: src/include/printer/autoconfig.rb:115 src/include/printer/overview.rb:220
-#: src/include/printer/overview.rb:1118 src/include/printer/policies.rb:153
+#: 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/printingvianetwork.rb:478
#: src/include/printer/sharing.rb:657
msgid "Failed to remove the 'ServerName' entry in /etc/cups/client.conf"
@@ -345,7 +345,7 @@
#: src/include/printer/basicmodify.rb:371
#: src/include/printer/basicmodify.rb:899
#: src/include/printer/connectionwizard.rb:551
-#: src/include/printer/overview.rb:89
+#: src/include/printer/overview.rb:86
msgid "Description"
msgstr "Beskrivelse"
@@ -449,8 +449,8 @@
#. does not set a valid Printer::selected_connections_index so that the BasicAddDialog
#. does not preselect a connection so that the first connection in the list is preselected
#. (via Table widget fallback) which is still better than an arbitrary preselected entry:
-#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:593
-#: src/include/printer/overview.rb:679 src/include/printer/overview.rb:1153
+#: src/include/printer/basicadd.rb:337 src/include/printer/overview.rb:590
+#: src/include/printer/overview.rb:676 src/include/printer/overview.rb:1150
msgid "Nothing Selected"
msgstr "Ingenting er valgt"
@@ -3517,56 +3517,56 @@
#. Authors: Johannes Meixner
#.
#. $Id: overview.ycp 29363 2006-03-24 08:20:43Z mzugec $
-#: src/include/printer/overview.rb:49
+#: src/include/printer/overview.rb:46
msgid "Show"
msgstr "Vis"
#. CheckBox to select local print queues to be listed:
-#: src/include/printer/overview.rb:55
+#: src/include/printer/overview.rb:52
msgid "&Local"
msgstr "&Lokal"
#. CheckBox to select remote print queues to be listed:
-#: src/include/printer/overview.rb:62
+#: src/include/printer/overview.rb:59
msgid "&Remote"
msgstr "Ekste&rn"
#. Where the queue configuration exists (local or remote):
-#: src/include/printer/overview.rb:83
+#: src/include/printer/overview.rb:80
msgid "Configuration"
msgstr "Konfigurasjon"
#. Header of a Table column with a list of print queues.
#. Print queue name:
-#: src/include/printer/overview.rb:86
+#: src/include/printer/overview.rb:83
msgid "Name"
msgstr "Navn"
#. Header of a Table column with a list of print queues.
#. Location of the printer (e.g. second floor, room 2.3):
-#: src/include/printer/overview.rb:92
+#: src/include/printer/overview.rb:89
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:95
+#: src/include/printer/overview.rb:92
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:98
+#: src/include/printer/overview.rb:95
msgid "Status"
msgstr "Status"
#. PushButton label to refresh the list of print queues:
-#: src/include/printer/overview.rb:110
+#: src/include/printer/overview.rb:107
msgid "Re&fresh List"
msgstr "Opp&dater liste"
#. PushButton label to print a test page:
-#: src/include/printer/overview.rb:115
+#: src/include/printer/overview.rb:112
msgid "Print &Test Page"
msgstr "Skriv ut &testside"
@@ -3576,7 +3576,7 @@
#. to check whether or not a local cupsd is accessible.
#. The command is shown here to the user (even if it is a bit technical)
#. to have him informed what goes on here and what he can do on his own.
-#: src/include/printer/overview.rb:131
+#: src/include/printer/overview.rb:128
msgid ""
"A locally running CUPS daemon is required, but it seems to be not accessible.\n"
"Check with 'lpstat -h localhost -r' whether a local cupsd is accessible.\n"
@@ -3592,7 +3592,7 @@
#. By default the cupsd uses the official IPP port (631).
#. If not, the user must have intentionally and manually changed
#. the port setting for the cupsd in /etc/cups/cupsd.conf
-#: src/include/printer/overview.rb:143
+#: src/include/printer/overview.rb:140
msgid ""
"The CUPS daemon seems not to listen on the official IANA IPP port (631).\n"
"Check with 'netstat -nap | grep cupsd' where the cupsd actually listens.\n"
@@ -3615,7 +3615,7 @@
#. Busy message:
#. Body of a Popup::ShowFeedback
-#: src/include/printer/overview.rb:185
+#: src/include/printer/overview.rb:182
msgid ""
"Running several tests regarding CUPS server accessibility...\n"
"(this might take some time)"
@@ -3624,67 +3624,67 @@
"(dette kan ta en stund)"
#. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:204
+#: src/include/printer/overview.rb:201
msgid "Do no longer use the inaccessible CUPS server '%1'?"
msgstr "Vil du ikke lenger bruker den utilgjengelige CUPS-serveren '%1'?"
#. Popup::YesNoHeadline body recommendation how to answer the headline question
#. where %1 will be replaced by the server name:
-#: src/include/printer/overview.rb:210
+#: src/include/printer/overview.rb:207
msgid "To proceed, you should agree that '%1' will be no longer used."
msgstr "For å fortsette må du bekrefte at '%1' ikke lenger vil bli brukt."
#. The 'ServerName' entry in /etc/cups/client.conf was removed
#. so that it is now no longer a real client-only config and
#. therefore the Printerlib::client_* values must be determined anew:
-#: src/include/printer/overview.rb:226 src/include/printer/overview.rb:237
+#: src/include/printer/overview.rb:223 src/include/printer/overview.rb:234
msgid "A non-accessible server leads to an endless sequence of delays and failures."
msgstr "En server du ikke har tilgang til, fører til en endeløs rekke av forsinkelser og feil."
#. where %1 will be replaced by the CUPS server name.
-#: src/include/printer/overview.rb:256
+#: src/include/printer/overview.rb:253
msgid "CUPS Server %1"
msgstr "CUPS-server %1"
#. Busy message:
#. Body of a Popup::ShowFeedback:
-#: src/include/printer/overview.rb:280
+#: src/include/printer/overview.rb:277
msgid "Testing if CUPS server is accessible..."
msgstr "Kontrollerer om en CUPS-server er tilgjengelig..."
#. Body of a Popup::AnyMessage when no queue was selected from the list:
#. Body of a Popup::AnyMessage when no queue was selected from the list:
#. Body of a Popup::AnyMessage when no queue was selected from the list:
-#: src/include/printer/overview.rb:595 src/include/printer/overview.rb:681
-#: src/include/printer/overview.rb:1155
+#: src/include/printer/overview.rb:592 src/include/printer/overview.rb:678
+#: src/include/printer/overview.rb:1152
msgid "Select an entry."
msgstr "Velg en oppføring."
-#: src/include/printer/overview.rb:608
+#: src/include/printer/overview.rb:605
msgid "Cannot Delete"
msgstr "Kan ikke slette"
#. Body of a Popup::AnyMessage when a remote queue was selected to be deleted:
-#: src/include/printer/overview.rb:610
+#: src/include/printer/overview.rb:607
msgid "This is a remote configuration. Only local configurations can be deleted."
msgstr "Dette er et eksternt oppsett. Bare lokale oppsett kan slettes."
-#: src/include/printer/overview.rb:617
+#: src/include/printer/overview.rb:614
msgid "Confirm Deletion"
msgstr "Bekreft sletting"
#. Body of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:619
+#: src/include/printer/overview.rb:616
msgid "The selected configuration would be deleted immediately and cannot be restored."
msgstr "Det valgte oppsettet vil bli slettet umiddelbart, og kan ikke gjenopprettes."
#. 'Yes' button label of a confirmation popup before a queue will be deleted:
-#: src/include/printer/overview.rb:623
+#: src/include/printer/overview.rb:620
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:625
+#: src/include/printer/overview.rb:622
msgid "Do not delete it"
msgstr "Ikke slett"
@@ -3695,33 +3695,33 @@
#. Nevertheless it is possible to delete a class with the YaST printer module
#. so that the user can get rid of a class which may have been created by accident
#. with whatever other setup tool:
-#: src/include/printer/overview.rb:640
+#: src/include/printer/overview.rb:637
msgid "Confirm Deletion of a Class"
msgstr "Bekreft sletting av en klasse"
#. Body of a confirmation popup before a class will be deleted:
-#: src/include/printer/overview.rb:642
+#: src/include/printer/overview.rb:639
msgid "A deleted class cannot be re-created with this tool."
msgstr "En slettet klasse kan ikke gjenopprettes med dette verktøyet."
-#: src/include/printer/overview.rb:688
+#: src/include/printer/overview.rb:685
msgid "Rejecting Print Jobs"
msgstr "Avviser utskriftsjobber"
#. Body of a Popup::AnyMessage when the queue rejects print jobs:
-#: src/include/printer/overview.rb:690
+#: src/include/printer/overview.rb:687
msgid "The testpage cannot be printed because print jobs are rejected."
msgstr "Testsiden kan ikke skrives ut fordi utskriftsjobber avvises."
#. Do a refresh of the overview content to be on the safe side.
#. Perhaps the actual current queue state is no longer "rejecting".
#. Re-run the OverviewDialog (with re-created queue status) via the sequencer:
-#: src/include/printer/overview.rb:700
+#: src/include/printer/overview.rb:697
msgid "Printout Disabled"
msgstr "Utskrift deaktivert"
#. Body of a Popup::AnyMessage when printing is disabled for the queue:
-#: src/include/printer/overview.rb:702
+#: src/include/printer/overview.rb:699
msgid "The testpage cannot be printed because printout is disabled."
msgstr "Testsiden kan ikke skrives ut fordi utskrift er deaktivert."
@@ -3730,25 +3730,25 @@
#. the test above makes sure that the queue has printing enabled.
#. When this command fails for whatever reason, it is a safe fallback
#. to assume that there are no pending jobs in the queue:
-#: src/include/printer/overview.rb:731
+#: src/include/printer/overview.rb:728
msgid "There are pending print jobs which might be deleted before the testpage is printed."
msgstr "Det er utskriftsjobber i køen som kanskje vil bli slettet før testsiden skrives ut."
#. where %1 will be replaced by the queue name.
#. where %1 will be replaced by the queue name.
-#: src/include/printer/overview.rb:751 src/include/printer/overview.rb:920
+#: src/include/printer/overview.rb:748 src/include/printer/overview.rb:917
msgid "Delete Pending Print Jobs For %1"
msgstr "Slett ventende utskriftsjobber for %1"
#. 'Yes' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:759
+#: src/include/printer/overview.rb:756
msgid "Delete them before printing testpage"
msgstr "Slett dem før utskrift av testside"
#. 'No' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:762
+#: src/include/printer/overview.rb:759
msgid "Print testpage after the other jobs"
msgstr "Skriv ut testsiden etter de andre utskriftsjobbene"
@@ -3756,7 +3756,7 @@
#. Only a simple message because this error does not happen on a normal system.
#. where %1 will be replaced by the queue name.
#. Only a simple message because this error does not happen on a normal system.
-#: src/include/printer/overview.rb:775 src/include/printer/overview.rb:944
+#: src/include/printer/overview.rb:772 src/include/printer/overview.rb:941
msgid "Failed to delete all pending jobs for %1."
msgstr "Kunne ikke slette alle jobber i køen for %1."
@@ -3775,28 +3775,28 @@
#. + (Printed with CUPS) show
#. make it obvious that it is not a YaST testpage but a CUPS testpage
#. and it is now independent of the CUPS version.
-#: src/include/printer/overview.rb:802
+#: src/include/printer/overview.rb:799
msgid "Test printout"
msgstr "Utskriftstest"
#. Popup::AnyQuestion message:
-#: src/include/printer/overview.rb:804
+#: src/include/printer/overview.rb:801
msgid "Print one or two pages e.g. to test duplex printing"
msgstr "Skriv ut én eller to sider, f.eks. for å teste tosidig utskrift"
#. Popup::AnyQuestion so called 'yes' (default) button label:
-#: src/include/printer/overview.rb:806
+#: src/include/printer/overview.rb:803
msgid "Single test page"
msgstr "Én testside"
#. Popup::AnyQuestion so called 'no' button label:
-#: src/include/printer/overview.rb:808
+#: src/include/printer/overview.rb:805
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:838
+#: src/include/printer/overview.rb:835
msgid "Failed to print testpage for %1."
msgstr "Kunne ikke skrive ut testside for %1."
@@ -3804,25 +3804,25 @@
#. there might be whatever reason (e.g. a remote queue might have been deleted in the meantime)
#. so that a refresh of the overview content is needed to be on the safe side.
#. Re-run the OverviewDialog (with re-created queue status) via the sequencer:
-#: src/include/printer/overview.rb:855
+#: src/include/printer/overview.rb:852
msgid "Wait Until Testpage Printing Finished"
msgstr "Vent til testutskriften er fullført"
#. Popup::AnyQuestion message regarding testpage printout result
#. where %1 will be replaced by the queue name.
-#: src/include/printer/overview.rb:859
+#: src/include/printer/overview.rb:856
msgid "Sent testpage to %1. Printing should start soon."
msgstr "Testside sendt til %1. Utskriften bør snart starte."
#. Popup::AnyQuestion 'Yes' button label
#. regarding a positive testpage printout result:
-#: src/include/printer/overview.rb:864
+#: src/include/printer/overview.rb:861
msgid "Testpage printout was successful"
msgstr "Testutskriften var vellykket"
#. Popup::AnyQuestion 'No' button label
#. regarding a negative testpage printout result:
-#: src/include/printer/overview.rb:867
+#: src/include/printer/overview.rb:864
msgid "Testpage printing failed"
msgstr "Testutskrift mislyktes."
@@ -3842,53 +3842,53 @@
#. spit out zillions of sheets with nonsense characters.
#. When this command fails for whatever reason, it is a safe fallback
#. to assume that there are no pending jobs in the queue:
-#: src/include/printer/overview.rb:900
+#: src/include/printer/overview.rb:897
msgid "There are pending print jobs which might be deleted now."
msgstr "Det er utskriftsjobber i køen som kan bli slettet nå."
#. 'Yes' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:928
+#: src/include/printer/overview.rb:925
msgid "Delete all pending jobs"
msgstr "Slett alle ventende jobber"
#. 'No' button label of a confirmation popup
#. before all pending jobs in a queue will be deleted:
-#: src/include/printer/overview.rb:931
+#: src/include/printer/overview.rb:928
msgid "Do not delete them"
msgstr "Ikke slett"
#. Ignore an effectively empty test_print_cups_error_log:
-#: src/include/printer/overview.rb:1046
+#: src/include/printer/overview.rb:1043
msgid "For the full log, see the /var/log/cups/error_log file."
msgstr "Filen /var/log/cups/error_log inneholder hele loggen."
-#: src/include/printer/overview.rb:1051
+#: src/include/printer/overview.rb:1048
msgid "CUPS log information while processing the testpage for %1 (English only)"
msgstr "CUPS-logg for behandling av testside for %1 (kun engelsk)"
#. but the test_print_cups_error_log was effectively empty,
#. show a very generic info to the user to show at least something:
-#: src/include/printer/overview.rb:1068
+#: src/include/printer/overview.rb:1065
msgid "For CUPS log information, see the /var/log/cups/error_log file."
msgstr "Filen /var/log/cups/error_log inneholder CUPS-informasjon."
#. show a very generic info to the user to show at least something:
-#: src/include/printer/overview.rb:1078
+#: src/include/printer/overview.rb:1075
msgid "When printing via a remote system fails, you may ask an admin of the remote system."
msgstr "Be en administrator for det eksterne systemet om hjelp hvis en utskrift via et eksternt system mislykkes."
#. PopupYesNoHeadline body:
-#: src/include/printer/overview.rb:1105
+#: src/include/printer/overview.rb:1102
msgid "A remote CUPS server setting conflicts with adding a configuration."
msgstr "Det er en konflikt mellom ekstern CUPS-serverinnstilling og nytt oppsett."
-#: src/include/printer/overview.rb:1162
+#: src/include/printer/overview.rb:1159
msgid "Cannot Modify"
msgstr "Kan ikke endre"
#. Body of a Popup::AnyMessage when a remote queue was selected to be modified:
-#: src/include/printer/overview.rb:1164
+#: src/include/printer/overview.rb:1161
msgid "This is a remote configuration. Only local configurations can be modified."
msgstr "Dette er et eksternt oppsett. Bare lokale oppsett kan endres."
Modified: branches/plus-SLE12-SP2/yast/nb/po/product-creator.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/product-creator.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/product-creator.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: product-creator\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-10-01 12:41+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/proxy.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/proxy.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/proxy.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/rdp.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/rdp.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/rdp.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/rear.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/rear.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/rear.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
@@ -230,13 +230,13 @@
msgstr "Leser Rear-oppsett"
#: src/include/rear/ui.rb:698
+msgid "Analyzing system"
+msgstr "Analyserer systemet"
+
+#: src/include/rear/ui.rb:698
msgid "Reading rear settings"
msgstr "Leser Rear-innstillinger"
-#: src/include/rear/ui.rb:698
-msgid "Analyzing system"
-msgstr "Analyserer systemet"
-
#: src/include/rear/ui.rb:699
msgid "Analyzing system..."
msgstr "Analyserer systemet..."
Modified: branches/plus-SLE12-SP2/yast/nb/po/registration.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/registration.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/registration.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: registration\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2009-10-10 09:51+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -68,7 +68,7 @@
#. dialog title
#. display and run a dialog for updating the current registration
#. @return [Symbol] user input
-#: src/clients/inst_scc.rb:189
+#: src/clients/inst_scc.rb:186
#: 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
@@ -86,26 +86,26 @@
msgstr ""
#. popup message: registration finished properly
-#: src/clients/scc_auto.rb:204
+#: src/clients/scc_auto.rb:201
#, fuzzy
#| msgid "Registration was successful."
msgid "Registration was successfull."
msgstr "Registreringen er fullført."
#. remove possible duplicates
-#: src/clients/scc_auto.rb:232
+#: src/clients/scc_auto.rb:229
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:250
+#: src/clients/scc_auto.rb:247
#, fuzzy
#| msgid "Download CA Certificate"
msgid "Downloading SSL Certificate"
msgstr "Last ned CA-sertifikat"
-#: src/clients/scc_auto.rb:254
+#: src/clients/scc_auto.rb:251
#, fuzzy
#| msgid "Import Certificate"
msgid "Importing SSL Certificate"
@@ -114,8 +114,8 @@
#. %s is name of given product
#. then register the product(s)
#. %s is name of given product
-#: src/clients/scc_auto.rb:329 src/lib/registration/registration_ui.rb:283
-#: src/lib/registration/registration_ui.rb:316
+#: src/clients/scc_auto.rb:326 src/lib/registration/registration_ui.rb:281
+#: src/lib/registration/registration_ui.rb:311
#, fuzzy
#| msgid "Registration Code"
msgid "Registering %s ..."
@@ -297,19 +297,30 @@
msgstr "Fingeravtrykk:"
#. Error popup
-#: src/lib/registration/connect_helpers.rb:76
+#: 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
msgid "Connection time out."
msgstr ""
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:84
+#: src/lib/registration/connect_helpers.rb:93
#, fuzzy
#| msgid "Registration code is invalid."
msgid "Check that this system is known to the registration server."
msgstr "Registreringskoden er ugyldig."
#. TRANSLATORS: additional hint for an error message
-#: src/lib/registration/connect_helpers.rb:90
+#: src/lib/registration/connect_helpers.rb:99
msgid ""
"If you are upgrading from SLE11 make sure the SCC server\n"
"knows the old NCC registration. Synchronization from NCC to SCC\n"
@@ -325,34 +336,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: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
+#: 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
msgid "Registration failed."
msgstr "Registreringen mislyktes."
-#: src/lib/registration/connect_helpers.rb:114
+#: src/lib/registration/connect_helpers.rb:123
#, fuzzy
#| msgid "Registration can not be performed."
msgid "Registration client error."
msgstr "Registreringen kan ikke utføres."
-#: src/lib/registration/connect_helpers.rb:116
+#: src/lib/registration/connect_helpers.rb:125
msgid ""
"Registration server error.\n"
"Retry registration later."
msgstr ""
#. error message
-#: src/lib/registration/connect_helpers.rb:158
+#: src/lib/registration/connect_helpers.rb:167
msgid "Received SSL Certificate does not match the expected certificate."
msgstr ""
#. %s are error details
-#: src/lib/registration/connect_helpers.rb:188
+#: src/lib/registration/connect_helpers.rb:197
#, fuzzy
#| msgid "Details..."
msgid "Details: %s"
@@ -361,7 +372,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:217
+#: src/lib/registration/connect_helpers.rb:226
msgid ""
"A certificate has been already imported\n"
"but the server connection still cannot be trusted.\n"
@@ -371,23 +382,23 @@
msgstr ""
#. progress label
-#: src/lib/registration/connect_helpers.rb:229
+#: src/lib/registration/connect_helpers.rb:238
msgid "Importing the SSL certificate"
msgstr ""
-#: src/lib/registration/connect_helpers.rb:230
+#: src/lib/registration/connect_helpers.rb:239
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:251
+#: src/lib/registration/connect_helpers.rb:260
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:270
+#: src/lib/registration/connect_helpers.rb:279
msgid ""
"An old registration server was detected at\n"
"%s.\n"
@@ -395,26 +406,6 @@
"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
-#, fuzzy
-#| msgid "Invalid value."
-msgid "Invalid URL."
-msgstr "Ugyldig verdi."
-
-#. 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
@@ -445,7 +436,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:269
+#: src/lib/registration/registration_ui.rb:267
msgid "Registering the System..."
msgstr ""
@@ -454,8 +445,8 @@
#. updating registered addon/extension, %s is an extension name
#. TRANSLATORS: Progress label
#: src/lib/registration/registration_ui.rb:106
-#: src/lib/registration/registration_ui.rb:148
-#: src/lib/registration/registration_ui.rb:353
+#: src/lib/registration/registration_ui.rb:146
+#: src/lib/registration/registration_ui.rb:346
#: src/lib/registration/ui/migration_repos_workflow.rb:304
#, fuzzy
#| msgid "Updating /etc/hosts ..."
@@ -463,7 +454,7 @@
msgstr "Oppdaterer /etc/hosts..."
#. TRANSLATORS: progress label
-#: src/lib/registration/registration_ui.rb:165
+#: src/lib/registration/registration_ui.rb:163
#, fuzzy
#| msgid "Loading configuration %1..."
msgid "Synchronizing Products..."
@@ -475,35 +466,35 @@
#. @return [ArrayRegistration::Addon] available addons
#. download the addons from SCC, let the user select addons to install
#. @return [Symbol] the user input
-#: src/lib/registration/registration_ui.rb:179
+#: src/lib/registration/registration_ui.rb:177
#: src/lib/registration/ui/autoyast_config_workflow.rb:106
#, fuzzy
#| msgid "Registration Module Help"
msgid "Loading Available Extensions and Modules..."
msgstr "Hjelp for registreringsmodul"
-#: src/lib/registration/registration_ui.rb:193
+#: src/lib/registration/registration_ui.rb:191
#, fuzzy
#| msgid "Loading configuration %1..."
msgid "Loading Migration Products..."
msgstr "Leser oppsettet %1..."
#. dialog title
-#: src/lib/registration/registration_ui.rb:210
+#: src/lib/registration/registration_ui.rb:208
#, fuzzy
#| msgid "Registration Module Help"
msgid "Register Extensions and Modules"
msgstr "Hjelp for registreringsmodul"
#. help text
-#: src/lib/registration/registration_ui.rb:214
+#: src/lib/registration/registration_ui.rb:212
#, fuzzy
#| msgid "<p>Please wait, while volumes are being detected.</p>"
msgid "<p>Extensions and Modules are being registered.</p>"
msgstr "<p>Vent mens volumene registreres.</p>"
#. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:239
+#: src/lib/registration/registration_ui.rb:237
#, fuzzy
#| msgid "Use custom registration server "
msgid ""
@@ -512,7 +503,7 @@
msgstr "Bruk egendefinert registreringsserver"
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:243
+#: src/lib/registration/registration_ui.rb:241
#, fuzzy
#| msgid ""
#| "Would you like to use these mount points\n"
@@ -526,7 +517,7 @@
#. Yast::Mode.update
#. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line
-#: src/lib/registration/registration_ui.rb:247
+#: src/lib/registration/registration_ui.rb:245
#, fuzzy
#| msgid "Would you like to enable access to the profile repository?"
msgid ""
@@ -563,7 +554,7 @@
#. error message
#. error message
-#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:293
+#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292
#, fuzzy
#| msgid "Starting registration..."
msgid "Saving repository configuration failed."
@@ -586,12 +577,12 @@
msgstr ""
#. error message
-#: src/lib/registration/sw_mgmt.rb:280
+#: src/lib/registration/sw_mgmt.rb:279
msgid "Refreshing service '%s' failed."
msgstr ""
#. TRANSLATORS: %s is a product name
-#: src/lib/registration/sw_mgmt.rb:487
+#: src/lib/registration/sw_mgmt.rb:486
#, fuzzy
#| msgid "No products found to be registered."
msgid ""
@@ -817,7 +808,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:140
+#: src/lib/registration/ui/base_system_registration_dialog.rb:133
#, fuzzy
#| msgid "Registration Code"
msgid "Registration &Code"
@@ -858,7 +849,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:138
+#: src/lib/registration/ui/base_system_registration_dialog.rb:131
#, fuzzy
#| msgid "Email Address"
msgid "&E-mail Address"
@@ -952,12 +943,12 @@
msgstr ""
#. help text
-#: src/lib/registration/ui/base_system_registration_dialog.rb:149
+#: src/lib/registration/ui/base_system_registration_dialog.rb:142
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:184
+#: src/lib/registration/ui/base_system_registration_dialog.rb:177
msgid ""
"If you do not register your system we will not be able\n"
"to grant you access to the update repositories.\n"
@@ -970,7 +961,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:201
+#: src/lib/registration/ui/base_system_registration_dialog.rb:194
msgid ""
"Please enter a registration or evaluation code for this product and your\n"
"User Name/E-mail address from the SUSE Customer Center in the fields below.\n"
@@ -981,7 +972,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:213
+#: src/lib/registration/ui/base_system_registration_dialog.rb:206
msgid ""
"If you skip product registration now, remember to register after\n"
"installation has completed."
@@ -989,10 +980,10 @@
#. 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:225
+#: src/lib/registration/ui/base_system_registration_dialog.rb:218
#, fuzzy
#| msgid "Novell Customer Center Configuration"
-msgid "Net&work Configuration..."
+msgid "Network Configuration..."
msgstr "Oppsett for Novell kundesenter"
#. SSL error message
@@ -1044,6 +1035,13 @@
msgid "<p><b>Importing an unknown certificate without verification is a big security risk.</b></p>"
msgstr ""
+#. error message, the entered URL is not valid
+#: src/lib/registration/ui/local_server_dialog.rb:67
+#, fuzzy
+#| msgid "Invalid value."
+msgid "Invalid URL."
+msgstr "Ugyldig verdi."
+
#. input field label
#: src/lib/registration/ui/local_server_dialog.rb:106
#, fuzzy
@@ -1288,13 +1286,13 @@
msgstr ""
#. ignore SUSE manager registration servers (bnc#894470)
-#: src/lib/registration/url_helpers.rb:211
+#: src/lib/registration/url_helpers.rb:203
#, fuzzy
#| msgid "Checking..."
msgid "Searching..."
msgstr "Kontrollerer..."
-#: src/lib/registration/url_helpers.rb:211
+#: src/lib/registration/url_helpers.rb:203
#, fuzzy
#| msgid "Use local registration server"
msgid "Looking up local registration servers..."
Modified: branches/plus-SLE12-SP2/yast/nb/po/reipl.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/reipl.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/reipl.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-08-13 16:41+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -27,7 +27,7 @@
#. TRANSLATORS: part of a shutdown message
#. %1 is replaced with a device name
#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:66
+#: src/clients/reipl_bootloader_finish.rb:64
msgid ""
"\n"
"After shutdown, reload the system\n"
@@ -42,7 +42,7 @@
#. %2 is replaced with a WWPN name
#. %3 is replaced with a LUN name
#. Newline at the end is required
-#: src/clients/reipl_bootloader_finish.rb:85
+#: src/clients/reipl_bootloader_finish.rb:83
msgid ""
"\n"
"After shutdown, reload the system\n"
@@ -56,7 +56,7 @@
"med WWPN '%2'\n"
"og LUN '%3'.\n"
-#: src/clients/reipl_bootloader_finish.rb:99
+#: src/clients/reipl_bootloader_finish.rb:97
msgid ""
"\n"
"After shutdown, reload the system \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/relocation-server.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/relocation-server.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/relocation-server.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/samba-client.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/samba-client.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/samba-client.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: samba-client\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2008-10-18 12:34+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: norsk bokmål\n"
@@ -878,59 +878,59 @@
msgstr "Installerer nødvendige pakker..."
#. summary header
-#: src/modules/Kerberos.rb:953
+#: src/modules/Kerberos.rb:947
msgid "PAM Login"
msgstr "PAM-innlogging"
#. summary item
-#: src/modules/Kerberos.rb:959
+#: src/modules/Kerberos.rb:953
msgid "Use Kerberos"
msgstr "Bruk Kerberos"
#. summary item
-#: src/modules/Kerberos.rb:961
+#: src/modules/Kerberos.rb:955
msgid "Do Not Use Kerberos"
msgstr "Ikke bruk Kerberos"
#. summary header
-#: src/modules/Kerberos.rb:965
+#: src/modules/Kerberos.rb:959
msgid "Default Realm"
msgstr "Standardområde"
#. summary header
-#: src/modules/Kerberos.rb:972
+#: src/modules/Kerberos.rb:966
msgid "Default Domain"
msgstr "Standard domene"
#. summary header
-#: src/modules/Kerberos.rb:979
+#: src/modules/Kerberos.rb:973
msgid "KDC Server Address"
msgstr "KDC-serveradresse"
#. summary header
-#: src/modules/Kerberos.rb:983
+#: src/modules/Kerberos.rb:977
msgid "Clock Skew"
msgstr "Tidsavvik"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:999
+#: src/modules/Kerberos.rb:993
msgid "<b>KDC Server</b>: %1<br>"
msgstr "<b>KDC-server</b>: %1<br>"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:1004
+#: src/modules/Kerberos.rb:998
#, fuzzy
#| msgid "<p><b>Workgroup or Domain</b>: %1</p>"
msgid "<b>Default Domain</b>: %1<br>"
msgstr "<p><b>Arbeidsgruppe eller domene</b>: %1</p>"
#. summary text, %1 is value
-#: src/modules/Kerberos.rb:1010
+#: src/modules/Kerberos.rb:1004
msgid "<b>Default Realm</b>: %1<br>"
msgstr "<b>Standardområde</b>: %1<br>"
#. summary text (yes/no follows)
-#: src/modules/Kerberos.rb:1016
+#: src/modules/Kerberos.rb:1010
#, fuzzy
#| msgid "Offline Authentication Enabled"
msgid "<b>Kerberos Authentication Enabled</b>: %1"
@@ -938,23 +938,23 @@
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1019 src/modules/Samba.rb:1112
+#: src/modules/Kerberos.rb:1013 src/modules/Samba.rb:1112
msgid "Yes"
msgstr "Ja"
#. summary value
#. translators: winbind status in summary
-#: src/modules/Kerberos.rb:1021 src/modules/Samba.rb:1114
+#: src/modules/Kerberos.rb:1015 src/modules/Samba.rb:1114
msgid "No"
msgstr "Nei"
#. summary line
-#: src/modules/Kerberos.rb:1028
+#: src/modules/Kerberos.rb:1022
msgid "Configuration Acquired via DNS"
msgstr "Oppsett hentet via DNS"
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1056
+#: src/modules/Kerberos.rb:1050
msgid ""
"Clock skew is invalid.\n"
"Try again.\n"
@@ -963,7 +963,7 @@
"Forsøk igjen.\n"
#. error popup (wrong format of entered value)
-#: src/modules/Kerberos.rb:1059
+#: src/modules/Kerberos.rb:1053
msgid ""
"Lifetime is invalid.\n"
"Try again."
Modified: branches/plus-SLE12-SP2/yast/nb/po/samba-server.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/samba-server.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/samba-server.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: samba-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2008-10-31 00:45+0100\n"
"Last-Translator: Olav P. \n"
"Language-Team: Norwegian Bokmål <>\n"
@@ -253,17 +253,11 @@
#. TRANSLATORS: a popup message
#: src/include/samba-server/complex.rb:88
-#, fuzzy
-#| msgid ""
-#| "Because users are currently connected to this Samba server,\n"
-#| "the server configuration has been reloaded instead of restarted.\n"
-#| "To confirm that all settings are applied despite possibly disconnecting the users,\n"
-#| "run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
msgid ""
"Because users are currently connected to this Samba server,\n"
"the server configuration has been reloaded instead of restarted.\n"
"To confirm that all settings are applied despite possibly disconnecting the users,\n"
-"run 'systemctl restart smb' and 'systemctl restart nmb'"
+"run '/etc/init.d/smb restart' and '/etc/init.d/nmb restart'"
msgstr ""
"Fordi brukere er koblet til denne Samba-serveren,\n"
"er serverkonfigurasjonen lastet på nytt uten omstart av serveren.\n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/samba-users.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/samba-users.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/samba-users.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: samba-users.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2008-09-29 12:07+0200\n"
"Last-Translator: Olav P. \n"
"Language-Team: Norwegian Bokmål <>\n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/scanner.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/scanner.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/scanner.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: scanner\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-08-13 16:44+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/security.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/security.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/security.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: security\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-08-13 16:46+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -127,204 +127,204 @@
#. Authors: Michal Svec
#.
#. $Id$
-#: src/include/security/dialogs.rb:64
+#: src/include/security/dialogs.rb:62
msgid "Unknown"
msgstr "Ukjent"
-#: src/include/security/dialogs.rb:67
+#: src/include/security/dialogs.rb:65
msgid "Use magic SysRq keys"
msgstr "Aktiver magiske SysRq-taster"
-#: src/include/security/dialogs.rb:68
+#: src/include/security/dialogs.rb:66
msgid "Use secure file permissions"
msgstr "Bruk sikre filrettigheter"
-#: src/include/security/dialogs.rb:71
+#: src/include/security/dialogs.rb:69
msgid "Remote access to the display manager"
msgstr "Ekstern tilgang til grafisk innlogging"
-#: src/include/security/dialogs.rb:74
+#: src/include/security/dialogs.rb:72
msgid "Write back system time to the hardware clock"
msgstr "Lagre systemtiden tilbake til maskinvareklokken"
-#: src/include/security/dialogs.rb:77
+#: src/include/security/dialogs.rb:75
msgid "Always generate syslog message for cron scripts"
msgstr "Generer alltid syslog-melding for cron-skript"
-#: src/include/security/dialogs.rb:80
+#: src/include/security/dialogs.rb:78
msgid "Run the DHCP daemon in a chroot"
msgstr "Kjør DHCP-nissen i chroot-varetekt"
-#: src/include/security/dialogs.rb:83
+#: src/include/security/dialogs.rb:81
msgid "Run the DHCP daemon as dhcp user"
msgstr "Kjør DHCP-nissen som dhcp-bruker"
-#: src/include/security/dialogs.rb:86
+#: src/include/security/dialogs.rb:84
msgid "Remote root login in the display manager"
msgstr "Ekstern grafisk innlogging for rotbruker"
-#: src/include/security/dialogs.rb:89
+#: src/include/security/dialogs.rb:87
msgid "Remote access to the X server"
msgstr "Ekstern tilgang til X-server"
-#: src/include/security/dialogs.rb:92
+#: src/include/security/dialogs.rb:90
msgid "Remote access to the email delivery subsystem"
msgstr "Ekstern tilgang til systemet for e-posttransport"
-#: src/include/security/dialogs.rb:95
+#: src/include/security/dialogs.rb:93
msgid "Restart services on update"
msgstr "Start tjenester på nytt etter oppdatering"
-#: src/include/security/dialogs.rb:98
+#: src/include/security/dialogs.rb:96
msgid "Stop services on removal"
msgstr "Deaktiver tjenester når programvare fjernes"
-#: src/include/security/dialogs.rb:101
+#: src/include/security/dialogs.rb:99
msgid "Enable TCP syncookies"
msgstr "Aktiver TCP-syncookies"
-#: src/include/security/dialogs.rb:104
+#: src/include/security/dialogs.rb:102
msgid "IPv4 forwarding"
msgstr "IPv4-overføring"
-#: src/include/security/dialogs.rb:105
+#: src/include/security/dialogs.rb:103
msgid "IPv6 forwarding"
msgstr "IPv6-overføring"
-#: src/include/security/dialogs.rb:106
+#: src/include/security/dialogs.rb:104
#, fuzzy
#| msgid "Enable the service"
msgid "Enable basic system services"
msgstr "Aktiver tjenesten"
-#: src/include/security/dialogs.rb:109
+#: src/include/security/dialogs.rb:107
#, fuzzy
#| msgid "Disable the service"
msgid "Disable extra services"
msgstr "Deaktiver tjenesten"
#. handle the special cases at first
-#: src/include/security/dialogs.rb:152
+#: src/include/security/dialogs.rb:150
msgid "Configure"
msgstr "Konfigurer"
-#: src/include/security/dialogs.rb:154
+#: src/include/security/dialogs.rb:152
msgid "Enabled"
msgstr "Aktivert"
-#: src/include/security/dialogs.rb:156
+#: src/include/security/dialogs.rb:154
msgid "Disabled"
msgstr "Deaktivert"
#. table header
#. table header
-#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
+#: src/include/security/dialogs.rb:180 src/include/security/dialogs.rb:409
msgid "Security Setting"
msgstr "Sikkerhetsinnstilling"
-#: src/include/security/dialogs.rb:183 src/include/security/dialogs.rb:412
+#: src/include/security/dialogs.rb:181 src/include/security/dialogs.rb:410
msgid "Status"
msgstr "Status"
-#: src/include/security/dialogs.rb:184 src/include/security/dialogs.rb:413
+#: src/include/security/dialogs.rb:182 src/include/security/dialogs.rb:411
msgid "Security Status"
msgstr "Sikkerhetsstatus"
#. add one line for each security setting
-#: src/include/security/dialogs.rb:320
+#: src/include/security/dialogs.rb:318
msgid "Help"
msgstr "Hjelp"
#. this is a separator between service names
#. e.g.: "postfix" + " or " + "sendmail"
-#: src/include/security/dialogs.rb:363
+#: src/include/security/dialogs.rb:361
msgid " or "
msgstr " eller "
#. richtext message: %1 = runlevel ("3" or "5"), %2 = list of services
-#: src/include/security/dialogs.rb:370
+#: src/include/security/dialogs.rb:368
#, fuzzy
#| msgid "<P>These basic system services are not running:<BR><B>%1</B></P>"
msgid "<P>These basic system services are not enabled:<BR><B>%s</B></P>"
msgstr "<P>Følgende grunnleggende systemtjeneser kjører ikke:<BR><B>%1</B></P>"
-#: src/include/security/dialogs.rb:372
+#: src/include/security/dialogs.rb:370
msgid "<P>All basic services are enabled.</P>"
msgstr "<P>Alle grunnleggende systemtjenester er aktivert.</P>"
-#: src/include/security/dialogs.rb:380
+#: src/include/security/dialogs.rb:378
#, fuzzy
#| msgid "<P>These extra services are running:<BR><B>%1</B></P>"
msgid "<P>These extra services are enabled:<BR><B>%s</B></P>"
msgstr "<P>Følgende ekstratjenester kjører:<BR><B>%1</B></P>"
-#: src/include/security/dialogs.rb:381
+#: src/include/security/dialogs.rb:379
msgid "<P>Check the list of services and disable all unused services.</P>"
msgstr "<P>Kontroller listen over tjenester, og deaktiver alle ubrukte tjenester.</P>"
-#: src/include/security/dialogs.rb:383
+#: src/include/security/dialogs.rb:381
msgid "<P>Only basic system services are enabled.</P>"
msgstr "<P>Bare grunnleggende systemtjenester er aktivert.</P>"
-#: src/include/security/dialogs.rb:389
+#: src/include/security/dialogs.rb:387
msgid "Description"
msgstr "Beskrivelse"
#. Overview dialog caption
#. params: input tree, parent, label, id
-#: src/include/security/dialogs.rb:401 src/include/security/wizards.rb:49
+#: src/include/security/dialogs.rb:399 src/include/security/wizards.rb:49
msgid "Security Overview"
msgstr "Sikkerhetsoversikt"
#. push button label
-#: src/include/security/dialogs.rb:426
+#: src/include/security/dialogs.rb:424
msgid "Change &Status"
msgstr "Endre &status"
#. push button label
-#: src/include/security/dialogs.rb:429
+#: src/include/security/dialogs.rb:427
msgid "&Description"
msgstr "&Beskrivelse"
#. update the current value
-#: src/include/security/dialogs.rb:523
+#: src/include/security/dialogs.rb:521
#, fuzzy
#| msgid "Analyzing the system..."
msgid "Analyzing system"
msgstr "Analyserer systemet..."
#. Boot dialog caption
-#: src/include/security/dialogs.rb:589 src/include/security/wizards.rb:57
+#: src/include/security/dialogs.rb:575 src/include/security/wizards.rb:57
msgid "Boot Settings"
msgstr "Oppstartsinnstillinger"
#. Frame label
-#: src/include/security/dialogs.rb:601
+#: src/include/security/dialogs.rb:587
msgid "Boot Permissions"
msgstr "Oppstartsrettigheter"
#. Misc dialog caption
-#: src/include/security/dialogs.rb:670 src/include/security/wizards.rb:60
+#: src/include/security/dialogs.rb:664 src/include/security/wizards.rb:60
msgid "Miscellaneous Settings"
msgstr "Diverse innstillinger"
#. Password dialog caption
-#: src/include/security/dialogs.rb:750 src/include/security/wizards.rb:56
+#: src/include/security/dialogs.rb:744 src/include/security/wizards.rb:56
msgid "Password Settings"
msgstr "Passordinnstilliinger"
#. Frame label
-#: src/include/security/dialogs.rb:759
+#: src/include/security/dialogs.rb:753
msgid "Checks"
msgstr "Kontroller"
#. Frame label
-#: src/include/security/dialogs.rb:774
+#: src/include/security/dialogs.rb:768
msgid "Password Age"
msgstr "Passordvarighet"
#. Popup text
-#: src/include/security/dialogs.rb:852
+#: src/include/security/dialogs.rb:846
msgid ""
"The minimum number of days cannot be larger\n"
"than the maximum."
@@ -333,7 +333,7 @@
"verdi enn største antall."
#. Popup text, %1 is number
-#: src/include/security/dialogs.rb:869
+#: src/include/security/dialogs.rb:863
msgid ""
"The minimum password length cannot be larger than the maximum.\n"
"The maximum password length for the selected encryption method is %1."
@@ -342,17 +342,17 @@
"Maksimal passordlengde for den valgte krypteringsmetoden er %1."
#. Login dialog caption
-#: src/include/security/dialogs.rb:901 src/include/security/wizards.rb:58
+#: src/include/security/dialogs.rb:895 src/include/security/wizards.rb:58
msgid "Login Settings"
msgstr "Innloggingsinnstillinger"
#. Frame label
-#: src/include/security/dialogs.rb:910
+#: src/include/security/dialogs.rb:904
msgid "Login"
msgstr "Innlogging"
#. Read dialog help 1/2
-#: src/include/security/helps.rb:41
+#: src/include/security/helps.rb:39
msgid ""
"<p><b><big>Initializing Security Configuration</big></b>\n"
"<br>Please wait...<br></p>"
@@ -361,7 +361,7 @@
"<br>Vent...<br></p>"
#. Read dialog help 2/2
-#: src/include/security/helps.rb:45
+#: src/include/security/helps.rb:43
msgid ""
"<p><b><big>Aborting the Initialization</big></b><br>\n"
"Safely abort the configuration utility by pressing <b>Abort</b> now.</p>"
@@ -370,7 +370,7 @@
"Du kan trygt avslutte konfigurasjonsverktøyet ved å klikke <B>Avbryt</b> nå.</p>"
#. Write dialog help 1/2
-#: src/include/security/helps.rb:49
+#: src/include/security/helps.rb:47
msgid ""
"<p><b><big>Saving Security Configuration</big></b>\n"
"<br>Please wait...<br></p>"
@@ -379,7 +379,7 @@
"<br>Vent...<br></p>"
#. Write dialog help 2/2
-#: src/include/security/helps.rb:53
+#: src/include/security/helps.rb:51
msgid ""
"<p><b><big>Aborting Saving</big></b><br>\n"
"Abort the save procedure by pressing <b>Abort</b>.</p>"
@@ -387,9 +387,55 @@
"<p><b><big>Avbryte lagring</big></b><br>\n"
"Avbryt lagringen ved å klikke <b>Avbryt</b>.</p>"
-#. Main dialog help 1/8
+#. Boot dialog help 1/4
+#: src/include/security/helps.rb:55
+msgid ""
+"<p><b><big>Boot Security</big></b></p>\n"
+"<p>In this dialog, change various boot settings related to security.</p>"
+msgstr ""
+"<p><b><big>Sikkerhet ved oppstart</big></b></p>\n"
+"<p>Bruk denne dialogen for å endre ulike innstillinger for sikkerhet ved oppstart.</p>"
+
+#. Boot dialog help 2/4
#: src/include/security/helps.rb:59
msgid ""
+"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
+"Configure what the system should do in response to\n"
+"someone at the console pressing the CTRL + ALT + DEL key\n"
+"combination. Usually the system reboots. Sometimes it is desirable\n"
+"to ignore this event, for example, when the system serves as both\n"
+"workstation and server.</p>"
+msgstr ""
+"<p><b>Tolking av Ctrl + Alt + Del</b>:\n"
+"Velg hvordan systemet skal reagere når noen trykker\n"
+"CTRL + ALT + DEL i konsollmodus. Normalt blir systemet\n"
+"startet på nytt, men noen ganger kan det være gunstig\n"
+"å ignorere kommandoen, for eksempel hvis systemet både fungerer som\n"
+"arbeidsstasjon og server.</p>"
+
+#. Boot dialog help 3/4
+#: src/include/security/helps.rb:68
+msgid ""
+"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
+"Set who is allowed to shut down the machine from KDM.</p>\n"
+msgstr ""
+"<p><b>Slå av maskinen fra innloggingsskjermen</b>\n"
+"Angi hvem som kan slå av maskinen fra KDM.</p>\n"
+
+#. Boot dialog help 4/4
+#: src/include/security/helps.rb:72
+msgid ""
+"<p><b>Hibernate System</b>:\n"
+"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
+"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
+msgstr ""
+"<p><b>Systemdvale</b>:\n"
+"Angi betingelsene for at brukere skal kunne bruke dvalefunksjonen. Som standard har brukeren på den aktive konsollen slike rettigheter.\n"
+"Andre valg er å la alle brukere gjøre dette, eller alltid kreve autentisering.</p>\n"
+
+#. Main dialog help 1/8
+#: src/include/security/helps.rb:78
+msgid ""
"<P><BIG><B>Configuring Local Security</B></BIG></P>\n"
"<p>Using predefined defaults, change the local security settings, which include\n"
" booting, login, password, user creation, and file permissions. The default\n"
@@ -403,7 +449,7 @@
"</p>"
#. Main dialog help 5/8
-#: src/include/security/helps.rb:67
+#: src/include/security/helps.rb:86
#, fuzzy
#| msgid ""
#| "<p><b>Networked Workstation</b>: For a computer connected\n"
@@ -416,14 +462,14 @@
"til et lokalt nettverk eller til Internett.</p>"
#. Main dialog help 6/8
-#: src/include/security/helps.rb:71
+#: src/include/security/helps.rb:90
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:75
+#: src/include/security/helps.rb:94
msgid ""
"<p><b>Network Server</b>: For a computer that provides\n"
"any type of service.</p>"
@@ -432,12 +478,12 @@
"server for en eller annen tjeneste.</p>"
#. Main dialog help 8/8
-#: src/include/security/helps.rb:79
+#: src/include/security/helps.rb:98
msgid "<p><b>Custom Settings</b>: Create your own configuration.</p>"
msgstr "<p><b>Egendefinerte innstillinger</b>: Lag ditt eget oppsett.</p>"
#. Login dialog help 1/4
-#: src/include/security/helps.rb:81
+#: src/include/security/helps.rb:100
msgid ""
"<p><big><b>Login Security</b></big></p>\n"
"<p>These login settings\n"
@@ -448,7 +494,7 @@
"er hovedsaklig lagret i filen /etc/login.defs.</p>"
#. Login dialog help 2/4
-#: src/include/security/helps.rb:87
+#: src/include/security/helps.rb:106
msgid ""
"<p><b>Delay after Incorrect Login Attempt:</b>\n"
"It is advisable to wait some time after an incorrect login attempt to prevent\n"
@@ -461,7 +507,7 @@
"for lenge hvis de skriver inn feil passord. Tre sekunder er en fornuftig verdi (<tt>3</tt>).</p>"
#. Login dialog help 3/4
-#: src/include/security/helps.rb:94
+#: src/include/security/helps.rb:113
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"
@@ -474,7 +520,7 @@
"</p>\n"
#. Login dialog help 4/4
-#: src/include/security/helps.rb:101
+#: src/include/security/helps.rb:120
msgid ""
"<p><b>Allow Remote Graphical Login:</b> Checking this allows access\n"
"to a graphical login screen for this machine over the network. Remote access\n"
@@ -485,7 +531,7 @@
"til maskinen via en innloggingsbehandler kan være en sikkerhetsrisiko.</p>"
#. Password dialog help 1/8
-#: src/include/security/helps.rb:107
+#: src/include/security/helps.rb:126
msgid ""
"<p>These password settings\n"
"are mainly stored in the /etc/login.defs file.</p>"
@@ -494,7 +540,7 @@
"er hovedsaklig lagret i filen /etc/login.defs.</p>"
#. Password dialog help 2/8
-#: src/include/security/helps.rb:111
+#: src/include/security/helps.rb:130
msgid ""
"<p><b>Check New Passwords</b>: It is wise to choose a password that\n"
"cannot be found in a dictionary and is not a name or other simple, common word.\n"
@@ -505,7 +551,7 @@
"Hvis du krysser av i boksen, blir nye passord kontrollert mot disse reglene.</p>"
#. Password dialog help
-#: src/include/security/helps.rb:117
+#: src/include/security/helps.rb:136
msgid ""
"<p><b>Minimum Acceptable Password Length:</b>\n"
"The minimum acceptable size for the new password reduced by the number\n"
@@ -520,7 +566,7 @@
"Dette valget kan bare endres hvis <b>Kontroller nytt passord</b> er valgt.</p>"
#. Password dialog help 4/8
-#: src/include/security/helps.rb:125
+#: src/include/security/helps.rb:144
msgid ""
"<p><b>Passwords to Remember</b>:\n"
"Enter the number of user passwords to store and prevent the user from reusing.\n"
@@ -531,12 +577,12 @@
"Angi 0 dersom ingen passord skal lagres.</p>"
#. Password dialog help 5a/8
-#: src/include/security/helps.rb:131
+#: src/include/security/helps.rb:150
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:133
+#: src/include/security/helps.rb:152
msgid ""
"<p><b>DES</b>, the Linux default method, works in all network environments,\n"
"but it restricts you to passwords no longer than eight characters. If you need\n"
@@ -547,7 +593,7 @@
"avhengig av kompatibilitet med andre systemer.</p>"
#. Password dialog help 5c/8
-#: src/include/security/helps.rb:139
+#: src/include/security/helps.rb:158
msgid ""
"<p><b>MD5</b> allows longer passwords and is supported by all current Linux \n"
"distributions, but not by other systems or old software.</p>"
@@ -556,12 +602,12 @@
"distribusjoner, men ikke av andre systemer eller eldre programvare.</p>"
#. Password dialog help 5d/8
-#: src/include/security/helps.rb:143
+#: src/include/security/helps.rb:162
msgid "<p><b>SHA-512</b> is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.</p>"
msgstr "<p><b>SHA-512</b> er standard hash-metode. Det anbefales ikke å bruke andre algoritmer dersom det ikke er nødvendig av kompatibilitetshensyn.</p>"
#. Password dialog help 7/8
-#: src/include/security/helps.rb:147
+#: src/include/security/helps.rb:166
msgid ""
"<p><b>Password Age:</b> Set the minimum and\n"
"maximum number of days a password may be used.</p>"
@@ -570,7 +616,7 @@
"største antall dager som et passord kan benyttes.</p>"
#. Password dialog help 8/8
-#: src/include/security/helps.rb:151
+#: src/include/security/helps.rb:170
msgid ""
"<p><b>Days before Password Expires Warning</b>: This entry sets the\n"
"number of days users are warned before their passwords expire. The longer the\n"
@@ -581,7 +627,7 @@
"gjør det mindre sannsynlig at noen kan gjette et passord.</p>"
#. Adduser dialog help 1/2
-#: src/include/security/helps.rb:157
+#: src/include/security/helps.rb:176
msgid ""
"<p><big><b>User Security</b></big></P>\n"
"<p>In this dialog, change various settings used to create users.</p>"
@@ -590,7 +636,7 @@
"<p>I denne dialogen kan du endre ulike innstillinger i forbindelse med oppretting av brukere.</p>"
#. Adduser dialog help 2/3
-#: src/include/security/helps.rb:161
+#: src/include/security/helps.rb:180
msgid ""
"<p><b>User ID Limitations:</b>\n"
"Set the minimum and maximum possible user ID.</p>"
@@ -599,7 +645,7 @@
"Definer minste og største antall mulige brukernavn.</p>"
#. Adduser dialog help 3/3
-#: src/include/security/helps.rb:165
+#: src/include/security/helps.rb:184
msgid ""
"<p><b>Group ID Limitations</b>:\n"
"Set the minimum and maximum possible group ID.</p>"
@@ -608,7 +654,7 @@
"Definer minste og største antall mulige gruppenavn.</p>"
#. Misc dialog help 1/14
-#: src/include/security/helps.rb:169
+#: src/include/security/helps.rb:188
msgid ""
"<p><big><b>Other Security Settings</b></big></P>\n"
"<p>In this dialog, change miscellaneous settings related to local security.</p>"
@@ -617,7 +663,7 @@
"<p>I denne dialogen kan du endre diverse innstillinger i forbindelse med lokal sikkerhet.</p>"
#. Misc dialog help 2/14
-#: src/include/security/helps.rb:173
+#: src/include/security/helps.rb:192
msgid ""
"<p><b>File Permissions</b>: Settings for the permissions\n"
"of certain system files are set according to the data in /etc/permissions.secure\n"
@@ -648,7 +694,7 @@
"definere hvilke brukere som kan kjøre X- og setuid-programmer.</p>\n"
#. Misc dialog help 6/14
-#: src/include/security/helps.rb:189
+#: src/include/security/helps.rb:208
msgid ""
"<p><b>User Launching updatedb</b>: The program updatedb runs \n"
"once a day. It scans your entire file system and creates a database (locatedb)\n"
@@ -663,7 +709,7 @@
" (noen filer) eller <b>root</b> (alle filer).</p>"
#. Misc dialog help 10/14
-#: src/include/security/helps.rb:197
+#: src/include/security/helps.rb:216
msgid ""
"<p><b>Current Directory in root's Path</b> On a DOS system,\n"
"the system first searches for executable files (programs) in the current\n"
@@ -676,7 +722,7 @@
"derimot utelukkende søkestien (variabelen PATH).</p>"
#. Misc dialog help 11/14
-#: src/include/security/helps.rb:204
+#: src/include/security/helps.rb:223
msgid ""
"<p><b>Current Directory in the Path of Regular Users</b><br> A DOS\n"
"system first searches for executable files (programs) in the current directory\n"
@@ -689,7 +735,7 @@
"derimot utelukkende søkestien (variabelen PATH).</p>"
#. Misc dialog help 12/14
-#: src/include/security/helps.rb:211
+#: src/include/security/helps.rb:230
msgid ""
"<p>Some systems set up a work-around by adding the dot (\".\") to the\n"
"search path, enabling files in the current path to be found and executed.\n"
@@ -706,7 +752,7 @@
"i systemet.</p>"
#. Misc dialog help 13/14
-#: src/include/security/helps.rb:220
+#: src/include/security/helps.rb:239
msgid ""
"<p>\"yes\": the dot (\".\") is attached to the end of the search\n"
"path of root, making it the last to be searched.</p>"
@@ -716,7 +762,7 @@
"slik at denne blir gjennomsøkt sist.</p>"
#. Misc dialog help 14/14
-#: src/include/security/helps.rb:224
+#: src/include/security/helps.rb:243
msgid ""
"<p>\"no\": the user root always must launch programs in the\n"
"current directory prefixed with a \"./\". Example: \"./configure\".</p>"
@@ -725,7 +771,7 @@
"gjeldende katalog ved å bruke prefikset \"./\". Eksempel: \"./configure\".</p>"
#. Misc dialog help 14/14
-#: src/include/security/helps.rb:228
+#: src/include/security/helps.rb:247
msgid ""
"<p><b>Enable Magic SysRq Keys</b><br> If you check this option, you\n"
"will have some control over the system even if it crashes (for example, during kernel\n"
@@ -736,26 +782,26 @@
"oppsett av kjernen). Du finner mer informasjon i /usr/src/linux/Documentation/sysrq.txt</p>."
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:234
+#: src/include/security/helps.rb:253
msgid "<P><B>Security Overview</B><BR>This overview shows the most important security settings.</P>"
msgstr "<P><B>Sikkerhetsoversikt</B><BR>Dette er en oversikt over de viktigste sikkerhetsinnstillingene.</P>"
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:238
+#: src/include/security/helps.rb:257
msgid "<P>To change the current value, click the link associated to the option.</P>"
msgstr "<P>Klikk på lenkene for å endre gjeldende verdi for et valg.</P>"
#. help text: security overview dialog 1/
-#: src/include/security/helps.rb:242
+#: src/include/security/helps.rb:261
msgid "<P> A check mark in the <B>Security Status</B> column means that the current value of the option is secure.</P>"
msgstr "<P>En hake i kolonnen <B>Sikkerhetsstatus</B> betyr at gjeldende verdi for valget er sikker.</P>"
#. an error message (rich text)
-#: src/include/security/helps.rb:246
+#: src/include/security/helps.rb:265
msgid "<P><B>The current value could not be read. The service is probably not installed or the option is missing on the system.</B></P>"
msgstr "<P><B>Gjeldende verdi kunne ikke leses. Tjenesten er sannsynligvis ikke installert, eller valget mangler i systemet.</B></P>"
-#: src/include/security/helps.rb:252
+#: src/include/security/helps.rb:271
msgid ""
"<P>A display manager provides a graphical login screen and can be accessed\n"
"across the network by an X server running on another system if so\n"
@@ -773,7 +819,7 @@
"som benyttes.</P><P>Hvis du ikke trenger <EM>XDMCP</EM> for\n"
"kstern grafisk innlogging, bør du deaktivere dette valget.</P>"
-#: src/include/security/helps.rb:262
+#: src/include/security/helps.rb:281
msgid ""
"<P>Upon startup, the system time is being set from the hardware clock of the\n"
"computer. As a consequence, setting the hardware clock before shutting down is\n"
@@ -785,23 +831,23 @@
"slås av.</P><P>Konsistent systemtid er avgjørende for at systemet skal opprette\n"
"riktige loggmeldinger.</P>"
-#: src/include/security/helps.rb:268
+#: src/include/security/helps.rb:287
msgid "<P>Malfunctions in a system are usually detected by anomalies in its behaviour. Syslog messages about events that reoccur on a regular basis are important to find causes of problems. And the absence of a single record can tell more than the absence of all log records.</P><P>Therefore, syslog messages of system events are only useful if they are present.</P>"
msgstr "<P>Funksjonsfeil kan vanligvis påvises av spesielle hendelser. Syslog-meldinger om hendelser som inntreffer regelmessig, er viktige for å finner årsakene til problemer, og en manglende oppføring kan fortelle mer enn om hele systemloggen mangler.</P><P>Man kan derfor si at syslog-meldinger om systemhendelser bare er nyttige dersom de finnes.</P>"
-#: src/include/security/helps.rb:271
+#: src/include/security/helps.rb:290
msgid "<P>Chroot execution environments restrict a process to only access files that it needs by placing them in a separate subdirectory and running the process with a changed root (chroot) set to that directory.</P>"
msgstr "<P>Chroot-miljøer brukes for å begrense en prosess bare til nødvendige filer og plassere disse i en separat underkatalog. Deretter kjøres prosessen av en endret rotbruker (chroot=changedroot) med adgang til den katalogen.</P>"
-#: src/include/security/helps.rb:274
+#: src/include/security/helps.rb:293
msgid "<P>The DHCP client daemon should run as the user <EM>dhcpd</EM> to minimize a possible threat if the service is found vulnerable to a weakness in its program code.</P><P>Note that dhcpd must never run as <EM>root</EM> or with the <EM>CAP_SYS_CHROOT</EM> capability for the chroot execution confinement to be effective.</P>"
msgstr "<P>DHCP-klientnissen bør kjøres som brukeren <EM>dhcpd</EM> for å minimere trusselen ved en eventuell svakhet i programkoden.</P><P>Husk at dhcpd ikke må kjøres som <EM>rot</EM> eller med mulighet for <EM>CAP_SYS_CHROOT</EM> dersom chroot-varetekten skal være effektiv.</P>"
-#: src/include/security/helps.rb:277
+#: src/include/security/helps.rb:296
msgid "<P>Administrators should never log on as <EM>root</EM> into an X Window session to minimize the usage of the root privileges.</P><P>This option does not help against careless administrators, but shall prevent attackers to be able to log on as <EM>root</EM> via the display manager if they guess or otherwise acquire the password.</P>"
msgstr "<P>For å minimere bruken av rotprivilegier bør ikke administratorer logge på en X-vindusøkt som <EM>rot</EM>.</P><P>Dette valget hjelper ikke mot uforsiktige administratorer, men vil hindre angripere i å logge inn som <EM>rot</EM> via den grafiske innloggingsskjermen dersom de gjetter passordet eller får fatt i det på annen måte.</P>"
-#: src/include/security/helps.rb:280
+#: src/include/security/helps.rb:299
msgid ""
"<P>X Window clients, e.g. programs that open a window on your display, connect\n"
"to the X server that runs on the physical machine. Programs can also run on a\n"
@@ -821,7 +867,7 @@
"slik at X-vindusklienter kan koble til X-serveren\n"
"via en kryptert ssh-forbindelse.</P>"
-#: src/include/security/helps.rb:290
+#: src/include/security/helps.rb:309
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>"
@@ -829,7 +875,7 @@
"<P>Systemet for e-postlevering kjører alltid. Som standard er det imidlertid ikke eksponert\n"
"utenfor systemet, fordi det ikke lytter på SMTP-nettverksport 25.</P><P>Hvis du ikke leverer e-post til systemet via SMTP-protokollen, bør du deaktivere dette valget.</P>"
-#: src/include/security/helps.rb:293
+#: src/include/security/helps.rb:312
msgid ""
"<P>If a package containing a service that is currently running is being\n"
"updated, the service is restarted after the files in the package have been\n"
@@ -845,7 +891,7 @@
"Denne innstillingen bør bare endres hvis det finnes spesielle\n"
"grunner til dette.</P>"
-#: src/include/security/helps.rb:303
+#: src/include/security/helps.rb:322
msgid ""
"<P>If a package containing a service that is currently running is being\n"
"uninstalled, the service is stopped before the files of the package are\n"
@@ -863,137 +909,38 @@
"bare endres hvis det finnes spesielle grunner\n"
"til dette.</P>"
-#: src/include/security/helps.rb:313
+#: src/include/security/helps.rb:332
msgid "<P>A system can be overwhelmed with numerous connection attempts so that the system runs out of memory, leading to a Denial of Service (DoS) vulnerability.</P><P>The use of syncookies is a method that can help in such situations. But in configurations with a very large number of legitimate connection attempts from one source, the <EM>Enabled</EM> setting can cause problems with denied TCP connections under high load.</P><P>Still, for most environments, syncookies are the first line of defense against SYN flood DoS attacks, so the secure setting is <EM>Enabled</EM>.</P>"
msgstr "<P>Et system kan bli overkjørt av så mange tilkoblingsforsøk, at det ikke er mer tilgjengelig minne, noe som fører til en DoS-sårbarhet (Denial of Service).</P><P>Bruk av syncookies er en metode som kan hjelpe i sånne situasjoner, men i oppsett med et svært stort antall legitime tilkoblingsforsøk fra samme kilde, kan en <EM>Aktivert</EM>-innstilling føre til problemer med at TCP-tilkoblinger avvises ved høy belastning.</P><P>I de fleste miljøer er likevel syncookies første forsvarslinje mot DoS-angrep, så den sikre innstillingen er <EM>Aktivert</EM>.</P>"
-#: src/include/security/helps.rb:316 src/include/security/helps.rb:320
+#: src/include/security/helps.rb:335 src/include/security/helps.rb:339
msgid "<P>IP forwarding means to pass on network packets that have been received, but that are not destined for one of the system's configured network interfaces, e.g. network interface addresses.</P><P>If a system forwards network traffic on ISO/OSI layer 3, it is called a router. If you do not need that routing functionality, then disable this option.</P>"
msgstr "<P>IP-overføring betyr videresending av nettverkspakker som mottas, men som ikke er beregnet for noen av systemets egne nettverksgrensesnitt, d.v.s. nettverkskortenes adresser.</P><P>Hvis et system videresender nettverkstrafikk via ISO/OSI 3, kalles det en ruter. Hvis du ikke trenger rutingfunksjonen, bør du deaktivere dette valget.</P>"
-#: src/include/security/helps.rb:319
+#: src/include/security/helps.rb:338
msgid "<P>This setting applies to <EM>IPv4</EM> only.</P>"
msgstr "<P>Denne innstillingen gjelder bare for <EM>IPv4</EM>.</P>"
-#: src/include/security/helps.rb:323
+#: src/include/security/helps.rb:342
msgid "<P>This setting applies to <EM>IPv6</EM> only.</P>"
msgstr "<P>Denne innstillingen gjelder bare for <EM>IPv6</EM>.</P>"
-#: src/include/security/helps.rb:324
+#: src/include/security/helps.rb:343
msgid "<P>Magic SysRq Keys enable some control over the system even if it crashes (e.g. during kernel debugging) or if the system does not respond.</P>"
msgstr "<P>Med magiske SysRq-taster har du en viss grad av kontroll over systemet selv om det havarerer (f.eks. under feilsøking av kjernen) eller hvis systemet ikke svarer.</P>"
-#: src/include/security/helps.rb:327
+#: src/include/security/helps.rb:346
msgid "<P>There are predefined file permissions in /etc/permissions.* files. The most restrictive file permissions are defined 'secure' or 'paranoid' file.</P>"
msgstr "<P>Det er forhåndsdefinerte filrettigheter i /etc/permissions.*-filene. De mest restriktive filrettighetene er definert som 'secure' eller 'paranoid'.</P>"
-#: src/include/security/helps.rb:330
+#: src/include/security/helps.rb:349
msgid "<P>Basic system services must be enabled to provide system consistency and to run the security-related services.</P>"
msgstr "<P>Grunnleggende systemtjenester må aktiveres for at systemet skal være konsistent og kunne kjøre sikkerhetsrelaterte tjenester.</P>"
-#: src/include/security/helps.rb:333
+#: src/include/security/helps.rb:352
msgid "<P>Every running service is a potential target of a security attack. Therefore it is recommended to turn off all services which are not used by the system.</P>"
msgstr "<P>Alle aktiverte tjenester er en potensiell sikkerhetsrisiko. Det anbefales derfor å deaktivere alle tjenester som ikke brukes av systemet.</P>"
-#: src/include/security/helps.rb:341
-msgid ""
-"<p><b><big>Boot Security</big></b></p>\n"
-"<p>In this dialog, change various boot settings related to security.</p>"
-msgstr ""
-"<p><b><big>Sikkerhet ved oppstart</big></b></p>\n"
-"<p>Bruk denne dialogen for å endre ulike innstillinger for sikkerhet ved oppstart.</p>"
-
-#
-#. TRANSLATORS: part of help text - default action (the default is
-#. reboot)
-#: src/include/security/helps.rb:348
-#, fuzzy
-#| msgid ""
-#| "<p><b>Interpretation of Ctrl + Alt + Del</b><br>\n"
-#| "When someone at the console has pressed the CTRL + ALT + DEL key\n"
-#| "combination, the system usually reboots. Sometimes it is desirable\n"
-#| "to ignore this event, for example, when the system serves as both\n"
-#| "workstation and server.</p>"
-msgid ""
-"Usually the system reboots. Sometimes it is desirable\n"
-"to ignore this event, for example, when the system serves as both\n"
-"workstation and server."
-msgstr ""
-"<p><b>Tolking av Ctrl + Alt + Del</b><br>\n"
-"Når noen trykker tastekombinasjonen CTRL + ALT + DEL,\n"
-"vil systemet vanligvis starte på nytt. Noen ganger kan det være gunstig\n"
-"å ignorere dette, for eksempel hvis systemet både fungerer som\n"
-"arbeidsstasjon og server.</p>"
-
-#
-#. TRANSLATORS: part of help text - default action (the default is halt)
-#: src/include/security/helps.rb:355
-#, fuzzy
-#| msgid ""
-#| "<p><b>Interpretation of Ctrl + Alt + Del</b><br>\n"
-#| "When someone at the console has pressed the CTRL + ALT + DEL key\n"
-#| "combination, the system usually reboots. Sometimes it is desirable\n"
-#| "to ignore this event, for example, when the system serves as both\n"
-#| "workstation and server.</p>"
-msgid ""
-"By default the system halts but sometimes it is desirable\n"
-"to ignore this event, for example, when the system serves as both\n"
-"workstation and server."
-msgstr ""
-"<p><b>Tolking av Ctrl + Alt + Del</b><br>\n"
-"Når noen trykker tastekombinasjonen CTRL + ALT + DEL,\n"
-"vil systemet vanligvis starte på nytt. Noen ganger kan det være gunstig\n"
-"å ignorere dette, for eksempel hvis systemet både fungerer som\n"
-"arbeidsstasjon og server.</p>"
-
-#. Boot dialog help 2/4
-#. TRANSLATORS: %s is help text - default action
-#: src/include/security/helps.rb:364
-#, fuzzy
-#| msgid ""
-#| "<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
-#| "Configure what the system should do in response to\n"
-#| "someone at the console pressing the CTRL + ALT + DEL key\n"
-#| "combination. Usually the system reboots. Sometimes it is desirable\n"
-#| "to ignore this event, for example, when the system serves as both\n"
-#| "workstation and server.</p>"
-msgid ""
-"<p><b>Interpretation of Ctrl + Alt + Del</b>:\n"
-"Configure what the system should do in response to\n"
-"someone at the console pressing the CTRL + ALT + DEL key\n"
-"combination. %s</p>"
-msgstr ""
-"<p><b>Tolking av Ctrl + Alt + Del</b>:\n"
-"Velg hvordan systemet skal reagere når noen trykker\n"
-"CTRL + ALT + DEL i konsollmodus. Normalt blir systemet\n"
-"startet på nytt, men noen ganger kan det være gunstig\n"
-"å ignorere kommandoen, for eksempel hvis systemet både fungerer som\n"
-"arbeidsstasjon og server.</p>"
-
-#. Boot dialog help 3/4
-#: src/include/security/helps.rb:373
-#, fuzzy
-#| msgid ""
-#| "<p><b>Shutdown Behaviour of Login Manager</b>:\n"
-#| "Set who is allowed to shut down the machine from KDM.</p>\n"
-msgid ""
-"<p><b>Shutdown Behaviour of Login Manager</b>:\n"
-"Set who is allowed to shut down the machine from %s.</p>\n"
-msgstr ""
-"<p><b>Slå av maskinen fra innloggingsskjermen</b>\n"
-"Angi hvem som kan slå av maskinen fra KDM.</p>\n"
-
-#. Boot dialog help 4/4
-#: src/include/security/helps.rb:377
-msgid ""
-"<p><b>Hibernate System</b>:\n"
-"Set the conditions for allowing users to hibernate the system. By default, user on active console has such right.\n"
-"Other options are allowing the action to any user or requiring authentication in all cases.</p>\n"
-msgstr ""
-"<p><b>Systemdvale</b>:\n"
-"Angi betingelsene for at brukere skal kunne bruke dvalefunksjonen. Som standard har brukeren på den aktive konsollen slike rettigheter.\n"
-"Andre valg er å la alle brukere gjøre dette, eller alltid kreve autentisering.</p>\n"
-
#. level name
#: src/include/security/levels.rb:54
#, fuzzy
@@ -1061,238 +1008,163 @@
"Minste antall gruppenavn kan ikke være større enn det\n"
"største."
-#. 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
+#. ComboBox label
+#: src/include/security/widgets.rb:100
+msgid "&Interpretation of Ctrl + Alt + Del"
+msgstr "&Tolking av Ctrl + Alt + Del"
+
+#. ComboBox value
+#: src/include/security/widgets.rb:105
msgid "Ignore"
msgstr "Ignorer"
-#: src/include/security/widgets.rb:88
+#. ComboBox value
+#: src/include/security/widgets.rb:107
msgid "Reboot"
msgstr "Start på nytt"
-#: src/include/security/widgets.rb:89
+#. ComboBox value
+#: src/include/security/widgets.rb:109
msgid "Halt"
msgstr "Slå av"
-#: src/include/security/widgets.rb:93
-msgid "Only root"
-msgstr "Bare rotbruker"
-
-#: src/include/security/widgets.rb:94
-msgid "All Users"
-msgstr "Alle brukere"
-
-#: src/include/security/widgets.rb:95
-msgid "Nobody"
-msgstr "Ingen"
-
-#. ComboBox label
-#: src/include/security/widgets.rb:117
-msgid "&Interpretation of Ctrl + Alt + Del"
-msgstr "&Tolking av Ctrl + Alt + Del"
-
#. CheckBox label
-#: src/include/security/widgets.rb:126
+#: src/include/security/widgets.rb:116
msgid "Allow Remote &Graphical Login"
msgstr "Tillat ekstern &grafisk innlogging"
#. CheckBox label
-#: src/include/security/widgets.rb:132
+#: src/include/security/widgets.rb:122
msgid "&Magic SysRq Keys"
msgstr "&Magiske SysRq-taster"
#. ComboBox value
-#: src/include/security/widgets.rb:135
+#: src/include/security/widgets.rb:125
msgid "Disable"
msgstr "Deaktiver"
#. ComboBox value
-#: src/include/security/widgets.rb:137
+#: src/include/security/widgets.rb:127
msgid "Enable All Functions"
msgstr "Aktiver alle funksjoner"
#. IntField label
-#: src/include/security/widgets.rb:144
+#: src/include/security/widgets.rb:134
msgid "&Delay after Incorrect Login Attempt"
msgstr "&Forsinkelse etter mislykket innloggingsforsøk"
#. IntField label
#. IntField label
-#: src/include/security/widgets.rb:152 src/include/security/widgets.rb:199
+#: src/include/security/widgets.rb:142 src/include/security/widgets.rb:205
msgid "Maxim&um"
msgstr "Størs&te"
#. IntField label
#. IntField label
-#: src/include/security/widgets.rb:158 src/include/security/widgets.rb:212
+#: src/include/security/widgets.rb:148 src/include/security/widgets.rb:218
msgid "M&inimum"
msgstr "M&inste"
#. ComboBox label
-#: src/include/security/widgets.rb:164
+#: src/include/security/widgets.rb:154
+msgid "&Shutdown Behaviour of KDM Login Manager:"
+msgstr "&Slå av maskinen fra KDM-innloggingsskjermen:"
+
+#. ComboBox value
+#: src/include/security/widgets.rb:159
+msgid "Only root"
+msgstr "Bare rotbruker"
+
+#. ComboBox value
+#: src/include/security/widgets.rb:161
+msgid "All Users"
+msgstr "Alle brukere"
+
+#. ComboBox value
+#: src/include/security/widgets.rb:163
+msgid "Nobody"
+msgstr "Ingen"
+
+#. ComboBox label
+#: src/include/security/widgets.rb:170
msgid "System Hybernation"
msgstr "Systemdvale"
#. ComboBox value
-#: src/include/security/widgets.rb:167
+#: src/include/security/widgets.rb:173
msgid "User on the active console"
msgstr "Bruker på aktiv konsoll"
#. ComboBox value
-#: src/include/security/widgets.rb:169
+#: src/include/security/widgets.rb:175
msgid "Anyone can hibernate"
msgstr "Alle kan bruke dvalefunksjonen"
#. ComboBox value
-#: src/include/security/widgets.rb:171
+#: src/include/security/widgets.rb:177
msgid "Authentication always required"
msgstr "Autentisering kreves alltid"
#. ComboBox label
-#: src/include/security/widgets.rb:178
+#: src/include/security/widgets.rb:184
msgid "P&assword Encryption Method"
msgstr "Krypteringsmetode for p&assord"
#. CheckBox label
-#: src/include/security/widgets.rb:192
+#: src/include/security/widgets.rb:198
msgid "&Check New Passwords"
msgstr "&Kontroller nye passord"
#. IntField label
-#: src/include/security/widgets.rb:205
+#: src/include/security/widgets.rb:211
msgid "Numb&er of Passwords to Remember"
msgstr "Antall passord som skal lagr&es"
#. IntField label
-#: src/include/security/widgets.rb:218
+#: src/include/security/widgets.rb:224
msgid "&Minimum Acceptable Password Length"
msgstr "&Minste godkjente passordlengde"
#. IntField label
-#: src/include/security/widgets.rb:226
+#: src/include/security/widgets.rb:232
msgid "&Days before Password Expires Warning"
msgstr "&Antall dager for varsel om utløp av passord"
#. ComboBox label
-#: src/include/security/widgets.rb:234
+#: src/include/security/widgets.rb:240
msgid "&File Permissions"
msgstr "&Filrettigheter"
#. ComboBox value
-#: src/include/security/widgets.rb:237
+#: src/include/security/widgets.rb:243
msgid "Easy"
msgstr "Enkel"
#. ComboBox value
-#: src/include/security/widgets.rb:239
+#: src/include/security/widgets.rb:245
msgid "Secure"
msgstr "Sikker"
#. ComboBox value
-#: src/include/security/widgets.rb:241
+#: src/include/security/widgets.rb:247
msgid "Paranoid"
msgstr "Paranoid"
#. ComboBox label
-#: src/include/security/widgets.rb:248
+#: src/include/security/widgets.rb:254
msgid "&User Launching updatedb"
msgstr "&Brukere som kan kjøre updatedb"
#. IntField label
-#: src/include/security/widgets.rb:255
+#: src/include/security/widgets.rb:261
msgid "Ma&ximum"
msgstr "St&ørste"
#. IntField label
-#: src/include/security/widgets.rb:261
+#: src/include/security/widgets.rb:267
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 Login Manager:"
-msgid "&Shutdown Behaviour of %s Login Manager:"
-msgstr "&Slå av-funksjon for grafisk innlogging:"
-
#: src/include/security/wizards.rb:53
msgid "Predefined Security Configurations"
msgstr "Forhåndsdefinerte sikkerhetsoppsett"
@@ -1308,68 +1180,65 @@
msgstr "Initialiserer ..."
#. Security read dialog caption
-#: src/modules/Security.rb:638
+#: src/modules/Security.rb:654
msgid "Saving Security Configuration"
msgstr "Lagrer sikkerhetskonfigurasjon"
#. Progress stage 1/4
-#: src/modules/Security.rb:647
+#: src/modules/Security.rb:663
msgid "Write security settings"
msgstr "Lagre sikkerhetsinnstillinger"
#. Progress stage 2/4
-#: src/modules/Security.rb:649
+#: src/modules/Security.rb:665
msgid "Write inittab settings"
msgstr "Lagre inittab-innstillinger"
#. Progress stage 3/4
-#: src/modules/Security.rb:651
+#: src/modules/Security.rb:667
msgid "Write PAM settings"
msgstr "Lagre PAM-innstillinger"
#. Progress stage 4/4
-#: src/modules/Security.rb:653
+#: src/modules/Security.rb:669
msgid "Update system settings"
msgstr "Oppdater systeminnstillinger"
#. Progress step 1/5
-#: src/modules/Security.rb:657
+#: src/modules/Security.rb:673
msgid "Writing security settings..."
msgstr "Lagrer sikkerhetsinnstillinger..."
#. Progress step 2/5
-#: src/modules/Security.rb:659
+#: src/modules/Security.rb:675
msgid "Writing inittab settings..."
msgstr "Lagrer inittab-innstillinger..."
#. Progress step 3/5
-#: src/modules/Security.rb:661
+#: src/modules/Security.rb:677
msgid "Writing PAM settings..."
msgstr "Lagrer PAM-innstillinger..."
#. Progress step 4/5
-#: src/modules/Security.rb:663
+#: src/modules/Security.rb:679
msgid "Updating system settings..."
msgstr "Oppdaterer systeminnstillinger..."
#. Progress step 5/5
-#: src/modules/Security.rb:665
+#: src/modules/Security.rb:681
msgid "Finished"
msgstr "Fullført"
#. Summary text
-#: src/modules/Security.rb:754
+#: src/modules/Security.rb:791
msgid "Current Security Level: Custom settings"
msgstr "Gjeldende sikkerhetsnivå: Brukerdefinerte innstillinger"
#. Summary text
-#: src/modules/Security.rb:758
+#: src/modules/Security.rb:795
msgid "Current Security Level: %1"
msgstr "Gjeldende sikkerhetsnivå: %1"
-#~ msgid "&Shutdown Behaviour of KDM Login Manager:"
-#~ msgstr "&Slå av maskinen fra KDM-innloggingsskjermen:"
-
#~ msgid "Home Workstation security level (without network)"
#~ msgstr "Sikkerhetsnivå for hjemmemaskin (uten nettverk)"
Modified: branches/plus-SLE12-SP2/yast/nb/po/services-manager.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/services-manager.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/services-manager.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2014-05-19 09:35+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/slp-server.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/slp-server.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/slp-server.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: slp-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2008-09-30 15:29+0200\n"
"Last-Translator: Olav P. \n"
"Language-Team: Norwegian Bokmål <>\n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/snapper.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/snapper.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/snapper.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
@@ -17,144 +17,175 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#. The main ()
-#: src/clients/snapper.rb:53
+#. 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
msgid "Configuration of system snapshots"
msgstr "Oppsett av systemøyeblikksbilder"
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:251
-#: src/include/snapper/dialogs.rb:490
+#: src/include/snapper/dialogs.rb:123 src/include/snapper/dialogs.rb:244
+#: src/include/snapper/dialogs.rb:496
msgid "Description"
msgstr "Beskrivelse"
#. text entry label
#. text entry label
-#: src/include/snapper/dialogs.rb:136 src/include/snapper/dialogs.rb:297
+#: src/include/snapper/dialogs.rb:130 src/include/snapper/dialogs.rb:290
msgid "User data"
msgstr "Brukerdata"
#. combo box label
#. text entry label
-#: src/include/snapper/dialogs.rb:144 src/include/snapper/dialogs.rb:302
+#: src/include/snapper/dialogs.rb:138 src/include/snapper/dialogs.rb:295
msgid "Cleanup algorithm"
msgstr "Opprryddingsalgoritme"
-#. popup label, %1 is number
-#: src/include/snapper/dialogs.rb:158
+#. popup label, %{num} is number
+#: src/include/snapper/dialogs.rb:153
#, fuzzy
#| msgid "Modify Snapshot %1"
-msgid "Modify Snapshot %1"
+msgid "Modify Snapshot %{num}"
msgstr "Endre øyeblikksbilde %1"
-#. popup label, %1, %2 are numbers (range)
-#: src/include/snapper/dialogs.rb:166
+#. popup label, %{pre} and %{post} are numbers
+#: src/include/snapper/dialogs.rb:159
#, fuzzy
-#| msgid "Modify Snapshot %1"
-msgid "Modify Snapshots %1 - %2"
-msgstr "Endre øyeblikksbilde %1"
+#| msgid "Modify Snapshots %1 - %2"
+msgid "Modify Snapshot %{pre} and %{post}"
+msgstr "Endre øyeblikksbilder %1 - %2"
#. label
-#: src/include/snapper/dialogs.rb:169
+#: src/include/snapper/dialogs.rb:161
#, fuzzy
-#| msgid "PReP (%1)"
-msgid "Pre (%1)"
-msgstr "PReP (%1)"
+#| msgid "Pre (%1)"
+msgid "Pre (%{pre})"
+msgstr "Før (%1)"
#. label
-#: src/include/snapper/dialogs.rb:173
+#: src/include/snapper/dialogs.rb:165
#, fuzzy
-#| msgid "Host %1"
-msgid "Post (%1)"
-msgstr "Vertsmaskin %1"
+#| msgid "Post (%1)"
+msgid "Post (%{post})"
+msgstr "Etter (%1)"
#. popup label
-#: src/include/snapper/dialogs.rb:249
+#: src/include/snapper/dialogs.rb:242
msgid "Create New Snapshot"
msgstr "Opprett nytt øyeblikksbilde"
#. radio button label
-#: src/include/snapper/dialogs.rb:262
+#: src/include/snapper/dialogs.rb:255
msgid "Single snapshot"
msgstr "Enkelt øyeblikksbilde"
#. radio button label
#. 0 means there's no post
-#: src/include/snapper/dialogs.rb:271 src/include/snapper/dialogs.rb:435
+#: src/include/snapper/dialogs.rb:264 src/include/snapper/dialogs.rb:442
msgid "Pre"
msgstr "Før"
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:281
+#: src/include/snapper/dialogs.rb:274
msgid "Post, paired with:"
msgstr "Etter, i par med:"
#. yes/no popup question
-#: src/include/snapper/dialogs.rb:352
+#: src/include/snapper/dialogs.rb:350
#, fuzzy
#| msgid "Really delete snapshot '%1'?"
-msgid "Really delete snapshot '%1'?"
+msgid "Really delete snapshot %{num}?"
msgstr "Vil du virkelig slette øyeblikksbildet '%1'?"
+#. yes/no popup question
+#: src/include/snapper/dialogs.rb:357
+#, fuzzy
+#| msgid "Really delete snapshot '%1'?"
+msgid "Really delete snapshots %{pre} and %{post}?"
+msgstr "Vil du virkelig slette øyeblikksbildet '%1'?"
+
#. summary dialog caption
-#: src/include/snapper/dialogs.rb:365
+#: src/include/snapper/dialogs.rb:372
msgid "Snapshots"
msgstr "Øyeblikksbilder"
#. generate list of snapshot table items
-#: src/include/snapper/dialogs.rb:394
+#: src/include/snapper/dialogs.rb:401
msgid "Single"
msgstr "Enkelt"
#. pre canot be 0
-#: src/include/snapper/dialogs.rb:419
+#: src/include/snapper/dialogs.rb:426
msgid "Pre & Post"
msgstr "Før og Etter"
#. busy popup message
-#: src/include/snapper/dialogs.rb:454
+#: src/include/snapper/dialogs.rb:461
msgid "Reading list of snapshots..."
msgstr "Leser listen over øyeblikksbilder..."
#. combo box label
-#: src/include/snapper/dialogs.rb:475
+#: src/include/snapper/dialogs.rb:481
msgid "Current Configuration"
msgstr "Gjeldende oppsett"
#. table header
-#: src/include/snapper/dialogs.rb:486
+#: src/include/snapper/dialogs.rb:492
msgid "ID"
msgstr "ID"
-#: src/include/snapper/dialogs.rb:487
+#: src/include/snapper/dialogs.rb:493
msgid "Type"
msgstr "Type"
-#: src/include/snapper/dialogs.rb:488
+#: src/include/snapper/dialogs.rb:494
msgid "Start Date"
msgstr "Startdato"
-#: src/include/snapper/dialogs.rb:489
+#: src/include/snapper/dialogs.rb:495
msgid "End Date"
msgstr "Sluttdato"
-#: src/include/snapper/dialogs.rb:491
+#: src/include/snapper/dialogs.rb:497
msgid "User Data"
msgstr "Brukerinformasjon"
#. button label
-#: src/include/snapper/dialogs.rb:497
+#: src/include/snapper/dialogs.rb:503
msgid "Show Changes"
msgstr "Vis endringer"
#. button label
-#: src/include/snapper/dialogs.rb:500
+#: src/include/snapper/dialogs.rb:506
msgid "Modify"
msgstr "Endre"
#. popup message
-#: src/include/snapper/dialogs.rb:542
+#: src/include/snapper/dialogs.rb:549
msgid ""
"This 'Pre' snapshot is not paired with any 'Post' one yet.\n"
"Showing differences is not possible."
@@ -163,131 +194,131 @@
"Det er ikke mulig å vise avvik."
#. dialog caption
-#: src/include/snapper/dialogs.rb:588
+#: src/include/snapper/dialogs.rb:634
msgid "Selected Snapshot Overview"
msgstr "Valgt oversikt over øyeblikksbilder"
#. '%1: %2' means 'ID: description', adapt the order if necessary
-#: src/include/snapper/dialogs.rb:626
+#: src/include/snapper/dialogs.rb:666
msgid "%1: %2"
msgstr "%1: %2"
#. busy popup message
-#: src/include/snapper/dialogs.rb:645
+#: src/include/snapper/dialogs.rb:685
msgid "Calculating changed files..."
msgstr "Beregner endrede filer..."
#. busy popup message
-#: src/include/snapper/dialogs.rb:742
+#: src/include/snapper/dialogs.rb:695
msgid "Calculating file modifications..."
msgstr "Beregner endringer i filer..."
#. label
-#: src/include/snapper/dialogs.rb:750
+#: src/include/snapper/dialogs.rb:703
msgid "New file was created."
msgstr "En ny fil er opprettet."
#. label
-#: src/include/snapper/dialogs.rb:754
+#: src/include/snapper/dialogs.rb:707
msgid "File was removed."
msgstr "Filen er slettet."
#. label
-#: src/include/snapper/dialogs.rb:759
+#: src/include/snapper/dialogs.rb:712
msgid "File content was not changed."
msgstr "Filinnholdet er ikke endret."
#. label
-#: src/include/snapper/dialogs.rb:765
+#: src/include/snapper/dialogs.rb:718
msgid "File does not exist in either snapshot."
msgstr "Filen finnes ikke i noen av øyeblikksbildene."
#. label
-#: src/include/snapper/dialogs.rb:771
+#: src/include/snapper/dialogs.rb:724
msgid "File content was modified."
msgstr "Innholdet i filen er endret."
#. text label, %1, %2 are file modes (like '-rw-r--r--')
-#: src/include/snapper/dialogs.rb:781
+#: src/include/snapper/dialogs.rb:734
msgid "File mode was changed from '%1' to '%2'."
msgstr "Filmodus er endret fra '%1' til '%2'."
#. text label, %1, %2 are user names
-#: src/include/snapper/dialogs.rb:796
+#: src/include/snapper/dialogs.rb:749
msgid "File user ownership was changed from '%1' to '%2'."
msgstr "Brukereierskap for filer er endret fra '%1' til '%2'."
#. text label, %1, %2 are group names
-#: src/include/snapper/dialogs.rb:812
+#: src/include/snapper/dialogs.rb:765
msgid "File group ownership was changed from '%1' to '%2'."
msgstr "Gruppeeierskap for filer er endret fra '%1' til '%2'."
#. button label
-#: src/include/snapper/dialogs.rb:847
+#: src/include/snapper/dialogs.rb:782
msgid "R&estore from First"
msgstr "Gj&enopprett fra første"
#. button label
-#: src/include/snapper/dialogs.rb:849
+#: src/include/snapper/dialogs.rb:784
msgid "Restore"
msgstr "Gjenopprett"
-#: src/include/snapper/dialogs.rb:872
+#: src/include/snapper/dialogs.rb:807
msgid "Res&tore from Second"
msgstr "Gjenoppre&tt fra andre"
#. radio button label
-#: src/include/snapper/dialogs.rb:909
+#: src/include/snapper/dialogs.rb:844
msgid "Show the difference between snapshot and current system"
msgstr "Vis forskjellen mellom øyeblikksbilde og gjeldende system"
#. radio button label, snapshot selection will follow
-#: src/include/snapper/dialogs.rb:921
+#: src/include/snapper/dialogs.rb:856
msgid "Show the difference between current and selected snapshot:"
msgstr "Vis forskjellen mellom gjeldende og valgt øyeblikksbilde:"
#. radio button label
-#: src/include/snapper/dialogs.rb:968
+#: src/include/snapper/dialogs.rb:903
msgid "Show the difference between first and second snapshot"
msgstr "Vis forskjellen mellom første og andre øyeblikksbilde"
#. radio button label
-#: src/include/snapper/dialogs.rb:979
+#: src/include/snapper/dialogs.rb:914
msgid "Show the difference between first snapshot and current system"
msgstr "Vis forskjellen mellom første øyeblikksbilde og gjeldende system"
#. radio button label
-#: src/include/snapper/dialogs.rb:990
+#: src/include/snapper/dialogs.rb:925
msgid "Show the difference between second snapshot and current system"
msgstr "Vis forskjellen mellom andre øyeblikksbilde og gjeldende system"
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1031
+#: src/include/snapper/dialogs.rb:954
+msgid "Time of taking the snapshot:"
+msgstr "Tid for å opprette øyeblikksbildet:"
+
+#. label, date string will follow at the end of line
+#: src/include/snapper/dialogs.rb:962
msgid "Time of taking the first snapshot:"
msgstr "Tid for å opprette første øyeblikksbilde:"
#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1036
+#: src/include/snapper/dialogs.rb:967
msgid "Time of taking the second snapshot:"
msgstr "Tid for å opprette andre øyeblikksbilde:"
-#. label, date string will follow at the end of line
-#: src/include/snapper/dialogs.rb:1044
-msgid "Time of taking the snapshot:"
-msgstr "Tid for å opprette øyeblikksbildet:"
-
#. button label
-#: src/include/snapper/dialogs.rb:1066
+#: src/include/snapper/dialogs.rb:990
msgid "&Open"
msgstr "&Åpne"
#. button label
-#: src/include/snapper/dialogs.rb:1112
+#: src/include/snapper/dialogs.rb:1036
msgid "Restore Selected"
msgstr "Oppdater valgte"
#. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1186
+#: src/include/snapper/dialogs.rb:1121
msgid ""
"Do you want to delete the file\n"
"\n"
@@ -303,7 +334,7 @@
#. yes/no question, %1 is file name, %2 is number
#. yes/no question, %1 is file name, %2 is number
-#: src/include/snapper/dialogs.rb:1206 src/include/snapper/dialogs.rb:1224
+#: src/include/snapper/dialogs.rb:1142 src/include/snapper/dialogs.rb:1161
msgid ""
"Do you want to copy the file\n"
"\n"
@@ -318,19 +349,19 @@
"fra øyeblikksbilde '%2' til gjeldende system?"
#. popup message
-#: src/include/snapper/dialogs.rb:1259
+#: src/include/snapper/dialogs.rb:1187
#, fuzzy
#| msgid "No file was selected for restoring"
-msgid "No file was selected for restoring"
+msgid "No file was selected for restoring."
msgstr "Ingen fil er valgt for gjenoppretting"
#. popup headline
-#: src/include/snapper/dialogs.rb:1264
+#: src/include/snapper/dialogs.rb:1197
msgid "Restoring files"
msgstr "Gjenoppretter filer"
#. popup message, %1 is snapshot number, %2 list of files
-#: src/include/snapper/dialogs.rb:1267
+#: src/include/snapper/dialogs.rb:1200
msgid ""
"<p>These files will be restored from snapshot '%1':</p>\n"
"<p>\n"
@@ -347,7 +378,7 @@
"<p>Filer som ikke finnes i øyeblikksbildet, vil bli slettet.</p>Er du sikker på at du vil gjøre dette?"
#. Read dialog help
-#: src/include/snapper/helps.rb:36
+#: src/include/snapper/helps.rb:35
msgid ""
"<p><b><big>Reading the list of snapshots</big></b><br>\n"
"</p>\n"
@@ -356,7 +387,7 @@
"</p>\n"
#. Summary dialog help:
-#: src/include/snapper/helps.rb:40
+#: src/include/snapper/helps.rb:39
#, fuzzy
#| msgid ""
#| "<p><b><big>Snapshots Configuration</big></b><p>\n"
@@ -369,8 +400,8 @@
"<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 coupled together in the table.</p>\n"
-"<p>Select a snapshot or snapshot couple and click <b>Show Changes</b> to see the\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"
msgstr ""
"<p><b><big>Oppsett av øyeblikksbilder</big></b><p>\n"
@@ -380,7 +411,7 @@
"<p>Velg et øyeblikksbilde eller et øyeblikksbildepar, og klikk <b>Vis endringer</b> for å vise endringer i filsystemet i det angitte øyeblikksbildet.</p>\n"
#. Show snapshot dialog help
-#: src/include/snapper/helps.rb:49
+#: src/include/snapper/helps.rb:48
#, fuzzy
#| msgid ""
#| "<p><b><big>Snapshot Overview</big></b><p>\n"
@@ -396,7 +427,7 @@
"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"
-"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"
+"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"
msgstr ""
"<p><b><big>Oversikt over øyeblikksbilder</big></b><p>\n"
@@ -408,7 +439,7 @@
"</p>\n"
#. Show snapshot dialog help, alternative for single snapshots
-#: src/include/snapper/helps.rb:59
+#: src/include/snapper/helps.rb:58
msgid ""
"<p><b><big>Snapshot Overview</big></b><p>\n"
"<p>\n"
@@ -426,195 +457,165 @@
"Når en fil er valgt i filstrukturen, vises forskjellen mellom øyeblikksbildeversjonen og versjonen i det gjeldende systemet.\n"
"</p>\n"
-#. popup error
-#: src/modules/Snapper.rb:91
-msgid "Snapshot '%1' was not found."
-msgstr "Øyeblikksbildet '%1' ble ikke funnet."
+#. 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 save ipsec.conf:"
+msgid "Failed to get config:\n"
+msgstr "Kunne ikke lagre ipsec.conf:"
-#. 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 "Årsaken er ukjent."
-
-#: src/modules/Snapper.rb:238
-msgid "Configuration not found."
-msgstr "Oppsett ikke funnet."
-
-#: src/modules/Snapper.rb:240
-msgid "Configuration is not valid."
-msgstr "Oppsettet er ikke gyldig."
-
-#. error popup
-#: src/modules/Snapper.rb:247
-msgid ""
-"Failed to initialize snapper library:\n"
-"%1"
+#. Return the path to given snapshot
+#: src/modules/Snapper.rb:129
+#, fuzzy
+#| msgid ""
+#| "Failed to delete snapshot:\n"
+#| "%1"
+msgid "Failed to get snapshot mount point:\n"
msgstr ""
-"Kunne ikke initialisere snapper-biblioteket:\n"
+"Kunne ikke slette øyeblikksbilde:\n"
"%1"
-#: src/modules/Snapper.rb:266
-msgid "Snapshot was not found."
-msgstr "Øyeblikksbildet ble ikke funnet."
-
-#. error popup
-#: src/modules/Snapper.rb:271
+#. Create new snapshot
+#. Return true on success
+#: src/modules/Snapper.rb:276
#, fuzzy
#| msgid ""
-#| "Failed to delete snapshot:\n"
+#| "Failed to create new snapshot:\n"
#| "%1"
-msgid ""
-"Failed to delete snapshot:\n"
-"%1"
+msgid "Failed to create new snapshot:\n"
msgstr ""
-"Kunne ikke slette øyeblikksbilde:\n"
+"Kunne ikke opprette nytt øyeblikksbilde:\n"
"%1"
-#. error popup
-#: src/modules/Snapper.rb:289
+#. Modify existing snapshot
+#. Return true on success
+#: src/modules/Snapper.rb:291
#, fuzzy
#| msgid ""
#| "Failed to modify snapshot:\n"
#| "%1"
-msgid ""
-"Failed to modify snapshot:\n"
-"%1"
+msgid "Failed to modify snapshot:\n"
msgstr ""
"Kunne ikke endre øyeblikksbilde:\n"
"%1"
+#. Delete existing snapshot
+#. Return true on success
#: src/modules/Snapper.rb:306
-msgid "Wrong snapshot type given."
-msgstr "Feil øyeblikksbildetype angitt."
-
-#: src/modules/Snapper.rb:308
-msgid "'Pre' snapshot was not given."
-msgstr "'Før'-øyeblikksbilde er ikke angitt."
-
-#: src/modules/Snapper.rb:310
-msgid "Given 'Pre' snapshot was not found."
-msgstr "Angitt 'Før'-øyeblikksbilde ble ikke funnet."
-
-#. error popup
-#: src/modules/Snapper.rb:316
#, fuzzy
#| msgid ""
-#| "Failed to create new snapshot:\n"
+#| "Failed to delete snapshot:\n"
#| "%1"
-msgid ""
-"Failed to create new snapshot:\n"
-"%1"
+msgid "Failed to delete snapshot:\n"
msgstr ""
-"Kunne ikke opprette nytt øyeblikksbilde:\n"
+"Kunne ikke slette øyeblikksbilde:\n"
"%1"
#. Snapper read dialog caption
-#: src/modules/Snapper.rb:326
+#: src/modules/Snapper.rb:319
msgid "Initializing Snapper"
msgstr "Initialiserer Snapper"
-#. Progress stage 1/3
-#: src/modules/Snapper.rb:337
+#. Progress stage 1/2
+#: src/modules/Snapper.rb:324
#, fuzzy
+#| msgid "Read configurations"
+msgid "Read list of configurations"
+msgstr "Les oppsett"
+
+#. Progress stage 2/2
+#: src/modules/Snapper.rb:326
+#, fuzzy
#| msgid "Read the list of snapshots"
-msgid "Read the list of snapshots"
+msgid "Read list of snapshots"
msgstr "Les listen over øyeblikksbilder"
-#. 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 the configurations..."
+msgid "Reading list of configurations"
+msgstr "Leser oppsett..."
+#. Progress step 2/2
+#: src/modules/Snapper.rb:332
+#, fuzzy
+#| msgid "Reading list of snapshots..."
+msgid "Reading list of snapshots"
+msgstr "Leser listen over øyeblikksbilder..."
+
#. Progress finished
-#: src/modules/Snapper.rb:343
+#: src/modules/Snapper.rb:334
msgid "Finished"
msgstr "Fullført"
-#. error popup
-#: src/modules/Snapper.rb:352
+#: src/modules/Snapper.rb:344
+#, fuzzy
+#| msgid "Boot loader configuration failed."
+msgid "Querying snapper configurations failed:"
+msgstr "Konfigurasjon av oppstartslaster mislyktes."
+
+#: src/modules/Snapper.rb:349
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:395
+#: src/modules/Snapper.rb:399
msgid "Restoring Files..."
msgstr "Gjenoppretter filer..."
#. log entry (%1 is file name)
-#: src/modules/Snapper.rb:424
+#: src/modules/Snapper.rb:428
msgid "Deleted %1\n"
msgstr "Slettet %1\n"
#. log entry (%1 is file name)
-#: src/modules/Snapper.rb:477
+#: src/modules/Snapper.rb:481
msgid "%1 skipped\n"
msgstr "%1 utelatt\n"
-#, fuzzy
-#~| msgid "Modify Snapshots %1 - %2"
-#~ msgid "Modify Snapshot %{pre} and %{post}"
-#~ msgstr "Endre øyeblikksbilder %1 - %2"
+#~ msgid "Snapshot '%1' was not found."
+#~ msgstr "Øyeblikksbildet '%1' ble ikke funnet."
-#, fuzzy
-#~| msgid "Pre (%1)"
-#~ msgid "Pre (%{pre})"
-#~ msgstr "Før (%1)"
+#~ msgid "Reason not known."
+#~ msgstr "Årsaken er ukjent."
-#, fuzzy
-#~| msgid "Post (%1)"
-#~ msgid "Post (%{post})"
-#~ msgstr "Etter (%1)"
+#~ msgid "Configuration not found."
+#~ msgstr "Oppsett ikke funnet."
-#, fuzzy
-#~| msgid "Really delete snapshot '%1'?"
-#~ msgid "Really delete snapshots %{pre} and %{post}?"
-#~ msgstr "Vil du virkelig slette øyeblikksbildet '%1'?"
+#~ msgid "Configuration is not valid."
+#~ msgstr "Oppsettet er ikke gyldig."
-#, fuzzy
-#~| msgid "Failed to save ipsec.conf:"
-#~ msgid "Failed to get config:\n"
-#~ msgstr "Kunne ikke lagre ipsec.conf:"
-
-#, fuzzy
-#~| msgid ""
-#~| "Failed to delete snapshot:\n"
-#~| "%1"
-#~ msgid "Failed to get snapshot mount point:\n"
+#~ msgid ""
+#~ "Failed to initialize snapper library:\n"
+#~ "%1"
#~ msgstr ""
-#~ "Kunne ikke slette øyeblikksbilde:\n"
+#~ "Kunne ikke initialisere snapper-biblioteket:\n"
#~ "%1"
-#, fuzzy
-#~| msgid "Read configurations"
-#~ msgid "Read list of configurations"
-#~ msgstr "Les oppsett"
+#~ msgid "Snapshot was not found."
+#~ msgstr "Øyeblikksbildet ble ikke funnet."
-#, fuzzy
-#~| msgid "Reading the configurations..."
-#~ msgid "Reading list of configurations"
-#~ msgstr "Leser oppsett..."
+#~ msgid "Wrong snapshot type given."
+#~ msgstr "Feil øyeblikksbildetype angitt."
-#, fuzzy
-#~| msgid "Reading list of snapshots..."
-#~ msgid "Reading list of snapshots"
-#~ msgstr "Leser listen over øyeblikksbilder..."
+#~ msgid "'Pre' snapshot was not given."
+#~ msgstr "'Før'-øyeblikksbilde er ikke angitt."
-#, fuzzy
-#~| msgid "Boot loader configuration failed."
-#~ msgid "Querying snapper configurations failed:"
-#~ msgstr "Konfigurasjon av oppstartslaster mislyktes."
+#~ msgid "Given 'Pre' snapshot was not found."
+#~ msgstr "Angitt 'Før'-øyeblikksbilde ble ikke funnet."
+#~ msgid "Reading the database..."
+#~ msgstr "Leser databasen..."
+
#~ msgid "File /etc/sysconfig/snapper is not available."
#~ msgstr "Filen /etc/sysconfig/snapper er ikke tilgjengelig."
Modified: branches/plus-SLE12-SP2/yast/nb/po/sound.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/sound.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/sound.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: sound\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-08-13 16:49+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/squid.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/squid.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/squid.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-08-13 16:51+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/sshd.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/sshd.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/sshd.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: sshd.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-08-13 17:00+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/storage.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/storage.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/storage.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: storage\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:58+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2009-10-08 13:00+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -184,13 +184,7 @@
msgid "Not enough space available to propose separate /home."
msgstr "Det er ikke nok ledig plass til å foreslå en separat partisjon for /home."
-#: src/clients/inst_disk_proposal.rb:283
-#, fuzzy
-#| msgid "Nothing assigned as root filesystem!"
-msgid "Nothing assigned as root filesystem. Cannot continue."
-msgstr "Det er ikke tilordnet noe rotfilsystem!"
-
-#: src/clients/inst_disk_proposal.rb:304
+#: src/clients/inst_disk_proposal.rb:295
msgid ""
"Computing this proposal will overwrite manual changes \n"
"done so far. Continue with computing proposal?"
@@ -978,7 +972,7 @@
#. Label text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/auto_part_ui.rb:341
-#: src/modules/StorageProposal.rb:6250
+#: src/modules/StorageProposal.rb:6245
msgid "Propose Separate &Home Partition"
msgstr "Foreslå separat partisjon for &hjemmekatalog"
@@ -996,7 +990,7 @@
msgstr "Forslagstype"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:244
+#: src/include/partitioning/custom_part_check_generated.rb:251
msgid ""
"You have not assigned a root partition for\n"
"installation. This does not work. Assign the root mount point \"/\" to a\n"
@@ -1011,7 +1005,7 @@
"Vil du virkelig bruke dette oppsettet?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:257
+#: src/include/partitioning/custom_part_check_generated.rb:264
msgid ""
"You tried to mount a FAT partition to one of the following mount\n"
"points: /, /usr, /home, /opt or /var. This will very likely cause problems.\n"
@@ -1027,7 +1021,7 @@
"Vil du virkelig bruke dette oppsettet?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:270
+#: src/include/partitioning/custom_part_check_generated.rb:277
msgid ""
"You tried to mount a FAT partition to the\n"
"mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -1042,7 +1036,7 @@
"Vil du virkelig bruke dette oppsettet?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:284
+#: src/include/partitioning/custom_part_check_generated.rb:291
msgid ""
"You have mounted a partition with Btrfs to the\n"
"mount point /boot. This will very likely cause problems. Use a Linux file\n"
@@ -1058,7 +1052,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:298
+#: src/include/partitioning/custom_part_check_generated.rb:305
msgid ""
"Warning:\n"
"Your system needs a boot partition with type 0x41 PReP/CHRP.\n"
@@ -1068,7 +1062,7 @@
msgstr ""
#. popup text, %1 is a number
-#: src/include/partitioning/custom_part_check_generated.rb:313
+#: src/include/partitioning/custom_part_check_generated.rb:320
msgid ""
"Warning:\n"
"Your boot partition ends above cylinder %1.\n"
@@ -1089,7 +1083,7 @@
"Vil du bruke dette oppsettet?\n"
#. popup text, %1 is a size
-#: src/include/partitioning/custom_part_check_generated.rb:333
+#: src/include/partitioning/custom_part_check_generated.rb:340
msgid ""
"Warning:\n"
"Your boot partition is smaller than %1.\n"
@@ -1104,7 +1098,7 @@
"Vil du virkelig bruke denne størrelsen på oppstartspartisjonen?\n"
#. /////////////////////////// NO BOOT ///////////////////////////
-#: src/include/partitioning/custom_part_check_generated.rb:350
+#: src/include/partitioning/custom_part_check_generated.rb:357
msgid ""
"Warning: There is no partition of type bios_grub present.\n"
"Such a partition is recommended (required with Btrfs) when Grub2 is\n"
@@ -1116,7 +1110,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:370
+#: src/include/partitioning/custom_part_check_generated.rb:377
#, fuzzy
#| msgid ""
#| "Warning: There is no partition mounted as /boot.\n"
@@ -1143,7 +1137,7 @@
"Vil du virkelig bruke dette oppsettet uten en /boot-partisjon?\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:389
+#: src/include/partitioning/custom_part_check_generated.rb:396
msgid ""
"Warning: According to your setup, you intend to\n"
"boot your machine from the root partition (/), which, unfortunately,\n"
@@ -1162,11 +1156,11 @@
"\n"
"Vil du virkelig bruke dette oppsettet?\n"
-#: src/include/partitioning/custom_part_check_generated.rb:415
+#: src/include/partitioning/custom_part_check_generated.rb:416
msgid ""
"Warning: Some subvolumes of the root filesystem are shadowed by\n"
"mount points of other filesystem. This could lead to problems.\n"
-"%s\n"
+"\n"
"Really use this setup?\n"
msgstr ""
@@ -1312,7 +1306,7 @@
"Vil du virkelig beholde partisjonen uformatert?\n"
#. popup text %1 is replaced by a raid name e.g. md0
-#: src/include/partitioning/custom_part_check_generated.rb:601
+#: src/include/partitioning/custom_part_check_generated.rb:595
msgid ""
"The selected device belongs to the RAID (%1).\n"
"Remove it from the RAID before editing it.\n"
@@ -1321,7 +1315,7 @@
"Fjern den fra RAID før du gjør endringer.\n"
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:612
+#: src/include/partitioning/custom_part_check_generated.rb:606
msgid ""
"The selected device belongs to a volume group (%1).\n"
"Remove it from the volume group before editing it.\n"
@@ -1330,7 +1324,7 @@
"Fjern den fra volumgruppen før du gjør endringer.\n"
#. popup text %1 is replaced by a name e.g. system
-#: src/include/partitioning/custom_part_check_generated.rb:622
+#: src/include/partitioning/custom_part_check_generated.rb:616
msgid ""
"The selected device is used by volume (%1).\n"
"Remove the volume before editing it.\n"
@@ -1339,7 +1333,7 @@
"Fjern den fra volumet før du gjør endringer.\n"
#. popup text %2 is a device name, %1 is the raid name
-#: src/include/partitioning/custom_part_check_generated.rb:655
+#: src/include/partitioning/custom_part_check_generated.rb:649
msgid ""
"The device (%2) belongs to the RAID (%1).\n"
"Remove it from the RAID before deleting it.\n"
@@ -1348,7 +1342,7 @@
"Fjern den fra RAID før du sletter den.\n"
#. popup text, %1 and %2 are device names
-#: src/include/partitioning/custom_part_check_generated.rb:666
+#: src/include/partitioning/custom_part_check_generated.rb:660
msgid ""
"The device (%2) is used by %1.\n"
"Remove %1 before deleting it.\n"
@@ -1356,12 +1350,12 @@
"Enheten (%2) benyttes av %1.\n"
"Fjern %1 før du sletter den.\n"
-#: src/include/partitioning/custom_part_check_generated.rb:678
+#: src/include/partitioning/custom_part_check_generated.rb:672
msgid "It cannot be deleted while mounted."
msgstr "Kan ikke slettes mens den er montert."
#. popup text, %1 is a device name
-#: src/include/partitioning/custom_part_check_generated.rb:714
+#: src/include/partitioning/custom_part_check_generated.rb:708
msgid ""
"The device (%1) cannot be removed since it is a logical partition and \n"
"another logical partition with a higher number is in use.\n"
@@ -1370,7 +1364,7 @@
"en annen logisk partisjon med høyere nummer er i bruk.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:790
+#: src/include/partitioning/custom_part_check_generated.rb:784
msgid ""
"The selected extended partition contains partitions which are currently mounted:\n"
"%1\n"
@@ -1383,7 +1377,7 @@
"Klikk Avbryt hvis du ikke vet nøyaktig hva du gjør.\n"
#. popup text, Do not translate LVM.
-#: src/include/partitioning/custom_part_check_generated.rb:808
+#: src/include/partitioning/custom_part_check_generated.rb:802
msgid ""
"\n"
"The selected extended partition contains at least one LVM partition\n"
@@ -1398,7 +1392,7 @@
"før du sletter den utvidede partisjonen.\n"
#. popup text, Do not translate RAID.
-#: src/include/partitioning/custom_part_check_generated.rb:819
+#: src/include/partitioning/custom_part_check_generated.rb:813
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1413,7 +1407,7 @@
"den utvidede partisjonen.\n"
#. popup text
-#: src/include/partitioning/custom_part_check_generated.rb:830
+#: src/include/partitioning/custom_part_check_generated.rb:824
msgid ""
"\n"
"The selected extended partition contains at least one partition\n"
@@ -1432,13 +1426,13 @@
#. label text
#: src/include/partitioning/custom_part_dialogs.rb:74
-#: src/include/partitioning/ep-dialogs.rb:806
-#: src/modules/StorageProposal.rb:6378
+#: src/include/partitioning/ep-dialogs.rb:768
+#: src/modules/StorageProposal.rb:6372
msgid "Do not forget what you enter here!"
msgstr "Ikke glem hva du skriver inn her!"
#: src/include/partitioning/custom_part_dialogs.rb:78
-#: src/include/partitioning/ep-dialogs.rb:809
+#: src/include/partitioning/ep-dialogs.rb:771
msgid "Empty password allowed."
msgstr "Passord er ikke nødvendig."
@@ -1467,7 +1461,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:834
+#: src/include/partitioning/ep-dialogs.rb:796
msgid "&Enter a Password for your File System:"
msgstr "Skriv inn &et passord for filsystemet:"
@@ -1478,7 +1472,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:818 src/modules/Storage.rb:4006
+#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002
msgid "Reenter the Password for &Verification:"
msgstr "&Gjenta passordet:"
@@ -1501,7 +1495,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:196
-#: src/modules/Storage.rb:3962
+#: src/modules/Storage.rb:3958
msgid ""
"You did not enter a password.\n"
"Try again.\n"
@@ -1512,7 +1506,7 @@
#. popup text
#. popup text
#: src/include/partitioning/custom_part_dialogs.rb:203
-#: src/modules/Storage.rb:3970
+#: src/modules/Storage.rb:3966
msgid ""
"The password must have at least %1 characters.\n"
"Try again.\n"
@@ -1880,7 +1874,7 @@
#. TRANSLATOR: checkbox text
#. TRANSLATORS: checkbox text
#: src/include/partitioning/custom_part_dialogs.rb:1592
-#: src/modules/StorageProposal.rb:6231
+#: src/modules/StorageProposal.rb:6226
msgid "Enable Snapshots"
msgstr ""
@@ -1895,7 +1889,7 @@
msgid "Empty subvolume name not allowed."
msgstr "Du må angi et navn på undervolumet."
-#: src/include/partitioning/custom_part_dialogs.rb:1671
+#: src/include/partitioning/custom_part_dialogs.rb:1670
msgid ""
"Only subvolume names starting with \"%1\" currently allowed!\n"
"Automatically prepending \"%1\" to name of subvolume."
@@ -1903,11 +1897,11 @@
"Bare undervolumnavn som begynner med \"%1\" er tillat!\n"
"Legger automatisk til \"%1\" foran undervolumnavnet."
-#: src/include/partitioning/custom_part_dialogs.rb:1681
+#: src/include/partitioning/custom_part_dialogs.rb:1680
msgid "Subvolume name %1 already exists."
msgstr "Undervolumnavnet %1 finnes allerede."
-#: src/include/partitioning/custom_part_dialogs.rb:1711
+#: src/include/partitioning/custom_part_dialogs.rb:1709
msgid "Modifications done so far in this dialog will be lost."
msgstr "Alle tidligere endringer i dialogen vil gå tapt."
@@ -1950,7 +1944,7 @@
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:87
-#: src/include/partitioning/ep-dialogs.rb:746
+#: src/include/partitioning/ep-dialogs.rb:708
msgid ""
"<p>\n"
"This mount point corresponds to a temporary filesystem like /tmp or /var/tmp.\n"
@@ -1969,7 +1963,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:100
-#: src/include/partitioning/ep-dialogs.rb:761
+#: src/include/partitioning/ep-dialogs.rb:723
msgid ""
"<p>\n"
"If you forget your password, you will lose access to the data on your file system.\n"
@@ -1988,7 +1982,7 @@
#. help text, continued
#. helptext, %1 is replaced by integer
#: src/include/partitioning/custom_part_helptexts.rb:114
-#: src/include/partitioning/ep-dialogs.rb:775
+#: src/include/partitioning/ep-dialogs.rb:737
msgid ""
"<p>\n"
"You must distinguish between uppercase and lowercase. A password should have at\n"
@@ -2020,7 +2014,7 @@
#. help text, continued
#. helptext
#: src/include/partitioning/custom_part_helptexts.rb:142
-#: src/include/partitioning/ep-dialogs.rb:787
+#: src/include/partitioning/ep-dialogs.rb:749
msgid ""
"<p>\n"
"Do not forget this password!\n"
@@ -2240,7 +2234,7 @@
"til enheter som mangler eller ha ukjent filsystem."
#. warning message, %1 is replaced by fs name (e.g. Ext3)
-#: src/include/partitioning/custom_part_lib.rb:482
+#: src/include/partitioning/custom_part_lib.rb:491
msgid ""
"\n"
"WARNING:\n"
@@ -2264,12 +2258,12 @@
#. //////////////////////////////////////////////
#. modify map new
-#: src/include/partitioning/custom_part_lib.rb:924
-#: src/include/partitioning/custom_part_lib.rb:951
+#: src/include/partitioning/custom_part_lib.rb:919
+#: src/include/partitioning/custom_part_lib.rb:946
msgid "The file system is currently mounted on %1."
msgstr "Filsystemet er montert på %1."
-#: src/include/partitioning/custom_part_lib.rb:929
+#: src/include/partitioning/custom_part_lib.rb:924
msgid ""
"You can try to unmount it now, continue without unmounting or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2279,12 +2273,12 @@
#. button text
#. button text
-#: src/include/partitioning/custom_part_lib.rb:940
-#: src/include/partitioning/custom_part_lib.rb:965
+#: src/include/partitioning/custom_part_lib.rb:935
+#: src/include/partitioning/custom_part_lib.rb:960
msgid "Unmount"
msgstr "Avmonter"
-#: src/include/partitioning/custom_part_lib.rb:956
+#: src/include/partitioning/custom_part_lib.rb:951
msgid ""
"You can try to unmount it now or cancel.\n"
"Click Cancel unless you know exactly what you are doing."
@@ -2292,15 +2286,15 @@
"Du kan forsøke avmontere det nå eller avbryte.\n"
"Klikk på Avbryt hvis du ikke vet nøyaktig hva du holder på med."
-#: src/include/partitioning/custom_part_lib.rb:1002
+#: src/include/partitioning/custom_part_lib.rb:997
msgid "It is not possible to shrink the file system while it is mounted."
msgstr "Filsystemet kan ikke krympes mens det er montert."
-#: src/include/partitioning/custom_part_lib.rb:1015
+#: src/include/partitioning/custom_part_lib.rb:1010
msgid "It is not possible to extend the file system while it is mounted."
msgstr "Filsystemet kan ikke utvides mens det er montert."
-#: src/include/partitioning/custom_part_lib.rb:1026
+#: src/include/partitioning/custom_part_lib.rb:1021
msgid "It is not possible to resize the file system while it is mounted."
msgstr "Du kan ikke endre størrelse på filsystemet mens det er montert."
@@ -2731,43 +2725,36 @@
msgstr "<p>Velg størrelsen på den nye partisjonen.</p>"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:56
-#, fuzzy
-#| msgid "HFS Boot Partition"
-msgid "EFI Boot Partition"
-msgstr "HFS-oppstartspartisjon"
-
-#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:64
+#: src/include/partitioning/ep-dialogs.rb:55
msgid "Operating System"
msgstr "Operativsystem"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:69
+#: src/include/partitioning/ep-dialogs.rb:60
#, fuzzy
#| msgid "Delta RPM Application Progress"
msgid "Data and ISV Applications"
msgstr "Forløpsindikator for installasjon av delta-RPM"
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:75
+#: src/include/partitioning/ep-dialogs.rb:65
msgid "Swap"
msgstr ""
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:80
+#: src/include/partitioning/ep-dialogs.rb:70
msgid "Raw Volume (unformatted)"
msgstr ""
#. heading for a frame in a dialog
-#: src/include/partitioning/ep-dialogs.rb:88
+#: src/include/partitioning/ep-dialogs.rb:78
#, fuzzy
#| msgid "Role: %s"
msgid "Role"
msgstr "Rolle: %s"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:120
+#: src/include/partitioning/ep-dialogs.rb:107
msgid ""
"<p>First, choose whether the partition should be\n"
"formatted and the desired file system type.</p>"
@@ -2776,7 +2763,7 @@
"og ønsket filsystemtype.</p>"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:127
+#: src/include/partitioning/ep-dialogs.rb:114
msgid ""
"<p>If you want to encrypt all data on the\n"
"volume, select <b>Encrypt Device</b>. Changing the encryption on an existing\n"
@@ -2787,7 +2774,7 @@
"volum, vil alle data på volumet bli slettet.</p>\n"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:137
+#: src/include/partitioning/ep-dialogs.rb:124
msgid ""
"<p>Then, choose whether the partition should\n"
"be mounted and enter the mount point (/, /boot, /home, /var, etc.).</p>"
@@ -2796,47 +2783,47 @@
" og monteringspunktet ( /, /boot, /usr, /var osv.).</p>"
#. set globals
-#: src/include/partitioning/ep-dialogs.rb:337
+#: src/include/partitioning/ep-dialogs.rb:309
msgid "Formatting Options"
msgstr "Formateringsvalg"
-#: src/include/partitioning/ep-dialogs.rb:345
+#: src/include/partitioning/ep-dialogs.rb:317
msgid "Format partition"
msgstr "Formater partisjon"
-#: src/include/partitioning/ep-dialogs.rb:356
+#: src/include/partitioning/ep-dialogs.rb:328
msgid "Do not format partition"
msgstr "Ikke formater partisjon"
-#: src/include/partitioning/ep-dialogs.rb:372
+#: src/include/partitioning/ep-dialogs.rb:344
msgid "Do not mount partition"
msgstr "Ikke monter partisjonen"
-#: src/include/partitioning/ep-dialogs.rb:391
+#: src/include/partitioning/ep-dialogs.rb:363
msgid "Mounting Options"
msgstr "Monteringsvalg"
-#: src/include/partitioning/ep-dialogs.rb:399
+#: src/include/partitioning/ep-dialogs.rb:371
msgid "Mount partition"
msgstr "Monter partisjonen"
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:405 src/modules/StorageFields.rb:144
+#: src/include/partitioning/ep-dialogs.rb:377 src/modules/StorageFields.rb:144
msgid "Mount Point"
msgstr "Monteringspunkt"
#. button text
-#: src/include/partitioning/ep-dialogs.rb:412
+#: src/include/partitioning/ep-dialogs.rb:384
msgid "Fs&tab Options..."
msgstr "Fs&tab-valg..."
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:596
+#: src/include/partitioning/ep-dialogs.rb:558
msgid "Crypt files must be encrypted."
msgstr "Kryptofiler må være kryptert."
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:607
+#: src/include/partitioning/ep-dialogs.rb:569
msgid ""
"You chose to create the crypt file, but did not specify\n"
"that it should be formatted. This does not make sense.\n"
@@ -2849,17 +2836,17 @@
"Kryss av for formatering også.\n"
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:623
+#: src/include/partitioning/ep-dialogs.rb:585
msgid "Crypt files require a mount point."
msgstr "Krypteringsfiler må ha et monteringspunkt."
#. error popup
-#: src/include/partitioning/ep-dialogs.rb:637
+#: src/include/partitioning/ep-dialogs.rb:599
msgid "Tmpfs requires a mount point."
msgstr "Tmpfs må ha et monteringspunkt."
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:721
+#: src/include/partitioning/ep-dialogs.rb:683
msgid ""
"<p>\n"
"Keep in mind that this file system is only protected when it is not\n"
@@ -2874,7 +2861,7 @@
"</p>"
#. helptext
-#: src/include/partitioning/ep-dialogs.rb:734
+#: src/include/partitioning/ep-dialogs.rb:696
msgid ""
"<p>\n"
"The file system used for this volume is swap. You can leave the encryption \n"
@@ -2888,21 +2875,21 @@
"(diskdvale).\n"
"</p>\n"
-#: src/include/partitioning/ep-dialogs.rb:804
+#: src/include/partitioning/ep-dialogs.rb:766
msgid "All data stored on the volume will be lost!"
msgstr "Alle data som er lagret på volumet, vil gåt tapt!"
-#: src/include/partitioning/ep-dialogs.rb:827
+#: src/include/partitioning/ep-dialogs.rb:789
msgid "Password"
msgstr "Passord"
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:924
+#: src/include/partitioning/ep-dialogs.rb:886
msgid "Resize not supported by underlying device."
msgstr "Enheten støtter ikke endring av størrelse."
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:929
+#: src/include/partitioning/ep-dialogs.rb:891
msgid ""
"\n"
"You cannot resize the selected partition because the file system\n"
@@ -2912,7 +2899,7 @@
"Du kan ikke endre størrelse på den valgte partisjonen fordi filsystemet\n"
"på denne partisjonen ikke støtter endring av størrelse.\n"
-#: src/include/partitioning/ep-dialogs.rb:953
+#: src/include/partitioning/ep-dialogs.rb:915
msgid ""
"It is not possible to check whether a NTFS\n"
"can be resized while it is mounted."
@@ -2921,7 +2908,7 @@
"-størrelsen mens filsystemet er montert."
#. FIXME: Really?
-#: src/include/partitioning/ep-dialogs.rb:972
+#: src/include/partitioning/ep-dialogs.rb:934
msgid ""
"Partition %1 cannot be resized\n"
"because the filesystem seems to be inconsistent.\n"
@@ -2930,21 +2917,21 @@
"fordi filsystemet ser ut til å være inkonsistent.\n"
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:999
+#: src/include/partitioning/ep-dialogs.rb:961
msgid "Resize Partition %1"
msgstr "Endre størrelse på partisjon %1"
#. Heading for dialog
-#: src/include/partitioning/ep-dialogs.rb:1020
+#: src/include/partitioning/ep-dialogs.rb:982
msgid "Resize Logical Volume %1"
msgstr "Endre størrelse på logisk volum %1"
#. size_k + min_size_k could be > max_size_k
-#: src/include/partitioning/ep-dialogs.rb:1052
+#: src/include/partitioning/ep-dialogs.rb:1014
msgid "Current size: %1"
msgstr "Gjeldende størrelse: %1"
-#: src/include/partitioning/ep-dialogs.rb:1064
+#: src/include/partitioning/ep-dialogs.rb:1026
msgid "Currently used: %1"
msgstr "Brukt størrelse: %1"
@@ -2952,8 +2939,8 @@
#. input field label
#. combo box label
#. Column header
-#: src/include/partitioning/ep-dialogs.rb:1077
-#: src/include/partitioning/ep-dialogs.rb:1114
+#: src/include/partitioning/ep-dialogs.rb:1039
+#: src/include/partitioning/ep-dialogs.rb:1076
#: src/include/partitioning/ep-hd-dialogs.rb:256
#: src/include/partitioning/ep-loop-dialogs.rb:118
#: src/include/partitioning/ep-lvm-dialogs.rb:559
@@ -2965,33 +2952,33 @@
#. radio button text, %1 is replaced by size
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1087
+#: src/include/partitioning/ep-dialogs.rb:1049
#: src/include/partitioning/ep-hd-dialogs.rb:242
#: src/include/partitioning/ep-lvm-dialogs.rb:535
msgid "Maximum Size (%1)"
msgstr "Maksimal størrelse (%1)"
#. radio button text, %1 is replaced by size
-#: src/include/partitioning/ep-dialogs.rb:1097
+#: src/include/partitioning/ep-dialogs.rb:1059
msgid "Minimum Size (%1)"
msgstr "Minimum størrelse (%1)"
#. radio button text
#. radio button text
-#: src/include/partitioning/ep-dialogs.rb:1106
+#: src/include/partitioning/ep-dialogs.rb:1068
#: src/include/partitioning/ep-hd-dialogs.rb:251
#: src/include/partitioning/ep-lvm-dialogs.rb:568
msgid "Custom Size"
msgstr "Egendefinert størrelse"
#. help text
-#: src/include/partitioning/ep-dialogs.rb:1140
+#: src/include/partitioning/ep-dialogs.rb:1102
msgid "<p>Choose new size.</p>"
msgstr "<p>Velg en ny størrelse.</p>"
#. error popup, %1 and %2 are replaced by sizes
#. error popup, %1 and %2 are replaced by sizes
-#: src/include/partitioning/ep-dialogs.rb:1191
+#: src/include/partitioning/ep-dialogs.rb:1153
#: src/include/partitioning/ep-hd-dialogs.rb:359
#: src/include/partitioning/ep-lvm-dialogs.rb:692
msgid "The size entered is invalid. Enter a size between %1 and %2."
@@ -3001,7 +2988,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:1234
+#: src/include/partitioning/ep-dialogs.rb:1196
msgid ""
"You are extending a mounted filesystem by %1 Gigabyte. \n"
"This may be quite slow and can take hours. You might possibly want \n"
@@ -3014,12 +3001,12 @@
"endre størrelsen."
#. label for log view
-#: src/include/partitioning/ep-dialogs.rb:1310
+#: src/include/partitioning/ep-dialogs.rb:1272
msgid "Output of %1"
msgstr "Resultat fra %1"
#. popup text
-#: src/include/partitioning/ep-dialogs.rb:1337
+#: src/include/partitioning/ep-dialogs.rb:1299
msgid "Rescanning disks..."
msgstr "Skanner disker på nytt..."
@@ -3211,50 +3198,50 @@
msgstr "Det angitte området er ugyldig."
#. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:549
+#: src/include/partitioning/ep-hd-dialogs.rb:548
msgid "Add Partition on %1"
msgstr "Legg til partisjon på %1"
#. dialog title
-#: src/include/partitioning/ep-hd-dialogs.rb:595
+#: src/include/partitioning/ep-hd-dialogs.rb:594
msgid "Edit Partition %1"
msgstr "Rediger partisjonen %1"
#. error popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:628
+#: src/include/partitioning/ep-hd-dialogs.rb:627
msgid "No space to moved partition %1."
msgstr "Ingen ledig plass på den flyttede partisjonen %1."
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:638
+#: src/include/partitioning/ep-hd-dialogs.rb:637
msgid "Move partition %1 forward?"
msgstr "Vil du flytte partisjonen %1 forover?"
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:647
+#: src/include/partitioning/ep-hd-dialogs.rb:646
msgid "Move partition %1 backward?"
msgstr "Vil du flytte partisjonen %1 bakover?"
#. popup text, %1 is replace with name of partition
-#: src/include/partitioning/ep-hd-dialogs.rb:666
+#: src/include/partitioning/ep-hd-dialogs.rb:665
msgid "Move partition %1?"
msgstr "Vil du flytte partisjonen %1?"
#. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:668
+#: src/include/partitioning/ep-hd-dialogs.rb:667
msgid "Forward"
msgstr "Forover"
#. radio button text
-#: src/include/partitioning/ep-hd-dialogs.rb:670
+#: src/include/partitioning/ep-hd-dialogs.rb:669
msgid "Backward"
msgstr "Bakover"
-#: src/include/partitioning/ep-hd-dialogs.rb:726
+#: src/include/partitioning/ep-hd-dialogs.rb:725
msgid "Confirm Deleting of All Partitions"
msgstr "Bekreft sletting av alle partisjoner"
-#: src/include/partitioning/ep-hd-dialogs.rb:728
+#: src/include/partitioning/ep-hd-dialogs.rb:727
msgid ""
"The disk \"%1\" contains at least one partition.\n"
"If you proceed, the following partitions will be deleted:"
@@ -3262,35 +3249,30 @@
"Disken «%1» inneholder minst én partisjon.\n"
"Hvis du fortsetter, vil følgende partisjoner bli slettet:"
-#: src/include/partitioning/ep-hd-dialogs.rb:733
+#: src/include/partitioning/ep-hd-dialogs.rb:732
msgid "Really delete all partitions on \"%1\"?"
msgstr "Vil du virkelig slette alle partisjoner på «%1»?"
#. error popup
#. error popup
#: src/include/partitioning/ep-hd-lib.rb:42
-#: src/include/partitioning/ep-hd-lib.rb:251
+#: src/include/partitioning/ep-hd-lib.rb:245
msgid "No hard disk selected."
msgstr "Ingen harddisk valgt."
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:51
-msgid "Cannot create partition table on LDL formatted DASD."
-msgstr ""
-
-#. error popup
#. TRANSLATORS: error popup
-#: src/include/partitioning/ep-hd-lib.rb:57 src/modules/Storage.rb:5250
+#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5240
msgid "The disk is in use and cannot be modified."
msgstr "Disken er i bruk, og kan ikke endres."
#. dialog heading
-#: src/include/partitioning/ep-hd-lib.rb:92
+#: src/include/partitioning/ep-hd-lib.rb:86
msgid "Select new partition table type for %1."
msgstr "Velg ny partisjonstabelltype for %1."
#. popup text, %1 is be replaced by disk name e.g. /dev/sda
-#: src/include/partitioning/ep-hd-lib.rb:117
+#: src/include/partitioning/ep-hd-lib.rb:111
msgid ""
"Really create new partition table on %1? This will delete all data\n"
"on %1 and all RAIDs and Volume Groups using partitions on %1."
@@ -3299,29 +3281,29 @@
"på %1, og alle RAID-enheter og volumgrupper som bruker partisjoner på %1."
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:137
+#: src/include/partitioning/ep-hd-lib.rb:131
msgid "No disk selected."
msgstr "Ingen disk valgt."
#. popup text
#. Must be called before removing device.
-#: src/include/partitioning/ep-hd-lib.rb:151
-#: src/include/partitioning/ep-lib.rb:202
+#: src/include/partitioning/ep-hd-lib.rb:145
+#: src/include/partitioning/ep-lib.rb:199
msgid "Really delete BIOS RAID %1?"
msgstr "Vil du virkelig slette BIOS RAID %1?"
#. popup text
-#: src/include/partitioning/ep-hd-lib.rb:165
+#: src/include/partitioning/ep-hd-lib.rb:159
msgid "Really delete Partitioned RAID %1?"
msgstr "Er du sikker på at du vil slette partisjonert RAID %1?"
#. error ppup
-#: src/include/partitioning/ep-hd-lib.rb:182
+#: src/include/partitioning/ep-hd-lib.rb:176
msgid "There are no partitions to delete on this disk."
msgstr "Denne disken inneholder ingen partisjoner som kan slettes."
#. error popup
-#: src/include/partitioning/ep-hd-lib.rb:235
+#: src/include/partitioning/ep-hd-lib.rb:229
msgid "It is not possible to create a partition on %1."
msgstr "Det er ikke mulig å opprette en partisjon på %1."
@@ -3329,15 +3311,15 @@
#. error popup
#. error popup
#. error popup
-#: 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
+#: 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
msgid "No partition selected."
msgstr "Ingen partisjon er valgt."
#. error popup, %1 is replace by partition device name e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:340
+#: src/include/partitioning/ep-hd-lib.rb:334
msgid ""
"The partition %1 is in use. It cannot be\n"
"edited. To edit %1, make sure it is not used."
@@ -3346,12 +3328,12 @@
"redigeres. For å redigere den %1, sørg for at den ikke er i bruk."
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:351
+#: src/include/partitioning/ep-hd-lib.rb:345
msgid "An extended partition cannot be edited."
msgstr "En utvidet partisjon kan ikke redigeres."
#. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:393
+#: src/include/partitioning/ep-hd-lib.rb:387
msgid ""
"The partition %1 is already created on disk\n"
"and cannot be moved."
@@ -3360,12 +3342,12 @@
"og kan ikke flyttes."
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:404
+#: src/include/partitioning/ep-hd-lib.rb:398
msgid "An extended partition cannot be moved."
msgstr "En utvidet partisjon kan ikke flyttes."
#. error popup, %1 is replace by partition device name, e.g. /dev/sdb1
-#: src/include/partitioning/ep-hd-lib.rb:449
+#: src/include/partitioning/ep-hd-lib.rb:443
msgid ""
"The partition %1 is in use. It cannot be\n"
"resized. To resize %1, make sure it is not used."
@@ -3374,12 +3356,12 @@
"endres. For å endre størrelse på %1, sørg for at den ikke er i bruk."
#. error popup text
-#: src/include/partitioning/ep-hd-lib.rb:460
+#: src/include/partitioning/ep-hd-lib.rb:454
msgid "An extended partition cannot be resized."
msgstr "Du kan ikke endre størrelsen på en utvidet partisjon."
#. helptext
-#: src/include/partitioning/ep-hd-lib.rb:533
+#: src/include/partitioning/ep-hd-lib.rb:527
msgid ""
"<p>Select one or more (if available) hard disks\n"
"that will have the same partition layout as\n"
@@ -3395,7 +3377,7 @@
"flere partisjoner. Etter kloning vil disse\n"
"partisjonene bli slettet.</p>\n"
-#: src/include/partitioning/ep-hd-lib.rb:579
+#: src/include/partitioning/ep-hd-lib.rb:573
msgid ""
"The following partitions will be deleted\n"
"and all data on them will be lost:"
@@ -3403,11 +3385,11 @@
"Følgende partisjoner vil bli slettet\n"
"og alle data på dem vil gå tapt:"
-#: src/include/partitioning/ep-hd-lib.rb:586
+#: src/include/partitioning/ep-hd-lib.rb:580
msgid "Really delete these partitions?"
msgstr "Er du sikker på at du vil slette disse partisjonene?"
-#: src/include/partitioning/ep-hd-lib.rb:602
+#: src/include/partitioning/ep-hd-lib.rb:596
msgid ""
"There are no partitions on this disk, but a clonable\n"
"disk must have at least one partition.\n"
@@ -3417,7 +3399,7 @@
"disk må ha minst én partisjon).\n"
"Opprett noen partisjoner før du kloner disken.\n"
-#: src/include/partitioning/ep-hd-lib.rb:615
+#: src/include/partitioning/ep-hd-lib.rb:609
msgid ""
"This disk cannot be cloned. There are no suitable\n"
"disks that could have the same partitioning layout."
@@ -3425,20 +3407,20 @@
"Denne disken kan ikke klones. Det finnes ingen egnede\n"
"disker som kan ha samme partisjonsoppsett."
-#: src/include/partitioning/ep-hd-lib.rb:644
+#: src/include/partitioning/ep-hd-lib.rb:638
msgid "Clone partition layout of %1"
msgstr "Klon partisjonsoppsettet for %1"
-#: src/include/partitioning/ep-hd-lib.rb:648
+#: src/include/partitioning/ep-hd-lib.rb:642
msgid "Available target disks:"
msgstr "Tilgjengelige måldisker:"
-#: src/include/partitioning/ep-hd-lib.rb:676
+#: src/include/partitioning/ep-hd-lib.rb:670
msgid "Select a target disk for creating a clone"
msgstr "Velg en måldisk for å opprette en klone."
#. popup text, %1 is replaced by a dasd name e.g. /dev/dasda
-#: src/include/partitioning/ep-hd-lib.rb:757
+#: src/include/partitioning/ep-hd-lib.rb:751
msgid ""
"Running dasdfmt deletes all data on the disk.\n"
"Really execute dasdfmt on disk %1?\n"
@@ -3447,7 +3429,7 @@
"Vil du virkelig kjøre dasdfmt for disken %1?\n"
#. popup text
-#: src/include/partitioning/ep-hd-lib.rb:768
+#: src/include/partitioning/ep-hd-lib.rb:762
msgid ""
"The disk is no longer marked for dasdfmt.\n"
"\n"
@@ -3709,11 +3691,11 @@
msgstr "Ugyldig passord ble gitt."
#. Must be called before removing device.
-#: src/include/partitioning/ep-lib.rb:110
+#: src/include/partitioning/ep-lib.rb:107
msgid "Confirm Deleting Partition Used by LVM"
msgstr "Bekreft sletting av partisjon som brukes av LVM"
-#: src/include/partitioning/ep-lib.rb:112
+#: src/include/partitioning/ep-lib.rb:109
msgid ""
"The selected partition is used by volume group \"%1\".\n"
"To keep the system in a consistent state, the following volume group\n"
@@ -3723,15 +3705,15 @@
"For at systemet skal være konsistent vil følgende volumgruppe\n"
"med tilhørende logiske volumer bli slettet:\n"
-#: src/include/partitioning/ep-lib.rb:120
+#: src/include/partitioning/ep-lib.rb:117
msgid "Delete partition \"%1\" and volume group \"%2\" now?"
msgstr "Vil du slette partisjonen «%1» og volumgruppen «%2» nå?"
-#: src/include/partitioning/ep-lib.rb:130
+#: src/include/partitioning/ep-lib.rb:127
msgid "Confirm Deleting Partition Used by RAID"
msgstr "Bekreft sletting av partisjonen som brukes av RAID"
-#: src/include/partitioning/ep-lib.rb:132
+#: src/include/partitioning/ep-lib.rb:129
msgid ""
"The selected partition belongs to RAID \"%1\".\n"
"To keep the system in a consistent state, the following\n"
@@ -3741,24 +3723,24 @@
"For at systemet skal være konsistent, vil følgende\n"
"RAID-enhet bli slettet:\n"
-#: src/include/partitioning/ep-lib.rb:140
+#: src/include/partitioning/ep-lib.rb:137
msgid "Delete partition \"%1\" and RAID \"%2\" now?"
msgstr "Vil du slette partisjonen «%1» og RAID «%2» nå?"
#. YesNo popup text %1 is replaced by a disk name e.g. /dev/hda
-#: src/include/partitioning/ep-lib.rb:210
+#: src/include/partitioning/ep-lib.rb:207
msgid "Really delete all partitions on %1?"
msgstr "Er du sikker på at du vil slette alle partisjonene på %1?"
#. ///////////////////////////////////////////////////
#. now delete partition!!
#. YesNo popup text, %1 is replaced by a device name e.g. /dev/hda1
-#: src/include/partitioning/ep-lib.rb:262
+#: src/include/partitioning/ep-lib.rb:259
msgid "Really delete %1?"
msgstr "Vil du virkelig slette %1?"
#. YesNo popup. %1 is path to a file
-#: src/include/partitioning/ep-lib.rb:276
+#: src/include/partitioning/ep-lib.rb:273
msgid ""
"\n"
"Should the loop file %1 also be removed?\n"
@@ -3768,7 +3750,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:358
+#: src/include/partitioning/ep-lib.rb:340
msgid "Unpartitioned"
msgstr "Ikke partisjonert"
@@ -3776,33 +3758,33 @@
#. or the end of the disk if
#. 1. end +1th cyl is not the next one
#. 2. end cyl is not the same as the next one (yeah, partitions may share a cylinder)
-#: src/include/partitioning/ep-lib.rb:461
+#: src/include/partitioning/ep-lib.rb:443
msgid "Unallocated"
msgstr "Ikke tilordnet"
-#: src/include/partitioning/ep-lib.rb:500
+#: src/include/partitioning/ep-lib.rb:482
msgid "<p>No changes to partitioning.</p>"
msgstr "<p>Ingen endringer i partisjoneringen.</p>"
-#: src/include/partitioning/ep-lib.rb:502
+#: src/include/partitioning/ep-lib.rb:484
msgid "<p>Changes to partitioning:</p>"
msgstr "<p>Endringer i partisjoneringen:</p>"
-#: src/include/partitioning/ep-lib.rb:505
+#: src/include/partitioning/ep-lib.rb:487
msgid "<p>No changes to storage settings.</p>"
msgstr "<p>Ingen endringer i lagringsinnstillingene.</p>"
-#: src/include/partitioning/ep-lib.rb:507
+#: src/include/partitioning/ep-lib.rb:489
msgid "<p>Storage settings:</p>"
msgstr "<p>Lagringsinnstillinger:</p>"
-#: src/include/partitioning/ep-lib.rb:516
+#: src/include/partitioning/ep-lib.rb:498
#, fuzzy
#| msgid "<p>Storage settings:</p>"
msgid "<p>Packages to install:</p>"
msgstr "<p>Lagringsinnstillinger:</p>"
-#: src/include/partitioning/ep-lib.rb:518
+#: src/include/partitioning/ep-lib.rb:500
#, fuzzy
#| msgid "<p>No changes to storage settings.</p>"
msgid "<p>No packages need to be installed.</p>"
@@ -3922,12 +3904,12 @@
"å opprette en fil."
#. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:282
+#: src/include/partitioning/ep-loop-dialogs.rb:281
msgid "Add Crypt File"
msgstr "Legg til krypteringsfil"
#. dialog title
-#: src/include/partitioning/ep-loop-dialogs.rb:326
+#: src/include/partitioning/ep-loop-dialogs.rb:325
msgid "Edit Crypt File %1"
msgstr "Rediger krypteringsfilen %1"
@@ -4255,12 +4237,12 @@
msgstr "Brukt pool"
#. dialog title, %1 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1029
+#: src/include/partitioning/ep-lvm-dialogs.rb:1028
msgid "Add Logical Volume on %1"
msgstr "Legg til logisk volum på %1"
#. dialog title - %1 is a logical volume name, %2 is a volume group
-#: src/include/partitioning/ep-lvm-dialogs.rb:1076
+#: src/include/partitioning/ep-lvm-dialogs.rb:1075
msgid "Edit Logical Volume %1 on %2"
msgstr "Rediger det logiske volumet %1 på %2"
@@ -4298,9 +4280,9 @@
#. error popup
#. error popup
#: src/include/partitioning/ep-lvm-lib.rb:214
-#: src/include/partitioning/ep-lvm-lib.rb:316
-#: src/include/partitioning/ep-lvm-lib.rb:368
-#: src/include/partitioning/ep-lvm-lib.rb:403
+#: src/include/partitioning/ep-lvm-lib.rb:315
+#: src/include/partitioning/ep-lvm-lib.rb:367
+#: src/include/partitioning/ep-lvm-lib.rb:402
msgid "No logical volume selected."
msgstr "Ingen logiske volumer er valgt."
@@ -4310,7 +4292,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:327
+#: src/include/partitioning/ep-lvm-lib.rb:326
msgid ""
"The volume %1 is a thin pool.\n"
"It cannot be edited."
@@ -4319,7 +4301,7 @@
"Det kan ikke redigeres."
#. error popup, %1 is replace by partition device name e.g. /dev/system/root
-#: src/include/partitioning/ep-lvm-lib.rb:338
+#: src/include/partitioning/ep-lvm-lib.rb:337
msgid ""
"The volume %1 is in use. It cannot be\n"
"edited. To edit %1, make sure it is not used."
@@ -4698,17 +4680,17 @@
msgstr "<p>Endre enhetene som brukes for RAID.</p>"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:643
+#: src/include/partitioning/ep-raid-dialogs.rb:642
msgid "Add RAID %1"
msgstr "Legg til RAID %1"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:677
+#: src/include/partitioning/ep-raid-dialogs.rb:676
msgid "Resize RAID %1"
msgstr "Endre størrelse på RAID %1"
#. dialog title
-#: src/include/partitioning/ep-raid-dialogs.rb:723
+#: src/include/partitioning/ep-raid-dialogs.rb:722
msgid "Edit RAID %1"
msgstr "Rediger RAID %1"
@@ -5007,7 +4989,7 @@
msgstr "<p>Dette er et installasjonssammendrag.</p>"
#. dialog title
-#: src/include/partitioning/ep-tmpfs-dialogs.rb:50
+#: src/include/partitioning/ep-tmpfs-dialogs.rb:49
msgid "Add tmpfs Mount"
msgstr "Legg til tmpfs-monteringspunkt"
@@ -5864,63 +5846,19 @@
"du vet hva du gjør.</p>\n"
#. this version makes some problems with interpreter, above lookup/add is OK
-#: src/modules/Partitions.rb:936
-#, fuzzy
-#| msgid "Operation not permitted on disk %1.\n"
-msgid "Operation not permitted on disk %{device}.\n"
+#: src/modules/Partitions.rb:930
+msgid "Operation not permitted on disk %1.\n"
msgstr "Hanlingen er ikke tillatt for disken %1.\n"
-#. 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"
-#| "supported by the partitioning tool parted used to change the\n"
-#| "partition table.\n"
-#| "\n"
-#| "You can use the partitions on disk %1 as they are or\n"
-#| "format them and assign mount points, but you cannot add, edit, \n"
-#| "resize, or remove partitions from that disk here.\n"
+#. popup text %1 is replaced by disk name e.g. /dev/hda
+#: src/modules/Partitions.rb:940
msgid ""
"\n"
-"It's not supported by the partitioning tool parted to change\n"
-"the partition table on your disk %{device}\n"
-"(the disk is LDL formatted).\n"
-"\n"
-"You can use the partitions on disk %{device} as they are or\n"
-"format them and assign mount points, but you cannot add,\n"
-"resize, or remove partitions from that disk here.\n"
-msgstr ""
-"\n"
-"Partisjoneringen på disken %1 kan enten ikke leses av\n"
-"partisjoneringsverktøyet parted, som benyttes for å endre\n"
-"partisjonstabellen eller støttes ikke av dette verktøyet.\n"
-"\n"
-"Du kan bruke partisjonene på disken %1 som de er eller\n"
-"formatere dem og tilordne monteringspunkter til dem, men du\n"
-"kan ikke legge til, redigere, endre størrelser eller slette partisjoner fra denne\n"
-"disken her.\n"
-
-#. popup text %{device} is replaced by disk name e.g. /dev/hda
-#: src/modules/Partitions.rb:953
-#, fuzzy
-#| msgid ""
-#| "\n"
-#| "The partitioning on your disk %1 is either not readable or not \n"
-#| "supported by the partitioning tool parted used to change the\n"
-#| "partition table.\n"
-#| "\n"
-#| "You can use the partitions on disk %1 as they are or\n"
-#| "format them and assign mount points, but you cannot add, edit, \n"
-#| "resize, or remove partitions from that disk here.\n"
-msgid ""
-"\n"
-"The partitioning on your disk %{device} is either not readable or not \n"
+"The partitioning on your disk %1 is either not readable or not \n"
"supported by the partitioning tool parted used to change the\n"
"partition table.\n"
"\n"
-"You can use the partitions on disk %{device} as they are or\n"
+"You can use the partitions on disk %1 as they are or\n"
"format them and assign mount points, but you cannot add, edit, \n"
"resize, or remove partitions from that disk here.\n"
msgstr ""
@@ -5934,25 +5872,15 @@
"kan ikke legge til, redigere, endre størrelser eller slette partisjoner fra denne\n"
"disken her.\n"
-#. popup text %{device} is replaced by disk name e.g. /dev/dasda
-#: src/modules/Partitions.rb:965
-#, fuzzy
-#| msgid ""
-#| "\n"
-#| "The disk %1 does not contain a partition table but for\n"
-#| "compatibility the kernel has automatically generated a\n"
-#| "partition spanning almost the entire disk.\n"
-#| "\n"
-#| "You can use the partition on disk %1 as it is or\n"
-#| "format it and assign a mount point, but you cannot resize\n"
-#| "or remove the partition from that disk here.\n"
+#. popup text %1 is replaced by disk name e.g. /dev/dasda
+#: src/modules/Partitions.rb:958
msgid ""
"\n"
-"The disk %{device} does not contain a partition table but for\n"
+"The disk %1 does not contain a partition table but for\n"
"compatibility the kernel has automatically generated a\n"
"partition spanning almost the entire disk.\n"
"\n"
-"You can use the partition on disk %{device} as it is or\n"
+"You can use the partition on disk %1 as it is or\n"
"format it and assign a mount point, but you cannot resize\n"
"or remove the partition from that disk here.\n"
msgstr ""
@@ -5966,7 +5894,7 @@
"eller slette partisjonen fra den disken her.\n"
#. popup text
-#: src/modules/Partitions.rb:981
+#: src/modules/Partitions.rb:977
msgid ""
"\n"
"\n"
@@ -5981,7 +5909,7 @@
"disken.\n"
#. popup text
-#: src/modules/Partitions.rb:991
+#: src/modules/Partitions.rb:989
msgid ""
"\n"
"\n"
@@ -5999,7 +5927,7 @@
#. @param integer testsize
#. @param [Symbol] used_fs
#. @param [Boolean] verbose
-#: src/modules/Storage.rb:993
+#: src/modules/Storage.rb:992
msgid "Resize Not Possible:"
msgstr "Størrelsen kunne ikke endres:"
@@ -6012,7 +5940,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:2696 src/modules/Storage.rb:3919
+#: src/modules/Storage.rb:2692 src/modules/Storage.rb:3915
msgid ""
"Could not set encryption.\n"
"System error code is %1.\n"
@@ -6025,7 +5953,7 @@
"Et ugyldig krypteringspassord er kanskje angitt.\n"
#. popup text
-#: src/modules/Storage.rb:3950
+#: src/modules/Storage.rb:3946
msgid ""
"The first and the second version\n"
"of the password do not match.\n"
@@ -6036,7 +5964,7 @@
"Prøv igjen."
#. popup text
-#: src/modules/Storage.rb:3981
+#: src/modules/Storage.rb:3977
msgid ""
"The password may only contain the following characters:\n"
"0..9, a..z, A..Z, and any of \"@#* ,.;:._-+=!$%&/|?{[()]}^\\<>\".\n"
@@ -6048,24 +5976,24 @@
#. Label: get password for encrypted volume
#. Please use newline if label is longer than 40 characters
-#: src/modules/Storage.rb:4035
+#: src/modules/Storage.rb:4031
msgid "&Enter Encryption Password:"
msgstr "Angi krypt&eringspassord"
#. Clear password fields on every round.
-#: src/modules/Storage.rb:4094
+#: src/modules/Storage.rb:4090
msgid "Provide Password"
msgstr "Angi et passord"
-#: src/modules/Storage.rb:4113
+#: src/modules/Storage.rb:4109
msgid "The following encrypted volumes are already available."
msgstr "Følgende krypterte volumer er allerede tilgjengelige."
-#: src/modules/Storage.rb:4128
+#: src/modules/Storage.rb:4124
msgid "Encrypted Volume Activation"
msgstr "Aktivering av krypterte volumer"
-#: src/modules/Storage.rb:4132
+#: src/modules/Storage.rb:4128
msgid ""
"The following volumes contain an encryption signature but the \n"
"passwords are not yet known.\n"
@@ -6077,12 +6005,12 @@
"Passordene må være kjent hvis det er behov for volumene, enten \n"
"under en oppdatering eller hvis de inneholder et fysisk kryptert LVM-volum."
-#: src/modules/Storage.rb:4144
+#: src/modules/Storage.rb:4140
msgid "Do you want to provide encryption passwords?"
msgstr "Vil du ang krypteringspassord?"
#. text in help field
-#: src/modules/Storage.rb:4201
+#: src/modules/Storage.rb:4197
msgid ""
"Enter encryption password for any of the\n"
"devices in the locked devices list.\n"
@@ -6093,65 +6021,65 @@
"Passordet vil bli forsøkt for alle enhetene."
#. header text
-#: src/modules/Storage.rb:4207
+#: src/modules/Storage.rb:4203
msgid "Enter Encryption Password"
msgstr "Angi krypteringspassord"
-#: src/modules/Storage.rb:4210
+#: src/modules/Storage.rb:4206
msgid "There are no encrypted volume to unlock."
msgstr "Det finnes ingen krypterte volumer å låse opp."
#. label text, multiple device names follow
-#: src/modules/Storage.rb:4223
+#: src/modules/Storage.rb:4219
msgid "Provide password for any of the following devices:"
msgstr "Angi passordet for en av følgende enheter:"
#. label text, one device name follows
-#: src/modules/Storage.rb:4226
+#: src/modules/Storage.rb:4222
msgid "Provide password for the following device:"
msgstr "Angi passordet for følgende enhet:"
-#: src/modules/Storage.rb:4239
+#: src/modules/Storage.rb:4235
msgid "Trying to unlock encrypted volumes..."
msgstr "Forsøker å låse opp krypterte volumer..."
-#: src/modules/Storage.rb:4263
+#: src/modules/Storage.rb:4259
msgid "Password did not unlock any volume."
msgstr "Passordet låste ikke opp noe volum."
-#: src/modules/Storage.rb:4349
+#: src/modules/Storage.rb:4345
msgid "IDE Disk"
msgstr "IDE-disk"
-#: src/modules/Storage.rb:4355
+#: src/modules/Storage.rb:4351
msgid "SCSI Disk"
msgstr "SCSI-disk"
-#: src/modules/Storage.rb:4361
+#: src/modules/Storage.rb:4357
msgid "Disk"
msgstr "Disk"
-#: src/modules/Storage.rb:4389
+#: src/modules/Storage.rb:4385
msgid "DM RAID"
msgstr "DM RAID"
-#: src/modules/Storage.rb:4402
+#: src/modules/Storage.rb:4398
msgid "MD RAID"
msgstr "MD RAID"
#. TODO: more informative error message, but the Package module does
#. not provide anything
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:4897
+#: src/modules/Storage.rb:4893
msgid "Installing required packages failed."
msgstr "Installasjon av nødvendige pakker mislyktes."
-#: src/modules/Storage.rb:4898 src/modules/StorageClients.rb:159
+#: src/modules/Storage.rb:4894 src/modules/StorageClients.rb:159
msgid "Continue despite the error?"
msgstr "Vil du fortsette til tross for feilen?"
#. TRANSLATORS: error popup
-#: src/modules/Storage.rb:5262
+#: src/modules/Storage.rb:5252
#, fuzzy
#| msgid ""
#| "\n"
@@ -6163,7 +6091,7 @@
"Partisjonen %1 kan ikke fjernes fordi andre partisjoner på\n"
"disken %2 er i bruk.\n"
-#: src/modules/Storage.rb:5288
+#: src/modules/Storage.rb:5278
msgid ""
"\n"
"Device %1 cannot be modified because it contains activated swap\n"
@@ -6173,7 +6101,7 @@
"Enheten %1 kan ikke endres fordi den benyttes som vekselminne,\n"
"og er nødvendig for å kjøre installasjonen.\n"
-#: src/modules/Storage.rb:5302
+#: src/modules/Storage.rb:5292
msgid ""
"\n"
"Device %1 cannot be modified because it contains the installation\n"
@@ -6183,7 +6111,7 @@
"Enheten %1 kan ikke endres fordi den inneholder installasjonsdata\n"
"som er nødvendig for installasjonen.\n"
-#: src/modules/Storage.rb:5331
+#: src/modules/Storage.rb:5321
msgid ""
"\n"
"Device %1 cannot be removed because it contains activated swap\n"
@@ -6193,7 +6121,7 @@
"Enheten %1 kan ikke fjernes fordi den benyttes som vekselminne,\n"
"og er nødvendig for å kjøre installasjonen.\n"
-#: src/modules/Storage.rb:5340
+#: src/modules/Storage.rb:5330
msgid ""
"\n"
"Device %1 cannot be removed because it contains the installation\n"
@@ -6203,7 +6131,7 @@
"Enheten %1 kan ikke fjernes fordi den inneholder installasjonsdata\n"
"som er nødvendig for installasjonen.\n"
-#: src/modules/Storage.rb:5369
+#: src/modules/Storage.rb:5359
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6215,7 +6143,7 @@
"%2, som benyttes som vekselminne, og er nødvendig for å kjøre\n"
"installasjonen.\n"
-#: src/modules/Storage.rb:5380
+#: src/modules/Storage.rb:5370
msgid ""
"\n"
"Device %1 cannot be removed because this would indirectly change\n"
@@ -6227,7 +6155,7 @@
"installasjonen.\n"
#. the check for verbose is needed for calls from StorageProposal (see bnc#871779)
-#: src/modules/Storage.rb:5402
+#: src/modules/Storage.rb:5392
msgid ""
"\n"
"Partition %1 cannot be removed since other partitions on the\n"
@@ -6238,18 +6166,18 @@
"disken %2 er i bruk.\n"
#. FIXME: please, add description of the list that is returned by this function.
-#: src/modules/Storage.rb:5491
+#: src/modules/Storage.rb:5481
msgid "Nothing assigned as root filesystem!"
msgstr "Det er ikke tilordnet noe rotfilsystem!"
-#: src/modules/Storage.rb:5492
+#: src/modules/Storage.rb:5482
msgid "Installation will most certainly fail fatally!"
msgstr "Installasjonen vil mislykkes!"
#. Set rather than Add, there might be some packs left over
#. from previous 'MakeProposal' we don't need now
#. This also covers the case when AddPackagesList returns [] or nil
-#: src/modules/Storage.rb:6042
+#: src/modules/Storage.rb:6032
msgid "Adding the following resolvables failed: %1"
msgstr "Følgende kunn ikke legges til for å løse konflikter: %1"
@@ -6901,45 +6829,62 @@
#. enable snapshots for root volume if desired
#. penalty for not having separate /home
-#: src/modules/StorageProposal.rb:4579 src/modules/StorageProposal.rb:5702
+#: src/modules/StorageProposal.rb:4560 src/modules/StorageProposal.rb:5683
msgid "Resize impossible due to inconsistent file system. Try checking file system under Windows."
msgstr "Det er ikke mulig å endre størrelse på grunn av inkonistent filsystem. Forsøk å kontrollere filsystemet fra Windows."
+#. TRANSLATORS: checkbox text
+#: src/modules/StorageProposal.rb:6179
+#, fuzzy
+#| msgid "Create &LVM Based Proposal"
+msgid "Create &LVM-based Proposal"
+msgstr "Opprett &LVM-basert forslag"
+
+#. TRANSLATORS: checkbox text
+#: src/modules/StorageProposal.rb:6194
+msgid "Encr&ypt Volume Group"
+msgstr "Kr&ypter volumgruppen"
+
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6217
+#: src/modules/StorageProposal.rb:6212
#, fuzzy
#| msgid "File system options:"
msgid "File System for Root Partition"
msgstr "Alternativer for filsystem:"
#. TRANSLATORS: combobox label
-#: src/modules/StorageProposal.rb:6264
+#: src/modules/StorageProposal.rb:6259
#, fuzzy
#| msgid "Propose Separate &Home Partition"
msgid "File System for Home Partition"
msgstr "Foreslå separat partisjon for &hjemmekatalog"
#. TRANSLATORS: checkbox text
-#: src/modules/StorageProposal.rb:6282
+#: src/modules/StorageProposal.rb:6277
msgid "Enlarge &Swap for Suspend"
msgstr "Utvid &bytt for dvale"
-#: src/modules/StorageProposal.rb:6292
+#: src/modules/StorageProposal.rb:6287
#, fuzzy
#| msgid "Proposal settings"
msgid "Proposal Settings"
msgstr "Forslag til innstillinger"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6307
+#: src/modules/StorageProposal.rb:6302
+#, fuzzy
+#| msgid ""
+#| "<p>\n"
+#| "To create an LVM-based proposal, choose the corresponding button.</p>\n"
msgid ""
-"<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>"
+"<p>To create an LVM-based proposal, choose the corresponding button. The\n"
+"LVM-based proposal can be encrypted.</p>\n"
msgstr ""
+"<p>\n"
+"For å opprette ett LVM-basert forslag, velg den aktuelle knappen.</p>\n"
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6315
+#: src/modules/StorageProposal.rb:6309
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"
@@ -6948,54 +6893,35 @@
msgstr ""
#. TRANSLATORS: help text
-#: src/modules/StorageProposal.rb:6324
+#: src/modules/StorageProposal.rb:6318
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:6331
+#: src/modules/StorageProposal.rb:6325
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:6356
+#: src/modules/StorageProposal.rb:6350
msgid "Enter your password for the proposal encryption."
msgstr "Angi passordet for det den foreslåtte krypteringen."
#. Label: get password for user root
#. Please use newline if label is longer than 40 characters
-#: src/modules/StorageProposal.rb:6363
+#: src/modules/StorageProposal.rb:6357
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:6374
+#: src/modules/StorageProposal.rb:6368
msgid "Reenter the password for verification:"
msgstr "Gjenta passordet for å bekrefte:"
-#. Clear password fields on every round.
-#: src/modules/StorageProposal.rb:6572
-#, fuzzy
-#| msgid "&Partition Based"
-msgid "&Partition-based Proposal"
-msgstr "&Partisjonsbasert"
-
-#: src/modules/StorageProposal.rb:6574
-#, fuzzy
-#| msgid "Create &LVM Based Proposal"
-msgid "&LVM-based Proposal"
-msgstr "Opprett &LVM-basert forslag"
-
-#: src/modules/StorageProposal.rb:6576
-#, fuzzy
-#| msgid "Create &LVM Based Proposal"
-msgid "&Encrypted LVM-based Proposal"
-msgstr "Opprett &LVM-basert forslag"
-
#. encoding: utf-8
#. Copyright (c) 2012 Novell, Inc.
#.
@@ -7039,20 +6965,6 @@
msgid "Visible Information on Storage Devices:"
msgstr "Synlig informasjon om lagringsenheter:"
-#~ msgid "Encr&ypt Volume Group"
-#~ msgstr "Kr&ypter volumgruppen"
-
-#, fuzzy
-#~| msgid ""
-#~| "<p>\n"
-#~| "To create an LVM-based proposal, choose the corresponding button.</p>\n"
-#~ msgid ""
-#~ "<p>To create an LVM-based proposal, choose the corresponding button. The\n"
-#~ "LVM-based proposal can be encrypted.</p>\n"
-#~ msgstr ""
-#~ "<p>\n"
-#~ "For å opprette ett LVM-basert forslag, velg den aktuelle knappen.</p>\n"
-
#~ msgid "No unsaved changes exist."
#~ msgstr "Det finnes ingen ulagrede endringer."
@@ -7273,6 +7185,9 @@
#~ msgid "Default Filesystem:"
#~ msgstr "Standardfilsystem:"
+#~ msgid "&Partition Based"
+#~ msgstr "&Partisjonsbasert"
+
#~ msgid "&LVM Based"
#~ msgstr "&LVM-basert"
Modified: branches/plus-SLE12-SP2/yast/nb/po/support.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/support.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/support.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: opensuse-i 18n\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2014-05-19 09:35+0200\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@@ -33,54 +33,54 @@
msgstr "Bruker&støtte"
#. Command line parameters dialog caption
-#: src/include/support/dialogs.rb:46
+#: src/include/support/dialogs.rb:50
msgid "Supportconfig Overview Dialog"
msgstr "Oversikt over brukerstøtteoppsett"
#. Support configure1 dialog contents
-#: src/include/support/dialogs.rb:53
+#: src/include/support/dialogs.rb:57
#, fuzzy
#| msgid "Open Novell Support Center"
msgid "Open SUSE Support Center"
msgstr " brukerstøttesenter"
-#: src/include/support/dialogs.rb:58
+#: src/include/support/dialogs.rb:62
msgid "This will start a browser connecting to the SUSE Support Center Portal."
msgstr ""
-#: src/include/support/dialogs.rb:68
+#: src/include/support/dialogs.rb:72
msgid "Open"
msgstr "Åpne"
-#: src/include/support/dialogs.rb:79
+#: src/include/support/dialogs.rb:83
msgid "Collect Data"
msgstr "Hent informasjon"
-#: src/include/support/dialogs.rb:84
+#: src/include/support/dialogs.rb:88
msgid "This will create a tarball containing the collected log files."
msgstr ""
-#: src/include/support/dialogs.rb:96
+#: src/include/support/dialogs.rb:100
msgid "Create report tarball"
msgstr "Opprett rapportarkiv"
-#: src/include/support/dialogs.rb:108
+#: src/include/support/dialogs.rb:112
msgid "Upload Data"
msgstr "Last opp data"
-#: src/include/support/dialogs.rb:112
+#: src/include/support/dialogs.rb:116
msgid "This will upload the collected logs to the specified URL."
msgstr ""
-#: src/include/support/dialogs.rb:119
+#: src/include/support/dialogs.rb:123
msgid "Upload"
msgstr "Last opp"
-#: src/include/support/dialogs.rb:149
+#: src/include/support/dialogs.rb:153
msgid "Could not find any installed browser."
msgstr ""
-#: src/include/support/dialogs.rb:159
+#: src/include/support/dialogs.rb:163
msgid ""
"YaST will run a Web browser as superuser. Consider\n"
"running it as a non-provileged user and entering the URL\n"
@@ -88,185 +88,186 @@
"Start Web browser?\n"
msgstr ""
-#: src/include/support/dialogs.rb:201
+#: src/include/support/dialogs.rb:205
msgid "Supportconfig Upload Dialog"
msgstr "Opplastingsdialog for brukerstøtte"
#. Support configure1 dialog contents
-#: src/include/support/dialogs.rb:226
+#: src/include/support/dialogs.rb:230
msgid "Save as"
msgstr "Lagre som"
-#: src/include/support/dialogs.rb:229
+#: src/include/support/dialogs.rb:233
msgid "Directory to Save"
msgstr ""
-#: src/include/support/dialogs.rb:239
+#: src/include/support/dialogs.rb:243
msgid "Package with log files"
msgstr "Pakke med loggfiler"
-#: src/include/support/dialogs.rb:253
+#: src/include/support/dialogs.rb:257
msgid "Upload log files tarball to URL"
msgstr ""
-#: src/include/support/dialogs.rb:255 src/include/support/dialogs.rb:756
+#: src/include/support/dialogs.rb:259 src/include/support/dialogs.rb:760
msgid "Upload Target"
msgstr "Last opp mål"
#. }
-#: src/include/support/dialogs.rb:327
+#: src/include/support/dialogs.rb:331
msgid "Cannot write settings"
msgstr "Kan ikke lagre innstillingene"
-#: src/include/support/dialogs.rb:343
+#: src/include/support/dialogs.rb:347
msgid "Cannot write settings."
msgstr "Kan ikke lagre innstillingene."
-#: src/include/support/dialogs.rb:389
+#: src/include/support/dialogs.rb:393
msgid "Choose Directory Where to Save Tarball"
msgstr "Velg katalogen der arkivet skal lagres"
#. Support::log_files["tmp_dir"]=save_dir;
-#: src/include/support/dialogs.rb:401
+#: src/include/support/dialogs.rb:405
msgid "Choose Log Files Tarball File"
msgstr "Velg filen med loggfilarkivet"
#. Command line parameters dialog caption
-#: src/include/support/dialogs.rb:421
+#: src/include/support/dialogs.rb:425
msgid "Supportconfig Parameters Configuration"
msgstr "Parameteroppsett for brukerstøtte"
-#: src/include/support/dialogs.rb:426
+#: src/include/support/dialogs.rb:430
msgid "Create a full file listing from '/'"
msgstr "Opprett en full filoversikt fra '/'"
-#: src/include/support/dialogs.rb:431
+#: src/include/support/dialogs.rb:435
msgid "Exclude detailed disk info and scans"
msgstr "Ikke ta med detaljert diskinformasjon og skanninger"
-#: src/include/support/dialogs.rb:436
+#: src/include/support/dialogs.rb:440
msgid "Search root filesystem for eDirectory instances"
msgstr "Søker etter rotfilsystem for eDirectory"
-#: src/include/support/dialogs.rb:441
+#: src/include/support/dialogs.rb:445
msgid "Include full SLP service lists"
msgstr "Ta med full SLP-tjenesteliste"
-#: src/include/support/dialogs.rb:446
+#: src/include/support/dialogs.rb:450
msgid "Performs an rpm -V for each installed rpm"
msgstr "Kjører en rpm -V for hver installert rpm"
-#: src/include/support/dialogs.rb:451
+#: src/include/support/dialogs.rb:455
msgid "Include all log file lines, gather additional rotated logs"
msgstr ""
#. Support configure1 dialog contents
-#: src/include/support/dialogs.rb:465
+#: src/include/support/dialogs.rb:469
msgid "Use Defaults (ignore /etc/supportconfig.conf)"
msgstr ""
-#: src/include/support/dialogs.rb:472
+#: src/include/support/dialogs.rb:476
msgid "Activates all support functions"
msgstr "Aktiverer alle brukerstøttefunksjoner"
-#: src/include/support/dialogs.rb:479
+#: src/include/support/dialogs.rb:483
msgid "Only gather a minimum amount of info"
msgstr "Samler bare et minimum av informasjon"
-#: src/include/support/dialogs.rb:487
+#: src/include/support/dialogs.rb:491
msgid "Use Custom (Expert) Settings"
msgstr "Bruke egendefinerte (avanserte) innstillinger"
-#: src/include/support/dialogs.rb:489
+#: src/include/support/dialogs.rb:493
msgid "Expert Settings"
msgstr "Avanserte innstillinger"
-#: src/include/support/dialogs.rb:495
+#: src/include/support/dialogs.rb:499
msgid "Options"
msgstr "Valg"
#. Support overview dialog caption
-#: src/include/support/dialogs.rb:584
+#: src/include/support/dialogs.rb:588
msgid "Supportconfig Expert Configuration"
msgstr "Avansert brukerstøtteoppsett"
#. FIXME table header
-#: src/include/support/dialogs.rb:614
+#: src/include/support/dialogs.rb:618
msgid "Default Options"
msgstr "Standardinnstillinger"
#. Support configure2 dialog caption
-#: src/include/support/dialogs.rb:680
+#: src/include/support/dialogs.rb:684
msgid "Supportconfig Contact Configuration"
msgstr "Kontaktoppsett for brukerstøtte"
#. Support configure2 dialog contents
-#: src/include/support/dialogs.rb:685
+#: src/include/support/dialogs.rb:689
msgid "Contact Information"
msgstr ""
-#: src/include/support/dialogs.rb:690
+#: src/include/support/dialogs.rb:694
msgid "Company"
msgstr "Firma"
-#: src/include/support/dialogs.rb:701
+#: src/include/support/dialogs.rb:705
msgid "Email Address"
msgstr "E-postadresse"
-#: src/include/support/dialogs.rb:708
+#: src/include/support/dialogs.rb:712
msgid "Name"
msgstr "Navn"
-#: src/include/support/dialogs.rb:715
+#: src/include/support/dialogs.rb:719
msgid "Phone Number"
msgstr "Telefonnummer"
-#: src/include/support/dialogs.rb:722
+#: src/include/support/dialogs.rb:726
msgid "Store ID"
msgstr "Lagre ID"
-#: src/include/support/dialogs.rb:733
+#: src/include/support/dialogs.rb:737
msgid "Terminal ID"
msgstr "Terminal-ID"
-#: src/include/support/dialogs.rb:744
+#: src/include/support/dialogs.rb:748
msgid "GPG UID"
msgstr ""
-#: src/include/support/dialogs.rb:751
+#: src/include/support/dialogs.rb:755
msgid "Upload Information"
msgstr ""
-#: src/include/support/dialogs.rb:770
+#: src/include/support/dialogs.rb:774
#, fuzzy
#| msgid "Novell 11 digit service request number"
msgid "11-digit service request number"
msgstr "Telefonnummer til Novell-brukerstøtte (11 siffer)"
#. abort?
-#: src/include/support/dialogs.rb:847
+#: src/include/support/dialogs.rb:851
msgid "The SR number must be 11 digits"
msgstr ""
-#: src/include/support/dialogs.rb:865
+#: src/include/support/dialogs.rb:869
msgid "Collecting Data"
msgstr "Samler informasjon"
-#: src/include/support/dialogs.rb:866
+#: src/include/support/dialogs.rb:870
msgid "Progress"
msgstr "Fremdrift"
-#: src/include/support/dialogs.rb:931
+#. Remove ANSI escape codes for cursor movement (bnc#921233)
+#: src/include/support/dialogs.rb:939
msgid "Collected Data Review"
msgstr "Oversikt over samlet informasjon"
#. FIXME use list of generated files, as well as directory prefix
#. `MultiLineEdit (`id (`file), `opt (`read_only), _("File Contents"))
-#: src/include/support/dialogs.rb:978 src/include/support/dialogs.rb:1026
+#: src/include/support/dialogs.rb:986 src/include/support/dialogs.rb:1034
msgid "File Name"
msgstr "Filnavn"
-#: src/include/support/dialogs.rb:984
+#: src/include/support/dialogs.rb:992
msgid "Remove from Data"
msgstr "Fjern fra informasjon"
Modified: branches/plus-SLE12-SP2/yast/nb/po/sysconfig.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/sysconfig.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/sysconfig.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: sysconfig.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2007-07-25 10:51+0200\n"
"Last-Translator: Rune Nordbøe Skillingstad \n"
"Language-Team: Norwegian\n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/tftp-server.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/tftp-server.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/tftp-server.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: tftp-server\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2008-10-02 14:30+0200\n"
"Last-Translator: Olav P. \n"
"Language-Team: Norwegian Bokmål <>\n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/timezone_db.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/timezone_db.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/timezone_db.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -13,7 +13,7 @@
msgstr ""
"Project-Id-Version: timezone_db.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2008-10-02 14:52+0200\n"
"Last-Translator: Olav P. \n"
"Language-Team: Norwegian Bokmål <>\n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/tune.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/tune.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/tune.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: tune\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-08-14 09:55+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/update.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/update.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/update.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: update.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 17:00+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-08-14 10:04+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
Modified: branches/plus-SLE12-SP2/yast/nb/po/users.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/users.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/users.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -14,7 +14,7 @@
msgstr ""
"Project-Id-Version: users\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2009-10-01 12:44+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"
@@ -134,6 +134,637 @@
msgid "Do not ask for missing data; return error instead."
msgstr "Ikke be om manglende informasjon; vis feilmelding i stedet."
+#. caption for dialog "User Authentication Method"
+#. dialog caption
+#: src/clients/inst_auth.rb:115 src/clients/inst_user.rb:137
+msgid "User Authentication Method"
+msgstr "Metode for brukerautentisering"
+
+#. help text for dialog "User Authentication Method" 1/3
+#: src/clients/inst_auth.rb:118
+msgid ""
+"<p>\n"
+"<b>Authentication</b><br>\n"
+"Select the authentication method to use for users on your system.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"<b>Autentisering</b><br>\n"
+"Her du kan du velge autentiseringsmetode for brukere i systemet.\n"
+"</p>"
+
+#. helptext 2/3
+#. help text for dialog "User Authentication Method" 2/2
+#: src/clients/inst_auth.rb:125 src/clients/inst_user_first.rb:164
+msgid "<p>Select <b>Local</b> to authenticate users only by using the local files <i>/etc/passwd</i> and <i>/etc/shadow</i>.</p>"
+msgstr "<p>Velg <b>Lokal</b> hvis du vil autentisere brukere bare ved hjelp av lokale filer <i>/etc/passwd</i> og <i>/etc/shadow</i>.</p>"
+
+#. optional helptext 2.5/3 (local users continued)
+#: src/clients/inst_auth.rb:133
+msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
+msgstr "Hvis du har en annen installasjon eller et annet system, kan du opprette brukere basert på denne kilden. Velg <b>Les brukerinformasjon fra tidligere installasjon</b> for å gjøre dette. Med dette valget kan du bruke en eksisterende eller opprette en ny hjemmekatalog for hver bruker på det spesifiserte stedet for denne installasjonen."
+
+#. radiobutton to select ldap user auth.
+#: src/clients/inst_auth.rb:141
+msgid "&LDAP"
+msgstr "&LDAP"
+
+#. radiobutton to select nis user auth.
+#: src/clients/inst_auth.rb:143
+msgid "N&IS"
+msgstr "N&IS"
+
+#. radiobutton to select samba user auth.
+#. menubutton label
+#: src/clients/inst_auth.rb:145 src/include/users/widgets.rb:159
+msgid "&Samba"
+msgstr "&Samba"
+
+#. radiobutton to select samba user auth.
+#: src/clients/inst_auth.rb:147
+msgid "&Windows Domain"
+msgstr "&Windows-domene"
+
+#. radiobutton to select local user auth.
+#. radiobutton label
+#: src/clients/inst_auth.rb:151 src/clients/inst_user_first.rb:85
+msgid "L&ocal (/etc/passwd)"
+msgstr "L&okal (/etc/passwd)"
+
+#. radiobutton to select local user auth.
+#. authentication type
+#: src/clients/inst_auth.rb:155 src/clients/users_proposal.rb:48
+msgid "eDirectory LDAP"
+msgstr "eDirectory LDAP"
+
+#. helptext 3/3 -- nis & samba & ldap avialable
+#: src/clients/inst_auth.rb:185
+msgid ""
+"<p>If you are using a NIS or LDAP server to store user data or if you want\n"
+"to authenticate users against an NT server, choose the appropriate value. Then\n"
+"press <b>Next</b> to continue with configuration of your client.</p>"
+msgstr ""
+"<p>Hvis du bruker en NIS- eller LDAP-server til lagring av brukerdata eller hvis du vil\n"
+"autentisere brukere mot en NT-server, velg den aktuelle verdien. Trykk deretter\n"
+"<b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
+
+#. helptext 3/3 -- nis & ldap avialable
+#: src/clients/inst_auth.rb:195
+msgid ""
+"<p>If you are using a NIS or LDAP server to store user data, choose the\n"
+"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
+msgstr ""
+"<p>Hvis du bruker en NIS- eller LDAP-server til lagring av brukerdata, velg den\n"
+"aktuelle verdien. Trykk deretter <b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
+
+#. helptext 3/3 -- samba &ldap available
+#: src/clients/inst_auth.rb:205
+msgid ""
+"<p>If you are using an LDAP server to store user data or if you want to\n"
+"authenticate users against an NT server, choose the appropriate value. Then\n"
+"press <b>Next</b> to continue with configuration of your client.</p>"
+msgstr ""
+"<p>Hvis du bruker en LDAP-server til lagring av brukerdata eller hvis du vil\n"
+"autentisere brukere mot en NT-server, velg den aktuelle verdien. Trykk deretter\n"
+"<b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
+
+#. helptext 3/3 -- only ldap available
+#: src/clients/inst_auth.rb:215
+msgid ""
+"<p>If you are using an LDAP server to store user data, choose the\n"
+"appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
+msgstr ""
+"<p>Hvis du bruker en LDAP-server til lagring av brukerdata, velg den\n"
+"aktuelle verdien. Trykk deretter <b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
+
+#. helptext: additional kerberos support
+#: src/clients/inst_auth.rb:225
+msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
+msgstr "<p>Kryss av for <b>Sett opp Kerberos-autentisering</b> for å konfigurere Kerberos etter at du har valgt brukerinformasjonskilde.</p>"
+
+#. check box label
+#. check box label
+#: src/clients/inst_auth.rb:240 src/clients/inst_user_first.rb:102
+msgid "&Read User Data from a Previous Installation"
+msgstr "Les b&rukerinformasjon fra en tidligere installasjon"
+
+#. button label
+#. button label
+#: src/clients/inst_auth.rb:245 src/clients/inst_user_first.rb:107
+msgid "&Choose"
+msgstr "&Velg"
+
+#. frame title for authentication methods
+#: src/clients/inst_auth.rb:295 src/clients/inst_user_first.rb:136
+msgid "Authentication Method"
+msgstr "Metode for brukerautentisering"
+
+#. check box label
+#: src/clients/inst_auth.rb:303
+msgid "Set Up &Kerberos Authentication"
+msgstr "Sett opp &Kerberos-autentisering"
+
+#. selection box label
+#. selection box label
+#: src/clients/inst_auth.rb:428 src/clients/inst_user_first.rb:507
+msgid "&Select Users to Read"
+msgstr "Velg brukere som skal le&ses"
+
+#. check box label
+#. check box label
+#: src/clients/inst_auth.rb:434 src/clients/inst_user_first.rb:515
+msgid "Select or Deselect &All"
+msgstr "Velg eller velg bort &alle"
+
+#. Title for root-password dialogue
+#. Title for root-password dialogue
+#: src/clients/inst_root.rb:88 src/clients/inst_root_first.rb:57
+msgid "Password for the System Administrator \"root\""
+msgstr "Passord for systemadministratoren \"root\","
+
+#. advise user to remember his new password
+#. advise users to remember their new password
+#: src/clients/inst_root.rb:95 src/clients/inst_root_first.rb:67
+msgid "Do not forget what you enter here."
+msgstr "Ikke glem hva du skriver inn her."
+
+#. Label: get password for user root
+#. Label: get password for user root
+#: src/clients/inst_root.rb:101 src/clients/inst_root_first.rb:73
+msgid "&Password for root User"
+msgstr "&Passord for rotbruker"
+
+#. Label: get same password again for verification
+#. Label: get same password again for verification
+#: src/clients/inst_root.rb:109 src/clients/inst_root_first.rb:81
+msgid "Con&firm Password"
+msgstr "B&ekreft passord"
+
+#. text entry label
+#. text entry label
+#: src/clients/inst_root.rb:114 src/clients/inst_root_first.rb:86
+msgid "&Test Keyboard Layout"
+msgstr "&Test tastaturoppsett"
+
+#. push button
+#: src/clients/inst_root.rb:119
+msgid "E&xpert Options..."
+msgstr "A&vanserte alternativer..."
+
+#. help text ( explain what the user "root" is and does ) 1/5
+#. help text ( explain what the user "root" is and does ) 1/5
+#: src/clients/inst_root.rb:124 src/clients/inst_root_first.rb:93
+msgid ""
+"<p>\n"
+"Unlike normal users of the system, who write texts, create\n"
+"graphics, or browse the Internet, the user \"root\" exists on\n"
+"every system and is called into action whenever\n"
+"administrative tasks need to be performed. Only log in as root\n"
+"when you need to be the system administrator.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Til forskjell fra vanlige brukere, som for eksempel jobber med tekst og\n"
+"grafikk eller surfer på nettet, finnes brukeren \"root\" i\n"
+"alle systemer, og må aktiveres hver gang en administrativ\n"
+"oppgave skal utføres. Logg inn som rot når\n"
+"du har behov for å være systemadministrator, aldri ellers.\n"
+"</p>\n"
+
+#. help text, continued 2/5
+#. help text, continued 2/5
+#: src/clients/inst_root.rb:137 src/clients/inst_root_first.rb:106
+msgid ""
+"<p>\n"
+"Because the root user is equipped with extensive permissions, the password\n"
+"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
+"is recommended. To ensure that the password was entered correctly,\n"
+"reenter it in a second field.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Fordi rotbrukeren har omfattende rettigheter, bør passordet \n"
+"for \"root\" velges med omhu. En kombinasjon av bokstaver og tall\n"
+"anbefales. For å sikre at passordet ble skrevet riktig, må det skrives inn\n"
+"på nytt i det andre feltet.\n"
+"</p>\n"
+
+#. help text, continued 3/5
+#. help text, continued 3/5
+#: src/clients/inst_root.rb:150 src/clients/inst_root_first.rb:119
+msgid ""
+"<p>\n"
+"All the rules for user passwords apply to the \"root\" password:\n"
+"Distinguish between uppercase and lowercase. A password should have at\n"
+"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Alle regler for brukerpassord gjelder for rotpassordet også:\n"
+"Skill mellom store og små bokstaver. Et passord bør bestå av minst 5 tegn,\n"
+"og bør normalt ikke inneholde bokstaver med aksenter eller tødler.\n"
+"</p>\n"
+
+#. help text, continued 5/5
+#. help text, continued 5/5
+#: src/clients/inst_root.rb:164 src/clients/inst_root_first.rb:133
+msgid ""
+"<p>\n"
+"Do not forget this \"root\" password.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"Ikke glem dette rotpassordet\n"
+"</p>"
+
+#. additional help text about password
+#. additional help text about password
+#: src/clients/inst_root.rb:176 src/clients/inst_root_first.rb:145
+msgid ""
+"<p>If you intend to use this password for creating certificates,\n"
+"it has to be at least %1 characters long.</p>"
+msgstr ""
+"<p>Hvis du har til hensikt å bruke dette passordet til å opprette sertifikater,\n"
+"må det har en lengde på minst %1 tegn.</p>"
+
+#. help text for 'test keyboard layout' entry'
+#: src/clients/inst_root.rb:187
+msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
+msgstr "<p>Kontroller om gjeldende tastaturoppsett er riktig ved å skrive inn tekst i feltet <b>Test tastaturoppsett</b>.</p>"
+
+#. report misspellings of the password
+#. report misspellings of the password
+#. The two group password information do not match
+#. error popup
+#. The two user password information do not match
+#. error popup
+#. The two group password information do not match
+#. error popup
+#: src/clients/inst_root.rb:233 src/clients/inst_root_first.rb:185
+#: src/clients/inst_user_first.rb:688 src/include/users/dialogs.rb:146
+#: src/include/users/dialogs.rb:1247 src/include/users/dialogs.rb:2364
+msgid ""
+"The passwords do not match.\n"
+"Try again."
+msgstr ""
+"Passordene er ikke identiske.\n"
+"Prøv igjen."
+
+#. #-#-#-#-# users.rxgettext.pot (PACKAGE VERSION) #-#-#-#-#
+#. report if user forgot to enter a password
+#. #-#-#-#-# users.xgettext.pot #-#-#-#-#
+#. error popup
+#: src/clients/inst_root.rb:243 src/clients/inst_root_first.rb:191
+#: src/modules/UsersSimple.pm:749
+msgid ""
+"No password entered.\n"
+"Try again."
+msgstr ""
+"Passord ble ikke angitt.\n"
+"Prøv igjen."
+
+#. yes/no popup question, %1 is a number
+#. yes/no popup question, %1 is a number
+#: src/clients/inst_root.rb:270 src/clients/inst_root_first.rb:224
+msgid ""
+"If you intend to create certificates,\n"
+"the password should have at least %1 characters."
+msgstr ""
+"Hvis du har til hensikt å opprette sertifikater,\n"
+"bør passordet ha minst %1 tegn."
+
+#. last part of message popup
+#. last part of message popup
+#. last part of message popup
+#. last part of message popup
+#: src/clients/inst_root.rb:285 src/clients/inst_root_first.rb:239
+#: src/clients/inst_user_first.rb:714 src/include/users/dialogs.rb:1269
+#: src/include/users/dialogs.rb:2391
+msgid "Really use this password?"
+msgstr "Vil du virkelig bruke dette passordet?"
+
+#. Error msg (yes/no)
+#: src/clients/inst_root.rb:301
+msgid ""
+"The root password could not be set.\n"
+"You might not be able to log in.\n"
+"Try setting it again?\n"
+msgstr ""
+"Et rotpassord kunne ikke defineres.\n"
+"Du vil kanskje ikke kunne logge inn.\n"
+"Vil du forsøke igjen?\n"
+
+#. help text (shown in the 'busy' situation)
+#: src/clients/inst_user.rb:144
+msgid "Initialization of module for configuration of authentication..."
+msgstr "Initialisering av modul for konfigurasjon av autentisering..."
+
+#. popup label (%1 is package to install)
+#. popup label (%1 is package to install)
+#. popup label (%1 is package to install)
+#: src/clients/inst_user.rb:171 src/clients/inst_user.rb:195
+#: src/include/users/widgets.rb:2450
+msgid ""
+"Package %1 is not installed.\n"
+"Install it now?\n"
+msgstr ""
+"Pakken %1 er ikke installert.\n"
+"Vil du installere den nå?\n"
+
+#. encryption type
+#. encryption type
+#. encryption type
+#. encryption type
+#: src/clients/inst_user_first.rb:89 src/clients/users_proposal.rb:53
+#: src/include/users/helps.rb:52 src/include/users/helps.rb:54
+msgid "DES"
+msgstr "DES"
+
+#. encryption type
+#. encryption type
+#. encryption type
+#: src/clients/inst_user_first.rb:91 src/clients/users_proposal.rb:55
+#: src/include/users/helps.rb:56
+msgid "MD5"
+msgstr "MD5"
+
+#. encryption type
+#. encryption type
+#: src/clients/inst_user_first.rb:93 src/clients/users_proposal.rb:57
+msgid "SHA-256"
+msgstr "SHA-256"
+
+#. encryption type
+#. encryption type
+#: src/clients/inst_user_first.rb:95 src/clients/users_proposal.rb:59
+msgid "SHA-512"
+msgstr "SHA-512"
+
+#. frame label
+#: src/clients/inst_user_first.rb:143
+msgid "Password Encryption Type"
+msgstr "Passordkrypteringstype"
+
+#. Radio button label: password encryption type
+#. Radio buttons for password encryption: DES-crypt
+#: src/clients/inst_user_first.rb:149 src/include/users/widgets.rb:513
+msgid "&DES"
+msgstr "&DES"
+
+#. Radio button label: password encryption type
+#. Radio buttons for password encryption: MD5-crypt
+#: src/clients/inst_user_first.rb:151 src/include/users/widgets.rb:515
+msgid "&MD5"
+msgstr "&MD5"
+
+#. Radio button label: password encryption type
+#. Radio buttons for password encryption: sha256 crypt
+#: src/clients/inst_user_first.rb:153 src/include/users/widgets.rb:520
+msgid "SHA-&256"
+msgstr "SHA-&256"
+
+#. Radio button label: password encryption type
+#. Radio buttons for password encryption: sha512 crypt
+#: src/clients/inst_user_first.rb:155 src/include/users/widgets.rb:528
+msgid "SHA-&512"
+msgstr "SHA-&512"
+
+#. help text for dialog "User Authentication Method" 1/2
+#: src/clients/inst_user_first.rb:162
+#, fuzzy
+#| msgid "<p><b>Login Settings</b></p>"
+msgid "<p><b>Authentication</b><br></p>"
+msgstr "<p><b>Innloggingsinnstillinger</b></p>"
+
+#. Help text for password expert dialog
+#: src/clients/inst_user_first.rb:168
+#, fuzzy
+#| msgid "The password encryption method is %1."
+msgid "<p>Choose a password encryption method for local and system users.</p>"
+msgstr "Krypteringsmetode for passord er %1."
+
+#. Help text for password expert dialog
+#. Help text for password expert dialog 4/5
+#: src/clients/inst_user_first.rb:170 src/include/users/widgets.rb:491
+msgid "<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
+msgstr "<p><b>SHA-512</b> er standard hash-metode. Det anbefales ikke å bruke andre algoritmer dersom det ikke er nødvendig av kompatibilitetshensyn.</p>"
+
+#. text entry
+#. text entry
+#: src/clients/inst_user_first.rb:223 src/include/users/dialogs.rb:403
+msgid "User's &Full Name"
+msgstr "Brukerens &fulle navn"
+
+#. input field for login name
+#. input field for login name
+#: src/clients/inst_user_first.rb:230 src/include/users/dialogs.rb:433
+msgid "&Username"
+msgstr "&Brukernavn"
+
+#. checkbox label
+#. checkbox label
+#: src/clients/inst_user_first.rb:252 src/include/users/dialogs.rb:470
+msgid "U&se this password for system administrator"
+msgstr "Bru&k dette passordet for systemadministrator"
+
+#. checkbox label
+#. checkbox label
+#: src/clients/inst_user_first.rb:258 src/include/users/dialogs.rb:446
+msgid "Receive S&ystem Mail"
+msgstr "Motta s&ystemmeldinger"
+
+#. checkbox label
+#: src/clients/inst_user_first.rb:261
+msgid "&Automatic Login"
+msgstr "&Automatisk innlogging"
+
+#. dialog caption
+#: src/clients/inst_user_first.rb:283
+msgid "Create New User"
+msgstr "Opprett ny bruker"
+
+#. yes-no popup headline
+#. The user login field is empty, this is allowed if the
+#. system is part of a network with (e.g.) NIS user management.
+#. yes-no popup headline
+#: src/clients/inst_user_first.rb:342 src/include/users/dialogs.rb:1112
+msgid "Empty User Login"
+msgstr "Brukernavn ikke angitt"
+
+#. yes-no popup contents
+#. yes-no popup contents
+#: src/clients/inst_user_first.rb:344 src/include/users/dialogs.rb:1114
+msgid ""
+"Leaving the user name empty only makes sense\n"
+"in a network environment with an authentication server.\n"
+"Leave it empty?"
+msgstr ""
+"Å la brukernavnfeltet være tomt er bare hensiktsmessig\n"
+"i nettverksmiljøer som bruker en autentiseringsserver.\n"
+"Skal feltet være tomt?"
+
+#. help text for main add user dialog
+#. alternative help text 1/7
+#: src/clients/inst_user_first.rb:450 src/include/users/helps.rb:212
+msgid ""
+"<p>\n"
+"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n"
+"assign to this user account.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Angi <b>Brukerens fulle navn</b>, <b>Brukernavn</b> og <b>Passord</b> for\n"
+"denne brukerkontoen.\n"
+"</p>\n"
+
+#. help text for main add user dialog
+#: src/clients/inst_user_first.rb:453
+msgid ""
+"<p>\n"
+"When entering a password, distinguish between uppercase and\n"
+"lowercase. Passwords should not contain any accented characters or umlauts.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"Skill mellom store og små bokstaver når du velger passord.\n"
+"Passord må ikke inneholde bokstaver med aksenter eller tødler.\n"
+"</p>\n"
+
+#. help text %1 is encryption type, %2,%3 numbers
+#. help text 2/4 %1 is encryption type, %2,%3 numbers
+#: src/clients/inst_user_first.rb:457 src/include/users/helps.rb:73
+msgid ""
+"<p>\n"
+"With the current password encryption (%1), the password length should be between\n"
+" %2 and %3 characters.\n"
+"</p>"
+msgstr ""
+"<p>\n"
+"Med gjeldende passordkryptering (%1) må passordets lengde være mellom\n"
+"%2 og %3 tegn.\n"
+"</p>"
+
+#. additional help text about password
+#: src/clients/inst_user_first.rb:467
+#, fuzzy
+#| msgid ""
+#| "<p>If you intend to use this password for creating certificates,\n"
+#| "it has to be at least %1 characters long.</p>"
+msgid ""
+"<p>If you intend to use this password for creating certificates,\n"
+"it has to be at least %s characters long.</p>"
+msgstr ""
+"<p>Hvis du har til hensikt å bruke dette passordet til å opprette sertifikater,\n"
+"må det har en lengde på minst %1 tegn.</p>"
+
+#. help text for main add user dialog
+#. help text 4/4
+#: src/clients/inst_user_first.rb:472 src/include/users/helps.rb:90
+msgid ""
+"<p>\n"
+"To ensure that the password was entered correctly,\n"
+"repeat it exactly in a second field. Do not forget your password.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"For å sikre at passordet ble skrevet riktig inn\n"
+"må det skrives inn en gang til i det andre feltet. Ikke glem passordet.\n"
+"</p>\n"
+
+#. help text for main add user dialog
+#: src/clients/inst_user_first.rb:476
+msgid ""
+"<p>\n"
+"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
+"Do not use uppercase letters in this entry unless you know what you are doing.\n"
+"Usernames have stricter restrictions than passwords. You can redefine the\n"
+"restrictions in the /etc/login.defs file. Read its man page for information.\n"
+"</p>\n"
+msgstr ""
+"<p>\n"
+"For <b>Brukernavn</b> må bare bokstaver (ingen tegn med aksenter), tall og tegnet <tt>._-</tt> benyttes.\n"
+"Ikke bruk store bokstaver her hvis du ikke vet nøyaktig hva du gjør.\n"
+"Brukernavn har flere begrensninger enn passord. Du kan omdefinere\n"
+"begrensningene i filen /etc/login.defs. Du finner mer informasjon på manualsiden for filen.\n"
+"</p>\n"
+
+#. help text for main add user dialog
+#: src/clients/inst_user_first.rb:482
+msgid "<p>Check <b>Use this password for system administrator</b> if the same password as entered for the first user should be used for root.</p>"
+msgstr " Kryss av for Bruk dette passordet hvis samme passord som ble angitt for første bruker, skal benyttes for rotbrukeren"
+
+#. help text for main add user dialog
+#. these are used only during installation time
+#. help text 4/7 (only during installation)
+#: src/clients/inst_user_first.rb:485 src/include/users/helps.rb:259
+msgid ""
+"<p>\n"
+"The username and password created here are needed to log in and work with your Linux system. With <b>Automatic Login</b> enabled, the login procedure is skipped. This user is logged in automatically.</p>\n"
+msgstr ""
+"<p>\n"
+"Brukernavnet og passordet som opprettes her, kreves for å logge på og arbeide med Linux-systemet. Hvis <b>Automatisk innlogging</b> aktiveres, blir Innloggingsprosedyren sløyfet, og denne brukeren blir logget inn automatisk.</p>\n"
+
+#. help text for main add user dialog
+#. help text 5/7 (only during installation)
+#: src/clients/inst_user_first.rb:489 src/include/users/helps.rb:264
+msgid ""
+"<p>\n"
+"Have mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>\n"
+msgstr ""
+"<p>\n"
+"E-post til rotbrukeren vil bli videresendt til denne brukeren hvis du krysser av for <b>Motta systemmeldinger</b>.</p>\n"
+
+#. Dialog for expert user settings: authentication method as well
+#. as password encryption (see fate 302980)
+#. @return true if user accepted expert settings
+#: src/clients/inst_user_first.rb:573
+msgid "Expert Settings"
+msgstr "Avanserte innstillinger"
+
+#. summary label
+#: src/clients/inst_user_first.rb:625
+msgid "The authentication method is local /etc/passwd."
+msgstr "Autentiseringsmetoden er lokal"
+
+#. summary label
+#: src/clients/inst_user_first.rb:628
+#, fuzzy
+#| msgid "The password encryption method is %1."
+msgid "The password encryption method is %s."
+msgstr "Krypteringsmetode for passord er %1."
+
+#. summary label, %s is a single user name or multiple usernames (comma separated)
+#: src/clients/inst_user_first.rb:635
+#, fuzzy
+#| msgid "User %1 will be imported."
+msgid "User %s will be imported."
+msgid_plural "Users %s will be imported."
+msgstr[0] "Brukeren %1 vil bli importert."
+msgstr[1] "Brukeren %1 vil bli importert."
+
+#. pushbutton label
+#: src/clients/inst_user_first.rb:650
+msgid "&Change..."
+msgstr "&Endre..."
+
+#. frame label
+#: src/clients/inst_user_first.rb:657
+msgid "Summary"
+msgstr "Sammendrag"
+
+#. yes/no popup question, %s is a number
+#: src/clients/inst_user_first.rb:709
+#, fuzzy
+#| msgid ""
+#| "If you intend to create certificates,\n"
+#| "the password should have at least %1 characters."
+msgid ""
+"If you intend to create certificates,\n"
+"the password should have at least %s characters."
+msgstr ""
+"Hvis du har til hensikt å opprette sertifikater,\n"
+"bør passordet ha minst %1 tegn."
+
#. translators: command line help text for Users module
#: src/clients/users.rb:102
msgid "User configuration module"
@@ -255,6 +886,11 @@
msgid "New UID of the user"
msgstr "Ny UID for brukeren"
+#. progress step title
+#: src/clients/users_finish.rb:63
+msgid "Writing Users Configuration..."
+msgstr "Lagrer brukeroppsett..."
+
#. helptext 1/3
#: src/clients/users_plugin_ldap_all.rb:105
msgid ""
@@ -509,6 +1145,93 @@
msgid "Seconds"
msgstr "Sekunder"
+#. authentication type
+#. type of user/group
+#. (item of list with the headline 'Choose the type of user to add')
+#: src/clients/users_proposal.rb:42 src/include/users/widgets.rb:1365
+msgid "LDAP"
+msgstr "LDAP"
+
+#. authentication type
+#. richtext label
+#: src/clients/users_proposal.rb:44 src/include/users/widgets.rb:136
+msgid "NIS"
+msgstr "NIS"
+
+#. authentication type
+#: src/clients/users_proposal.rb:46
+msgid "Samba (Windows Domain)"
+msgstr " -domene"
+
+#. summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/clients/users_proposal.rb:69
+msgid "<%1>Root Password<%2> set"
+msgstr "<%1>Rotpassord<%2> definert"
+
+#: src/clients/users_proposal.rb:74
+msgid "<%1>Root Password<%2> not set"
+msgstr "<%1>Rotpassord<%2> ikke definert"
+
+#. summary label <%1>-<%2> are HTML tags, leave untouched
+#: src/clients/users_proposal.rb:81
+msgid "No <%1>user<%2> configured"
+msgstr "Ingen <%1>bruker<%2> satt opp"
+
+#. summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. % is LDAP/NIS etc.
+#: src/clients/users_proposal.rb:93
+msgid "<%1>Authentication method<%2>: %3"
+msgstr "<%1>Autentiseringsmetode<%2>: %3"
+
+#. summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. % is LDAP/NIS etc.
+#: src/clients/users_proposal.rb:102
+msgid "<%1>Authentication method<%2>: %3 and Kerberos."
+msgstr "<%1>Autentiseringsmetode<<%2>: %3 og Kerberos."
+
+#. summary line, %3 are user names (comma separated)
+#. <%1>,<%2> are HTML tags, leave untouched,
+#: src/clients/users_proposal.rb:116
+msgid "<%1>Users<%2> %3 selected for import"
+msgstr "<%1>Brukerne<%2> %3 valgt for import"
+
+#. summary line, <%1>,<%2> are HTML tags, %3 user name
+#: src/clients/users_proposal.rb:124
+msgid "<%1>User<%2> %3 will be imported."
+msgstr "<%1>Brukeren<%2> %3 vil bli importert."
+
+#. summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is login name
+#: src/clients/users_proposal.rb:134
+msgid "<%1>User<%2> %3 configured"
+msgstr "<%1>Brukeren<%2> %3 definert"
+
+#. summary line: <%1>-<%2> are HTML tags, leave untouched,
+#. %3 is full name, %4 login name
+#: src/clients/users_proposal.rb:143
+msgid "<%1>User<%2> %3 (%4) configured"
+msgstr "<%1>Brukeren<%2> %3 (%4) definert"
+
+#. summary line
+#: src/clients/users_proposal.rb:156
+msgid "Password Encryption Method: %1"
+msgstr "Passordkrypteringsmetode: %1"
+
+#. rich text label
+#: src/clients/users_proposal.rb:170
+msgid "User Settings"
+msgstr "Brukerinnstillinger"
+
+#. menu button label
+#: src/clients/users_proposal.rb:173
+msgid "&User"
+msgstr "&Bruker"
+
+#. menu button label
+#: src/clients/users_proposal.rb:175
+msgid "&Root Password"
+msgstr "&Rotpassord"
+
#. password entering label
#: src/include/users/cmdline.rb:55
msgid "LDAP Server Password:"
@@ -671,24 +1394,6 @@
"krypteringsinnstillingene for denne brukeren,\n"
"må du skrive inn brukerens gjeldende passord."
-#. The two user password information do not match
-#. error popup
-#. The two group password information do not match
-#. error popup
-#. report misspellings of the password
-#. The two group password information do not match
-#. error popup
-#: src/include/users/dialogs.rb:146 src/include/users/dialogs.rb:1247
-#: src/include/users/dialogs.rb:2364
-#: src/lib/users/dialogs/inst_root_first.rb:193
-#: src/lib/users/dialogs/inst_user_first.rb:470
-msgid ""
-"The passwords do not match.\n"
-"Try again."
-msgstr ""
-"Passordene er ikke identiske.\n"
-"Prøv igjen."
-
#. yes/no popup label, %1,%2 are file paths
#: src/include/users/dialogs.rb:344
msgid ""
@@ -719,13 +1424,6 @@
msgstr "&Endre hjemmekatalogeier"
#. text entry
-#. text entry
-#: src/include/users/dialogs.rb:403
-#: src/lib/users/dialogs/inst_user_first.rb:582
-msgid "User's &Full Name"
-msgstr "Brukerens &fulle navn"
-
-#. text entry
#: src/include/users/dialogs.rb:411
msgid "&First Name"
msgstr "&Fornavn"
@@ -740,30 +1438,11 @@
msgid "For remote users, only additional group memberships can be changed."
msgstr "Bare medlemskap i tilleggsgrupper kan endres for eksterne brukere."
-#. input field for login name
-#. input field for login name
-#: src/include/users/dialogs.rb:433
-#: src/lib/users/dialogs/inst_user_first.rb:589
-msgid "&Username"
-msgstr "&Brukernavn"
-
#. checkbox label
-#: src/include/users/dialogs.rb:446
-msgid "Receive S&ystem Mail"
-msgstr "Motta s&ystemmeldinger"
-
-#. checkbox label
#: src/include/users/dialogs.rb:456
msgid "A&utomatic Login"
msgstr "A&utomatisk innlogging"
-#. checkbox label
-#. checkbox label
-#: src/include/users/dialogs.rb:470
-#: src/lib/users/dialogs/inst_user_first.rb:613
-msgid "U&se this password for system administrator"
-msgstr "Bru&k dette passordet for systemadministrator"
-
#. check box label
#: src/include/users/dialogs.rb:480
msgid "D&isable User Login"
@@ -933,33 +1612,6 @@
msgid "Plu&g-Ins"
msgstr "Pro&gramtillegg"
-#. The user login field is empty, this is allowed if the
-#. system is part of a network with (e.g.) NIS user management.
-#. yes-no popup headline
-#: src/include/users/dialogs.rb:1112
-msgid "Empty User Login"
-msgstr "Brukernavn ikke angitt"
-
-#. yes-no popup contents
-#: src/include/users/dialogs.rb:1114
-msgid ""
-"Leaving the user name empty only makes sense\n"
-"in a network environment with an authentication server.\n"
-"Leave it empty?"
-msgstr ""
-"Å la brukernavnfeltet være tomt er bare hensiktsmessig\n"
-"i nettverksmiljøer som bruker en autentiseringsserver.\n"
-"Skal feltet være tomt?"
-
-#. last part of message popup
-#. last part of message popup
-#. User can confirm using "invalid" password confirming all the errors
-#: src/include/users/dialogs.rb:1269 src/include/users/dialogs.rb:2391
-#: src/lib/users/dialogs/inst_root_first.rb:212
-#: src/lib/users/dialogs/inst_user_first.rb:482
-msgid "Really use this password?"
-msgstr "Vil du virkelig bruke dette passordet?"
-
#. popup question
#: src/include/users/dialogs.rb:1308
msgid "Change home directory to %1?"
@@ -1051,20 +1703,6 @@
msgid "Group &Data"
msgstr "Gruppe&informasjon"
-#. encryption type
-#. encryption type
-#. TRANSLATORS: encryption type
-#: src/include/users/helps.rb:52 src/include/users/helps.rb:54
-#: src/lib/users/encryption_method.rb:51
-msgid "DES"
-msgstr "DES"
-
-#. encryption type
-#. TRANSLATORS: encryption type
-#: src/include/users/helps.rb:56 src/lib/users/encryption_method.rb:53
-msgid "MD5"
-msgstr "MD5"
-
#. help text 1/4
#: src/include/users/helps.rb:62
msgid ""
@@ -1078,32 +1716,6 @@
"Passord må ikke inneholde bokstaver med aksenter eller tødler.\n"
"</p>\n"
-#. help text 2/4 %1 is encryption type, %2,%3 numbers
-#: src/include/users/helps.rb:73
-msgid ""
-"<p>\n"
-"With the current password encryption (%1), the password length should be between\n"
-" %2 and %3 characters.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"Med gjeldende passordkryptering (%1) må passordets lengde være mellom\n"
-"%2 og %3 tegn.\n"
-"</p>"
-
-#. help text 4/4
-#: src/include/users/helps.rb:90 src/lib/users/dialogs/inst_user_first.rb:159
-msgid ""
-"<p>\n"
-"To ensure that the password was entered correctly,\n"
-"repeat it exactly in a second field. Do not forget your password.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"For å sikre at passordet ble skrevet riktig inn\n"
-"må det skrives inn en gang til i det andre feltet. Ikke glem passordet.\n"
-"</p>\n"
-
#. Help text 0/6
#: src/include/users/helps.rb:103
msgid ""
@@ -1269,19 +1881,6 @@
"<b>Passord</b> for brukeren.\n"
"</p>\n"
-#. alternative help text 1/7
-#: src/include/users/helps.rb:212 src/lib/users/dialogs/inst_user_first.rb:138
-msgid ""
-"<p>\n"
-"Enter the <b>User's Full Name</b>, <b>Username</b>, and <b>Password</b> to\n"
-"assign to this user account.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Angi <b>Brukerens fulle navn</b>, <b>Brukernavn</b> og <b>Passord</b> for\n"
-"denne brukerkontoen.\n"
-"</p>\n"
-
#. help text 2/7
#: src/include/users/helps.rb:226
msgid ""
@@ -1322,25 +1921,6 @@
"begrensningene i filen /etc/login.defs. Du finner mer informasjon på manualsiden for filen.\n"
"</p>\n"
-#. these are used only during installation time
-#. help text 4/7 (only during installation)
-#: src/include/users/helps.rb:259 src/lib/users/dialogs/inst_user_first.rb:175
-msgid ""
-"<p>\n"
-"The username and password created here are needed to log in and work with your Linux system. With <b>Automatic Login</b> enabled, the login procedure is skipped. This user is logged in automatically.</p>\n"
-msgstr ""
-"<p>\n"
-"Brukernavnet og passordet som opprettes her, kreves for å logge på og arbeide med Linux-systemet. Hvis <b>Automatisk innlogging</b> aktiveres, blir Innloggingsprosedyren sløyfet, og denne brukeren blir logget inn automatisk.</p>\n"
-
-#. help text 5/7 (only during installation)
-#: src/include/users/helps.rb:264
-msgid ""
-"<p>\n"
-"Have mail for root forwarded to this user by checking <b>Receive System Mail</b>.</p>\n"
-msgstr ""
-"<p>\n"
-"E-post til rotbrukeren vil bli videresendt til denne brukeren hvis du krysser av for <b>Motta systemmeldinger</b>.</p>\n"
-
#. help text 6/7 (only during installation)
#: src/include/users/helps.rb:269
msgid "<p>Press <b>User Management</b> to add more users or groups to your system.</p>"
@@ -2095,9 +2675,7 @@
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
msgid "Local Users"
msgstr "Lokale brukere"
@@ -2173,11 +2751,6 @@
msgstr "Samba-grupper"
#. richtext label
-#: src/include/users/widgets.rb:136
-msgid "NIS"
-msgstr "NIS"
-
-#. richtext label
#: src/include/users/widgets.rb:138
msgid "SSSD"
msgstr ""
@@ -2197,11 +2770,6 @@
msgid "&SSSD"
msgstr ""
-#. menubutton label
-#: src/include/users/widgets.rb:159
-msgid "&Samba"
-msgstr "&Samba"
-
#. tab header
#: src/include/users/widgets.rb:168
msgid "&Users"
@@ -2329,11 +2897,6 @@
"nettverksprotokoller støtter ikke dette, og det kan oppstå problemer i forbindelse med NIS.\n"
"</p>"
-#. Help text for password expert dialog 4/5
-#: src/include/users/widgets.rb:491
-msgid "<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
-msgstr "<p><b>SHA-512</b> er standard hash-metode. Det anbefales ikke å bruke andre algoritmer dersom det ikke er nødvendig av kompatibilitetshensyn.</p>"
-
#. Label
#: src/include/users/widgets.rb:499
msgid "Password Encryption"
@@ -2344,26 +2907,6 @@
msgid "Encryption Type"
msgstr "Krypteringstype"
-#. Radio buttons for password encryption: DES-crypt
-#: src/include/users/widgets.rb:513
-msgid "&DES"
-msgstr "&DES"
-
-#. Radio buttons for password encryption: MD5-crypt
-#: src/include/users/widgets.rb:515
-msgid "&MD5"
-msgstr "&MD5"
-
-#. Radio buttons for password encryption: sha256 crypt
-#: src/include/users/widgets.rb:520
-msgid "SHA-&256"
-msgstr "SHA-&256"
-
-#. Radio buttons for password encryption: sha512 crypt
-#: src/include/users/widgets.rb:528
-msgid "SHA-&512"
-msgstr "SHA-&512"
-
#. help text 1/3
#: src/include/users/widgets.rb:582
msgid ""
@@ -2658,12 +3201,6 @@
#. type of user/group
#. (item of list with the headline 'Choose the type of user to add')
-#: src/include/users/widgets.rb:1365
-msgid "LDAP"
-msgstr "LDAP"
-
-#. type of user/group
-#. (item of list with the headline 'Choose the type of user to add')
#: src/include/users/widgets.rb:1370
msgid "System"
msgstr "System"
@@ -3001,15 +3538,6 @@
msgid "Package %1 is not available for installation."
msgstr "Pakken %1 er ikke tilgjengelig for installasjon."
-#. popup label (%1 is package to install)
-#: src/include/users/widgets.rb:2450
-msgid ""
-"Package %1 is not installed.\n"
-"Install it now?\n"
-msgstr ""
-"Pakken %1 er ikke installert.\n"
-"Vil du installere den nå?\n"
-
#. dialog caption
#: src/include/users/wizards.rb:102
msgid "User and Group Administration"
@@ -3027,433 +3555,6 @@
msgid "Initializing..."
msgstr "Initialiserer ..."
-#. List of errors found for a given password
-#.
-#. The errors are localized and ready to be displayed to the user
-#.
-#. @param passwd [String] password to check
-#. @return [Array<String>] errors or empty array if no errors are found or
-#. validation is disabled
-#: src/lib/users/ca_password_validator.rb:56
-#, fuzzy
-#| msgid ""
-#| "If you intend to create certificates,\n"
-#| "the password should have at least %1 characters."
-msgid ""
-"If you intend to create certificates,\n"
-"the password should have at least %s characters."
-msgstr ""
-"Hvis du har til hensikt å opprette sertifikater,\n"
-"bør passordet ha minst %1 tegn."
-
-#. Localized help text about CA constraints
-#.
-#. @return [String] html text or empty string if validation is disabled
-#: src/lib/users/ca_password_validator.rb:69
-#, fuzzy
-#| msgid ""
-#| "<p>If you intend to use this password for creating certificates,\n"
-#| "it has to be at least %1 characters long.</p>"
-msgid ""
-"<p>If you intend to use this password for creating certificates,\n"
-"it has to be at least %s characters long.</p>"
-msgstr ""
-"<p>Hvis du har til hensikt å bruke dette passordet til å opprette sertifikater,\n"
-"må det har en lengde på minst %1 tegn.</p>"
-
-#. @see Implements ::Installation::FinishClient#title
-#: src/lib/users/clients/users_finish.rb:55
-msgid "Writing Users Configuration..."
-msgstr "Lagrer brukeroppsett..."
-
-#. Copyright (c) 2016 SUSE LLC.
-#. All Rights Reserved.
-#. This program is free software; you can redistribute it and/or
-#. modify it under the terms of version 2 or 3 of the GNU General
-#. Public License as published by the Free Software Foundation.
-#. This program is distributed in the hope that it will be useful,
-#. but WITHOUT ANY WARRANTY; without even the implied warranty of
-#. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-#. GNU General Public License for more details.
-#. You should have received a copy of the GNU General Public License
-#. along with this program; if not, contact SUSE LLC.
-#. To contact SUSE about this file by physical or electronic mail,
-#. you may find current contact information at www.suse.com
-#: src/lib/users/dialogs/encryption_method.rb:39
-#, fuzzy
-#| msgid "The password encryption method is %1."
-msgid "<p>Choose a password encryption method for local and system users.</p>"
-msgstr "Krypteringsmetode for passord er %1."
-
-#. TRANSLATORS: %s is the name of the recommended encryption method
-#: src/lib/users/dialogs/encryption_method.rb:41
-#, fuzzy
-#| msgid "<p><b>SHA-512</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
-msgid "<p><b>%s</b> is the current standard hash method. Using other algorithms is not recommended unless needed for compatibility purposes.</p>"
-msgstr "<p><b>SHA-512</b> er standard hash-metode. Det anbefales ikke å bruke andre algoritmer dersom det ikke er nødvendig av kompatibilitetshensyn.</p>"
-
-#. Let's add some vertical space after each widget
-#. TRANSLATORS: rich text label
-#: src/lib/users/dialogs/encryption_method.rb:72
-#: src/lib/users/encryption_proposal.rb:63
-msgid "Password Encryption Type"
-msgstr "Passordkrypteringstype"
-
-#. advise users to remember their new password
-#: src/lib/users/dialogs/inst_root_first.rb:70
-msgid "Do not forget what you enter here."
-msgstr "Ikke glem hva du skriver inn her."
-
-#. Label: get password for user root
-#: src/lib/users/dialogs/inst_root_first.rb:76
-msgid "&Password for root User"
-msgstr "&Passord for rotbruker"
-
-#. Label: get same password again for verification
-#: src/lib/users/dialogs/inst_root_first.rb:84
-msgid "Con&firm Password"
-msgstr "B&ekreft passord"
-
-#. text entry label
-#: src/lib/users/dialogs/inst_root_first.rb:89
-msgid "&Test Keyboard Layout"
-msgstr "&Test tastaturoppsett"
-
-#. help text ( explain what the user "root" is and does ) 1
-#: src/lib/users/dialogs/inst_root_first.rb:99
-msgid ""
-"<p>\n"
-"Unlike normal users of the system, who write texts, create\n"
-"graphics, or browse the Internet, the user \"root\" exists on\n"
-"every system and is called into action whenever\n"
-"administrative tasks need to be performed. Only log in as root\n"
-"when you need to be the system administrator.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Til forskjell fra vanlige brukere, som for eksempel jobber med tekst og\n"
-"grafikk eller surfer på nettet, finnes brukeren \"root\" i\n"
-"alle systemer, og må aktiveres hver gang en administrativ\n"
-"oppgave skal utføres. Logg inn som rot når\n"
-"du har behov for å være systemadministrator, aldri ellers.\n"
-"</p>\n"
-
-#. help text, continued 2
-#: src/lib/users/dialogs/inst_root_first.rb:110
-msgid ""
-"<p>\n"
-"Because the root user is equipped with extensive permissions, the password\n"
-"for \"root\" should be chosen carefully. A combination of letters and numbers\n"
-"is recommended. To ensure that the password was entered correctly,\n"
-"reenter it in a second field.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Fordi rotbrukeren har omfattende rettigheter, bør passordet \n"
-"for \"root\" velges med omhu. En kombinasjon av bokstaver og tall\n"
-"anbefales. For å sikre at passordet ble skrevet riktig, må det skrives inn\n"
-"på nytt i det andre feltet.\n"
-"</p>\n"
-
-#. help text, continued 3
-#: src/lib/users/dialogs/inst_root_first.rb:120
-msgid ""
-"<p>\n"
-"All the rules for user passwords apply to the \"root\" password:\n"
-"Distinguish between uppercase and lowercase. A password should have at\n"
-"least 5 characters and, as a rule, not contain any accented letters or umlauts.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Alle regler for brukerpassord gjelder for rotpassordet også:\n"
-"Skill mellom store og små bokstaver. Et passord bør bestå av minst 5 tegn,\n"
-"og bør normalt ikke inneholde bokstaver med aksenter eller tødler.\n"
-"</p>\n"
-
-#. help text, continued 4
-#: src/lib/users/dialogs/inst_root_first.rb:131
-msgid ""
-"<p>\n"
-"Do not forget this \"root\" password.\n"
-"</p>"
-msgstr ""
-"<p>\n"
-"Ikke glem dette rotpassordet\n"
-"</p>"
-
-#. Title for root-password dialogue
-#: src/lib/users/dialogs/inst_root_first.rb:148
-msgid "Password for the System Administrator \"root\""
-msgstr "Passord for systemadministratoren \"root\","
-
-#. #-#-#-#-# users.xgettext.pot #-#-#-#-#
-#. error popup
-#: src/lib/users/dialogs/inst_root_first.rb:198 src/modules/UsersSimple.pm:623
-msgid ""
-"No password entered.\n"
-"Try again."
-msgstr ""
-"Passord ble ikke angitt.\n"
-"Prøv igjen."
-
-#. reenable suggestion
-#: src/lib/users/dialogs/inst_user_first.rb:133
-#, fuzzy
-#| msgid "<p>Select <b>Local</b> to authenticate users only by using the local files <i>/etc/passwd</i> and <i>/etc/shadow</i>.</p>"
-msgid ""
-"<p>\n"
-"Use one of the available options to add local users to the system.\n"
-"Local users are stored in <i>/etc/passwd</i> and <i>/etc/shadow</i>.\n"
-"</p>\n"
-msgstr "<p>Velg <b>Lokal</b> hvis du vil autentisere brukere bare ved hjelp av lokale filer <i>/etc/passwd</i> og <i>/etc/shadow</i>.</p>"
-
-#: src/lib/users/dialogs/inst_user_first.rb:137
-#, fuzzy
-#| msgid "Create New User"
-msgid "Create new user"
-msgstr "Opprett ny bruker"
-
-#: src/lib/users/dialogs/inst_user_first.rb:141
-msgid ""
-"<p>\n"
-"When entering a password, distinguish between uppercase and\n"
-"lowercase. Passwords should not contain any accented characters or umlauts.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Skill mellom store og små bokstaver når du velger passord.\n"
-"Passord må ikke inneholde bokstaver med aksenter eller tødler.\n"
-"</p>\n"
-
-#. TRANSLATORS: %{min} and %{max} will be replaced by numbers
-#: src/lib/users/dialogs/inst_user_first.rb:148
-#, fuzzy
-#| msgid ""
-#| "<p>\n"
-#| "With the current password encryption (%1), the password length should be between\n"
-#| " %2 and %3 characters.\n"
-#| "</p>"
-msgid ""
-"<p>\n"
-"The password length should be between %{min}\n"
-" and %{max} characters.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"Med gjeldende passordkryptering (%1) må passordets lengde være mellom\n"
-"%2 og %3 tegn.\n"
-"</p>"
-
-#: src/lib/users/dialogs/inst_user_first.rb:164
-msgid ""
-"<p>\n"
-"For the <b>Username</b> use only letters (no accented characters), digits, and <tt>._-</tt>.\n"
-"Do not use uppercase letters in this entry unless you know what you are doing.\n"
-"Usernames have stricter restrictions than passwords. You can redefine the\n"
-"restrictions in the /etc/login.defs file. Read its man page for information.\n"
-"</p>\n"
-msgstr ""
-"<p>\n"
-"For <b>Brukernavn</b> må bare bokstaver (ingen tegn med aksenter), tall og tegnet <tt>._-</tt> benyttes.\n"
-"Ikke bruk store bokstaver her hvis du ikke vet nøyaktig hva du gjør.\n"
-"Brukernavn har flere begrensninger enn passord. Du kan omdefinere\n"
-"begrensningene i filen /etc/login.defs. Du finner mer informasjon på manualsiden for filen.\n"
-"</p>\n"
-
-#: src/lib/users/dialogs/inst_user_first.rb:171
-msgid "<p>Check <b>Use this password for system administrator</b> if the same password as entered for the first user should be used for root.</p>"
-msgstr " Kryss av for Bruk dette passordet hvis samme passord som ble angitt for første bruker, skal benyttes for rotbrukeren"
-
-#: src/lib/users/dialogs/inst_user_first.rb:182
-#, fuzzy
-#| msgid "&Read User Data from a Previous Installation"
-msgid "Import User Data from a Previous Installation"
-msgstr "Les b&rukerinformasjon fra en tidligere installasjon"
-
-#: src/lib/users/dialogs/inst_user_first.rb: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
-#, fuzzy
-#| msgid "&Skip Migration"
-msgid "Skip User Creation"
-msgstr "Hopp over migra&sjon"
-
-#: 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
-msgid "Local User"
-msgstr "Lokal bruker"
-
-#. 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"
-msgid "&Create New User"
-msgstr "Opprett ny bruker"
-
-#. TRANSLATORS: radio button
-#: src/lib/users/dialogs/inst_user_first.rb:536
-#, fuzzy
-#| msgid "&Read User Data from a Previous Installation"
-msgid "&Import User Data from a Previous Installation"
-msgstr "Les b&rukerinformasjon fra en tidligere installasjon"
-
-#: src/lib/users/dialogs/inst_user_first.rb:546
-#, fuzzy
-#| msgid "System Users"
-msgid "Choose Users"
-msgstr "Systembrukere"
-
-#. TRANSLATORS: radio button
-#: src/lib/users/dialogs/inst_user_first.rb:562
-#, fuzzy
-#| msgid "&Skip Migration"
-msgid "&Skip User Creation"
-msgstr "Hopp over migra&sjon"
-
-#. checkbox label
-#: src/lib/users/dialogs/inst_user_first.rb:618
-msgid "&Automatic Login"
-msgstr "&Automatisk innlogging"
-
-#: src/lib/users/dialogs/inst_user_first.rb:625
-#, fuzzy
-#| msgid "No server is selected."
-msgid "No users selected"
-msgstr "Ingen server er valgt."
-
-#: src/lib/users/dialogs/inst_user_first.rb:627
-#, fuzzy
-#| msgid "User %1 will be imported."
-msgid "%d user will be imported"
-msgid_plural "%d users will be imported"
-msgstr[0] "Brukeren %1 vil bli importert."
-msgstr[1] "Brukeren %1 vil bli importert."
-
-#. selection box label
-#: src/lib/users/dialogs/users_to_import.rb:58
-msgid "&Select Users to Read"
-msgstr "Velg brukere som skal le&ses"
-
-#. check box label
-#: src/lib/users/dialogs/users_to_import.rb:66
-msgid "Select or Deselect &All"
-msgstr "Velg eller velg bort &alle"
-
-#. TRANSLATORS: encryption type
-#: src/lib/users/encryption_method.rb:55
-msgid "SHA-256"
-msgstr "SHA-256"
-
-#. TRANSLATORS: encryption type
-#: src/lib/users/encryption_method.rb:57
-msgid "SHA-512"
-msgstr "SHA-512"
-
-#. TRANSLATORS: summary line. Second %s is the name of the method
-#: src/lib/users/encryption_proposal.rb:35
-#, fuzzy
-#| msgid "Password Encryption Method: %1"
-msgid "Encryption Method: <a href=%s>%s</a>"
-msgstr "Passordkrypteringsmetode: %1"
-
-#. TRANSLATORS: menu button label
-#. menu button label
-#: src/lib/users/encryption_proposal.rb:66 src/lib/users/proposal.rb:82
-#, fuzzy
-#| msgid "Password Encryption Type"
-msgid "Password &Encryption Type"
-msgstr "Passordkrypteringstype"
-
-#. rich text label
-#: src/lib/users/proposal.rb:75
-msgid "User Settings"
-msgstr "Brukerinnstillinger"
-
-#. menu button label
-#: src/lib/users/proposal.rb:78
-msgid "&User"
-msgstr "&Bruker"
-
-#. menu button label
-#: src/lib/users/proposal.rb:80
-msgid "&Root Password"
-msgstr "&Rotpassord"
-
-#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/lib/users/proposal.rb:92
-msgid "<%1>Root Password<%2> set"
-msgstr "<%1>Rotpassord<%2> definert"
-
-#. TRANSLATORS: summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/lib/users/proposal.rb:95
-msgid "<%1>Root Password<%2> not set"
-msgstr "<%1>Rotpassord<%2> ikke definert"
-
-#. summary label <%1>-<%2> are HTML tags, leave untouched
-#: src/lib/users/proposal.rb:104
-msgid "No <%1>user<%2> configured"
-msgstr "Ingen <%1>bruker<%2> satt opp"
-
-#. TRANSLATORS: summary line, %d is the number of users
-#: src/lib/users/proposal.rb:110
-#, fuzzy
-#| msgid "<%1>User<%2> %3 will be imported."
-msgid "<a href=%s>%d user</a> will be imported"
-msgid_plural "<a href=%s>%d users</a> will be imported"
-msgstr[0] "<%1>Brukeren<%2> %3 vil bli importert."
-msgstr[1] "<%1>Brukeren<%2> %3 vil bli importert."
-
-#. TRANSLATORS: summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is login name
-#: src/lib/users/proposal.rb:118
-msgid "<%1>User<%2> %3 configured"
-msgstr "<%1>Brukeren<%2> %3 definert"
-
-#. summary line: <%1>-<%2> are HTML tags, leave untouched,
-#. %3 is full name, %4 login name
-#: src/lib/users/proposal.rb:127
-msgid "<%1>User<%2> %3 (%4) configured"
-msgstr "<%1>Brukeren<%2> %3 (%4) definert"
-
-#. TRANSLATORS: summary line. Second %s is the name of the method
-#: src/lib/users/proposal.rb:141
-#, fuzzy
-#| msgid "Password Encryption Method: %1"
-msgid "Password Encryption Method: <a href=%s>%s</a>"
-msgstr "Passordkrypteringsmetode: %1"
-
#. User name for user: "root"
#: src/modules/UsersUI.rb:44
msgid "root"
@@ -3911,7 +4012,7 @@
#. Popup text: %1 is the file name (e.g. /etc/fstab),
#. %2 is the directory (e.g. /home),
-#: src/modules/Users.pm:716
+#: src/modules/Users.pm:740
msgid ""
"In %1, there is a mount point for the directory\n"
"%2, which is used as a default home directory for new\n"
@@ -3930,202 +4031,202 @@
"etter at de er riktig montert. Vil du fortsette brukerkonfigurasjonen?"
#. error message
-#: src/modules/Users.pm:964
+#: src/modules/Users.pm:988
msgid "Multiple users satisfy the input conditions."
msgstr "Flere brukere samsvarer med vilkårene."
#. progress caption
-#: src/modules/Users.pm:1542
+#: src/modules/Users.pm:1566
msgid "Initializing User and Group Configuration"
msgstr "Initialiserer bruker- og gruppekonfigurasjon"
#. progress stage label
-#: src/modules/Users.pm:1549
+#: src/modules/Users.pm:1573
msgid "Read the default login settings"
msgstr "Les standardinnstillinger for innlogging"
#. progress stage label
-#: src/modules/Users.pm:1551
+#: src/modules/Users.pm:1575
msgid "Read the default system settings"
msgstr "Les standardinnstillinger for system"
#. progress stage label
-#: src/modules/Users.pm:1553
+#: src/modules/Users.pm:1577
msgid "Read the configuration type"
msgstr "Les konfigurasjonstype"
#. progress stage label
-#: src/modules/Users.pm:1555
+#: src/modules/Users.pm:1579
msgid "Read the user custom settings"
msgstr "Les spesialinnstillinger for bruker"
#. progress stage label
-#: src/modules/Users.pm:1557
+#: src/modules/Users.pm:1581
msgid "Read users and groups"
msgstr "Les brukere og grupper"
#. progress stage label
-#: src/modules/Users.pm:1559
+#: src/modules/Users.pm:1583
msgid "Build the cache structures"
msgstr "Opprett mellomlagerstrukturer"
#. progress step label
-#: src/modules/Users.pm:1563
+#: src/modules/Users.pm:1587
msgid "Reading the default login settings..."
msgstr "Leser standardinnstillinger for innlogging..."
#. progress step label
-#: src/modules/Users.pm:1565
+#: src/modules/Users.pm:1589
msgid "Reading the default system settings..."
msgstr "Leser standardinnstillinger for system..."
#. progress step label
-#: src/modules/Users.pm:1567
+#: src/modules/Users.pm:1591
msgid "Reading the configuration type..."
msgstr "Leser konfigurasjonstype..."
#. progress step label
-#: src/modules/Users.pm:1569
+#: src/modules/Users.pm:1593
msgid "Reading custom settings..."
msgstr "Leser spesialinnstillinger..."
#. progress step label
-#: src/modules/Users.pm:1571
+#: src/modules/Users.pm:1595
msgid "Reading users and groups..."
msgstr "Leser brukere og grupper..."
#. progress step label
-#: src/modules/Users.pm:1573
+#: src/modules/Users.pm:1597
msgid "Building the cache structures..."
msgstr "Oppretter mellomlagerstrukturer..."
#. final progress step label
-#: src/modules/Users.pm:1575 src/modules/Users.pm:4290
+#: src/modules/Users.pm:1599 src/modules/Users.pm:4314
msgid "Finished"
msgstr "Fullført"
#. error message
-#: src/modules/Users.pm:2131
+#: src/modules/Users.pm:2155
msgid "User does not exist."
msgstr "Brukeren finnes ikke."
#. error message
-#: src/modules/Users.pm:2383
+#: src/modules/Users.pm:2407
msgid "Group does not exist."
msgstr "Gruppen finnes ikke."
#. progress caption
-#: src/modules/Users.pm:4252
+#: src/modules/Users.pm:4276
msgid "Writing User and Group Configuration"
msgstr "Lagrer bruker- og gruppekonfigurasjon"
#. progress stage label
-#: src/modules/Users.pm:4261
+#: src/modules/Users.pm:4285
msgid "Write LDAP users and groups"
msgstr "Lagre LDAP-brukere og -grupper"
#. progress stage label
-#: src/modules/Users.pm:4263
+#: src/modules/Users.pm:4287
msgid "Write groups"
msgstr "Lagre grupper"
#. progress stage label
-#: src/modules/Users.pm:4265
+#: src/modules/Users.pm:4289
msgid "Check for deleted users"
msgstr "Søk etter slettede brukere"
#. progress stage label
-#: src/modules/Users.pm:4267
+#: src/modules/Users.pm:4291
msgid "Write users"
msgstr "Lagre brukere"
#. progress stage label
-#: src/modules/Users.pm:4269
+#: src/modules/Users.pm:4293
msgid "Write passwords"
msgstr "Lagre passord"
#. progress stage label
-#: src/modules/Users.pm:4271
+#: src/modules/Users.pm:4295
msgid "Write the custom settings"
msgstr "Lagre spesialinnstillinger"
#. progress stage label
-#: src/modules/Users.pm:4273
+#: src/modules/Users.pm:4297
msgid "Write the default login settings"
msgstr "Les standardinnstillinger for innlogging"
#. progress step label
-#: src/modules/Users.pm:4276
+#: src/modules/Users.pm:4300
msgid "Writing LDAP users and groups..."
msgstr "Lagrer LDAP-brukere og -grupper..."
#. progress step label
-#: src/modules/Users.pm:4278
+#: src/modules/Users.pm:4302
msgid "Writing groups..."
msgstr "Lagrer grupper..."
#. progress step label
-#: src/modules/Users.pm:4280
+#: src/modules/Users.pm:4304
msgid "Checking deleted users..."
msgstr "Søker etter slettede brukere..."
#. progress step label
-#: src/modules/Users.pm:4282
+#: src/modules/Users.pm:4306
msgid "Writing users..."
msgstr "Lagrer brukere..."
#. progress step label
-#: src/modules/Users.pm:4284
+#: src/modules/Users.pm:4308
msgid "Writing passwords..."
msgstr "Lagrer passord..."
#. progress step label
-#: src/modules/Users.pm:4286
+#: src/modules/Users.pm:4310
msgid "Writing the custom settings..."
msgstr "Lagrer spesialinnstillinger..."
#. progress step label
-#: src/modules/Users.pm:4288
+#: src/modules/Users.pm:4312
msgid "Writing the default login settings..."
msgstr "Lagrer standardinnstillinger for innlogging..."
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4373
+#: src/modules/Users.pm:4397
#, perl-format
msgid "File %s was not read correctly, so it will not be written."
msgstr "Filen %s kunne ikke leses riktig og vil ikke ble lagret."
#. error popup
-#: src/modules/Users.pm:4409 src/modules/Users.pm:4444
-#: src/modules/Users.pm:4720
+#: src/modules/Users.pm:4433 src/modules/Users.pm:4468
+#: src/modules/Users.pm:4744
msgid "An error occurred while removing users."
msgstr "Det oppstod en feil under sletting av brukere."
#. error popup (%s is a file name)
-#: src/modules/Users.pm:4422 src/modules/Users.pm:4570
+#: src/modules/Users.pm:4446 src/modules/Users.pm:4594
#, perl-format
msgid "File %s was not correctly read, so it will not be written."
msgstr "Filen %s kunne ikke leses riktig og vil ikke ble lagret."
#. error message
-#: src/modules/Users.pm:4559
+#: src/modules/Users.pm:4583
msgid ""
"\n"
"Encryption support is not installed, home directories will NOT be encrypted."
msgstr ""
#. error popup
-#: src/modules/Users.pm:4761 src/modules/YaPI/ADMINISTRATOR.pm:101
+#: src/modules/Users.pm:4785 src/modules/YaPI/ADMINISTRATOR.pm:101
msgid "An error occurred while setting forwarding for root's mail."
msgstr "Det oppstod en feil under konfigurasjon av videresending av rotbrukerens e-post."
#. error popup
-#: src/modules/Users.pm:4837
+#: src/modules/Users.pm:4861
msgid "No UID is available for this type of user."
msgstr "Det finnes ingen tilgjengelig UID for denne brukertypen."
#. error popup
-#: src/modules/Users.pm:4868
+#: src/modules/Users.pm:4892
#, perl-format
msgid ""
"The selected user ID is not allowed.\n"
@@ -4135,7 +4236,7 @@
"Velg et gyldig heltall mellom %i og %i."
#. popup question
-#: src/modules/Users.pm:4899
+#: src/modules/Users.pm:4923
msgid ""
"The user ID entered is already in use.\n"
"Really use it?"
@@ -4144,7 +4245,7 @@
"Vil du bruke det likevel?"
#. popup question, %i are numbers
-#: src/modules/Users.pm:4912
+#: src/modules/Users.pm:4936
#, perl-format
msgid ""
"The selected user ID is not from a range\n"
@@ -4156,7 +4257,7 @@
"Vil du virkelig bruke den?"
#. popup question
-#: src/modules/Users.pm:4927
+#: src/modules/Users.pm:4951
#, perl-format
msgid ""
"The selected user ID is a local ID,\n"
@@ -4168,7 +4269,7 @@
"Er du sikker at du vil endre typen til 'local'?"
#. popup question
-#: src/modules/Users.pm:4941
+#: src/modules/Users.pm:4965
#, perl-format
msgid ""
"The selected user ID is a system ID,\n"
@@ -4179,7 +4280,7 @@
"fordi verdien er mindre enn %i. \n"
"Er du sikker at du vil endre typen til 'system'?"
-#: src/modules/Users.pm:4975
+#: src/modules/Users.pm:4999
msgid ""
"\n"
"The existing username might belong to a NIS or LDAP user.\n"
@@ -4188,7 +4289,7 @@
"Brukernavnet kan tilhøre en eksisterende NIS- eller LDAP-bruker.\n"
#. error popup, %1 might be additional sentence ("The existing username...")
-#: src/modules/Users.pm:4979
+#: src/modules/Users.pm:5003
msgid ""
"There is a conflict between the entered\n"
"username and an existing username. %1\n"
@@ -4199,7 +4300,7 @@
"Prøv et annet brukernavn."
#. error popup
-#: src/modules/Users.pm:5009
+#: src/modules/Users.pm:5033
msgid ""
"The \"Additional User Information\" entry cannot\n"
"contain a colon (:). Try again."
@@ -4208,7 +4309,7 @@
"inneholde et kolon (:). Prøv igjen."
#. error popup
-#: src/modules/Users.pm:5016
+#: src/modules/Users.pm:5040
msgid ""
"The \"Additional User Information\" entry can consist\n"
"of up to three sections separated by commas.\n"
@@ -4219,7 +4320,7 @@
"Rediger oppføringene."
#. error popup
-#: src/modules/Users.pm:5079
+#: src/modules/Users.pm:5103
msgid ""
"The home directory may only contain the following characters:\n"
"a-z, A-Z, 0-9, and _-/\n"
@@ -4230,7 +4331,7 @@
"Prøv igjen."
#. error popup
-#: src/modules/Users.pm:5102
+#: src/modules/Users.pm:5126
#, perl-format
msgid ""
"The directory %s is not writable.\n"
@@ -4240,7 +4341,7 @@
"Velg en annen sti for hjemmekatalogen."
#. error message
-#: src/modules/Users.pm:5113
+#: src/modules/Users.pm:5137
msgid ""
"The home directory is used by another user.\n"
"Try again."
@@ -4249,7 +4350,7 @@
"Prøv igjen."
#. yes/no popup: user seleceted something strange as a home directory
-#: src/modules/Users.pm:5155
+#: src/modules/Users.pm:5179
msgid ""
"The path for the selected home directory already exists,\n"
"but it is not a directory.\n"
@@ -4260,7 +4361,7 @@
"Vil du virkelig bruke denne stien?"
#. yes/no popup
-#: src/modules/Users.pm:5166
+#: src/modules/Users.pm:5190
msgid ""
"The home directory selected already exists.\n"
"Use it and change its owner?"
@@ -4270,7 +4371,7 @@
#. chown is not needed (#25200)
#. yes/no popup
-#: src/modules/Users.pm:5173
+#: src/modules/Users.pm:5197
#, perl-format
msgid ""
"The selected home directory (%s)\n"
@@ -4282,7 +4383,7 @@
"Vil du bruke denne katalogen?\n"
#. yes/no popup
-#: src/modules/Users.pm:5182
+#: src/modules/Users.pm:5206
#, perl-format
msgid ""
"The home directory selected (%s)\n"
@@ -4296,7 +4397,7 @@
"Vil du bruke denne katalogen?"
#. popup question
-#: src/modules/Users.pm:5210
+#: src/modules/Users.pm:5234
msgid ""
"If you select a nonexistent shell, the user may be unable to log in.\n"
"Use this shell?"
@@ -4305,12 +4406,12 @@
"Vil du bruke dette skallet?"
#. error popup
-#: src/modules/Users.pm:5230
+#: src/modules/Users.pm:5254
msgid "No GID is available for this type of group."
msgstr "Ingen GID er tilgjengelig for denne gruppetypen."
#. error popup
-#: src/modules/Users.pm:5263
+#: src/modules/Users.pm:5287
#, perl-format
msgid ""
"The selected group ID is not allowed.\n"
@@ -4320,7 +4421,7 @@
"Velg et gyldig heltall mellom %i og %i."
#. popup question
-#: src/modules/Users.pm:5293
+#: src/modules/Users.pm:5317
msgid ""
"The group ID entered is already in use.\n"
"Really use it?"
@@ -4329,7 +4430,7 @@
"Vil du bruke det likevel?"
#. popup question, %i are numbers
-#: src/modules/Users.pm:5305
+#: src/modules/Users.pm:5329
#, perl-format
msgid ""
"The selected group ID is not from a range\n"
@@ -4341,7 +4442,7 @@
"Vil du virkelig bruke den?"
#. popup question
-#: src/modules/Users.pm:5320
+#: src/modules/Users.pm:5344
#, perl-format
msgid ""
"The selected group ID is a local ID,\n"
@@ -4353,7 +4454,7 @@
"Er du sikker på at du vil endre gruppetypen til 'local'?"
#. popup question
-#: src/modules/Users.pm:5334
+#: src/modules/Users.pm:5358
#, perl-format
msgid ""
"The selected group ID is a system ID,\n"
@@ -4365,7 +4466,7 @@
"Er du sikker på at du vil endre gruppetypen til 'system'?"
#. error popup
-#: src/modules/Users.pm:5353
+#: src/modules/Users.pm:5377
msgid ""
"No group name entered.\n"
"Try again."
@@ -4374,7 +4475,7 @@
"Prøv igjen."
#. error popup
-#: src/modules/Users.pm:5370
+#: src/modules/Users.pm:5394
#, perl-format
msgid ""
"The group name must be between %i and %i characters in length.\n"
@@ -4384,7 +4485,7 @@
"Prøv igjen."
#. error popup
-#: src/modules/Users.pm:5383
+#: src/modules/Users.pm:5407
msgid ""
"The group name may contain only\n"
"letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4397,7 +4498,7 @@
"Prøv igjen."
#. error popup
-#: src/modules/Users.pm:5391
+#: src/modules/Users.pm:5415
msgid ""
"There is a conflict between the entered\n"
"group name and an existing group name.\n"
@@ -4407,13 +4508,13 @@
"du skrev inn og et eksisterende gruppenavn.\n"
"Prøv et annet navn."
-#: src/modules/Users.pm:5507
+#: src/modules/Users.pm:5531
#, perl-format
msgid "User %s does not exist."
msgstr "Brukeren %s finnes ikke."
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5561
+#: src/modules/Users.pm:5585
msgid ""
"You cannot delete this group because\n"
"there are users that use this group\n"
@@ -4424,7 +4525,7 @@
"som standardgruppe."
#. error message: group cannot be deleted
-#: src/modules/Users.pm:5568
+#: src/modules/Users.pm:5592
msgid ""
"You cannot delete this group because\n"
"there are users in the group.\n"
@@ -4435,22 +4536,22 @@
"Slett disse brukerne fra gruppen først."
#. summary label
-#: src/modules/Users.pm:6581
+#: src/modules/Users.pm:6603
msgid "<h3>Users</h3>"
msgstr "<h3>Brukere</h3>"
#. summary label
-#: src/modules/Users.pm:6591
+#: src/modules/Users.pm:6613
msgid "<h3>Groups</h3>"
msgstr "<h3>Grupper</h3>"
#. summary label
-#: src/modules/Users.pm:6602
+#: src/modules/Users.pm:6624
msgid "<h3>Login Settings</h3>"
msgstr "<h3>Innstillinger for innlogging</h3>"
#. summary item, %1 is user name
-#: src/modules/Users.pm:6604
+#: src/modules/Users.pm:6626
msgid "User %1 configured for automatic login"
msgstr "Brukeren %1 blir logget automatisk inn"
@@ -4470,23 +4571,23 @@
"finnes på LDAP-serveren. Vil du opprette den nå?"
#. plugin name
-#: src/modules/UsersPluginKerberos.pm:124
+#: src/modules/UsersPluginKerberos.pm:122
#, fuzzy
#| msgid "Quota Configuration"
msgid "Kerberos Configuration"
msgstr "Diskkvotekonfigurasjon"
#. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:135
+#: src/modules/UsersPluginKerberos.pm:133
msgid "No Kerberos Management for Groups"
msgstr ""
#. user plugin summary (table item)
-#: src/modules/UsersPluginKerberos.pm:138
+#: src/modules/UsersPluginKerberos.pm:136
msgid "Manage Kerberos Principials"
msgstr ""
-#: src/modules/UsersPluginKerberos.pm:262
+#: src/modules/UsersPluginKerberos.pm:260
msgid "Cannot execute kadmin.local."
msgstr ""
@@ -4618,7 +4719,7 @@
#. the ']' is or-ed...
#. error popup
-#: src/modules/UsersSimple.pm:379
+#: src/modules/UsersSimple.pm:505
msgid ""
"The password may only contain the following characters:\n"
"0-9, a-z, A-Z, and any of \"`~!@#$%^&* ,.;:._-+/|?='{[(<>)]}\\\".\n"
@@ -4629,7 +4730,7 @@
"Prøv igjen."
#. help text (default part shown in more places)
-#: src/modules/UsersSimple.pm:414
+#: src/modules/UsersSimple.pm:540
msgid ""
"<p>\n"
"For the password, use only characters that can be found on an English keyboard\n"
@@ -4644,7 +4745,7 @@
"</p>"
#. error popup
-#: src/modules/UsersSimple.pm:494
+#: src/modules/UsersSimple.pm:620
msgid ""
"The user's full name cannot contain\n"
"\":\" or \",\" characters.\n"
@@ -4655,37 +4756,37 @@
"Prøv igjen."
#. popup question
-#: src/modules/UsersSimple.pm:521
+#: src/modules/UsersSimple.pm:647
msgid "You have used the group name as a part of the password."
msgstr "Du har brukt gruppenavnet som en del av passordet."
#. popup question
-#: src/modules/UsersSimple.pm:524
+#: src/modules/UsersSimple.pm:650
msgid "You have used the username as a part of the password."
msgstr "Du har benyttet brukernavnet som en del av passordet."
#. popup question
-#: src/modules/UsersSimple.pm:533
+#: src/modules/UsersSimple.pm:659
msgid "You have used only lowercase letters for the password."
msgstr "Du har brukt bare små bokstaver for passordet."
#. popup question
-#: src/modules/UsersSimple.pm:541
+#: src/modules/UsersSimple.pm:667
msgid "You have used only uppercase letters for the password."
msgstr "Du har brukt bare store bokstaver for passordet."
#. popup question
-#: src/modules/UsersSimple.pm:548
+#: src/modules/UsersSimple.pm:674
msgid "You have used a palindrome for the password."
msgstr "Du har brukt et palindrom som passord."
#. popup question
-#: src/modules/UsersSimple.pm:556
+#: src/modules/UsersSimple.pm:682
msgid "You have used only digits for the password."
msgstr "Du har brukt bare tall for passordet."
#. popup question
-#: src/modules/UsersSimple.pm:578
+#: src/modules/UsersSimple.pm:704
#, perl-format
msgid ""
"The password is too long for the current encryption method.\n"
@@ -4695,7 +4796,7 @@
"Det vil bli forkortet til %s tegn?"
#. error message
-#: src/modules/UsersSimple.pm:665
+#: src/modules/UsersSimple.pm:791
#, perl-format
msgid ""
"The password is too simple:\n"
@@ -4705,13 +4806,13 @@
"%s."
#. popup error, %i is number
-#: src/modules/UsersSimple.pm:679
+#: src/modules/UsersSimple.pm:805
#, perl-format
msgid "The password should have at least %i characters."
msgstr "Passordet bør inneholde minst %i tegn."
#. error popup
-#: src/modules/UsersSimple.pm:700
+#: src/modules/UsersSimple.pm:826
msgid ""
"No username entered.\n"
"Try again."
@@ -4720,7 +4821,7 @@
"Prøv igjen."
#. error popup
-#: src/modules/UsersSimple.pm:710
+#: src/modules/UsersSimple.pm:836
#, perl-format
msgid ""
"The username must be between %i and %i characters in length.\n"
@@ -4730,7 +4831,7 @@
"Prøv igjen."
#. error popup
-#: src/modules/UsersSimple.pm:739
+#: src/modules/UsersSimple.pm:865
msgid ""
"The username may contain only\n"
"letters, digits, \"-\", \".\", and \"_\"\n"
@@ -4743,7 +4844,7 @@
"Prøv igjen."
#. error popup
-#: src/modules/UsersSimple.pm:760
+#: src/modules/UsersSimple.pm:886
msgid ""
"There is a conflict between the entered\n"
"username and an existing username.\n"
@@ -4753,13 +4854,15 @@
"skrev inn og et annet brukernavn.\n"
"Prøv et annet brukernavn."
+#. busy popup message, %1 is package name
#. busy popup message
-#: src/modules/UsersSimple.pm:982
+#: src/modules/UsersSimple.pm:1179 src/modules/UsersSimple.pm:1294
msgid "Retrieving %1 extension..."
msgstr "Henter %1-utvidelse..."
+#. busy popup message, %1 is package name
#. busy popup message
-#: src/modules/UsersSimple.pm:996
+#: src/modules/UsersSimple.pm:1277 src/modules/UsersSimple.pm:1308
msgid "Releasing %1 extension..."
msgstr "Frigjør -utvidelse"
@@ -4826,148 +4929,6 @@
msgid "There are multiple users satisfying the input conditions."
msgstr "Flere brukere samsvarer med vilkårene."
-#~ msgid "User Authentication Method"
-#~ msgstr "Metode for brukerautentisering"
-
-#~ msgid ""
-#~ "<p>\n"
-#~ "<b>Authentication</b><br>\n"
-#~ "Select the authentication method to use for users on your system.\n"
-#~ "</p>"
-#~ msgstr ""
-#~ "<p>\n"
-#~ "<b>Autentisering</b><br>\n"
-#~ "Her du kan du velge autentiseringsmetode for brukere i systemet.\n"
-#~ "</p>"
-
-#~ msgid "If you have a previous installation or alternative system, it is possible to create users based on this source. To do so, select <b>Read User Data from a Previous Installation</b>. This option uses an existing or creates a new home directory for each user in the location specified for this installation."
-#~ msgstr "Hvis du har en annen installasjon eller et annet system, kan du opprette brukere basert på denne kilden. Velg <b>Les brukerinformasjon fra tidligere installasjon</b> for å gjøre dette. Med dette valget kan du bruke en eksisterende eller opprette en ny hjemmekatalog for hver bruker på det spesifiserte stedet for denne installasjonen."
-
-#~ msgid "&LDAP"
-#~ msgstr "&LDAP"
-
-#~ msgid "N&IS"
-#~ msgstr "N&IS"
-
-#~ msgid "&Windows Domain"
-#~ msgstr "&Windows-domene"
-
-#~ msgid "L&ocal (/etc/passwd)"
-#~ msgstr "L&okal (/etc/passwd)"
-
-#~ msgid "eDirectory LDAP"
-#~ msgstr "eDirectory LDAP"
-
-#~ msgid ""
-#~ "<p>If you are using a NIS or LDAP server to store user data or if you want\n"
-#~ "to authenticate users against an NT server, choose the appropriate value. Then\n"
-#~ "press <b>Next</b> to continue with configuration of your client.</p>"
-#~ msgstr ""
-#~ "<p>Hvis du bruker en NIS- eller LDAP-server til lagring av brukerdata eller hvis du vil\n"
-#~ "autentisere brukere mot en NT-server, velg den aktuelle verdien. Trykk deretter\n"
-#~ "<b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
-
-#~ msgid ""
-#~ "<p>If you are using a NIS or LDAP server to store user data, choose the\n"
-#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-#~ msgstr ""
-#~ "<p>Hvis du bruker en NIS- eller LDAP-server til lagring av brukerdata, velg den\n"
-#~ "aktuelle verdien. Trykk deretter <b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
-
-#~ msgid ""
-#~ "<p>If you are using an LDAP server to store user data or if you want to\n"
-#~ "authenticate users against an NT server, choose the appropriate value. Then\n"
-#~ "press <b>Next</b> to continue with configuration of your client.</p>"
-#~ msgstr ""
-#~ "<p>Hvis du bruker en LDAP-server til lagring av brukerdata eller hvis du vil\n"
-#~ "autentisere brukere mot en NT-server, velg den aktuelle verdien. Trykk deretter\n"
-#~ "<b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
-
-#~ msgid ""
-#~ "<p>If you are using an LDAP server to store user data, choose the\n"
-#~ "appropriate value. Then press <b>Next</b> to continue with configuration of your client.</p>"
-#~ msgstr ""
-#~ "<p>Hvis du bruker en LDAP-server til lagring av brukerdata, velg den\n"
-#~ "aktuelle verdien. Trykk deretter <b>Neste</b>, og fortsett med klientkonfigurasjonen.</p>"
-
-#~ msgid "<p>Check <b>Set Up Kerberos Authentication</b> to configure Kerberos after configuring the user data source.</p>"
-#~ msgstr "<p>Kryss av for <b>Sett opp Kerberos-autentisering</b> for å konfigurere Kerberos etter at du har valgt brukerinformasjonskilde.</p>"
-
-#~ msgid "&Choose"
-#~ msgstr "&Velg"
-
-#~ msgid "Authentication Method"
-#~ msgstr "Metode for brukerautentisering"
-
-#~ msgid "Set Up &Kerberos Authentication"
-#~ msgstr "Sett opp &Kerberos-autentisering"
-
-#~ msgid "E&xpert Options..."
-#~ msgstr "A&vanserte alternativer..."
-
-#~ msgid ""
-#~ "<p>If you intend to use this password for creating certificates,\n"
-#~ "it has to be at least %1 characters long.</p>"
-#~ msgstr ""
-#~ "<p>Hvis du har til hensikt å bruke dette passordet til å opprette sertifikater,\n"
-#~ "må det har en lengde på minst %1 tegn.</p>"
-
-#~ msgid "<p>To check whether your current keyboard layout is correct, try entering text into the <b>Test Keyboard Layout</b> field.</p>"
-#~ msgstr "<p>Kontroller om gjeldende tastaturoppsett er riktig ved å skrive inn tekst i feltet <b>Test tastaturoppsett</b>.</p>"
-
-#~ msgid ""
-#~ "If you intend to create certificates,\n"
-#~ "the password should have at least %1 characters."
-#~ msgstr ""
-#~ "Hvis du har til hensikt å opprette sertifikater,\n"
-#~ "bør passordet ha minst %1 tegn."
-
-#~ msgid ""
-#~ "The root password could not be set.\n"
-#~ "You might not be able to log in.\n"
-#~ "Try setting it again?\n"
-#~ msgstr ""
-#~ "Et rotpassord kunne ikke defineres.\n"
-#~ "Du vil kanskje ikke kunne logge inn.\n"
-#~ "Vil du forsøke igjen?\n"
-
-#~ msgid "Initialization of module for configuration of authentication..."
-#~ msgstr "Initialisering av modul for konfigurasjon av autentisering..."
-
-#, fuzzy
-#~| msgid "<p><b>Login Settings</b></p>"
-#~ msgid "<p><b>Authentication</b><br></p>"
-#~ msgstr "<p><b>Innloggingsinnstillinger</b></p>"
-
-#~ msgid "Expert Settings"
-#~ msgstr "Avanserte innstillinger"
-
-#~ msgid "The authentication method is local /etc/passwd."
-#~ msgstr "Autentiseringsmetoden er lokal"
-
-#, fuzzy
-#~| msgid "The password encryption method is %1."
-#~ msgid "The password encryption method is %s."
-#~ msgstr "Krypteringsmetode for passord er %1."
-
-#~ msgid "&Change..."
-#~ msgstr "&Endre..."
-
-#~ msgid "Summary"
-#~ msgstr "Sammendrag"
-
-#~ msgid "Samba (Windows Domain)"
-#~ msgstr " -domene"
-
-#~ msgid "<%1>Authentication method<%2>: %3"
-#~ msgstr "<%1>Autentiseringsmetode<%2>: %3"
-
-#~ msgid "<%1>Authentication method<%2>: %3 and Kerberos."
-#~ msgstr "<%1>Autentiseringsmetode<<%2>: %3 og Kerberos."
-
-#~ msgid "<%1>Users<%2> %3 selected for import"
-#~ msgstr "<%1>Brukerne<%2> %3 valgt for import"
-
#~ msgid "No Password Entered"
#~ msgstr "Passord er ikke angitt"
Modified: branches/plus-SLE12-SP2/yast/nb/po/vm.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/vm.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/vm.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: vm.nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-08-25 18:37+0200\n"
"PO-Revision-Date: 2008-10-31 01:17+0100\n"
"Last-Translator: Olav P. \n"
"Language-Team: Norwegian Bokmål <>\n"
@@ -34,12 +34,12 @@
msgstr "Konfigurerer virtuell maskin..."
#. check for kernel-bigsmp
-#: src/modules/VirtConfig.rb:157
+#: src/modules/VirtConfig.rb:158
msgid "x86_64 is the only supported architecture for hosting virtual machines. Your architecture is "
msgstr "x86_64 er den eneste arkitekturen som støttes som vert for virtuelle maskiner. Din arktitektur er "
#. we are already in UML, nested virtual machine is not supported
-#: src/modules/VirtConfig.rb:176
+#: src/modules/VirtConfig.rb:177
msgid ""
"Virtual machine installation cannot be started inside the UML machine.\n"
"Start installation in the host system.\n"
@@ -49,167 +49,167 @@
#. progress stage 1/2
#. Generate a pop dialog to allow user selection of Xen or KVM
-#: src/modules/VirtConfig.rb:193 src/modules/VirtConfig.rb:281
+#: src/modules/VirtConfig.rb:194 src/modules/VirtConfig.rb:282
msgid "Verify Installed Packages"
msgstr "Kontroller installerte pakker"
#. progress stage 2/2
-#: src/modules/VirtConfig.rb:195
+#: src/modules/VirtConfig.rb:196
msgid "Network Bridge Configuration"
msgstr "Oppsett av nettverksbro"
#. Headline for management domain installation
-#: src/modules/VirtConfig.rb:210
+#: src/modules/VirtConfig.rb:211
msgid "Configuring the VM Server (domain 0)"
msgstr "Konfigurerer VM-serveren (domene 0)"
#. xen domain0 installation help text - 1/4
-#: src/modules/VirtConfig.rb:213
+#: 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>Konfigurasjon av VM-server</b></big></p><p>Konfigurasjon av VM-serveren (domene 0) foregår i to deler.</p>"
#. xen domain0 installation help text - 2/4
-#: src/modules/VirtConfig.rb:217
+#: src/modules/VirtConfig.rb:218
msgid "<p>The required packages are installed into the system first. Then the boot loader is switched to GRUB (if not already used) and the Xen section is added to the boot loader menu if it is missing.</p>"
msgstr "<p>Nødvendige pakker installeres først. Deretter bytter systemet til oppstartslasteren GRUB (hvis denne ikke allerede brukes), og Xen-seksjonen legges til i oppstartslastermenyen hvis den mangler.</p>"
#. xen domain0 installation help text - 3/4
-#: src/modules/VirtConfig.rb:221
+#: src/modules/VirtConfig.rb:222
msgid "<p>GRUB is needed because it supports the multiboot standard required to boot Xen and the Linux kernel.</p>"
msgstr "<p>GRUB må brukes fordi den støtter multiboot-standarden som kreves for å starte Xen- og Linux-kjernen.</p>"
#. xen domain0 installation help text - 4/4
-#: src/modules/VirtConfig.rb:225
+#: src/modules/VirtConfig.rb:226
msgid "<p>When the configuration has finished successfully, you can boot the VM Server from the boot loader menu.</p>"
msgstr "<p>Når oppsettet er fullført, kan VM-serveren startes fra oppstartslastermenyen.</p>"
#. error popup
-#: src/modules/VirtConfig.rb:230
+#: src/modules/VirtConfig.rb:231
msgid "The installation will be aborted."
msgstr "Installasjonen vil bli avbrutt."
-#: src/modules/VirtConfig.rb:233
+#: src/modules/VirtConfig.rb:234
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Choose Hypervisor(s) to install"
msgstr "Hypervisor og verktøy er installert."
-#: src/modules/VirtConfig.rb:236
+#: src/modules/VirtConfig.rb:237
msgid "Server: Minimal system to get a running Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:237
+#: src/modules/VirtConfig.rb:238
#, fuzzy
#| msgid "Configuring the virtual machine..."
msgid "Tools: Configure, manage and monitor virtual machines"
msgstr "Konfigurerer virtuell maskin..."
-#: src/modules/VirtConfig.rb:250
+#: src/modules/VirtConfig.rb:251
msgid "KVM Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:252
+#: src/modules/VirtConfig.rb:253
msgid "KVM server"
msgstr ""
-#: src/modules/VirtConfig.rb:253
+#: src/modules/VirtConfig.rb:254
#, fuzzy
#| msgid "Admin tools"
msgid "KVM tools"
msgstr "Administrasjonsverktøy"
-#: src/modules/VirtConfig.rb:258
+#: src/modules/VirtConfig.rb:259
msgid "libvirt LXC containers"
msgstr ""
-#: src/modules/VirtConfig.rb:260
+#: src/modules/VirtConfig.rb:261
msgid "libvirt LXC daemon"
msgstr ""
-#: src/modules/VirtConfig.rb:288
+#: src/modules/VirtConfig.rb:289
msgid "Software to connect to Virtualization server"
msgstr ""
-#: src/modules/VirtConfig.rb:290
+#: src/modules/VirtConfig.rb:291
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Virtualization client tools"
msgstr "Hypervisor og verktøy er installert."
-#: src/modules/VirtConfig.rb:306
+#: src/modules/VirtConfig.rb:307
msgid "Xen Hypervisor"
msgstr ""
-#: src/modules/VirtConfig.rb:308
+#: src/modules/VirtConfig.rb:309
#, fuzzy
#| msgid "Broken server"
msgid "Xen server"
msgstr "Deaktivert server"
-#: src/modules/VirtConfig.rb:309
+#: src/modules/VirtConfig.rb:310
#, fuzzy
#| msgid "Admin tools"
msgid "Xen tools"
msgstr "Administrasjonsverktøy"
#. SLED doesn't have any installation capabilities (L3 support)
-#: src/modules/VirtConfig.rb:387
+#: src/modules/VirtConfig.rb:388
#, fuzzy
#| msgid "The installation will be aborted."
msgid "Package installation failed\n"
msgstr "Installasjonen vil bli avbrutt."
-#: src/modules/VirtConfig.rb:395
+#: src/modules/VirtConfig.rb:396
#, fuzzy
#| msgid "The installation will be aborted."
msgid "Package installation failed for lxc\n"
msgstr "Installasjonen vil bli avbrutt."
-#: src/modules/VirtConfig.rb:402
+#: src/modules/VirtConfig.rb:403
msgid "Package installation failed for sled client pattern\n"
msgstr ""
-#: src/modules/VirtConfig.rb:412
+#: src/modules/VirtConfig.rb:413
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:425
+#: src/modules/VirtConfig.rb:426
msgid "Running in text mode. Install graphical components anyway?"
msgstr "Kjører i tekstmodus. Vil du likevel installere grafiske komponenter?"
#. progressbar title - check whether Xen packages are installed
-#: src/modules/VirtConfig.rb:438
+#: src/modules/VirtConfig.rb:439
msgid "Checking packages..."
msgstr "Kontrollerer pakker..."
#. progressbar title - install the required packages
-#: src/modules/VirtConfig.rb:441
+#: src/modules/VirtConfig.rb:442
msgid "Installing packages..."
msgstr "Installerer pakker..."
#. error popup
#. Now see if they really were installed (bnc#508347)
-#: src/modules/VirtConfig.rb:446 src/modules/VirtConfig.rb:453
+#: src/modules/VirtConfig.rb:447 src/modules/VirtConfig.rb:454
msgid "Cannot install required packages."
msgstr "Kan ikke installere nødvendige pakker."
#. If grub2 is the bootloader and we succesfully installed Xen, update the grub2 files
-#: src/modules/VirtConfig.rb:463
+#: src/modules/VirtConfig.rb:464
msgid "Updating grub2 configuration files..."
msgstr "Oppdaterer konfigurasjonsfiler for grub2..."
#. Default Bridge stage
-#: src/modules/VirtConfig.rb:477
+#: src/modules/VirtConfig.rb:484
msgid "Configuring Default Network Bridge..."
msgstr "Setter opp standard nettverksbro..."
#. Popup yes/no dialog
-#: src/modules/VirtConfig.rb:498
+#: src/modules/VirtConfig.rb:505
msgid "Network Bridge."
msgstr "Nettverksbro."
-#: src/modules/VirtConfig.rb:499
+#: 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 vanlige nettverksoppsett med virtuelle maskiner anbefales det en nettverksbro.</p><p>Vil du sette opp en standard nettverksbro?</p>"
@@ -222,35 +222,35 @@
#. Report::Error(_("Failed to configure the firewall to allow the Xen bridge") + "\n" + abortmsg);
#. return false;
#. }
-#: src/modules/VirtConfig.rb:568
+#: src/modules/VirtConfig.rb:567
msgid "KVM components are installed. Your host is ready to install KVM guests."
msgstr ""
-#: src/modules/VirtConfig.rb:571
+#: src/modules/VirtConfig.rb:570
#, fuzzy
#| msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu.\n"
msgid "KVM components are installed. Reboot the machine and select the native kernel in the boot loader menu to install KVM guests."
msgstr "For å installere Xen-gjester, start maskinen på nytt og velg Xen-seksjonen i oppstartslastermenyen.\n"
-#: src/modules/VirtConfig.rb:574
+#: src/modules/VirtConfig.rb:573
#, fuzzy
#| msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu.\n"
msgid "For installing Xen guests, reboot the machine and select the Xen section in the boot loader menu."
msgstr "For å installere Xen-gjester, start maskinen på nytt og velg Xen-seksjonen i oppstartslastermenyen.\n"
-#: src/modules/VirtConfig.rb:577
+#: src/modules/VirtConfig.rb:576
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Xen Hypervisor and tools are installed."
msgstr "Hypervisor og verktøy er installert."
-#: src/modules/VirtConfig.rb:578
+#: src/modules/VirtConfig.rb:577
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Virtualization client tools are installed."
msgstr "Hypervisor og verktøy er installert."
-#: src/modules/VirtConfig.rb:579
+#: src/modules/VirtConfig.rb:578
#, fuzzy
#| msgid "Hypervisor and tools are installed."
msgid "Libvirt LXC components are installed."
Modified: branches/plus-SLE12-SP2/yast/nb/po/vpn.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/vpn.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/vpn.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: YaST (@memory@)\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:59+0200\n"
+"POT-Creation-Date: 2015-09-28 18:17+0200\n"
"PO-Revision-Date: 2002-06-17 14:33+0200\n"
"Last-Translator: www.linuxbutikken.no \n"
"Language-Team: Norwegian \n"
@@ -237,14 +237,14 @@
msgstr ""
#. Create the user (:xauth or :eap). Return true if successful.
-#: src/lib/vpn/ipsec.rb:442
+#: src/lib/vpn/ipsec.rb:439
#, fuzzy
#| msgid "Specified queue name %1 is already used."
msgid "The user name is already used."
msgstr "Det spesifiserte kønavnet %1 er allerede i bruk."
#. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false.
-#: src/lib/vpn/ipsec.rb:506
+#: src/lib/vpn/ipsec.rb:503
msgid "Cannot find a matching client connection."
msgstr ""
@@ -345,122 +345,122 @@
msgstr "Vil du forsøke en annen CD ?"
#. Open dialog to edit VPN client passwords/certificates.
-#: src/lib/vpn/main_dialog.rb:289
+#: src/lib/vpn/main_dialog.rb:285
msgid "Please enter gateway IP before editing credentials."
msgstr ""
#. Render a table of configured gateway and client connections.
-#: src/lib/vpn/main_dialog.rb:365
+#: src/lib/vpn/main_dialog.rb:361
msgid "Name"
msgstr "Navn"
-#: src/lib/vpn/main_dialog.rb:365
+#: src/lib/vpn/main_dialog.rb:361
msgid "Description"
msgstr "Beskrivelse"
#. Render configuration controls for the chosen connection.
-#: src/lib/vpn/main_dialog.rb:380
+#: src/lib/vpn/main_dialog.rb:376
msgid "Click 'New VPN' to create a gateway or client."
msgstr ""
#. Make widgets for connection configuration
-#: src/lib/vpn/main_dialog.rb:390
+#: src/lib/vpn/main_dialog.rb:386
msgid "All IPv4 networks (0.0.0.0/0)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:391
+#: src/lib/vpn/main_dialog.rb:387
#, fuzzy
#| msgid "All networks"
msgid "All IPv6 networks (::/0)"
msgstr "Alle nettverk"
-#: src/lib/vpn/main_dialog.rb:393
+#: src/lib/vpn/main_dialog.rb:389
msgid "Limited CIDRs, comma separated:"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:399
+#: src/lib/vpn/main_dialog.rb:395
#, fuzzy
#| msgid "Connection Management"
msgid "Connection name: "
msgstr "Administrasjon av tilkoblinger"
-#: src/lib/vpn/main_dialog.rb:400
+#: src/lib/vpn/main_dialog.rb:396
msgid "Type"
msgstr "Type"
-#: src/lib/vpn/main_dialog.rb:402
+#: src/lib/vpn/main_dialog.rb:398
#, fuzzy
#| msgid "Master Server"
msgid "Gateway (Server)"
msgstr "Hovedserver"
-#: src/lib/vpn/main_dialog.rb:403
+#: src/lib/vpn/main_dialog.rb:399
#, fuzzy
#| msgid "Clients"
msgid "Client"
msgstr "Klienter"
-#: src/lib/vpn/main_dialog.rb:410
+#: src/lib/vpn/main_dialog.rb:406
#, fuzzy
#| msgid "Choose Scenario"
msgid "The scenario is"
msgstr "Velg scenario"
-#: src/lib/vpn/main_dialog.rb:412
+#: src/lib/vpn/main_dialog.rb:408
msgid "Secure communication with a pre-shared key"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:413
+#: src/lib/vpn/main_dialog.rb:409
#, fuzzy
#| msgid "Choose the directory with certificates"
msgid "Secure communication with a certificate"
msgstr "Velg katalogen med sertifikater"
-#: src/lib/vpn/main_dialog.rb:414
+#: src/lib/vpn/main_dialog.rb:410
msgid "Provide access to Android, iOS, MacOS X clients"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:415
+#: src/lib/vpn/main_dialog.rb:411
msgid "Provide access to Windows 7, Windows 8 clients"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:417 src/lib/vpn/main_dialog.rb:431
+#: src/lib/vpn/main_dialog.rb:413 src/lib/vpn/main_dialog.rb:427
#, fuzzy
#| msgid "External credentials"
msgid "Edit Credentials"
msgstr "Eksterne sertifikater"
-#: src/lib/vpn/main_dialog.rb:420
+#: src/lib/vpn/main_dialog.rb:416
msgid "Provide VPN clients access to"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:421
+#: src/lib/vpn/main_dialog.rb:417
msgid "Clients' address pool (e.g. 192.168.100.0/24)"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:425
+#: src/lib/vpn/main_dialog.rb:421
#, fuzzy
#| msgid "Server Requires Authentication"
msgid "The gateway requires authentication"
msgstr "Serveren krever autentisering"
-#: src/lib/vpn/main_dialog.rb:427
+#: src/lib/vpn/main_dialog.rb:423
msgid "By a pre-shared key"
msgstr ""
-#: src/lib/vpn/main_dialog.rb:428
+#: src/lib/vpn/main_dialog.rb:424
#, fuzzy
#| msgid "Read certificates"
msgid "By a certificate"
msgstr "Les sertifikater"
-#: src/lib/vpn/main_dialog.rb:430
+#: src/lib/vpn/main_dialog.rb:426
#, fuzzy
#| msgid "Default &Gateway IP"
msgid "VPN gateway IP"
msgstr "Standard &systemport"
-#: src/lib/vpn/main_dialog.rb:434
+#: src/lib/vpn/main_dialog.rb:430
msgid "Use the VPN tunnel to access"
msgstr ""
@@ -579,40 +579,40 @@
msgstr "Smart er ikke tilgjengelig for denne disken."
#. Install packages
-#: src/modules/IPSecConf.rb:174
+#: src/modules/IPSecConf.rb:172
#, fuzzy
#| msgid "Failed to install required packages."
msgid "Failed to install IPSec packages."
msgstr "Nødvendige pakker kunne ikke installeres."
#. Enable/disable daemon
-#: src/modules/IPSecConf.rb:182
+#: src/modules/IPSecConf.rb:180
#, fuzzy
#| msgid "Failed to start the CUPS daemon"
msgid "Failed to start IPSec daemon."
msgstr "Kunne ikke starte CUPS-nissen"
#. Configure IP forwarding
-#: src/modules/IPSecConf.rb:212
+#: src/modules/IPSecConf.rb:210
#, fuzzy
#| msgid "Failed to apply the settings to the system."
msgid "Failed to apply IP forwarding settings using sysctl:"
msgstr "Kunne ikke bruke innstillingene i systemet."
#. Configure/deconfigure firewall
-#: src/modules/IPSecConf.rb:228
+#: src/modules/IPSecConf.rb:225
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:232 src/modules/IPSecConf.rb:237
+#: src/modules/IPSecConf.rb:229 src/modules/IPSecConf.rb:234
#, fuzzy
#| msgid "Failed to create the new map."
msgid "Failed to restart SuSE firewall."
msgstr "Kunne ikke opprette nytt kart."
-#: src/modules/IPSecConf.rb:243
+#: src/modules/IPSecConf.rb:240
msgid ""
"Both VPN gateway and clients require special SuSE firewall configuration.\n"
"SuSE firewall is not enabled, therefore you must manually run the configuration script on every reboot. The script will be run now.\n"
@@ -620,35 +620,35 @@
msgstr ""
#. AutoYaST: Return a rich text summary of the current configuration.
-#: src/modules/IPSecConf.rb:282
+#: src/modules/IPSecConf.rb:279
#, fuzzy
#| msgid "Global Settings"
msgid "VPN Global Settings"
msgstr "Generelle innstillinger"
-#: src/modules/IPSecConf.rb:283
+#: src/modules/IPSecConf.rb:280
#, fuzzy
#| msgid "Enable VPN Services"
msgid "Enable VPN (IPSec) daemon: %s"
msgstr "Aktiver VPN-tjenester"
-#: src/modules/IPSecConf.rb:284
-msgid "Reduce TCP MSS: %s"
+#: src/modules/IPSecConf.rb:281
+msgid "Reduce TCP MSS to 1024: %s"
msgstr ""
-#: src/modules/IPSecConf.rb:285
+#: src/modules/IPSecConf.rb:282
#, fuzzy
#| msgid "Create Client Connection"
msgid "Gateway and Connections"
msgstr "Opprett klienttilkobling"
#. Gateway summary
-#: src/modules/IPSecConf.rb:291
+#: src/modules/IPSecConf.rb:288
msgid "A gateway serving clients in "
msgstr ""
#. Client summary
-#: src/modules/IPSecConf.rb:295
+#: src/modules/IPSecConf.rb:292
#, fuzzy
#| msgid "Read current connection setup"
msgid "A client connecting to "
Modified: branches/plus-SLE12-SP2/yast/nb/po/yast2-apparmor.nb.po
===================================================================
--- branches/plus-SLE12-SP2/yast/nb/po/yast2-apparmor.nb.po 2016-08-04 12:30:38 UTC (rev 96122)
+++ branches/plus-SLE12-SP2/yast/nb/po/yast2-apparmor.nb.po 2016-08-04 12:30:42 UTC (rev 96123)
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: yast2-apparmor\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-05-06 16:57+0200\n"
+"POT-Creation-Date: 2015-08-25 18:36+0200\n"
"PO-Revision-Date: 2009-08-14 14:49+0200\n"
"Last-Translator: Olav Pettershagen \n"
"Language-Team: Norwegian Bokmål \n"