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

Author: keichwa Date: 2015-10-01 13:24:54 +0200 (Thu, 01 Oct 2015) New Revision: 92961 Modified: trunk/yast/nb/po/autoinst.nb.po trunk/yast/nb/po/bootloader.nb.po trunk/yast/nb/po/crowbar.nb.po trunk/yast/nb/po/kdump.nb.po trunk/yast/nb/po/ncurses-pkg.nb.po trunk/yast/nb/po/qt-pkg.nb.po trunk/yast/nb/po/registration.nb.po trunk/yast/nb/po/storage.nb.po trunk/yast/nb/po/vpn.nb.po Log: merged Modified: trunk/yast/nb/po/autoinst.nb.po =================================================================== --- trunk/yast/nb/po/autoinst.nb.po 2015-10-01 11:24:53 UTC (rev 92960) +++ trunk/yast/nb/po/autoinst.nb.po 2015-10-01 11:24:54 UTC (rev 92961) @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: autoinst\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+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:360 +#: 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 "" @@ -516,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" @@ -616,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" @@ -1593,7 +1607,7 @@ #. list<any> l = [ "key1",0,"key3" ]; #. m[ l ] = v; #. @return [Hash] -#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:815 +#: src/include/autoinstall/dialogs.rb:410 src/modules/Profile.rb:807 msgid "Checking XML with RNG validation..." msgstr "Kontrollerer XML med RNG-validering..." @@ -1603,7 +1617,7 @@ msgstr "Seksjon %1:" #. jing validation -- validates complete xml profile -#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:827 +#: src/include/autoinstall/dialogs.rb:459 src/modules/Profile.rb:819 msgid "Checking XML with RNC validation..." msgstr "Kontrollerer XML med RNC-validering..." @@ -2311,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:746 +#: 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" @@ -2791,14 +2805,14 @@ #. Prepare Profile for saving and remove empty data structs #. @return [void] -#: src/modules/Profile.rb:359 +#: 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:462 +#: src/modules/Profile.rb:454 msgid "Encrypted AutoYaST profile. Enter the password twice." msgstr "Kryptert Autoast-profil. Angi passordet to ganger." @@ -2806,14 +2820,14 @@ #. #. @param [String] dir - directory to store section xml files in #. @return - list of filenames -#: src/modules/Profile.rb:536 +#: 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:703 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." @@ -2930,9 +2944,6 @@ #~ "Opprett og rediger volumgrupper her. Deretter må du tilordne fysiske partisjoner til denne volumgruppen i partisjonsdialogen for en fysisk harddisk. Velg partisjons-ID 0x8e for for aktuelle partisjoner.\n" #~ "</P>\n" -#~ msgid "Configure Volume Groups" -#~ msgstr "Konfigurere volumgrupper" - #~ msgid "&Volume Group" #~ msgstr "&Volumgruppe" Modified: trunk/yast/nb/po/bootloader.nb.po =================================================================== --- trunk/yast/nb/po/bootloader.nb.po 2015-10-01 11:24:53 UTC (rev 92960) +++ trunk/yast/nb/po/bootloader.nb.po 2015-10-01 11:24:54 UTC (rev 92961) @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: bootloader\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+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" @@ -401,7 +401,7 @@ msgstr "Aktiver red&undans for MD-tilordning" #. Title in tab -#: src/include/bootloader/grub2/dialogs.rb:56 +#: src/include/bootloader/grub2/dialogs.rb:57 #, fuzzy #| msgid "Boot Loader Options" msgid "Boot Code Options" @@ -476,29 +476,19 @@ 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:35 -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:41 +#: src/include/bootloader/grub2/helps.rb:38 msgid "O&ptional Kernel Command Line Parameter" msgstr "Andre kommandolinje¶metere for kjernen" -#: src/include/bootloader/grub2/helps.rb:42 -#, fuzzy -#| msgid "Distribution:" -msgid "D&istributor" -msgstr "Distribusjon:" - -#: src/include/bootloader/grub2/helps.rb:43 +#: src/include/bootloader/grub2/helps.rb:39 msgid "&Vga Mode" msgstr "&VGA-modus" -#: src/include/bootloader/grub2/helps.rb:44 +#: src/include/bootloader/grub2/helps.rb:40 msgid "Probe Foreign OS" msgstr "Søk etter andre OS" -#: src/include/bootloader/grub2/helps.rb:45 +#: src/include/bootloader/grub2/helps.rb:41 msgid "Protective MBR flag" msgstr "" @@ -588,7 +578,7 @@ #. F#300779 - Install diskless client (NFS-root) #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed #. kokso: additional warning that root partition is nfs type -> bootloader will not be installed -#: src/include/bootloader/routines/dialogs.rb:86 src/modules/Bootloader.rb:237 +#: 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." @@ -959,7 +949,7 @@ "å starte opp andre operativsystemer.</p>" #. part of summary, %1 is a list of hard disks device names -#: src/include/bootloader/routines/lilolike.rb:101 +#: src/include/bootloader/routines/lilolike.rb:108 msgid "Order of Hard Disks: %1" msgstr "Harddiskrekkefølge: %1" @@ -1158,61 +1148,61 @@ msgstr "&Oppstart" #. warning text in the summary richtext -#: src/lib/bootloader/proposal_client.rb:178 +#: 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." #. error in the proposal -#: src/lib/bootloader/proposal_client.rb:187 +#: 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" #. FATE#303643 Enable one-click changes in bootloader proposal #. -#: src/modules/BootGRUB2.rb:194 +#: 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/BootGRUB2.rb:198 +#: 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 -#: src/modules/BootGRUB2.rb:211 +#: 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/BootGRUB2.rb:215 +#: 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/BootGRUB2.rb:221 +#: 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/BootGRUB2.rb:225 +#: 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:235 +#: 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/BootGRUB2.rb:243 +#: src/modules/BootGRUB2.rb:217 #, fuzzy #| msgid "Change Location: %1" msgid "Change Location: %s" @@ -1222,22 +1212,22 @@ #. @return a list of summary lines #. Display bootloader summary #. @return a list of summary lines -#: src/modules/BootGRUB2.rb:252 src/modules/BootGRUB2EFI.rb:100 +#: src/modules/BootGRUB2.rb:226 src/modules/BootGRUB2EFI.rb:100 msgid "Boot Loader Type: %1" msgstr "Oppstartslastertype: %1" #. TRANSLATORS: extended is here for extended partition. Keep translation short. -#: src/modules/BootGRUB2.rb:263 +#: src/modules/BootGRUB2.rb:237 msgid " (extended)" msgstr " (utvidet)" #. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific #. is used in your language, then keep it as it is. -#: src/modules/BootGRUB2.rb:271 +#: src/modules/BootGRUB2.rb:245 msgid " (MBR)" msgstr " (MBR)" -#: src/modules/BootGRUB2.rb:278 +#: src/modules/BootGRUB2.rb:252 msgid "Status Location: %1" msgstr "Status for plassering: %1" @@ -1271,80 +1261,94 @@ msgstr "Oppstartsenheten er plassert på programvarebasert RAID1. Velg en annen plassering for oppstartslasteren, f.eks. Master Boot Record." #. if partitioning worked before upgrade, it will keep working (bnc#886604) -#: src/modules/BootSupportCheck.rb:243 +#: 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:144 +#: src/modules/Bootloader.rb:146 msgid "Check boot loader" msgstr "Kontroller oppstartslaster" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:146 +#: src/modules/Bootloader.rb:148 msgid "Read partitioning" msgstr "Les partisjonstabell" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:148 +#: 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:152 +#: src/modules/Bootloader.rb:154 msgid "Checking boot loader..." msgstr "Kontrollerer oppstartslaster..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:154 +#: src/modules/Bootloader.rb:156 msgid "Reading partitioning..." msgstr "Leser partisjonstabell..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:156 +#: src/modules/Bootloader.rb:158 msgid "Loading boot loader settings..." msgstr "Laster innstillinger for oppstartslaster..." #. dialog header -#: src/modules/Bootloader.rb:160 +#: src/modules/Bootloader.rb:162 msgid "Initializing Boot Loader Configuration" msgstr "Initialiserer konfigurasjon for oppstartslaster" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:279 +#: src/modules/Bootloader.rb:281 msgid "Create initrd" msgstr "Opprett initrd" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:281 +#: 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:283 +#: src/modules/Bootloader.rb:285 msgid "Install boot loader" msgstr "Installer oppstartslaster" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:287 +#: src/modules/Bootloader.rb:289 msgid "Creating initrd..." msgstr "Oppretter initrd..." #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:289 +#: 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:291 +#: src/modules/Bootloader.rb:293 msgid "Installing boot loader..." msgstr "Installerer oppstartslaster..." #. progress line -#: src/modules/Bootloader.rb:297 +#: src/modules/Bootloader.rb:299 msgid "Saving Boot Loader Configuration" msgstr "Lagrer konfigurasjon for oppstartslaster" +#, fuzzy +#~| msgid "Distribution:" +#~ msgid "D&istributor" +#~ msgstr "Distribusjon:" + #~ 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>" Modified: trunk/yast/nb/po/crowbar.nb.po =================================================================== --- trunk/yast/nb/po/crowbar.nb.po 2015-10-01 11:24:53 UTC (rev 92960) +++ trunk/yast/nb/po/crowbar.nb.po 2015-10-01 11:24:54 UTC (rev 92961) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 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" @@ -461,8 +461,14 @@ #. popup message %1 is FQDN #: src/include/crowbar/complex.rb:1731 +#, fuzzy +#| msgid "" +#| "The SUSE Cloud Admin Server has been deployed. Changing the network is\n" +#| "currently not supported.\n" +#| "\n" +#| "You can visit the Crowbar web UI on http://%1:3000/" msgid "" -"The SUSE Cloud Admin Server has been deployed. Changing the network is\n" +"The Crowbar Admin Server has been deployed. Changing the network is\n" "currently not supported.\n" "\n" "You can visit the Crowbar web UI on http://%1:3000/" @@ -506,9 +512,15 @@ #. Ovreview dialog help #: src/include/crowbar/helps.rb:49 +#, fuzzy +#| msgid "" +#| "<p>\n" +#| "See the SUSE Cloud deployment guide for details on the network\n" +#| "configuration and on using this YaST module.\n" +#| "</p>" msgid "" "<p>\n" -"See the SUSE Cloud deployment guide for details on the network\n" +"See the product deployment guide for details on the network\n" "configuration and on using this YaST module.\n" "</p>" msgstr "" Modified: trunk/yast/nb/po/kdump.nb.po =================================================================== --- trunk/yast/nb/po/kdump.nb.po 2015-10-01 11:24:53 UTC (rev 92960) +++ trunk/yast/nb/po/kdump.nb.po 2015-10-01 11:24:54 UTC (rev 92961) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: kdump\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+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" @@ -322,13 +322,13 @@ msgid "Kdump immediate reboots: %1" msgstr "Umiddelbare Kdump-omstarter: %1" -#: src/clients/kdump.rb:652 src/clients/kdump.rb:1259 +#: src/clients/kdump.rb:652 src/clients/kdump.rb:1262 #, fuzzy #| msgid "enabled" msgid "Enabled" msgstr "aktivert" -#: src/clients/kdump.rb:653 src/clients/kdump.rb:1260 +#: src/clients/kdump.rb:653 src/clients/kdump.rb:1263 #, fuzzy #| msgid "disabled" msgid "Disabled" @@ -371,14 +371,19 @@ #. TRANSLATORS: CommandLine printed text #: src/clients/kdump.rb:747 -msgid "Kernel option \"crashkernel\" includes ranges. They will be rewritten." +#, fuzzy +#| msgid "Kernel option \"crashkernel\" includes ranges. They will be rewritten." +msgid "" +"Kernel option \"crashkernel\" includes ranges and/or redundant values.\n" +"It will be rewritten." msgstr "Kjernevalget \"crashkernel\" omfatter områder. De vil bli lagret på nytt." +#. Force value to false, so it's actually rewritten #. TRANSLATORS: CommandLine printed text -#. Popup::Message(crash_value); -#. delete crashkernel paramter from bootloader -#: src/clients/kdump.rb:752 src/clients/kdump.rb:757 src/modules/Kdump.rb:570 -#: src/modules/Kdump.rb:589 +#. start kdump at boot +#. delete crashkernel parameter from bootloader +#: src/clients/kdump.rb:755 src/clients/kdump.rb:760 src/modules/Kdump.rb:487 +#: src/modules/Kdump.rb:500 msgid "To apply changes a reboot is necessary." msgstr "Maskinen må startes på nytt for å aktivere endringer." @@ -397,41 +402,41 @@ #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:761 src/clients/kdump.rb:787 src/clients/kdump.rb:816 -#: src/clients/kdump.rb:1048 src/clients/kdump.rb:1065 -#: src/clients/kdump.rb:1082 src/clients/kdump.rb:1099 -#: src/clients/kdump.rb:1114 src/clients/kdump.rb:1130 -#: src/clients/kdump.rb:1153 src/clients/kdump.rb:1173 -#: src/clients/kdump.rb:1193 src/clients/kdump.rb:1207 -#: src/clients/kdump.rb:1230 src/clients/kdump.rb:1250 +#: src/clients/kdump.rb:764 src/clients/kdump.rb:790 src/clients/kdump.rb:819 +#: src/clients/kdump.rb:1051 src/clients/kdump.rb:1068 +#: src/clients/kdump.rb:1085 src/clients/kdump.rb:1102 +#: src/clients/kdump.rb:1117 src/clients/kdump.rb:1133 +#: src/clients/kdump.rb:1156 src/clients/kdump.rb:1176 +#: src/clients/kdump.rb:1196 src/clients/kdump.rb:1210 +#: src/clients/kdump.rb:1233 src/clients/kdump.rb:1253 msgid "Wrong options were used." msgstr "Feil valg er brukt." #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:778 +#: src/clients/kdump.rb:781 msgid "Dump level was set." msgstr "Dump-nivå er definert." #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:782 src/clients/kdump.rb:807 +#: src/clients/kdump.rb:785 src/clients/kdump.rb:810 msgid "Wrong value of option." msgstr "Feil verdi." #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:803 +#: src/clients/kdump.rb:806 msgid "Dump format was set." msgstr "Dump-format er definert." #. TRANSLATORS: CommandLine printed text help -#: src/clients/kdump.rb:810 +#: src/clients/kdump.rb:813 #, fuzzy #| msgid "Option can include only \"ELF\" or \"compressed\" value." msgid "Option can include only \"none\", \"ELF\", \"compressed\" or \"lzo\" value." msgstr "Valget kan bare inneholde \"ELF\" eller en \"komprimert\" verdi." #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:830 +#: src/clients/kdump.rb:833 msgid "File %1 does not exist." msgstr "Filen %1 finnes ikke." @@ -439,8 +444,8 @@ #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:852 src/clients/kdump.rb:886 src/clients/kdump.rb:935 -#: src/clients/kdump.rb:969 src/clients/kdump.rb:1016 +#: src/clients/kdump.rb:855 src/clients/kdump.rb:889 src/clients/kdump.rb:938 +#: src/clients/kdump.rb:972 src/clients/kdump.rb:1019 msgid "Value for \"dir\" missing." msgstr "Verdi for \"dir\" mangler." @@ -448,48 +453,48 @@ #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:866 src/clients/kdump.rb:916 src/clients/kdump.rb:957 -#: src/clients/kdump.rb:983 +#: src/clients/kdump.rb:869 src/clients/kdump.rb:919 src/clients/kdump.rb:960 +#: src/clients/kdump.rb:986 msgid "Value for \"server\" missing." msgstr "Verdi for \"server\" mangler." #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:995 +#: src/clients/kdump.rb:998 msgid "Value for \"share\" missing." msgstr "Verdi for \"share\" mangler." #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1037 +#: src/clients/kdump.rb:1040 msgid "Wrong value for target." msgstr "Feil verdi for mål." #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1148 +#: src/clients/kdump.rb:1151 msgid "Wrong value of options \"no\"." msgstr "Feil verdi for valg \"no\"." #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1168 +#: src/clients/kdump.rb:1171 msgid "Wrong value for option \"server\"." msgstr "Feil verdi for valget \"server\"." #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1188 +#: src/clients/kdump.rb:1191 msgid "Wrong value for option \"user\"." msgstr "Feil verdi for valget \"user\"." #. TRANSLATORS: CommandLine error message #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1225 src/clients/kdump.rb:1245 +#: src/clients/kdump.rb:1228 src/clients/kdump.rb:1248 msgid "Wrong value for option \"email\"." msgstr "Feil verdi for valget \"email\"." -#: src/clients/kdump.rb:1257 +#: src/clients/kdump.rb:1260 msgid "Firmware-assisted dump: %{status}" msgstr "" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1275 +#: src/clients/kdump.rb:1278 #, fuzzy #| msgid "Wrong options were used." msgid "No option has been defined." @@ -511,115 +516,102 @@ msgstr "&Kdump" #. TRANSLATORS: RadioButtonGroup Label -#: src/include/kdump/dialogs.rb:53 +#: src/include/kdump/dialogs.rb:57 msgid "Enable/Disable Kdump" msgstr "Aktiver/deaktiver Kdump" -#: src/include/kdump/dialogs.rb:58 +#: src/include/kdump/dialogs.rb:62 msgid "Enable Kd&ump" msgstr "Aktiver Kd&ump" -#: src/include/kdump/dialogs.rb:59 +#: src/include/kdump/dialogs.rb:63 msgid "&Disable Kdump" msgstr "&Deaktiver Kdump" -#. "handle" : HandleEnableDisalbeKdump, -#: src/include/kdump/dialogs.rb:79 -msgid "Total System Memory [MB]:" -msgstr "Totalt system-minne [MB]:" - -#: src/include/kdump/dialogs.rb:86 -msgid "Usable Memory [MB]:" -msgstr "Tilgjengelig minne [MB]:" - -#: src/include/kdump/dialogs.rb:95 -msgid "Kdump Memor&y [MB]" -msgstr "Kdump M&inne [MB]" - #. ---------============ Dump Filtering screen=============------------ -#: src/include/kdump/dialogs.rb:134 +#: src/include/kdump/dialogs.rb:111 msgid "Include in Dumping" msgstr "Inkluder i dump" -#: src/include/kdump/dialogs.rb:141 +#: src/include/kdump/dialogs.rb:118 msgid "&Pages Filled with Zero" msgstr "&Sider fylt med null" #. `VStretch () -#: src/include/kdump/dialogs.rb:147 +#: src/include/kdump/dialogs.rb:124 msgid "Cach&e Pages" msgstr "M&ellomlagersider" -#: src/include/kdump/dialogs.rb:157 +#: src/include/kdump/dialogs.rb:134 msgid "Cache Priva&te Pages" msgstr "Priva&te mellomlagersider" -#: src/include/kdump/dialogs.rb:162 +#: src/include/kdump/dialogs.rb:139 msgid "&User Data Pages" msgstr "Br&ukerdatasider" -#: src/include/kdump/dialogs.rb:163 +#: src/include/kdump/dialogs.rb:140 msgid "&Free Pages" msgstr "&Ledige sider" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:191 +#: src/include/kdump/dialogs.rb:168 msgid "&Dump Format" msgstr "&Dump-format" -#: src/include/kdump/dialogs.rb:194 +#: src/include/kdump/dialogs.rb:171 #, fuzzy #| msgid "Number of Dumps" msgid "&No Dump" msgstr "Antall dumper" -#: src/include/kdump/dialogs.rb:195 +#: src/include/kdump/dialogs.rb:172 #, fuzzy #| msgid "E&LF Format" msgid "&ELF Format" msgstr "E&LF Format" -#: src/include/kdump/dialogs.rb:196 +#: src/include/kdump/dialogs.rb:173 msgid "C&ompressed Format" msgstr "&Komprimert format" -#: src/include/kdump/dialogs.rb:197 +#: src/include/kdump/dialogs.rb:174 #, fuzzy #| msgid "C&ompressed Format" msgid "&LZO Compressed Format" msgstr "&Komprimert format" #. ---------============ Dump Target screen=============------------ -#: src/include/kdump/dialogs.rb:217 +#: src/include/kdump/dialogs.rb:194 msgid "&Select Target" msgstr "&Velg mål" -#: src/include/kdump/dialogs.rb:221 +#: src/include/kdump/dialogs.rb:198 msgid "Local Directory" msgstr "Lokal katalog" -#: src/include/kdump/dialogs.rb:222 src/include/kdump/uifunctions.rb:106 +#: src/include/kdump/dialogs.rb:199 src/include/kdump/uifunctions.rb:106 msgid "FTP" msgstr "FTP" -#: src/include/kdump/dialogs.rb:223 +#: src/include/kdump/dialogs.rb:200 msgid "SSH" msgstr "SSH" -#: src/include/kdump/dialogs.rb:224 +#: src/include/kdump/dialogs.rb:201 msgid "SFTP" msgstr "" -#: src/include/kdump/dialogs.rb:225 src/include/kdump/uifunctions.rb:173 +#: src/include/kdump/dialogs.rb:202 src/include/kdump/uifunctions.rb:173 msgid "NFS" msgstr "NFS" -#: src/include/kdump/dialogs.rb:226 src/include/kdump/uifunctions.rb:188 +#: src/include/kdump/dialogs.rb:203 src/include/kdump/uifunctions.rb:188 msgid "CIFS (SMB)" msgstr "CIFS (SMB)" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:251 +#: src/include/kdump/dialogs.rb:228 msgid "&SMTP Server" msgstr "&SMTP-server" @@ -627,7 +619,7 @@ #. text entry #. text entry #. text entry -#: src/include/kdump/dialogs.rb:263 src/include/kdump/uifunctions.rb:130 +#: src/include/kdump/dialogs.rb:240 src/include/kdump/uifunctions.rb:130 #: src/include/kdump/uifunctions.rb:160 src/include/kdump/uifunctions.rb:212 msgid "&User Name" msgstr "&Brukernavn" @@ -636,117 +628,147 @@ #. password entry #. password entry #. password entry -#: src/include/kdump/dialogs.rb:275 src/include/kdump/uifunctions.rb:133 +#: src/include/kdump/dialogs.rb:252 src/include/kdump/uifunctions.rb:133 #: src/include/kdump/uifunctions.rb:163 src/include/kdump/uifunctions.rb:215 msgid "&Password" msgstr "&Passord" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:287 +#: src/include/kdump/dialogs.rb:264 msgid "Notification &To" msgstr "Varsling &til" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:303 +#: src/include/kdump/dialogs.rb:280 msgid "Notifica&tion CC" msgstr "Varslingskopi &til" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:320 +#: src/include/kdump/dialogs.rb:297 msgid "Custom Kdump &Kernel" msgstr "Tilpasset Kdump-&Kjerne" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:332 +#: src/include/kdump/dialogs.rb:309 msgid "Kdump Co&mmand Line" msgstr "Kdump ko&mmandolinje" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:344 +#: src/include/kdump/dialogs.rb:321 msgid "Kdump Command &Line Append" msgstr "Kdump kommando&linjetillegg" #. TRANSLATORS: CheckBox Label -#: src/include/kdump/dialogs.rb:361 +#: src/include/kdump/dialogs.rb:338 msgid "&Enable Immediate Reboot After Saving the Core" msgstr "Aktiver omstart umiddelbart &etter at kjernen er lagret" #. TRANSLATORS: CheckBox Label -#: src/include/kdump/dialogs.rb:375 +#: src/include/kdump/dialogs.rb:352 msgid "Enable Copy Ke&rnel into the Dump Directory" msgstr "Aktiver kopiering av kje&rne til dump-katalog." #. TRANSLATORS: CheckBox Label -#: src/include/kdump/dialogs.rb:389 +#: src/include/kdump/dialogs.rb:366 msgid "Enable &Delete Old Dump Images" msgstr "&Aktiver sletting av gamle dump-bilder" #. TRANSLATORS: IntField Label -#: src/include/kdump/dialogs.rb:406 +#: src/include/kdump/dialogs.rb:383 msgid "N&umber of Old Dumps" msgstr "Maks. antall gamle d&ump-bilder" #. "handle" : -#: src/include/kdump/dialogs.rb:427 +#: src/include/kdump/dialogs.rb:408 msgid "Kdump Memory" msgstr "Kdump-minne" -#: src/include/kdump/dialogs.rb:432 +#: src/include/kdump/dialogs.rb:413 msgid "Kdump Start-Up" msgstr "Oppstart av Kdump" -#: src/include/kdump/dialogs.rb:433 +#: src/include/kdump/dialogs.rb:414 msgid "Start-Up" msgstr "Oppstart" -#: src/include/kdump/dialogs.rb:448 +#: src/include/kdump/dialogs.rb:429 msgid "Kdump - Dump Filtering" msgstr "Kdump - Dumpfiltrering" -#: src/include/kdump/dialogs.rb:449 +#: src/include/kdump/dialogs.rb:430 msgid "Dump Filtering" msgstr "Dumpfiltrering" -#: src/include/kdump/dialogs.rb:455 +#: src/include/kdump/dialogs.rb:436 msgid "Saving Target for Kdump Image" msgstr "Lagrer mål for Kdump-bilde" -#: src/include/kdump/dialogs.rb:462 src/include/kdump/dialogs.rb:463 +#: src/include/kdump/dialogs.rb:443 src/include/kdump/dialogs.rb:444 msgid "Dump Target" msgstr "Dumpmål" -#: src/include/kdump/dialogs.rb:469 +#: src/include/kdump/dialogs.rb:450 msgid "SMTP Server" msgstr "SMTP-server" -#: src/include/kdump/dialogs.rb:479 +#: src/include/kdump/dialogs.rb:460 msgid "Notification Email Addresses" msgstr "E-postadresser for varsling" -#: src/include/kdump/dialogs.rb:487 src/include/kdump/dialogs.rb:488 +#: src/include/kdump/dialogs.rb:468 src/include/kdump/dialogs.rb:469 msgid "Email Notification" msgstr "E-postvarsling" -#: src/include/kdump/dialogs.rb:501 +#: src/include/kdump/dialogs.rb:482 msgid "Custom Kernel for Kdump" msgstr "Tilpasset kjerne for Kdump" -#: src/include/kdump/dialogs.rb:506 +#: src/include/kdump/dialogs.rb:487 msgid "Command Line" msgstr "Kommandolinje" -#: src/include/kdump/dialogs.rb:514 +#: src/include/kdump/dialogs.rb:495 msgid "Dump Settings" msgstr "Dump-innstillinger" -#: src/include/kdump/dialogs.rb:527 +#: src/include/kdump/dialogs.rb:508 msgid "Kdump Expert Settings" msgstr "Avanserte innstillinger for Kdump" -#: src/include/kdump/dialogs.rb:528 +#: src/include/kdump/dialogs.rb:509 msgid "Expert Settings" msgstr "Avanserte innstillinger" +#: src/include/kdump/dialogs.rb:529 +#, fuzzy +#| msgid "Kdump Memor&y [MB]" +msgid "Kdump &Low Memory [MiB]" +msgstr "Kdump M&inne [MB]" + +#: src/include/kdump/dialogs.rb:531 +#, fuzzy +#| msgid "Kdump Memor&y [MB]" +msgid "Kdump Memor&y [MiB]" +msgstr "Kdump M&inne [MB]" + +#: src/include/kdump/dialogs.rb:537 +#, fuzzy +#| msgid "Total System Memory [MB]:" +msgid "Total System Memory [MiB]:" +msgstr "Totalt system-minne [MB]:" + +#: src/include/kdump/dialogs.rb:544 +#, fuzzy +#| msgid "Usable Memory [MB]:" +msgid "Usable Memory [MiB]:" +msgstr "Tilgjengelig minne [MB]:" + +#: src/include/kdump/dialogs.rb:567 +#, fuzzy +#| msgid "Kdump Memor&y [MB]" +msgid "Kdump &High Memory [MiB]" +msgstr "Kdump M&inne [MB]" + #. Enable/Disable Kdump - RadioButtons 1/1 #: src/include/kdump/helps.rb:36 msgid "" @@ -1220,144 +1242,154 @@ #. several ranges and ask user about rewritting #. #. "KdumpMemory" -#: src/include/kdump/uifunctions.rb:1439 -msgid "Kernel option includes several ranges. Rewrite it?" +#: 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:1467 +#: src/include/kdump/uifunctions.rb:1482 msgid "Use &Firmware-Assisted Dump" msgstr "" #. See FATE#315780 #. See https://www.suse.com/support/kb/doc.php?id=7012786 #. FIXME what about dracut? -#: src/modules/Kdump.rb:495 +#: 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:605 +#: 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:614 src/modules/Kdump.rb:622 +#: 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:616 +#: src/modules/Kdump.rb:525 msgid "Reading kernel boot options..." msgstr "Leser oppstartsvalg for kjernen..." #. Progress stage 4/4 -#. Progress finished 3/4 -#: src/modules/Kdump.rb:618 src/modules/Kdump.rb:626 -msgid "Reading available memory..." -msgstr "Leser tilgjengelig minne..." +#: src/modules/Kdump.rb:527 +msgid "Calculating memory limits..." +msgstr "" #. Progress step 2/4 -#: src/modules/Kdump.rb:624 +#: src/modules/Kdump.rb:533 msgid "Reading partitions of disks..." msgstr "Leser diskenes partisjoner..." +#. Progress finished 3/4 +#: 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:638 +#: 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:646 +#: src/modules/Kdump.rb:555 msgid "Cannot read kernel boot options." msgstr "Kan ikke lese oppstartsvalg for kjerne." #. Error message -#: src/modules/Kdump.rb:653 +#: src/modules/Kdump.rb:563 msgid "Cannot read available memory." msgstr "Kan ikke lese tilgjengelig minne." #. Kdump read dialog caption -#: src/modules/Kdump.rb:679 +#: src/modules/Kdump.rb:589 msgid "Saving kdump Configuration" msgstr "Lagrer kdump-oppsett" #. Progress stage 1/2 -#: src/modules/Kdump.rb:708 +#: src/modules/Kdump.rb:618 msgid "Write the settings" msgstr "Lagre innstillingene" #. Progress stage 2/2 -#: src/modules/Kdump.rb:710 +#: src/modules/Kdump.rb:620 msgid "Update boot options" msgstr "Oppdater oppstartsvalg" #. Progress step 1/2 -#: src/modules/Kdump.rb:714 +#: src/modules/Kdump.rb:624 msgid "Writing the settings..." msgstr "Lagrer innstillingene..." #. Progress step 2/2 -#: src/modules/Kdump.rb:716 +#: src/modules/Kdump.rb:626 msgid "Updating boot options..." msgstr "Oppdaterer oppstartsvalg..." #. Progress finished -#: src/modules/Kdump.rb:718 +#: src/modules/Kdump.rb:628 msgid "Finished" msgstr "Fullført" #. Error message -#: src/modules/Kdump.rb:728 +#: src/modules/Kdump.rb:638 msgid "Cannot write settings." msgstr "Kan ikke lagre innstillingene." #. Error message -#: src/modules/Kdump.rb:737 +#: src/modules/Kdump.rb:647 msgid "Adding crashkernel parameter to bootloader fault." msgstr "Legger til crashkernel-parameter for oppstartslasterfeil." -#. Create a textual summary and a list of unconfigured cards +#. Create a textual summary #. @return summary of the current configuration -#: src/modules/Kdump.rb:851 +#: src/modules/Kdump.rb:758 msgid "Kdump status: %1" msgstr "Kdump-status: %1" -#: src/modules/Kdump.rb:852 +#: src/modules/Kdump.rb:759 msgid "enabled" msgstr "aktivert" -#: src/modules/Kdump.rb:852 +#: src/modules/Kdump.rb:759 msgid "disabled" msgstr "deaktivert" -#: src/modules/Kdump.rb:859 -msgid "Value of crashkernel option: %1" +#: 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:866 +#: src/modules/Kdump.rb:773 msgid "Dump format: %1" msgstr "Dump-format: %1" -#: src/modules/Kdump.rb:873 +#: src/modules/Kdump.rb:780 msgid "Target of dumps: %1" msgstr "Dump-mål: %1" -#: src/modules/Kdump.rb:880 +#: 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:972 +#: 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:1065 +#: src/modules/Kdump.rb:974 msgid "" "Cannot use Firmware-assisted dump.\n" "It is not supported on this hardware." Modified: trunk/yast/nb/po/ncurses-pkg.nb.po =================================================================== --- trunk/yast/nb/po/ncurses-pkg.nb.po 2015-10-01 11:24:53 UTC (rev 92960) +++ trunk/yast/nb/po/ncurses-pkg.nb.po 2015-10-01 11:24:54 UTC (rev 92961) @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: ncurses-pkg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2015-09-28 18:16+0200\n" "PO-Revision-Date: 2009-08-12 12:37+0200\n" "Last-Translator: Olav Pettershagen \n" "Language-Team: Norwegian Bokmål \n" @@ -90,14 +90,14 @@ #. add the Cancel button #. begin: the label of the Cancel button #: src/NCPackageSelector.cc:1717 src/NCPackageSelector.cc:1836 -#: src/NCPkgStrings.cc:684 +#: src/NCPkgStrings.cc:691 msgid "&Cancel" msgstr "&Avbryt" #. add the OK button #. the label of an Accept button #: src/NCPackageSelector.cc:1722 src/NCPackageSelector.cc:1841 -#: src/NCPkgStrings.cc:698 +#: src/NCPkgStrings.cc:705 msgid "&Accept" msgstr "&Bekreft" @@ -1040,34 +1040,41 @@ msgid "&OK" msgstr "&OK" +#. begin: the label of the Contiunue button +#: src/NCPkgStrings.cc:684 +#, fuzzy +#| msgid "&Continue anyway" +msgid "C&ontinue" +msgstr "&Vil du fortsette likevel" + #. the label of the Yes button -#: src/NCPkgStrings.cc:691 +#: src/NCPkgStrings.cc:698 msgid "&Yes" msgstr "&Ja" #. the label of the No button -#: src/NCPkgStrings.cc:705 +#: src/NCPkgStrings.cc:712 msgid "&No" msgstr "&Nei" #. the label of the Solve button - 'try again' implies that user #. has to make some action (#213602) -#: src/NCPkgStrings.cc:713 +#: src/NCPkgStrings.cc:720 msgid "&OK -- Try Again" msgstr "&OK -- prøv igjen" #. text for a Notify popup -#: src/NCPkgStrings.cc:721 +#: src/NCPkgStrings.cc:728 msgid "<p>All changes in the package, patch or pattern selection will be lost.<br>Really exit?</p>" msgstr "<p>Alle valgene dine vil gå tapt når du avslutter med Avbryt.<br>Vil du virkelig avslutte?</p>" #. the label of language table -#: src/NCPkgStrings.cc:729 +#: src/NCPkgStrings.cc:736 msgid "Available Languages" msgstr "Tilgjengelige språk" #. the label of language table -#: src/NCPkgStrings.cc:736 +#: src/NCPkgStrings.cc:743 msgid "Available Repositories" msgstr "Tilgjengelige pakkebrønner" @@ -1075,65 +1082,83 @@ #. (the list shows all patches which are needed) #. static const std::string value = _( "Installable Patches" ); #. static const std::string value = _( "Relevant Patches" ); -#: src/NCPkgStrings.cc:746 +#: src/NCPkgStrings.cc:753 msgid "Needed Patches" msgstr "Nødvendige pakkeoppdateringer" #. A label for a list of YOU Patches - keep it short - max. 25 chars! #. (the list shows all patches which are already installed) -#: src/NCPkgStrings.cc:754 +#: src/NCPkgStrings.cc:761 msgid "Installed Patches" msgstr "Installerte oppgraderinger" #. A common label for a list of YOU Patches - keep it short - max. 25 chars! -#: src/NCPkgStrings.cc:762 +#: src/NCPkgStrings.cc:769 msgid "Online Update Patches" msgstr "Online-oppgraderinger" #. the label Filter: Update Problem ( keep it short - max. 25 chars ) -#: src/NCPkgStrings.cc:769 +#: src/NCPkgStrings.cc:776 msgid "Update Problem -- see help" msgstr "Oppgraderingsfeil -- se hjelp" #. the label for Filter: Search results -#: src/NCPkgStrings.cc:776 +#: src/NCPkgStrings.cc:783 msgid "Search Results" msgstr "Søkeresultater" #. the headline of the dependency popup -#: src/NCPkgStrings.cc:783 +#: src/NCPkgStrings.cc:790 msgid "Package Dependencies" msgstr "Pakkeavhengigheter" #. help text package status -#: src/NCPkgStrings.cc:790 +#: src/NCPkgStrings.cc:797 msgid "<b>Update Problem List</b><br><p>The packages in the list cannot be updated automatically.</p><p>Possible reasons:</p><p>They are obsoleted by other packages.</p><p>There is no newer version to which to update on any installation media.</p><p>They are third-party packages</p><p>Manually select what to do with them. The safest course of action is to delete them.</p>" msgstr "<b>Oppgraderingsfeil</b><br><p>Pakkene i listen kan ikke oppgraderes automatisk.</p><p>Mulige årsaker:</p><p>De er inkompatible pga. installasjon av andre pakker.</p><p>Det finnes ingen nyere versjon å oppgradere til på installasjonsmediene.</p><p>Det er pakker fra tredjepart</p><p>Velg hva du vil gjøre med dem manuelt. Det sikreste alternativet er å fjerne pakkene.</p>" #. column header source RPM installation (keep it short!) -#: src/NCPkgStrings.cc:797 +#: src/NCPkgStrings.cc:804 msgid "Source" msgstr "Kilde" #. menu entry Update List -#: src/NCPkgStrings.cc:805 +#: src/NCPkgStrings.cc:812 msgid "&Update List" msgstr "&Oppgraderingsliste" #. part of the patch description -#: src/NCPkgStrings.cc:812 +#: src/NCPkgStrings.cc:819 msgid "<b>Patch: </b>" msgstr "<b>oppgradering: </b>" #. info line is shown if YOU patch list is empty -#: src/NCPkgStrings.cc:819 +#: src/NCPkgStrings.cc:826 msgid "No patches available" msgstr "Ingen oppdateringer tilgjengelig" -#: src/NCPkgStrings.cc:825 +#: src/NCPkgStrings.cc:832 msgid "Script" msgstr "Skript" +#: src/NCPkgStrings.cc:838 +#, fuzzy +#| msgid "Package Versions" +msgid "Incompatible Package Versions" +msgstr "Pakkeversjoner" + +#: src/NCPkgStrings.cc:845 +msgid "<p>You are trying to install multiversion-capable and non-multiversion-capable versions of this package at the same time.</p>" +msgstr "" + +#: src/NCPkgStrings.cc:854 +msgid "<p>This version is multiversion-capable.</p><p>Press \"Continue\" to install this version and unselect the non-multiversion-capable version, \"Cancel\" to unselect this version and keep the other one.</p>" +msgstr "" + +#: src/NCPkgStrings.cc:864 +msgid "<p>This version is not multiversion-capable.</p><p>Press \"Continue\" to install only this version and unselect all other versions, \"Cancel\" to unselect this version and keep the other ones.<p>" +msgstr "" + #~ msgid "This is a list of useful packages. They will be additionally installed if recommeded by a newly installed package. To get packages recommeded by already installed packages the option <b>Install Recommended Packages for Already Installed Packages</b> from <b>Dependencies</b> menu has to be set." #~ msgstr "Dette er en liste over nyttige pakker. De vil bli installert hvis de anbefales som tillegg til en nylig installert pakke. For å hente pakker som anbefales for allerede installerte pakker, må du velge <b>Installer anbefalte pakker for allerede installert pakker</b> i menyen <b>Avhengigheter</b>." Modified: trunk/yast/nb/po/qt-pkg.nb.po =================================================================== --- trunk/yast/nb/po/qt-pkg.nb.po 2015-10-01 11:24:53 UTC (rev 92960) +++ trunk/yast/nb/po/qt-pkg.nb.po 2015-10-01 11:24:54 UTC (rev 92961) @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: qt-pkg\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:36+0200\n" +"POT-Creation-Date: 2015-09-28 18:16+0200\n" "PO-Revision-Date: 2010-07-27 11:04+0200\n" "Last-Translator: Olav Pettershagen \n" "Language-Team: Norwegian Bokmål \n" @@ -54,7 +54,7 @@ msgstr "&Søk" #. DEBUG -#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:113 +#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:114 msgid "&Keywords" msgstr "Sø&keord" @@ -94,8 +94,8 @@ #: src/YQPackageSelectorBase.cc:249 src/YQPackageSelectorBase.cc:305 #: src/YQPackageSelectorBase.cc:326 src/YQPatternSelector.cc:259 #: src/YQPkgConflictDialog.cc:163 src/YQPkgConflictDialog.cc:398 -#: src/YQPkgSearchFilterView.cc:245 src/YQPkgTextDialog.cc:258 -#: src/YQPkgVersionsView.cc:429 src/YQSimplePatchSelector.cc:219 +#: src/YQPkgSearchFilterView.cc:249 src/YQPkgTextDialog.cc:258 +#: src/YQPkgVersionsView.cc:413 src/YQSimplePatchSelector.cc:219 msgid "&Cancel" msgstr "&Avbryt" @@ -383,7 +383,7 @@ msgstr "I tillegg til dine manuelle valg er følgende pakker endret for å løse avhengigheter:" #: src/YQPackageSelectorBase.cc:305 src/YQPackageSelectorBase.cc:326 -#: src/YQPkgConflictDialog.cc:397 src/YQPkgVersionsView.cc:428 +#: src/YQPkgConflictDialog.cc:397 src/YQPkgVersionsView.cc:412 msgid "C&ontinue" msgstr "F&ortsett" @@ -1308,15 +1308,11 @@ msgid "Unmaintained Packages" msgstr "Pakker som ikke vedlikeholdes" -#. horizontal -#. vertical -#: src/YQPkgRepoFilterView.cc:180 +#: src/YQPkgRepoFilterView.cc:177 msgid "Search" msgstr "Søk" -#. horizontal -#. vertical -#: src/YQPkgRepoFilterView.cc:199 +#: src/YQPkgRepoFilterView.cc:192 msgid "Installation Summary" msgstr "Installasjonssammendrag" @@ -1330,78 +1326,78 @@ msgstr "zzz Alle" #. Search button -#: src/YQPkgSearchFilterView.cc:92 +#: src/YQPkgSearchFilterView.cc:93 msgid "&Search" msgstr "&Søk" #. #. Where to search #. -#: src/YQPkgSearchFilterView.cc:105 +#: src/YQPkgSearchFilterView.cc:106 msgid "Search in" msgstr "Søk i" -#: src/YQPkgSearchFilterView.cc:111 +#: src/YQPkgSearchFilterView.cc:112 msgid "Nam&e" msgstr "Nav&n" -#: src/YQPkgSearchFilterView.cc:115 +#: src/YQPkgSearchFilterView.cc:116 msgid "Su&mmary" msgstr "Sa&mmendrag" -#: src/YQPkgSearchFilterView.cc:117 +#: src/YQPkgSearchFilterView.cc:118 msgid "Descr&iption" msgstr "Beskr&ivelse" -#: src/YQPkgSearchFilterView.cc:122 +#: src/YQPkgSearchFilterView.cc:123 msgid "RPM \"P&rovides\"" msgstr "RPM «inneholde&r»" -#: src/YQPkgSearchFilterView.cc:124 +#: src/YQPkgSearchFilterView.cc:125 msgid "RPM \"Re&quires\"" msgstr "RPM «kre&ver»" -#: src/YQPkgSearchFilterView.cc:127 +#: src/YQPkgSearchFilterView.cc:128 msgid "File list" msgstr "Filliste" #. #. Search mode #. -#: src/YQPkgSearchFilterView.cc:142 +#: src/YQPkgSearchFilterView.cc:143 msgid "Search &Mode:" msgstr "Søke&modus:" #. Caution: combo box items must be inserted in the same order as enum SearchMode! -#: src/YQPkgSearchFilterView.cc:155 +#: src/YQPkgSearchFilterView.cc:156 msgid "Contains" msgstr "Inneholder" -#: src/YQPkgSearchFilterView.cc:156 +#: src/YQPkgSearchFilterView.cc:157 msgid "Begins with" msgstr "Begynner med" -#: src/YQPkgSearchFilterView.cc:157 +#: src/YQPkgSearchFilterView.cc:158 msgid "Exact Match" msgstr "Nøyaktig treff" -#: src/YQPkgSearchFilterView.cc:158 +#: src/YQPkgSearchFilterView.cc:159 msgid "Use Wild Cards" msgstr "Bruk jokertegn" -#: src/YQPkgSearchFilterView.cc:159 +#: src/YQPkgSearchFilterView.cc:160 msgid "Use Regular Expression" msgstr "Bruk regulært uttrykk" -#: src/YQPkgSearchFilterView.cc:166 +#: src/YQPkgSearchFilterView.cc:167 msgid "Case Sensiti&ve" msgstr "Skill mellom små og s&tore bokstaver" -#: src/YQPkgSearchFilterView.cc:244 +#: src/YQPkgSearchFilterView.cc:248 msgid "Searching..." msgstr "Søker..." -#: src/YQPkgSearchFilterView.cc:330 +#: src/YQPkgSearchFilterView.cc:334 msgid "No Results." msgstr "Ingen treff." @@ -1410,7 +1406,7 @@ #. if it's a user error (e.g., syntax error in regular expression) or #. an internal error. But there is a "Details" button that will return #. the original (translated) error message. -#: src/YQPkgSearchFilterView.cc:345 +#: src/YQPkgSearchFilterView.cc:349 msgid "Query Error" msgstr "Forespørselsfeil" @@ -1558,14 +1554,14 @@ msgstr "%1-%2 fra leverandør %3 (installert)" #. Translators: Popup dialog text. Try to keep the lines about the same length. -#: src/YQPkgVersionsView.cc:398 +#: src/YQPkgVersionsView.cc:382 msgid "" "You are trying to install multiversion-capable\n" "and non-multiversion-capable versions of this\n" "package at the same time." msgstr "" -#: src/YQPkgVersionsView.cc:406 +#: src/YQPkgVersionsView.cc:390 msgid "" "This version is multiversion-capable.\n" "\n" @@ -1574,7 +1570,7 @@ "\"Cancel\" to unselect this version and keep the other one." msgstr "" -#: src/YQPkgVersionsView.cc:415 +#: src/YQPkgVersionsView.cc:399 msgid "" "This version is not multiversion-capable.\n" "\n" @@ -1584,7 +1580,7 @@ msgstr "" #. Dialog heading -#: src/YQPkgVersionsView.cc:423 +#: src/YQPkgVersionsView.cc:407 #, fuzzy #| msgid "Package &Versions" msgid "Incompatible Package Versions" @@ -1599,11 +1595,11 @@ #. 3.17.4-i386 from openSUSE-11.1 update repository with priority 20 and vendor openSUSE #. ^^^^^^ ^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^ ^^^^^^^^ #. %1 %2 %3 %4 %5 -#: src/YQPkgVersionsView.cc:549 src/YQPkgVersionsView.cc:586 +#: src/YQPkgVersionsView.cc:533 src/YQPkgVersionsView.cc:570 msgid "%1-%2 from %3 with priority %4 and vendor %5" msgstr "%1-%2 fra %3 med prioritet %4 og leverandør %5" -#: src/YQPkgVersionsView.cc:570 +#: src/YQPkgVersionsView.cc:554 msgid "This version is installed in your system." msgstr "Denne versjonen er installert på systemet." Modified: trunk/yast/nb/po/registration.nb.po =================================================================== --- trunk/yast/nb/po/registration.nb.po 2015-10-01 11:24:53 UTC (rev 92960) +++ trunk/yast/nb/po/registration.nb.po 2015-10-01 11:24:54 UTC (rev 92961) @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: registration\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-27 10:52+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" @@ -71,7 +71,7 @@ #: 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:270 +#: src/lib/registration/ui/migration_repos_workflow.rb:287 #: src/lib/registration/ui/registered_system_dialog.rb:37 #: src/lib/registration/ui/registration_update_dialog.rb:41 #, fuzzy @@ -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:326 src/lib/registration/registration_ui.rb:247 -#: src/lib/registration/registration_ui.rb:277 +#: 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 ..." @@ -369,24 +369,36 @@ msgid "Details: %s" msgstr "Detaljer..." +#. TRANSLATORS: multiline error message - a SSL certificate has been +#. imported but the registration server still cannot be accessed securely, +#. user has to solve the certificate issue manually. +#: src/lib/registration/connect_helpers.rb:226 +msgid "" +"A certificate has been already imported\n" +"but the server connection still cannot be trusted.\n" +"\n" +"Please fix the certificate issue manually, ensure that the server\n" +"can be connected securely and start the YaST module again." +msgstr "" + #. progress label -#: src/lib/registration/connect_helpers.rb:222 +#: src/lib/registration/connect_helpers.rb:238 msgid "Importing the SSL certificate" msgstr "" -#: src/lib/registration/connect_helpers.rb:223 +#: 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:244 +#: 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:263 +#: src/lib/registration/connect_helpers.rb:279 msgid "" "An old registration server was detected at\n" "%s.\n" @@ -424,54 +436,65 @@ #. 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:233 +#: src/lib/registration/registration_ui.rb:267 msgid "Registering the System..." msgstr "" #. updating base product registration, %s is a new base product name +#. updating product registration, %s is a product name #. 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:312 +#: 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 ..." msgid "Updating to %s ..." msgstr "Oppdaterer /etc/hosts..." +#. TRANSLATORS: progress label +#: src/lib/registration/registration_ui.rb:163 +#, fuzzy +#| msgid "Loading configuration %1..." +msgid "Synchronizing Products..." +msgstr "Leser oppsettet %1..." + #. load available addons from SCC server #. the result is cached to avoid reloading when going back and forth in the #. installation workflow #. @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:143 -#: src/lib/registration/ui/autoyast_config_workflow.rb:109 +#: 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:157 +#: 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:174 +#: 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:178 +#: 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:203 +#: src/lib/registration/registration_ui.rb:237 #, fuzzy #| msgid "Use custom registration server " msgid "" @@ -480,22 +503,26 @@ msgstr "Bruk egendefinert registreringsserver" #. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line -#: src/lib/registration/registration_ui.rb:207 +#: src/lib/registration/registration_ui.rb:241 #, fuzzy #| msgid "" #| "Would you like to use these mount points\n" #| "for your new installation?" -msgid "Would you like to enable these repositories during installation\n" +msgid "" +"Would you like to enable these repositories during installation\n" +"in order to receive the latest updates?" msgstr "" "Vil du bruke disse monteringspunktene\n" "for den nye installasjonen?" #. Yast::Mode.update #. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line -#: src/lib/registration/registration_ui.rb:211 +#: src/lib/registration/registration_ui.rb:245 #, fuzzy #| msgid "Would you like to enable access to the profile repository?" -msgid "Would you like to enable these repositories during upgrade\n" +msgid "" +"Would you like to enable these repositories during upgrade\n" +"in order to receive the latest updates?" msgstr "Vil du aktivere tilgang til profilarkivet?" #. indent size used in summary text @@ -505,10 +532,21 @@ msgid "Certificate:" msgstr "SMT-sertifikat" +#. TRANSLATORS: error popup, %s is a repository name, the popup is displayed +#. when a migration repository cannot be accessed, there are [Skip] +#. and [Abort] buttons displayed below the question +#: src/lib/registration/sw_mgmt.rb:97 +msgid "" +"Repository '%s'\n" +"cannot be loaded.\n" +"\n" +"Skip the repository or abort?" +msgstr "" + #. create UI label for a base product #. @param base_product [Hash] Product (hash from pkg-bindings) #. @return [String] UI Label -#: src/lib/registration/sw_mgmt.rb:147 +#: src/lib/registration/sw_mgmt.rb:192 #, fuzzy #| msgid "Unknown error" msgid "Unknown product" @@ -516,7 +554,7 @@ #. error message #. error message -#: src/lib/registration/sw_mgmt.rb:174 src/lib/registration/sw_mgmt.rb:248 +#: src/lib/registration/sw_mgmt.rb:219 src/lib/registration/sw_mgmt.rb:292 #, fuzzy #| msgid "Starting registration..." msgid "Saving repository configuration failed." @@ -524,27 +562,27 @@ #. # error message #. error message -#: src/lib/registration/sw_mgmt.rb:212 src/lib/registration/sw_mgmt.rb:223 +#: src/lib/registration/sw_mgmt.rb:256 src/lib/registration/sw_mgmt.rb:267 msgid "Updating service '%s' failed." msgstr "" #. error message -#: src/lib/registration/sw_mgmt.rb:218 +#: src/lib/registration/sw_mgmt.rb:262 msgid "Adding service '%s' failed." msgstr "" #. error message -#: src/lib/registration/sw_mgmt.rb:230 +#: src/lib/registration/sw_mgmt.rb:274 msgid "Saving service '%s' failed." msgstr "" #. error message -#: src/lib/registration/sw_mgmt.rb:235 +#: 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:438 +#: src/lib/registration/sw_mgmt.rb:486 #, fuzzy #| msgid "No products found to be registered." msgid "" @@ -1011,20 +1049,26 @@ msgid "&Local Registration Server URL" msgstr "Lokal registreringsserver" +#. TRANSLATORS: error message, %s are details +#. TRANSLATORS: error message, %s are details +#: src/lib/registration/ui/media_addon_workflow.rb:95 +#: src/lib/registration/ui/wizard_client.rb:57 +#, fuzzy +#| msgid "Internal error" +msgid "Internal error: %s" +msgstr "Intern feil" + #. register the base system if not already registered -#: src/lib/registration/ui/media_addon_workflow.rb:130 +#: src/lib/registration/ui/media_addon_workflow.rb:132 msgid "" "The base system has to be registered in order to register the '%s' add-on.\n" "Skip the base system and the add-on registration?" msgstr "" -# #. TRANSLATORS: dialog title #: src/lib/registration/ui/migration_repos_selection_dialog.rb:47 -#, fuzzy -#| msgid "Additional Repositories" -msgid "Migration Repositories" -msgstr "Flere installasjonskilder" +msgid "Repositories used for Migration" +msgstr "" #. TRANSLATORS: help text #: src/lib/registration/ui/migration_repos_selection_dialog.rb:50 @@ -1034,9 +1078,9 @@ #. TRANSLATORS: Multiselection widget label #: src/lib/registration/ui/migration_repos_selection_dialog.rb:85 #, fuzzy -#| msgid "Di&rectory to Contain Repositories:" -msgid "Select the Migration Repositories" -msgstr "Katalog som skal inneholde a&rkiver:" +#| msgid "Select the new target architecture." +msgid "Select the Repositories used for Migration" +msgstr "Velg ny målarkitektur." #. TRANSLATORS: Push button label, starts the repository management module #: src/lib/registration/ui/migration_repos_selection_dialog.rb:89 @@ -1059,48 +1103,32 @@ msgid "Priority: %s" msgstr "Prioritet" -#. a dummy message which will be used later, just make sure we have it -#. before the translation deadline... -#. TRANSLATORS: popup question, confirm installing the available -#. updates now -#: src/lib/registration/ui/migration_repos_workflow.rb:50 +#. TRANSLATORS: a popup message with [Continue] [Cancel] buttons, +#. pressing [Continue] starts the registration module, [Cancel] aborts +#. the online migration +#: src/lib/registration/ui/migration_repos_workflow.rb:145 msgid "" -"Online updates are available for installation.\n" -"It is recommended to install all updates before proceeding.\n" -"\n" -"Would you like to install the updates now?" +"The system is not registered,\n" +"to run the online migration you need\n" +"to register the system first." msgstr "" -#. TRANSLATORS: error message, %s are details -#: src/lib/registration/ui/migration_repos_workflow.rb:86 -#, fuzzy -#| msgid "Internal error" -msgid "Internal error: %s" -msgstr "Intern feil" - #. TRANSLATORS: Error message -#: src/lib/registration/ui/migration_repos_workflow.rb:170 +#: src/lib/registration/ui/migration_repos_workflow.rb:183 #, fuzzy #| msgid "Cannot update installed product %1." msgid "No installed product found." msgstr "Kan ikke oppdatere det installerte produktet %1." #. TRANSLATORS: Error message -#: src/lib/registration/ui/migration_repos_workflow.rb:199 +#: src/lib/registration/ui/migration_repos_workflow.rb:212 #, fuzzy #| msgid "Configuration of Product creator" msgid "No migration product found." msgstr "Oppsett av produktgenerator" -#. TRANSLATORS: Progress label -#: src/lib/registration/ui/migration_repos_workflow.rb:246 -#, fuzzy -#| msgid "Registration Code" -msgid "Registering Migration Products..." -msgstr "Registreringskode" - #. TRANSLATORS: progress message -#: src/lib/registration/ui/migration_repos_workflow.rb:272 +#: src/lib/registration/ui/migration_repos_workflow.rb:289 #, fuzzy #| msgid "Saving Repositories..." msgid "Preparing Migration Repositories..." @@ -1108,53 +1136,56 @@ # #. TRANSLATORS: dialog title -#: src/lib/registration/ui/migration_selection_dialog.rb:61 +#: src/lib/registration/ui/migration_selection_dialog.rb:62 #, fuzzy #| msgid "Select the Synchronization Peer Type" msgid "Select the Migration Target" msgstr "Velg forbindelsestype for synkronisering" #. TRANSLATORS: help text (1/3) -#: src/lib/registration/ui/migration_selection_dialog.rb:64 +#: src/lib/registration/ui/migration_selection_dialog.rb:65 msgid "<p>Here you can select the migration target products. The registrationserver may offer several possible migration to new products.</p>" msgstr "" #. TRANSLATORS: help text (2/3) -#: src/lib/registration/ui/migration_selection_dialog.rb:67 +#: src/lib/registration/ui/migration_selection_dialog.rb:68 msgid "<p>Only one migration target from the list can be selected.</p>" msgstr "" #. TRANSLATORS: help text (3/3), %s is replaced by the (translated) check box label -#: src/lib/registration/ui/migration_selection_dialog.rb:69 +#: src/lib/registration/ui/migration_selection_dialog.rb:70 #, fuzzy #| msgid "<p>Use <b>Edit</b> to change selected image configuration or create the image.</p>" msgid "<p>Use the <b>%s</b> check box to manually select the migration repositories later.</p>" msgstr "<p>Klikk <b>Rediger</b> for å endre det valgte diskbildeoppsettet eller for å opprette diskbildet.</p>" -#. TRANSLATORS: check button label -#: src/lib/registration/ui/migration_selection_dialog.rb:70 -#: src/lib/registration/ui/migration_selection_dialog.rb:139 +#: src/lib/registration/ui/migration_selection_dialog.rb:71 #, fuzzy #| msgid "Add all selected online repositories" msgid "Manually Select Migration Repositories" msgstr "Legg til alle valgte online-pakkebrønner" #. TRANSLATORS: error popup, no target migration is selected -#: src/lib/registration/ui/migration_selection_dialog.rb:96 +#: src/lib/registration/ui/migration_selection_dialog.rb:97 #, fuzzy #| msgid "Select the new target architecture." msgid "Select the target migration." msgstr "Velg ny målarkitektur." +#. TRANSLATORS: check button label +#: src/lib/registration/ui/migration_selection_dialog.rb:138 +msgid "Manually Adjust the Repositories for Migration" +msgstr "" + #. TRANSLATORS: selection box label -#: src/lib/registration/ui/migration_selection_dialog.rb:151 +#: src/lib/registration/ui/migration_selection_dialog.rb:153 #, fuzzy #| msgid "Possible &Solutions" msgid "Possible Migration Targets" msgstr "Mulige &løsninger" #. TRANSLATORS: RichText header (details for the selected item) -#: src/lib/registration/ui/migration_selection_dialog.rb:189 +#: src/lib/registration/ui/migration_selection_dialog.rb:191 #, fuzzy #| msgid "Configuration Summary" msgid "Migration Summary" @@ -1166,14 +1197,14 @@ #. using the selected migration. #. %{url} is the URL of the registration server (SMT) #. %{product} is a full product name, e.g. "SUSE Linux Enterprise Server 12" -#: src/lib/registration/ui/migration_selection_dialog.rb:212 +#: src/lib/registration/ui/migration_selection_dialog.rb:214 msgid "ERROR: Product <b>%{product}</b> is not available at the registration server (%{url}). Make the product available to allow using this migration." msgstr "" #. this is rather a theoretical case, but anyway.... #. TRANSLATORS: Summary message, rich text format #. %s is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64" -#: src/lib/registration/ui/migration_selection_dialog.rb:223 +#: src/lib/registration/ui/migration_selection_dialog.rb:225 #, fuzzy #| msgid "Package %1 will be installed." msgid "%s <b>will be installed.</b>" @@ -1181,25 +1212,25 @@ #. TRANSLATORS: Summary message, rich text format #. %s is a product name, e.g. "SUSE Linux Enterprise Server 12" -#: src/lib/registration/ui/migration_selection_dialog.rb:240 +#: src/lib/registration/ui/migration_selection_dialog.rb:242 msgid "%s <b>stays unchanged.</b>" msgstr "" #. TRANSLATORS: Summary message, rich text format #. %{old_product} is a product name, e.g. "SUSE Linux Enterprise Server 12" #. %{new_product} is a product name, e.g. "SUSE Linux Enterprise Server 12 SP1 x86_64" -#: src/lib/registration/ui/migration_selection_dialog.rb:250 +#: src/lib/registration/ui/migration_selection_dialog.rb:252 msgid "%{old_product} <b>will be upgraded to</b> %{new_product}." msgstr "" #. TRANSLATORS: Summary message, rich text format #. %{old_product} and %{new_product} are product names -#: src/lib/registration/ui/migration_selection_dialog.rb:255 +#: src/lib/registration/ui/migration_selection_dialog.rb:257 msgid "%{old_product} <b>will be downgraded to</b> %{new_product}." msgstr "" #. TRANSLATORS: an error popup message -#: src/lib/registration/ui/migration_selection_dialog.rb:285 +#: src/lib/registration/ui/migration_selection_dialog.rb:290 msgid "" "The selected migration contains a product\n" "which is not available at the registration server.\n" @@ -1267,7 +1298,23 @@ msgid "Looking up local registration servers..." msgstr "Bruk lokal registreringsserver" +# #, fuzzy +#~| msgid "Additional Repositories" +#~ msgid "Migration Repositories" +#~ msgstr "Flere installasjonskilder" + +#, fuzzy +#~| msgid "Di&rectory to Contain Repositories:" +#~ msgid "Select the Migration Repositories" +#~ msgstr "Katalog som skal inneholde a&rkiver:" + +#, fuzzy +#~| msgid "Registration Code" +#~ msgid "Registering Migration Products..." +#~ msgstr "Registreringskode" + +#, fuzzy #~| msgid "SMT Certificate" #~ msgid "SSL Certificate" #~ msgstr "SMT-sertifikat" Modified: trunk/yast/nb/po/storage.nb.po =================================================================== --- trunk/yast/nb/po/storage.nb.po 2015-10-01 11:24:53 UTC (rev 92960) +++ trunk/yast/nb/po/storage.nb.po 2015-10-01 11:24:54 UTC (rev 92961) @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: storage\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-27 10:53+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" @@ -990,7 +990,7 @@ msgstr "Forslagstype" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:246 +#: 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" @@ -1005,7 +1005,7 @@ "Vil du virkelig bruke dette oppsettet?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:259 +#: 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" @@ -1021,7 +1021,7 @@ "Vil du virkelig bruke dette oppsettet?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:272 +#: 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" @@ -1036,7 +1036,7 @@ "Vil du virkelig bruke dette oppsettet?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:286 +#: 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" @@ -1050,8 +1050,19 @@ "\n" "Vil du virkelig bruke dette oppsettet?\n" +#. A PReP/CHRP partition is not supposed to be mounted. So if we find any +#. other /boot partition, we should warn the user. +#: src/include/partitioning/custom_part_check_generated.rb:305 +msgid "" +"Warning:\n" +"Your system needs a boot partition with type 0x41 PReP/CHRP.\n" +"Please, consider creating one.\n" +"\n" +"Really use this setup?\n" +msgstr "" + #. popup text, %1 is a number -#: src/include/partitioning/custom_part_check_generated.rb:301 +#: src/include/partitioning/custom_part_check_generated.rb:320 msgid "" "Warning:\n" "Your boot partition ends above cylinder %1.\n" @@ -1072,7 +1083,7 @@ "Vil du bruke dette oppsettet?\n" #. popup text, %1 is a size -#: src/include/partitioning/custom_part_check_generated.rb:321 +#: src/include/partitioning/custom_part_check_generated.rb:340 msgid "" "Warning:\n" "Your boot partition is smaller than %1.\n" @@ -1087,7 +1098,7 @@ "Vil du virkelig bruke denne størrelsen på oppstartspartisjonen?\n" #. /////////////////////////// NO BOOT /////////////////////////// -#: src/include/partitioning/custom_part_check_generated.rb:338 +#: 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" @@ -1099,13 +1110,21 @@ #. 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:360 +#: src/include/partitioning/custom_part_check_generated.rb:377 +#, fuzzy +#| msgid "" +#| "Warning: There is no partition mounted as /boot.\n" +#| "To boot from your hard disk, a small /boot partition\n" +#| "(approx. %1) is required. Consider creating one.\n" +#| "Partitions assigned to /boot will automatically be changed to\n" +#| "type 0x41 PReP/CHRP.\n" +#| "\n" +#| "Really use the setup without /boot partition?\n" msgid "" "Warning: There is no partition mounted as /boot.\n" "To boot from your hard disk, a small /boot partition\n" -"(approx. %1) is required. Consider creating one.\n" -"Partitions assigned to /boot will automatically be changed to\n" -"type 0x41 PReP/CHRP.\n" +"(approx. %1) is required. Consider creating one\n" +"with type 0x41 PReP/CHRP.\n" "\n" "Really use the setup without /boot partition?\n" msgstr "" @@ -1118,7 +1137,7 @@ "Vil du virkelig bruke dette oppsettet uten en /boot-partisjon?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:380 +#: 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" @@ -1137,7 +1156,7 @@ "\n" "Vil du virkelig bruke dette oppsettet?\n" -#: src/include/partitioning/custom_part_check_generated.rb:400 +#: 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" @@ -1146,7 +1165,7 @@ msgstr "" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:417 +#: src/include/partitioning/custom_part_check_generated.rb:433 msgid "" "Warning: With your current setup, your %1\n" "installation might not be directly bootable, because\n" @@ -1163,7 +1182,7 @@ "Vil du virkelig bruke dette oppsettet?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:435 +#: src/include/partitioning/custom_part_check_generated.rb:451 msgid "" "Warning: With your current setup, your %2 installation\n" "will encounter problems when booting, because you have no\n" @@ -1188,7 +1207,7 @@ "Vil du virkelig bruke dette oppsettet?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:457 +#: src/include/partitioning/custom_part_check_generated.rb:473 msgid "" "Warning: With your current setup, your %2 installation will\n" "encounter problems when booting, because you have no \n" @@ -1213,12 +1232,12 @@ "Vil du virkelig bruke dette oppsettet?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:480 +#: src/include/partitioning/custom_part_check_generated.rb:496 msgid "Really use this setup?" msgstr "Vil du virkelig bruke dette oppsettet?" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:488 +#: src/include/partitioning/custom_part_check_generated.rb:504 msgid "" "\n" "You have not assigned a swap partition. In most cases, we highly recommend \n" @@ -1239,7 +1258,7 @@ "Vil du virkelig bruke dette oppsettet uten en veksleminnepartisjon?\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:504 +#: src/include/partitioning/custom_part_check_generated.rb:520 msgid "" "\n" "You chose to install onto an existing partition that will not be\n" @@ -1252,7 +1271,7 @@ "vellykket, spesielt i følgende tilfeller:\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:511 +#: src/include/partitioning/custom_part_check_generated.rb:527 msgid "" "- if this is an existing ReiserFS partition\n" "- if this partition already contains a Linux distribution that will be\n" @@ -1265,7 +1284,7 @@ "- dersom denne partisjonen ikke inneholder noe filsystem ennå\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:518 +#: src/include/partitioning/custom_part_check_generated.rb:534 msgid "" "If in doubt, better go back and mark this partition for\n" "formatting, especially if it is assigned to one of the standard mount points\n" @@ -1276,7 +1295,7 @@ "som f.eks. /, /boot,/usr, /opt eller /var.\n" #. continued popup text -#: src/include/partitioning/custom_part_check_generated.rb:524 +#: src/include/partitioning/custom_part_check_generated.rb:540 msgid "" "If you decide to format the partition, all data on it will be lost.\n" "\n" @@ -1287,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:579 +#: 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" @@ -1296,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:590 +#: 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" @@ -1305,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:600 +#: 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" @@ -1314,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:633 +#: 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" @@ -1323,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:644 +#: src/include/partitioning/custom_part_check_generated.rb:660 msgid "" "The device (%2) is used by %1.\n" "Remove %1 before deleting it.\n" @@ -1331,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:656 +#: 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:692 +#: 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" @@ -1345,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:768 +#: src/include/partitioning/custom_part_check_generated.rb:784 msgid "" "The selected extended partition contains partitions which are currently mounted:\n" "%1\n" @@ -1358,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:786 +#: src/include/partitioning/custom_part_check_generated.rb:802 msgid "" "\n" "The selected extended partition contains at least one LVM partition\n" @@ -1373,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:797 +#: src/include/partitioning/custom_part_check_generated.rb:813 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -1388,7 +1407,7 @@ "den utvidede partisjonen.\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:808 +#: src/include/partitioning/custom_part_check_generated.rb:824 msgid "" "\n" "The selected extended partition contains at least one partition\n" @@ -1401,30 +1420,30 @@ "du sletter den utvidede partisjonen.\n" #. heading text -#: src/include/partitioning/custom_part_dialogs.rb:71 +#: src/include/partitioning/custom_part_dialogs.rb:70 msgid "Enter your Password for the Encrypted File System." msgstr "Skriv inn passordet for det krypterte filsystemet." #. label text -#: src/include/partitioning/custom_part_dialogs.rb:75 +#: src/include/partitioning/custom_part_dialogs.rb:74 #: 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:79 +#: src/include/partitioning/custom_part_dialogs.rb:78 #: src/include/partitioning/ep-dialogs.rb:771 msgid "Empty password allowed." msgstr "Passord er ikke nødvendig." #. heading text, %1 is replaced by device name (e.g. /dev/hda1) -#: src/include/partitioning/custom_part_dialogs.rb:85 +#: src/include/partitioning/custom_part_dialogs.rb:84 msgid "Password for Encrypted File System on %1" msgstr "Passord for kryptert filsystem på %1" #. translator comment: %1 is the device name, %2 is a directory #. example: "...password for device /dev/hda6 mounted on /var" -#: src/include/partitioning/custom_part_dialogs.rb:106 +#: src/include/partitioning/custom_part_dialogs.rb:105 msgid "" "Enter your encryption password for\n" "device %1 mounted on %2.\n" @@ -1433,7 +1452,7 @@ "enheten %1 montert på %2.\n" #. heading text -#: src/include/partitioning/custom_part_dialogs.rb:122 +#: src/include/partitioning/custom_part_dialogs.rb:121 msgid "Enter your Password for the Encrypted File System" msgstr "Skriv inn passordet for det krypterte filsystemet." @@ -1441,7 +1460,7 @@ #. Please use newline if label is longer than 40 characters #. Label: get password for user root #. Please use newline if label is longer than 40 characters -#: src/include/partitioning/custom_part_dialogs.rb:137 +#: src/include/partitioning/custom_part_dialogs.rb:136 #: src/include/partitioning/ep-dialogs.rb:796 msgid "&Enter a Password for your File System:" msgstr "Skriv inn &et passord for filsystemet:" @@ -1452,18 +1471,18 @@ #. Please use newline if label is longer than 40 characters #. Label: get same password again for verification #. Please use newline if label is longer than 40 characters -#: src/include/partitioning/custom_part_dialogs.rb:148 -#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4001 +#: src/include/partitioning/custom_part_dialogs.rb:147 +#: src/include/partitioning/ep-dialogs.rb:780 src/modules/Storage.rb:4002 msgid "Reenter the Password for &Verification:" msgstr "&Gjenta passordet:" #. Cancel button -#: src/include/partitioning/custom_part_dialogs.rb:160 +#: src/include/partitioning/custom_part_dialogs.rb:159 msgid "&Skip" msgstr "&Hopp over" #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:189 +#: src/include/partitioning/custom_part_dialogs.rb:188 msgid "" "The first and the second version\n" "of the password do not match!\n" @@ -1475,8 +1494,8 @@ #. popup text #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:197 -#: src/modules/Storage.rb:3957 +#: src/include/partitioning/custom_part_dialogs.rb:196 +#: src/modules/Storage.rb:3958 msgid "" "You did not enter a password.\n" "Try again.\n" @@ -1486,8 +1505,8 @@ #. popup text #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:204 -#: src/modules/Storage.rb:3965 +#: src/include/partitioning/custom_part_dialogs.rb:203 +#: src/modules/Storage.rb:3966 msgid "" "The password must have at least %1 characters.\n" "Try again.\n" @@ -1495,17 +1514,17 @@ "Passordet må bestå av minst %1 tegn.\n" "Prøv igjen.\n" -#: src/include/partitioning/custom_part_dialogs.rb:238 +#: src/include/partitioning/custom_part_dialogs.rb:237 msgid "No floating point number." msgstr "Ikke en flytende desimalenhet." #. heading text -#: src/include/partitioning/custom_part_dialogs.rb:362 +#: src/include/partitioning/custom_part_dialogs.rb:361 msgid "File system options:" msgstr "Alternativer for filsystem:" #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:444 +#: src/include/partitioning/custom_part_dialogs.rb:443 msgid "" "The character '/' is no longer permitted in a volume label.\n" "Change your volume label so that it does not contain this character.\n" @@ -1514,7 +1533,7 @@ "Du må angi en volumbetegnelse som ikke inneholder dette tegnet.\n" #. help text, richtext format -#: src/include/partitioning/custom_part_dialogs.rb:467 +#: src/include/partitioning/custom_part_dialogs.rb:466 msgid "" "<p><b>Mount in /etc/fstab by:</b>\n" "Normally, a file system to mount is identified in /etc/fstab\n" @@ -1530,7 +1549,7 @@ "monteres med en UUID eller volumbetegnelse. Hvis et alternativ er deaktivert, er ikke dette mulig.\n" #. help text, richtext format -#: src/include/partitioning/custom_part_dialogs.rb:480 +#: src/include/partitioning/custom_part_dialogs.rb:479 msgid "" "<p><b>Volume Label:</b>\n" "The name entered in this field is used as the volume label. This usually makes sense only \n" @@ -1543,46 +1562,46 @@ "En volumbetegnelse kan ikke inneholde tegnet / eller mellomrom.\n" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:495 +#: src/include/partitioning/custom_part_dialogs.rb:494 msgid "Mount in /etc/fstab by" msgstr "Monter i /etc/fstab med" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:502 +#: src/include/partitioning/custom_part_dialogs.rb:501 msgid "&Device Name" msgstr "&Enhetsnavn" #. label text #. label text -#: src/include/partitioning/custom_part_dialogs.rb:509 -#: src/include/partitioning/custom_part_dialogs.rb:545 +#: src/include/partitioning/custom_part_dialogs.rb:508 +#: src/include/partitioning/custom_part_dialogs.rb:544 msgid "Volume &Label" msgstr "Volum&betegnelse" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:516 +#: src/include/partitioning/custom_part_dialogs.rb:515 #, fuzzy #| msgid "UUID" msgid "&UUID" msgstr "UUID" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:526 +#: src/include/partitioning/custom_part_dialogs.rb:525 msgid "Device &ID" msgstr "Enhets-&ID" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:533 +#: src/include/partitioning/custom_part_dialogs.rb:532 msgid "Device &Path" msgstr "Enhets&filsti" #. heading text -#: src/include/partitioning/custom_part_dialogs.rb:673 +#: src/include/partitioning/custom_part_dialogs.rb:672 msgid "Fstab Options:" msgstr "Fstab-valg:" #. popup text %1 is a number -#: src/include/partitioning/custom_part_dialogs.rb:847 +#: src/include/partitioning/custom_part_dialogs.rb:846 msgid "" "\n" "Maximum volume label length for the selected file system\n" @@ -1593,62 +1612,62 @@ "enn %1. Volumbetegnelse ble forkortet til denne lengden.\n" #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:870 +#: src/include/partitioning/custom_part_dialogs.rb:869 msgid "Provide a volume label to mount by label." msgstr "Angi en volumbetegnelse for å montere med betegnelse." #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:881 +#: src/include/partitioning/custom_part_dialogs.rb:880 msgid "This volume label is already in use. Select a different one." msgstr "Denne volumbetegnelsen er allerede i bruk. Velg en annen." #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1050 +#: src/include/partitioning/custom_part_dialogs.rb:1046 msgid "File &System" msgstr "Fil&system" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1057 +#: src/include/partitioning/custom_part_dialogs.rb:1053 msgid "O&ptions..." msgstr "Va&lg..." #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1073 +#: src/include/partitioning/custom_part_dialogs.rb:1069 msgid "&Encrypt Device" msgstr "Krypt&eringsenhet" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1148 +#: src/include/partitioning/custom_part_dialogs.rb:1144 msgid "File system &ID:" msgstr "Filsystem-&ID:" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1180 +#: src/include/partitioning/custom_part_dialogs.rb:1176 msgid "Format" msgstr "Formater" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1190 +#: src/include/partitioning/custom_part_dialogs.rb:1186 msgid "Do ¬ format" msgstr "&Ikke formater" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1200 +#: src/include/partitioning/custom_part_dialogs.rb:1196 msgid "&Format" msgstr "&Formater" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1253 +#: src/include/partitioning/custom_part_dialogs.rb:1249 msgid "Fs&tab Options" msgstr "Fs&tab-alternativer" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1260 +#: src/include/partitioning/custom_part_dialogs.rb:1256 msgid "&Mount Point" msgstr "&Monteringspunkt" #. popup text %1 is a partition name, %2 a dirctory -#: src/include/partitioning/custom_part_dialogs.rb:1272 +#: src/include/partitioning/custom_part_dialogs.rb:1268 msgid "" "\n" "The selected partition (%1) is currently mounted on %2.\n" @@ -1673,7 +1692,7 @@ "Vil du fortsette?\n" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1301 +#: src/include/partitioning/custom_part_dialogs.rb:1297 msgid "" "\n" "The file system on the partition cannot be shrunk by YaST2.\n" @@ -1684,7 +1703,7 @@ "Bare fat, ext2, ext3, ext4 og reiser tillater krymping av filsystemet." #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1308 +#: src/include/partitioning/custom_part_dialogs.rb:1304 msgid "" "\n" "The file system on the logical volume cannot be shrunk by YaST2.\n" @@ -1695,21 +1714,21 @@ "Bare fat, ext2, ext3, ext4 og reiser tillater krymping av filsystemet." #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1320 +#: src/include/partitioning/custom_part_dialogs.rb:1316 msgid "You risk losing data if you shrink this partition." msgstr "Du risikerer å miste data hvis du krymper denne partisjonen." #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1326 +#: src/include/partitioning/custom_part_dialogs.rb:1322 msgid "You risk losing data if you shrink this logical volume." msgstr "Du risikerer å miste data hvis du krymper dette logiske volumet." -#: src/include/partitioning/custom_part_dialogs.rb:1330 +#: src/include/partitioning/custom_part_dialogs.rb:1326 msgid "Continue?" msgstr "Vil du fortsette?" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1346 +#: src/include/partitioning/custom_part_dialogs.rb:1342 msgid "" "\n" "The file system on the selected partition cannot be extended by YaST2.\n" @@ -1720,7 +1739,7 @@ "Bare fat, ext2, ext3, ext4, xfs og reiser tillater utvidelse av filsystemet." #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1353 +#: src/include/partitioning/custom_part_dialogs.rb:1349 msgid "" "\n" "The file system on the selected logical volume cannot be extended by YaST2.\n" @@ -1730,20 +1749,20 @@ "Filsystemet på det valgte logiske volumet kan ikke utvides av YaST2.\n" "Bare fat, ext2, ext3, ext4, xfs og reiser tillater utvidelse av filsystemet." -#: src/include/partitioning/custom_part_dialogs.rb:1361 +#: src/include/partitioning/custom_part_dialogs.rb:1357 msgid "Continue resizing?" msgstr "Vil du fortsette å endre størrelse?" #. Popup text -#: src/include/partitioning/custom_part_dialogs.rb:1378 +#: src/include/partitioning/custom_part_dialogs.rb:1374 msgid "You decreased a partition with a reiser file system on it." msgstr "Du har krympet en partisjon som inneholder et reiser-filsystem." -#: src/include/partitioning/custom_part_dialogs.rb:1380 +#: src/include/partitioning/custom_part_dialogs.rb:1376 msgid "You decreased a logical volume with a reiser file system on it." msgstr "Du har krympet et logisk volum som inneholder et reiser-filsystem." -#: src/include/partitioning/custom_part_dialogs.rb:1387 +#: src/include/partitioning/custom_part_dialogs.rb:1383 msgid "" "\n" "It is possible to shrink a reiser file system, but this feature is not\n" @@ -1758,7 +1777,7 @@ "Vil du krympe filsystemet nå?" #. popup text, %1 is replaced by device name -#: src/include/partitioning/custom_part_dialogs.rb:1441 +#: src/include/partitioning/custom_part_dialogs.rb:1437 msgid "" "The selected device contains partitions that are currently mounted:\n" "%1\n" @@ -1771,7 +1790,7 @@ "Velg Avbryt dersom du ikke vet nøyaktig hva du gjør.\n" #. popup text, Do not translate LVM. -#: src/include/partitioning/custom_part_dialogs.rb:1464 +#: src/include/partitioning/custom_part_dialogs.rb:1460 msgid "" "\n" "The selected device contains at least one LVM partition\n" @@ -1786,7 +1805,7 @@ "før du sletter enheten.\n" #. popup text, Do not translate RAID. -#: src/include/partitioning/custom_part_dialogs.rb:1475 +#: src/include/partitioning/custom_part_dialogs.rb:1471 msgid "" "\n" "The selected device contains at least one partition\n" @@ -1801,7 +1820,7 @@ "sletter enheten.\n" #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:1486 +#: src/include/partitioning/custom_part_dialogs.rb:1482 msgid "" "\n" "The selected device contains at least one partition\n" @@ -1814,7 +1833,7 @@ "før du sletter enheten.\n" #. help text, richtext format -#: src/include/partitioning/custom_part_dialogs.rb:1547 +#: src/include/partitioning/custom_part_dialogs.rb:1543 #, fuzzy #| msgid "" #| "<p>\n" @@ -1826,51 +1845,51 @@ "Opprett og fjern undervolumer \n" "i et Btrfs-filsystem.</p>\n" -#: src/include/partitioning/custom_part_dialogs.rb:1552 +#: src/include/partitioning/custom_part_dialogs.rb:1548 msgid "<p>Enable automatic snapshots for a Btrfs filesystem with snapper.</p>" msgstr "" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1566 +#: src/include/partitioning/custom_part_dialogs.rb:1562 msgid "Existing Subvolumes:" msgstr "Eksisterende undervolumer:" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1572 +#: src/include/partitioning/custom_part_dialogs.rb:1568 msgid "New Subvolume" msgstr "Nytt undervolum" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1578 +#: src/include/partitioning/custom_part_dialogs.rb:1574 msgid "Add new" msgstr "Legg til nytt" #. button text #. push button text -#: src/include/partitioning/custom_part_dialogs.rb:1584 +#: src/include/partitioning/custom_part_dialogs.rb:1580 #: src/modules/DualMultiSelectionBox.rb:147 msgid "Remove" msgstr "Fjern" #. TRANSLATOR: checkbox text #. TRANSLATORS: checkbox text -#: src/include/partitioning/custom_part_dialogs.rb:1596 +#: src/include/partitioning/custom_part_dialogs.rb:1592 #: src/modules/StorageProposal.rb:6226 msgid "Enable Snapshots" msgstr "" #. heading text #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1607 -#: src/include/partitioning/custom_part_lib.rb:420 +#: src/include/partitioning/custom_part_dialogs.rb:1603 +#: src/include/partitioning/custom_part_lib.rb:409 msgid "Subvolume Handling" msgstr "Behandling av undervolumer" -#: src/include/partitioning/custom_part_dialogs.rb:1670 +#: src/include/partitioning/custom_part_dialogs.rb:1666 msgid "Empty subvolume name not allowed." msgstr "Du må angi et navn på undervolumet." -#: src/include/partitioning/custom_part_dialogs.rb:1674 +#: 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." @@ -1878,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:1684 +#: 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:1713 +#: 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." @@ -2072,17 +2091,17 @@ "Du må merke alle partisjoner på denne disken for fjerning.\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:62 +#: src/include/partitioning/custom_part_lib.rb:51 msgid "You cannot use the mount point \"%1\" for LVM.\n" msgstr "Du kan ikke bruke monteringspunktet \"%1\" for LVM.\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:89 +#: src/include/partitioning/custom_part_lib.rb:78 msgid "You cannot use the mount point %1 for RAID." msgstr "Du kan ikke bruke monteringspunktet %1 for RAID." #. error popup text -#: src/include/partitioning/custom_part_lib.rb:108 +#: src/include/partitioning/custom_part_lib.rb:97 msgid "" "You have selected to not automatically mount at start-up a file system\n" "that may contain files that the system needs to work properly.\n" @@ -2099,7 +2118,7 @@ "Vil du virkelig gjøre dette?\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:131 +#: src/include/partitioning/custom_part_lib.rb:120 msgid "" "You have assigned an encrypted file system to a partition\n" "with one of the following mount points: \"/\", \"/usr\", \"/boot\",\n" @@ -2112,7 +2131,7 @@ " et filsystem uten loopback.\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:169 +#: src/include/partitioning/custom_part_lib.rb:158 msgid "" "You have set a file system as mountable by users. The file system\n" "may contain files that need to be executable.\n" @@ -2132,28 +2151,28 @@ #. @param [Hash{String => map}] targetMap the TargetMap #. @param mount mount point #. @return [Boolean] -#: src/include/partitioning/custom_part_lib.rb:216 +#: src/include/partitioning/custom_part_lib.rb:205 msgid "Mount point must not be empty." msgstr "Et monteringspunkt må angis." #. error popup -#: src/include/partitioning/custom_part_lib.rb:221 +#: src/include/partitioning/custom_part_lib.rb:210 msgid "Swap devices must have swap as mount point." msgstr "Veksleminneenheter må bruke swap som monteringspunkt." #. error popup -#: src/include/partitioning/custom_part_lib.rb:225 +#: src/include/partitioning/custom_part_lib.rb:214 msgid "Only swap devices may have swap as mount point." msgstr "Bare veksleminneenheter kan bruke swap som monteringspunkt." #. && mount!="swap" ) #. error popup text -#: src/include/partitioning/custom_part_lib.rb:240 +#: src/include/partitioning/custom_part_lib.rb:229 msgid "This mount point is already in use. Select a different one." msgstr "Monteringspunktet er i bruk. Velg et annet." #. error popup text -#: src/include/partitioning/custom_part_lib.rb:250 +#: src/include/partitioning/custom_part_lib.rb:239 msgid "" "FAT filesystem used for system mount point (/, /usr, /opt, /var, /home).\n" "This is not possible." @@ -2162,12 +2181,12 @@ "Dette er ikke mulig." #. error popup text -#: src/include/partitioning/custom_part_lib.rb:259 +#: src/include/partitioning/custom_part_lib.rb:248 msgid "Invalid character in mount point. Do not use \"`'!\"%#\" in a mount point." msgstr "Ugyldig tegn i monteringspunkt. Ikke bruk \"`'!\"%#\" for et monteringspunkt." #. error popup text -#: src/include/partitioning/custom_part_lib.rb:268 +#: src/include/partitioning/custom_part_lib.rb:257 msgid "" "You cannot use any of the following mount points:\n" "/bin, /dev, /etc, /lib, /lib64, /lost+found, /mnt, /proc, /sbin, /sys,\n" @@ -2178,12 +2197,12 @@ "/var/adm/mnt\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:277 +#: src/include/partitioning/custom_part_lib.rb:266 msgid "Your mount point must start with a \"/\" " msgstr "Monteringspunktet må begynne med \"/\" " #. error popup text -#: src/include/partitioning/custom_part_lib.rb:283 +#: src/include/partitioning/custom_part_lib.rb:272 #, fuzzy #| msgid "" #| "It is not allowed to assign a mount point\n" @@ -2197,7 +2216,7 @@ #. warning message, %1 is replaced by fs name (e.g. Ext3) #. %2 is prelaced by a size (e.g. 10 MB) -#: src/include/partitioning/custom_part_lib.rb:310 +#: src/include/partitioning/custom_part_lib.rb:299 msgid "" "Your partition is too small to use %1.\n" "The minimum size for this file system is %2.\n" @@ -2206,7 +2225,7 @@ "Minste størrelse for dette filsystemet er %2.\n" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:380 +#: src/include/partitioning/custom_part_lib.rb:369 msgid "" "It is not allowed to assign a mount point\n" "to a device with nonexistent or unknown file system." @@ -2215,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:502 +#: src/include/partitioning/custom_part_lib.rb:491 msgid "" "\n" "WARNING:\n" @@ -2239,12 +2258,12 @@ #. ////////////////////////////////////////////// #. modify map new -#: src/include/partitioning/custom_part_lib.rb:948 -#: src/include/partitioning/custom_part_lib.rb:975 +#: 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:953 +#: 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." @@ -2254,12 +2273,12 @@ #. button text #. button text -#: src/include/partitioning/custom_part_lib.rb:964 -#: src/include/partitioning/custom_part_lib.rb:989 +#: 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:980 +#: 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." @@ -2267,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:1026 +#: 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:1039 +#: 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:1050 +#: 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." @@ -3243,7 +3262,7 @@ #. error popup #. TRANSLATORS: error popup -#: src/include/partitioning/ep-hd-lib.rb:51 src/modules/Storage.rb:5211 +#: 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." @@ -3747,18 +3766,30 @@ msgid "<p>No changes to partitioning.</p>" msgstr "<p>Ingen endringer i partisjoneringen.</p>" -#: src/include/partitioning/ep-lib.rb:485 +#: 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:490 +#: 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:493 +#: src/include/partitioning/ep-lib.rb:489 msgid "<p>Storage settings:</p>" msgstr "<p>Lagringsinnstillinger:</p>" +#: 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:500 +#, fuzzy +#| msgid "<p>No changes to storage settings.</p>" +msgid "<p>No packages need to be installed.</p>" +msgstr "<p>Ingen endringer i lagringsinnstillingene.</p>" + #. heading #. tree node label #: src/include/partitioning/ep-log.rb:43 @@ -5896,7 +5927,7 @@ #. @param integer testsize #. @param [Symbol] used_fs #. @param [Boolean] verbose -#: src/modules/Storage.rb:991 +#: src/modules/Storage.rb:992 msgid "Resize Not Possible:" msgstr "Størrelsen kunne ikke endres:" @@ -5909,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:2691 src/modules/Storage.rb:3914 +#: src/modules/Storage.rb:2692 src/modules/Storage.rb:3915 msgid "" "Could not set encryption.\n" "System error code is %1.\n" @@ -5922,7 +5953,7 @@ "Et ugyldig krypteringspassord er kanskje angitt.\n" #. popup text -#: src/modules/Storage.rb:3945 +#: src/modules/Storage.rb:3946 msgid "" "The first and the second version\n" "of the password do not match.\n" @@ -5933,7 +5964,7 @@ "Prøv igjen." #. popup text -#: src/modules/Storage.rb:3976 +#: 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" @@ -5945,24 +5976,24 @@ #. Label: get password for encrypted volume #. Please use newline if label is longer than 40 characters -#: src/modules/Storage.rb:4030 +#: src/modules/Storage.rb:4031 msgid "&Enter Encryption Password:" msgstr "Angi krypt&eringspassord" #. Clear password fields on every round. -#: src/modules/Storage.rb:4089 +#: src/modules/Storage.rb:4090 msgid "Provide Password" msgstr "Angi et passord" -#: src/modules/Storage.rb:4108 +#: 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:4123 +#: src/modules/Storage.rb:4124 msgid "Encrypted Volume Activation" msgstr "Aktivering av krypterte volumer" -#: src/modules/Storage.rb:4127 +#: src/modules/Storage.rb:4128 msgid "" "The following volumes contain an encryption signature but the \n" "passwords are not yet known.\n" @@ -5974,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:4139 +#: 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:4196 +#: src/modules/Storage.rb:4197 msgid "" "Enter encryption password for any of the\n" "devices in the locked devices list.\n" @@ -5990,54 +6021,65 @@ "Passordet vil bli forsøkt for alle enhetene." #. header text -#: src/modules/Storage.rb:4202 +#: src/modules/Storage.rb:4203 msgid "Enter Encryption Password" msgstr "Angi krypteringspassord" -#: src/modules/Storage.rb:4205 +#: 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:4218 +#: 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:4221 +#: src/modules/Storage.rb:4222 msgid "Provide password for the following device:" msgstr "Angi passordet for følgende enhet:" -#: src/modules/Storage.rb:4234 +#: src/modules/Storage.rb:4235 msgid "Trying to unlock encrypted volumes..." msgstr "Forsøker å låse opp krypterte volumer..." -#: src/modules/Storage.rb:4258 +#: src/modules/Storage.rb:4259 msgid "Password did not unlock any volume." msgstr "Passordet låste ikke opp noe volum." -#: src/modules/Storage.rb:4344 +#: src/modules/Storage.rb:4345 msgid "IDE Disk" msgstr "IDE-disk" -#: src/modules/Storage.rb:4350 +#: src/modules/Storage.rb:4351 msgid "SCSI Disk" msgstr "SCSI-disk" -#: src/modules/Storage.rb:4356 +#: src/modules/Storage.rb:4357 msgid "Disk" msgstr "Disk" -#: src/modules/Storage.rb:4384 +#: src/modules/Storage.rb:4385 msgid "DM RAID" msgstr "DM RAID" -#: src/modules/Storage.rb:4397 +#: 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:5223 +#: src/modules/Storage.rb:4893 +msgid "Installing required packages failed." +msgstr "" + +#: 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:5252 #, fuzzy #| msgid "" #| "\n" @@ -6049,7 +6091,7 @@ "Partisjonen %1 kan ikke fjernes fordi andre partisjoner på\n" "disken %2 er i bruk.\n" -#: src/modules/Storage.rb:5249 +#: src/modules/Storage.rb:5278 msgid "" "\n" "Device %1 cannot be modified because it contains activated swap\n" @@ -6059,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:5263 +#: src/modules/Storage.rb:5292 msgid "" "\n" "Device %1 cannot be modified because it contains the installation\n" @@ -6069,7 +6111,7 @@ "Enheten %1 kan ikke endres fordi den inneholder installasjonsdata\n" "som er nødvendig for installasjonen.\n" -#: src/modules/Storage.rb:5292 +#: src/modules/Storage.rb:5321 msgid "" "\n" "Device %1 cannot be removed because it contains activated swap\n" @@ -6079,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:5301 +#: src/modules/Storage.rb:5330 msgid "" "\n" "Device %1 cannot be removed because it contains the installation\n" @@ -6089,7 +6131,7 @@ "Enheten %1 kan ikke fjernes fordi den inneholder installasjonsdata\n" "som er nødvendig for installasjonen.\n" -#: src/modules/Storage.rb:5330 +#: src/modules/Storage.rb:5359 msgid "" "\n" "Device %1 cannot be removed because this would indirectly change\n" @@ -6101,7 +6143,7 @@ "%2, som benyttes som vekselminne, og er nødvendig for å kjøre\n" "installasjonen.\n" -#: src/modules/Storage.rb:5341 +#: src/modules/Storage.rb:5370 msgid "" "\n" "Device %1 cannot be removed because this would indirectly change\n" @@ -6113,7 +6155,7 @@ "installasjonen.\n" #. the check for verbose is needed for calls from StorageProposal (see bnc#871779) -#: src/modules/Storage.rb:5363 +#: src/modules/Storage.rb:5392 msgid "" "\n" "Partition %1 cannot be removed since other partitions on the\n" @@ -6124,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:5452 +#: src/modules/Storage.rb:5481 msgid "Nothing assigned as root filesystem!" msgstr "Det er ikke tilordnet noe rotfilsystem!" -#: src/modules/Storage.rb:5453 +#: 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:6003 +#: src/modules/Storage.rb:6032 msgid "Adding the following resolvables failed: %1" msgstr "Følgende kunn ikke legges til for å løse konflikter: %1" @@ -6148,10 +6190,6 @@ msgid "System error code was: %1" msgstr "Systemfeilmeldingen var: %1" -#: src/modules/StorageClients.rb:159 -msgid "Continue despite the error?" -msgstr "Vil du fortsette til tross for feilen?" - #. Label: get password for device #. Please use newline if label is longer than 40 characters #: src/modules/StorageClients.rb:199 Modified: trunk/yast/nb/po/vpn.nb.po =================================================================== --- trunk/yast/nb/po/vpn.nb.po 2015-10-01 11:24:53 UTC (rev 92960) +++ trunk/yast/nb/po/vpn.nb.po 2015-10-01 11:24:54 UTC (rev 92961) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-25 18:37+0200\n" +"POT-Creation-Date: 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" @@ -208,36 +208,43 @@ msgid "Client - Certificate" msgstr "&Klientsertifikat" +#. Load parameters from connections of known scenarios +#: src/lib/vpn/ipsec.rb:239 +msgid "" +"ipsec.conf and ipsec.secrets have been manipulated outside of this module.\n" +"Continue using the module will remove your customisation." +msgstr "" + #. Create a new connection, by default it is a site-to-site client. Return true if successful. -#: src/lib/vpn/ipsec.rb:303 +#: src/lib/vpn/ipsec.rb:310 #, fuzzy #| msgid "Configuration name '%1' is already in use" msgid "The connection name is already used." msgstr "Konfigurasjonsnavnet %1 er allerede i bruk" #. Find an unused gateway scenario -#: src/lib/vpn/ipsec.rb:320 +#: src/lib/vpn/ipsec.rb:327 msgid "" "You may only have one gateway connection per scenario.\n" "All of gateway scenarios are already used." msgstr "" #. Warn against duplicated configuration -#: src/lib/vpn/ipsec.rb:337 +#: src/lib/vpn/ipsec.rb:344 msgid "" "The scenario is already configured with another gateway.\n" "You may not have two gateways operating under one scenario." msgstr "" #. Create the user (:xauth or :eap). Return true if successful. -#: src/lib/vpn/ipsec.rb:432 +#: 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:496 +#: src/lib/vpn/ipsec.rb:503 msgid "Cannot find a matching client connection." msgstr ""