[opensuse-translation-commit] r92991 - trunk/yast/en_US/po

Author: keichwa Date: 2015-10-01 13:25:25 +0200 (Thu, 01 Oct 2015) New Revision: 92991 Modified: trunk/yast/en_US/po/autoinst.en_US.po trunk/yast/en_US/po/bootloader.en_US.po trunk/yast/en_US/po/crowbar.en_US.po trunk/yast/en_US/po/kdump.en_US.po trunk/yast/en_US/po/ncurses-pkg.en_US.po trunk/yast/en_US/po/qt-pkg.en_US.po trunk/yast/en_US/po/registration.en_US.po trunk/yast/en_US/po/storage.en_US.po trunk/yast/en_US/po/vpn.en_US.po Log: merged Modified: trunk/yast/en_US/po/autoinst.en_US.po =================================================================== --- trunk/yast/en_US/po/autoinst.en_US.po 2015-10-01 11:25:25 UTC (rev 92990) +++ trunk/yast/en_US/po/autoinst.en_US.po 2015-10-01 11:25:25 UTC (rev 92991) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xPACKAGE VERSION\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: 2007-08-14 15:56+0200\n" "Last-Translator: xFULL NAME \n" "Language-Team: xLANGUAGE \n" @@ -30,7 +30,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 "" @@ -52,12 +52,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 "" @@ -490,82 +490,94 @@ #. 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 "" -#: 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 "" -#: 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 "" -#: 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 "" -#: src/clients/inst_autosetup.rb:57 +#: src/clients/inst_autosetup.rb:60 msgid "Create partition plans" msgstr "" -#: 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 "" -#: 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 "Registration" -#: 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 "" -#: src/clients/inst_autosetup.rb:61 +#: src/clients/inst_autosetup.rb:64 msgid "Configure Systemd Default Target" msgstr "" -#: src/clients/inst_autosetup.rb:65 src/clients/inst_autosetup_upgrade.rb:61 +#: src/clients/inst_autosetup.rb:65 +msgid "Configure users and groups" +msgstr "" + +#: src/clients/inst_autosetup.rb:69 src/clients/inst_autosetup_upgrade.rb:61 msgid "Executing pre-install user scripts..." msgstr "" -#: 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 "" -#: 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 #, fuzzy #| msgid "Creating ISO image..." msgid "Setting up language..." msgstr "Creating ISO image..." -#: src/clients/inst_autosetup.rb:68 +#: src/clients/inst_autosetup.rb:72 msgid "Creating partition plans..." msgstr "" -#: 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 "" -#: 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 msgid "Registering the system..." msgstr "" -#: 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 "" -#: src/clients/inst_autosetup.rb:72 +#: src/clients/inst_autosetup.rb:76 msgid "Configuring Systemd Default Target..." msgstr "" -#: 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 "" -#. 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 #, fuzzy #| msgid "Signing the Add-On Product" msgid "Handling Add-On Products..." @@ -574,19 +586,19 @@ #. 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 "" #. 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" msgstr "" #. Software -#: src/clients/inst_autosetup.rb:331 +#: src/clients/inst_autosetup.rb:344 msgid "" "Error while configuring software selections.\n" "Try again.\n" @@ -1519,7 +1531,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 #, fuzzy msgid "Checking XML with RNG validation..." msgstr "Checking XML without validation..." @@ -1531,7 +1543,7 @@ msgstr "Xen Section" #. 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 #, fuzzy msgid "Checking XML with RNC validation..." msgstr "Checking XML without validation..." @@ -2150,7 +2162,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 "" @@ -2615,14 +2627,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 "" #. 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 "" @@ -2630,7 +2642,7 @@ #. #. @param [String] dir - directory to store section xml files in #. @return - list of filenames -#: src/modules/Profile.rb:536 +#: src/modules/Profile.rb:528 #, fuzzy msgid "Could not write section %1 to file %2." msgstr "Cannot write content file." @@ -2638,7 +2650,7 @@ #. 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 "" Modified: trunk/yast/en_US/po/bootloader.en_US.po =================================================================== --- trunk/yast/en_US/po/bootloader.en_US.po 2015-10-01 11:25:25 UTC (rev 92990) +++ trunk/yast/en_US/po/bootloader.en_US.po 2015-10-01 11:25:25 UTC (rev 92991) @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: xPACKAGE VERSION\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: 2007-08-16 10:24+0200\n" "Last-Translator: xFULL NAME \n" "Language-Team: xLANGUAGE \n" @@ -401,7 +401,7 @@ msgstr "" #. Title in tab -#: src/include/bootloader/grub2/dialogs.rb:56 +#: src/include/bootloader/grub2/dialogs.rb:57 #, fuzzy msgid "Boot Code Options" msgstr "Boot Loader Locations" @@ -477,31 +477,21 @@ 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 #, fuzzy msgid "O&ptional Kernel Command Line Parameter" msgstr "Optional Kernel Command Line Parameter" -#: src/include/bootloader/grub2/helps.rb:42 +#: src/include/bootloader/grub2/helps.rb:39 #, fuzzy -#| msgid "Distribution ID" -msgid "D&istributor" -msgstr "Distribution ID" - -#: src/include/bootloader/grub2/helps.rb:43 -#, fuzzy msgid "&Vga Mode" msgstr "Vga Mode" -#: src/include/bootloader/grub2/helps.rb:44 +#: src/include/bootloader/grub2/helps.rb:40 msgid "Probe Foreign OS" msgstr "" -#: src/include/bootloader/grub2/helps.rb:45 +#: src/include/bootloader/grub2/helps.rb:41 msgid "Protective MBR flag" msgstr "" @@ -592,7 +582,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 "" @@ -914,7 +904,7 @@ "Menu sections represent a list of tasks which are grouped together</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 "" @@ -1089,55 +1079,55 @@ msgstr "" #. 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 "" #. 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 "" #. FATE#303643 Enable one-click changes in bootloader proposal #. -#: src/modules/BootGRUB2.rb:194 +#: src/modules/BootGRUB2.rb:168 #, fuzzy msgid "Install bootcode into MBR (do not install</a>)" msgstr "Firewall is enabled (disable</a>)" -#: src/modules/BootGRUB2.rb:198 +#: src/modules/BootGRUB2.rb:172 #, fuzzy msgid "Do not install bootcode into MBR (install</a>)" msgstr "Firewall is disabled (enable</a>)" #. check for separated boot partition, use root otherwise -#: src/modules/BootGRUB2.rb:211 +#: src/modules/BootGRUB2.rb:185 #, fuzzy msgid "Install bootcode into /boot partition (do not install</a>)" msgstr "Firewall is enabled (disable</a>)" -#: src/modules/BootGRUB2.rb:215 +#: src/modules/BootGRUB2.rb:189 #, fuzzy msgid "Do not install bootcode into /boot partition (install</a>)" msgstr "Firewall is enabled (disable</a>)" -#: src/modules/BootGRUB2.rb:221 +#: src/modules/BootGRUB2.rb:195 #, fuzzy msgid "Install bootcode into \"/\" partition (do not install</a>)" msgstr "Firewall is enabled (disable</a>)" -#: src/modules/BootGRUB2.rb:225 +#: src/modules/BootGRUB2.rb:199 #, fuzzy msgid "Do not install bootcode into \"/\" partition (install</a>)" msgstr "Firewall is disabled (enable</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: %s" msgstr "Boot Image Location" @@ -1146,22 +1136,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 "" #. TRANSLATORS: extended is here for extended partition. Keep translation short. -#: src/modules/BootGRUB2.rb:263 +#: src/modules/BootGRUB2.rb:237 msgid " (extended)" msgstr "" #. TRANSLATORS: MBR is acronym for Master Boot Record, if nothing locally specific #. is used in your language, then keep it as it is. -#: src/modules/BootGRUB2.rb:271 +#: src/modules/BootGRUB2.rb:245 msgid " (MBR)" msgstr "" -#: src/modules/BootGRUB2.rb:278 +#: src/modules/BootGRUB2.rb:252 msgid "Status Location: %1" msgstr "" @@ -1198,84 +1188,98 @@ msgstr "" #. 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 "" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:146 +#: src/modules/Bootloader.rb:148 msgid "Read partitioning" msgstr "" #. progress stage, text in dialog (short, infinitiv) -#: src/modules/Bootloader.rb:148 +#: src/modules/Bootloader.rb:150 #, fuzzy msgid "Load boot loader settings" msgstr "Boot Loader Locations" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:152 +#: src/modules/Bootloader.rb:154 msgid "Checking boot loader..." msgstr "" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:154 +#: src/modules/Bootloader.rb:156 msgid "Reading partitioning..." msgstr "" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:156 +#: src/modules/Bootloader.rb:158 msgid "Loading boot loader settings..." msgstr "" #. dialog header -#: src/modules/Bootloader.rb:160 +#: src/modules/Bootloader.rb:162 #, fuzzy msgid "Initializing Boot Loader Configuration" msgstr "Boot Loader Locations" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:279 +#: src/modules/Bootloader.rb:281 msgid "Create initrd" msgstr "" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:281 +#: src/modules/Bootloader.rb:283 msgid "Save boot loader configuration files" msgstr "" #. progress stage, text in dialog (short) -#: src/modules/Bootloader.rb:283 +#: src/modules/Bootloader.rb:285 msgid "Install boot loader" msgstr "" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:287 +#: src/modules/Bootloader.rb:289 msgid "Creating initrd..." msgstr "" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:289 +#: src/modules/Bootloader.rb:291 msgid "Saving boot loader configuration files..." msgstr "" #. progress step, text in dialog (short) -#: src/modules/Bootloader.rb:291 +#: src/modules/Bootloader.rb:293 msgid "Installing boot loader..." msgstr "" #. progress line -#: src/modules/Bootloader.rb:297 +#: src/modules/Bootloader.rb:299 #, fuzzy msgid "Saving Boot Loader Configuration" msgstr "Boot Loader Locations" #, fuzzy +#~| msgid "Distribution ID" +#~ msgid "D&istributor" +#~ msgstr "Distribution ID" + +#, fuzzy #~ msgid "<p><b>Failsafe Kernel Command Line Parameter</b> lets you define failsafe parameters to pass to the kernel.</p>" #~ msgstr "<p><b>Optional Kernel Command Line Parameter</b> lets you define additional parameters to pass to the kernel.</p>" Modified: trunk/yast/en_US/po/crowbar.en_US.po =================================================================== --- trunk/yast/en_US/po/crowbar.en_US.po 2015-10-01 11:25:25 UTC (rev 92990) +++ trunk/yast/en_US/po/crowbar.en_US.po 2015-10-01 11:25:25 UTC (rev 92991) @@ -6,7 +6,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-07-18 14:04+0200\n" "Last-Translator: proofreader \n" "Language-Team: English \n" @@ -431,7 +431,7 @@ #. popup message %1 is FQDN #: src/include/crowbar/complex.rb:1731 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/" @@ -481,7 +481,7 @@ #: src/include/crowbar/helps.rb:49 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/en_US/po/kdump.en_US.po =================================================================== --- trunk/yast/en_US/po/kdump.en_US.po 2015-10-01 11:25:25 UTC (rev 92990) +++ trunk/yast/en_US/po/kdump.en_US.po 2015-10-01 11:25:25 UTC (rev 92991) @@ -6,7 +6,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-07-18 14:04+0200\n" "Last-Translator: proofreader \n" "Language-Team: English \n" @@ -315,11 +315,11 @@ msgid "Kdump immediate reboots: %1" msgstr "" -#: src/clients/kdump.rb:652 src/clients/kdump.rb:1259 +#: src/clients/kdump.rb:652 src/clients/kdump.rb:1262 msgid "Enabled" msgstr "" -#: src/clients/kdump.rb:653 src/clients/kdump.rb:1260 +#: src/clients/kdump.rb:653 src/clients/kdump.rb:1263 msgid "Disabled" msgstr "" @@ -360,14 +360,17 @@ #. TRANSLATORS: CommandLine printed text #: src/clients/kdump.rb:747 -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 "" +#. 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 #, fuzzy msgid "To apply changes a reboot is necessary." msgstr "To apply this change a reboot is needed." @@ -387,40 +390,40 @@ #. 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 #, fuzzy msgid "Wrong options were used." msgstr "Wrong options were used." #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:778 +#: src/clients/kdump.rb:781 msgid "Dump level was set." msgstr "" #. 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 "" #. TRANSLATORS: CommandLine printed text -#: src/clients/kdump.rb:803 +#: src/clients/kdump.rb:806 msgid "Dump format was set." msgstr "" #. TRANSLATORS: CommandLine printed text help -#: src/clients/kdump.rb:810 +#: src/clients/kdump.rb:813 msgid "Option can include only \"none\", \"ELF\", \"compressed\" or \"lzo\" value." msgstr "" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:830 +#: src/clients/kdump.rb:833 #, fuzzy msgid "File %1 does not exist." msgstr "File %1 does not exist." @@ -429,8 +432,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 "" @@ -438,52 +441,52 @@ #. 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 "" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:995 +#: src/clients/kdump.rb:998 msgid "Value for \"share\" missing." msgstr "" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1037 +#: src/clients/kdump.rb:1040 msgid "Wrong value for target." msgstr "" #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1148 +#: src/clients/kdump.rb:1151 #, fuzzy msgid "Wrong value of options \"no\"." msgstr "Wrong value of options \"raw\". Partition does not exist." #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1168 +#: src/clients/kdump.rb:1171 #, fuzzy msgid "Wrong value for option \"server\"." msgstr "Wrong value of options \"raw\". Partition does not exist." #. TRANSLATORS: CommandLine error message -#: src/clients/kdump.rb:1188 +#: src/clients/kdump.rb:1191 #, fuzzy msgid "Wrong value for option \"user\"." msgstr "Wrong value of options \"raw\". Partition does not exist." #. 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 #, fuzzy msgid "Wrong value for option \"email\"." msgstr "Wrong value of options \"raw\". Partition does not exist." -#: 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 "No option has been defined." msgstr "Wrong options were used." @@ -505,111 +508,98 @@ msgstr "" #. TRANSLATORS: RadioButtonGroup Label -#: src/include/kdump/dialogs.rb:53 +#: src/include/kdump/dialogs.rb:57 msgid "Enable/Disable Kdump" msgstr "" -#: src/include/kdump/dialogs.rb:58 +#: src/include/kdump/dialogs.rb:62 msgid "Enable Kd&ump" msgstr "" -#: src/include/kdump/dialogs.rb:59 +#: src/include/kdump/dialogs.rb:63 msgid "&Disable Kdump" msgstr "" -#. "handle" : HandleEnableDisalbeKdump, -#: src/include/kdump/dialogs.rb:79 -msgid "Total System Memory [MB]:" -msgstr "" - -#: src/include/kdump/dialogs.rb:86 -msgid "Usable Memory [MB]:" -msgstr "" - -#: src/include/kdump/dialogs.rb:95 -msgid "Kdump Memor&y [MB]" -msgstr "" - #. ---------============ Dump Filtering screen=============------------ -#: src/include/kdump/dialogs.rb:134 +#: src/include/kdump/dialogs.rb:111 msgid "Include in Dumping" msgstr "" -#: src/include/kdump/dialogs.rb:141 +#: src/include/kdump/dialogs.rb:118 msgid "&Pages Filled with Zero" msgstr "" #. `VStretch () -#: src/include/kdump/dialogs.rb:147 +#: src/include/kdump/dialogs.rb:124 msgid "Cach&e Pages" msgstr "" -#: src/include/kdump/dialogs.rb:157 +#: src/include/kdump/dialogs.rb:134 #, fuzzy msgid "Cache Priva&te Pages" msgstr "GPG Private Keys" -#: src/include/kdump/dialogs.rb:162 +#: src/include/kdump/dialogs.rb:139 msgid "&User Data Pages" msgstr "" -#: src/include/kdump/dialogs.rb:163 +#: src/include/kdump/dialogs.rb:140 msgid "&Free Pages" msgstr "" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:191 +#: src/include/kdump/dialogs.rb:168 msgid "&Dump Format" msgstr "" -#: src/include/kdump/dialogs.rb:194 +#: src/include/kdump/dialogs.rb:171 msgid "&No Dump" msgstr "" -#: src/include/kdump/dialogs.rb:195 +#: src/include/kdump/dialogs.rb:172 msgid "&ELF Format" msgstr "" -#: src/include/kdump/dialogs.rb:196 +#: src/include/kdump/dialogs.rb:173 msgid "C&ompressed Format" msgstr "" -#: src/include/kdump/dialogs.rb:197 +#: src/include/kdump/dialogs.rb:174 msgid "&LZO Compressed Format" msgstr "" #. ---------============ Dump Target screen=============------------ -#: src/include/kdump/dialogs.rb:217 +#: src/include/kdump/dialogs.rb:194 msgid "&Select Target" msgstr "" -#: src/include/kdump/dialogs.rb:221 +#: src/include/kdump/dialogs.rb:198 #, fuzzy msgid "Local Directory" msgstr "Input Directory" -#: 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 "" -#: src/include/kdump/dialogs.rb:223 +#: src/include/kdump/dialogs.rb:200 msgid "SSH" msgstr "" -#: 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 "" -#: 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 "" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:251 +#: src/include/kdump/dialogs.rb:228 #, fuzzy msgid "&SMTP Server" msgstr "NTP Server Address" @@ -618,7 +608,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 "" @@ -627,122 +617,142 @@ #. 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 "" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:287 +#: src/include/kdump/dialogs.rb:264 #, fuzzy msgid "Notification &To" msgstr "Deletion Notification" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:303 +#: src/include/kdump/dialogs.rb:280 #, fuzzy msgid "Notifica&tion CC" msgstr "Deletion Notification" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:320 +#: src/include/kdump/dialogs.rb:297 msgid "Custom Kdump &Kernel" msgstr "" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:332 +#: src/include/kdump/dialogs.rb:309 msgid "Kdump Co&mmand Line" msgstr "" #. TRANSLATORS: TextEntry Label -#: src/include/kdump/dialogs.rb:344 +#: src/include/kdump/dialogs.rb:321 msgid "Kdump Command &Line Append" msgstr "" #. TRANSLATORS: CheckBox Label -#: src/include/kdump/dialogs.rb:361 +#: src/include/kdump/dialogs.rb:338 msgid "&Enable Immediate Reboot After Saving the Core" msgstr "" #. 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 "" #. TRANSLATORS: CheckBox Label -#: src/include/kdump/dialogs.rb:389 +#: src/include/kdump/dialogs.rb:366 msgid "Enable &Delete Old Dump Images" msgstr "" #. TRANSLATORS: IntField Label -#: src/include/kdump/dialogs.rb:406 +#: src/include/kdump/dialogs.rb:383 msgid "N&umber of Old Dumps" msgstr "" #. "handle" : -#: src/include/kdump/dialogs.rb:427 +#: src/include/kdump/dialogs.rb:408 msgid "Kdump Memory" msgstr "" -#: src/include/kdump/dialogs.rb:432 +#: src/include/kdump/dialogs.rb:413 msgid "Kdump Start-Up" msgstr "" -#: src/include/kdump/dialogs.rb:433 +#: src/include/kdump/dialogs.rb:414 msgid "Start-Up" msgstr "" -#: src/include/kdump/dialogs.rb:448 +#: src/include/kdump/dialogs.rb:429 msgid "Kdump - Dump Filtering" msgstr "" -#: src/include/kdump/dialogs.rb:449 +#: src/include/kdump/dialogs.rb:430 msgid "Dump Filtering" msgstr "" -#: src/include/kdump/dialogs.rb:455 +#: src/include/kdump/dialogs.rb:436 msgid "Saving Target for Kdump Image" msgstr "" -#: 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 "" -#: src/include/kdump/dialogs.rb:469 +#: src/include/kdump/dialogs.rb:450 #, fuzzy msgid "SMTP Server" msgstr "NTP Server Address" -#: src/include/kdump/dialogs.rb:479 +#: src/include/kdump/dialogs.rb:460 msgid "Notification Email Addresses" msgstr "" -#: src/include/kdump/dialogs.rb:487 src/include/kdump/dialogs.rb:488 +#: src/include/kdump/dialogs.rb:468 src/include/kdump/dialogs.rb:469 #, fuzzy msgid "Email Notification" msgstr "Deletion Notification" -#: src/include/kdump/dialogs.rb:501 +#: src/include/kdump/dialogs.rb:482 msgid "Custom Kernel for Kdump" msgstr "" -#: src/include/kdump/dialogs.rb:506 +#: src/include/kdump/dialogs.rb:487 msgid "Command Line" msgstr "" -#: src/include/kdump/dialogs.rb:514 +#: src/include/kdump/dialogs.rb:495 #, fuzzy msgid "Dump Settings" msgstr "Output Settings" -#: src/include/kdump/dialogs.rb:527 +#: src/include/kdump/dialogs.rb:508 msgid "Kdump Expert Settings" msgstr "" -#: src/include/kdump/dialogs.rb:528 +#: src/include/kdump/dialogs.rb:509 msgid "Expert Settings" msgstr "" +#: src/include/kdump/dialogs.rb:529 +msgid "Kdump &Low Memory [MiB]" +msgstr "" + +#: src/include/kdump/dialogs.rb:531 +msgid "Kdump Memor&y [MiB]" +msgstr "" + +#: src/include/kdump/dialogs.rb:537 +msgid "Total System Memory [MiB]:" +msgstr "" + +#: src/include/kdump/dialogs.rb:544 +msgid "Usable Memory [MiB]:" +msgstr "" + +#: src/include/kdump/dialogs.rb:567 +msgid "Kdump &High Memory [MiB]" +msgstr "" + #. Enable/Disable Kdump - RadioButtons 1/1 #: src/include/kdump/helps.rb:36 #, fuzzy @@ -1167,148 +1177,152 @@ #. 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 +msgid "Kernel option includes several ranges or redundant values. Rewrite it?" msgstr "" #. 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 "" #. 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 "" #. Progress stage 3/4 -#: src/modules/Kdump.rb:616 +#: src/modules/Kdump.rb:525 #, fuzzy msgid "Reading kernel boot options..." msgstr "Reading the firewall status..." #. Progress stage 4/4 -#. Progress finished 3/4 -#: src/modules/Kdump.rb:618 src/modules/Kdump.rb:626 -msgid "Reading available memory..." +#: 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 "" +#. Progress finished 3/4 +#: src/modules/Kdump.rb:535 +msgid "Reading available memory and calibrating usage..." +msgstr "" + #. Error message -#: src/modules/Kdump.rb:638 +#: src/modules/Kdump.rb:547 msgid "Cannot read config file /etc/sysconfig/kdump" msgstr "" #. Error message -#: src/modules/Kdump.rb:646 +#: src/modules/Kdump.rb:555 #, fuzzy msgid "Cannot read kernel boot options." msgstr "Cannot read firewall status." #. Error message -#: src/modules/Kdump.rb:653 +#: src/modules/Kdump.rb:563 msgid "Cannot read available memory." msgstr "" #. Kdump read dialog caption -#: src/modules/Kdump.rb:679 +#: src/modules/Kdump.rb:589 #, fuzzy msgid "Saving kdump Configuration" msgstr "Configure Online Update" #. Progress stage 1/2 -#: src/modules/Kdump.rb:708 +#: src/modules/Kdump.rb:618 msgid "Write the settings" msgstr "" #. Progress stage 2/2 -#: src/modules/Kdump.rb:710 +#: src/modules/Kdump.rb:620 #, fuzzy msgid "Update boot options" msgstr "Configure Online Update" #. Progress step 1/2 -#: src/modules/Kdump.rb:714 +#: src/modules/Kdump.rb:624 msgid "Writing the settings..." msgstr "" #. Progress step 2/2 -#: src/modules/Kdump.rb:716 +#: src/modules/Kdump.rb:626 msgid "Updating boot options..." msgstr "" #. Progress finished -#: src/modules/Kdump.rb:718 +#: src/modules/Kdump.rb:628 msgid "Finished" msgstr "" #. Error message -#: src/modules/Kdump.rb:728 +#: src/modules/Kdump.rb:638 msgid "Cannot write settings." msgstr "" #. Error message -#: src/modules/Kdump.rb:737 +#: src/modules/Kdump.rb:647 msgid "Adding crashkernel parameter to bootloader fault." msgstr "" -#. 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 "" -#: src/modules/Kdump.rb:852 +#: src/modules/Kdump.rb:759 msgid "enabled" msgstr "" -#: src/modules/Kdump.rb:852 +#: src/modules/Kdump.rb:759 msgid "disabled" msgstr "" -#: src/modules/Kdump.rb:859 -msgid "Value of crashkernel option: %1" +#: src/modules/Kdump.rb:766 +msgid "Value(s) of crashkernel option: %1" msgstr "" -#: src/modules/Kdump.rb:866 +#: src/modules/Kdump.rb:773 msgid "Dump format: %1" msgstr "" -#: src/modules/Kdump.rb:873 +#: src/modules/Kdump.rb:780 msgid "Target of dumps: %1" msgstr "" -#: src/modules/Kdump.rb:880 +#: src/modules/Kdump.rb:787 msgid "Number of dumps: %1" msgstr "" #. 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/en_US/po/ncurses-pkg.en_US.po =================================================================== --- trunk/yast/en_US/po/ncurses-pkg.en_US.po 2015-10-01 11:25:25 UTC (rev 92990) +++ trunk/yast/en_US/po/ncurses-pkg.en_US.po 2015-10-01 11:25:25 UTC (rev 92991) @@ -6,7 +6,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-07-18 14:04+0200\n" "Last-Translator: proofreader \n" "Language-Team: English \n" @@ -84,14 +84,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 "" #. 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 "" @@ -1072,36 +1072,42 @@ msgid "&OK" msgstr "" +#. begin: the label of the Contiunue button +#: src/NCPkgStrings.cc:684 +#, fuzzy +msgid "C&ontinue" +msgstr "CASA Configuration" + #. the label of the Yes button -#: src/NCPkgStrings.cc:691 +#: src/NCPkgStrings.cc:698 msgid "&Yes" msgstr "" #. the label of the No button -#: src/NCPkgStrings.cc:705 +#: src/NCPkgStrings.cc:712 msgid "&No" msgstr "" #. 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 "" #. text for a Notify popup -#: src/NCPkgStrings.cc:721 +#: src/NCPkgStrings.cc:728 #, fuzzy #| msgid "<p>All changes in package, patch or pattern selection will be lost.<br>Really exit?</p>" msgid "<p>All changes in the package, patch or pattern selection will be lost.<br>Really exit?</p>" msgstr "<p>All changes in the package, patch or pattern selection will be lost.<br>Really exit?</p>" #. the label of language table -#: src/NCPkgStrings.cc:729 +#: src/NCPkgStrings.cc:736 msgid "Available Languages" msgstr "" #. the label of language table -#: src/NCPkgStrings.cc:736 +#: src/NCPkgStrings.cc:743 #, fuzzy msgid "Available Repositories" msgstr "Online Repositories" @@ -1110,68 +1116,85 @@ #. (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 #, fuzzy msgid "Needed Patches" msgstr "Selected Patterns" #. 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 #, fuzzy msgid "Installed Patches" msgstr "&Import the Packages" #. 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 "" #. 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 "" #. the label for Filter: Search results -#: src/NCPkgStrings.cc:776 +#: src/NCPkgStrings.cc:783 msgid "Search Results" msgstr "" #. the headline of the dependency popup -#: src/NCPkgStrings.cc:783 +#: src/NCPkgStrings.cc:790 msgid "Package Dependencies" msgstr "" #. 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 "" #. column header source RPM installation (keep it short!) -#: src/NCPkgStrings.cc:797 +#: src/NCPkgStrings.cc:804 msgid "Source" msgstr "" #. menu entry Update List -#: src/NCPkgStrings.cc:805 +#: src/NCPkgStrings.cc:812 msgid "&Update List" msgstr "" #. part of the patch description -#: src/NCPkgStrings.cc:812 +#: src/NCPkgStrings.cc:819 msgid "<b>Patch: </b>" msgstr "" #. info line is shown if YOU patch list is empty -#: src/NCPkgStrings.cc:819 +#: src/NCPkgStrings.cc:826 msgid "No patches available" msgstr "" -#: src/NCPkgStrings.cc:825 +#: src/NCPkgStrings.cc:832 msgid "Script" msgstr "" +#: src/NCPkgStrings.cc:838 #, fuzzy +msgid "Incompatible Package Versions" +msgstr "Package Descriptions" + +#: 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 "" + +#, fuzzy #~ msgid "<p>Kind \"recommended\" means you should install the patch. \"security\" is a security patch and we highly recommend to install it.</p>" #~ msgstr "<p>Mode \"recommended\" means you should install the patch. \"security\" is a security patch and it is highly recommended to install it. \"YaST\" patches will be always installed first. The other patches must be installed on a second run.</p>" Modified: trunk/yast/en_US/po/qt-pkg.en_US.po =================================================================== --- trunk/yast/en_US/po/qt-pkg.en_US.po 2015-10-01 11:25:25 UTC (rev 92990) +++ trunk/yast/en_US/po/qt-pkg.en_US.po 2015-10-01 11:25:25 UTC (rev 92991) @@ -6,7 +6,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-07-18 14:04+0200\n" "Last-Translator: proofreader \n" "Language-Team: English \n" @@ -49,7 +49,7 @@ msgstr "S&earch" #. DEBUG -#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:113 +#: src/YQPackageSelector.cc:429 src/YQPkgSearchFilterView.cc:114 msgid "&Keywords" msgstr "" @@ -90,8 +90,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 "" @@ -385,7 +385,7 @@ msgstr "" #: 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 "" @@ -1341,15 +1341,11 @@ msgid "Unmaintained Packages" msgstr "" -#. horizontal -#. vertical -#: src/YQPkgRepoFilterView.cc:180 +#: src/YQPkgRepoFilterView.cc:177 msgid "Search" msgstr "" -#. horizontal -#. vertical -#: src/YQPkgRepoFilterView.cc:199 +#: src/YQPkgRepoFilterView.cc:192 msgid "Installation Summary" msgstr "" @@ -1363,80 +1359,80 @@ msgstr "" #. Search button -#: src/YQPkgSearchFilterView.cc:92 +#: src/YQPkgSearchFilterView.cc:93 msgid "&Search" msgstr "" #. #. Where to search #. -#: src/YQPkgSearchFilterView.cc:105 +#: src/YQPkgSearchFilterView.cc:106 msgid "Search in" msgstr "" -#: src/YQPkgSearchFilterView.cc:111 +#: src/YQPkgSearchFilterView.cc:112 #, fuzzy #| msgid "Name" msgid "Nam&e" msgstr "Name" -#: src/YQPkgSearchFilterView.cc:115 +#: src/YQPkgSearchFilterView.cc:116 msgid "Su&mmary" msgstr "" -#: src/YQPkgSearchFilterView.cc:117 +#: src/YQPkgSearchFilterView.cc:118 msgid "Descr&iption" msgstr "" -#: src/YQPkgSearchFilterView.cc:122 +#: src/YQPkgSearchFilterView.cc:123 msgid "RPM \"P&rovides\"" msgstr "" -#: src/YQPkgSearchFilterView.cc:124 +#: src/YQPkgSearchFilterView.cc:125 msgid "RPM \"Re&quires\"" msgstr "" -#: src/YQPkgSearchFilterView.cc:127 +#: src/YQPkgSearchFilterView.cc:128 msgid "File list" msgstr "" #. #. Search mode #. -#: src/YQPkgSearchFilterView.cc:142 +#: src/YQPkgSearchFilterView.cc:143 msgid "Search &Mode:" msgstr "" #. 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 "" -#: src/YQPkgSearchFilterView.cc:156 +#: src/YQPkgSearchFilterView.cc:157 msgid "Begins with" msgstr "" -#: src/YQPkgSearchFilterView.cc:157 +#: src/YQPkgSearchFilterView.cc:158 msgid "Exact Match" msgstr "" -#: src/YQPkgSearchFilterView.cc:158 +#: src/YQPkgSearchFilterView.cc:159 msgid "Use Wild Cards" msgstr "" -#: src/YQPkgSearchFilterView.cc:159 +#: src/YQPkgSearchFilterView.cc:160 msgid "Use Regular Expression" msgstr "" -#: src/YQPkgSearchFilterView.cc:166 +#: src/YQPkgSearchFilterView.cc:167 msgid "Case Sensiti&ve" msgstr "" -#: src/YQPkgSearchFilterView.cc:244 +#: src/YQPkgSearchFilterView.cc:248 msgid "Searching..." msgstr "" -#: src/YQPkgSearchFilterView.cc:330 +#: src/YQPkgSearchFilterView.cc:334 msgid "No Results." msgstr "" @@ -1445,7 +1441,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 "" @@ -1556,14 +1552,14 @@ msgstr "" #. 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" @@ -1572,7 +1568,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" @@ -1582,7 +1578,7 @@ msgstr "" #. Dialog heading -#: src/YQPkgVersionsView.cc:423 +#: src/YQPkgVersionsView.cc:407 #, fuzzy #| msgid "&Generate Package Descriptions" msgid "Incompatible Package Versions" @@ -1597,11 +1593,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 "" -#: src/YQPkgVersionsView.cc:570 +#: src/YQPkgVersionsView.cc:554 msgid "This version is installed in your system." msgstr "" Modified: trunk/yast/en_US/po/registration.en_US.po =================================================================== --- trunk/yast/en_US/po/registration.en_US.po 2015-10-01 11:25:25 UTC (rev 92990) +++ trunk/yast/en_US/po/registration.en_US.po 2015-10-01 11:25:25 UTC (rev 92991) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\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: 2002-07-18 14:04+0200\n" "Last-Translator: proofreader \n" "Language-Team: English \n" @@ -60,7 +60,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 @@ -100,8 +100,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 msgid "Registering %s ..." msgstr "" @@ -331,24 +331,36 @@ msgid "Details: %s" msgstr "" +#. 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" @@ -386,49 +398,59 @@ #. 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 "Writing log files ..." msgid "Updating to %s ..." msgstr "Writing log files ..." +#. TRANSLATORS: progress label +#: src/lib/registration/registration_ui.rb:163 +#, fuzzy +msgid "Synchronizing Products..." +msgstr "Registration" + #. 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 "Loading Available Extensions and Modules..." msgstr "Registration" -#: src/lib/registration/registration_ui.rb:157 +#: src/lib/registration/registration_ui.rb:191 #, fuzzy msgid "Loading Migration Products..." msgstr "Registration" #. dialog title -#: src/lib/registration/registration_ui.rb:174 +#: src/lib/registration/registration_ui.rb:208 #, fuzzy msgid "Register Extensions and Modules" msgstr "Registration" #. help text -#: src/lib/registration/registration_ui.rb:178 +#: src/lib/registration/registration_ui.rb:212 msgid "<p>Extensions and Modules are being registered.</p>" msgstr "" #. TRANSLATORS: updates popup question (1/2), multiline, max. ~60 chars/line -#: src/lib/registration/registration_ui.rb:203 +#: src/lib/registration/registration_ui.rb:237 #, fuzzy msgid "" "The registration server offers update repositories.\n" @@ -436,14 +458,18 @@ msgstr "Registration" #. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line -#: src/lib/registration/registration_ui.rb:207 -msgid "Would you like to enable these repositories during installation\n" +#: src/lib/registration/registration_ui.rb:241 +msgid "" +"Would you like to enable these repositories during installation\n" +"in order to receive the latest updates?" msgstr "" #. Yast::Mode.update #. TRANSLATORS: updates popup question (2/2), multiline, max. ~60 chars/line -#: src/lib/registration/registration_ui.rb:211 -msgid "Would you like to enable these repositories during upgrade\n" +#: src/lib/registration/registration_ui.rb:245 +msgid "" +"Would you like to enable these repositories during upgrade\n" +"in order to receive the latest updates?" msgstr "" #. indent size used in summary text @@ -452,44 +478,55 @@ msgid "Certificate:" msgstr "S&erver Certificate" +#. 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 product" msgstr "An unknown error occurred." #. 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 "Saving repository configuration failed." msgstr "Contacting server..." #. # 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 msgid "" "Cannot find remote product %s.\n" "The product cannot be registered." @@ -909,8 +946,15 @@ msgid "&Local Registration Server URL" msgstr "Registration" +#. 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 +msgid "Internal error: %s" +msgstr "" + #. 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?" @@ -918,10 +962,8 @@ #. TRANSLATORS: dialog title #: src/lib/registration/ui/migration_repos_selection_dialog.rb:47 -#, fuzzy -#| msgid "Online Repositories" -msgid "Migration Repositories" -msgstr "Online Repositories" +msgid "Repositories used for Migration" +msgstr "" #. TRANSLATORS: help text #: src/lib/registration/ui/migration_repos_selection_dialog.rb:50 @@ -932,7 +974,7 @@ #: src/lib/registration/ui/migration_repos_selection_dialog.rb:85 #, fuzzy #| msgid "Online Repositories" -msgid "Select the Migration Repositories" +msgid "Select the Repositories used for Migration" msgstr "Online Repositories" #. TRANSLATORS: Push button label, starts the repository management module @@ -954,84 +996,73 @@ msgid "Priority: %s" msgstr "" -#. 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 -msgid "Internal error: %s" -msgstr "" - #. TRANSLATORS: Error message -#: src/lib/registration/ui/migration_repos_workflow.rb:170 +#: src/lib/registration/ui/migration_repos_workflow.rb:183 msgid "No installed product found." msgstr "" #. TRANSLATORS: Error message -#: src/lib/registration/ui/migration_repos_workflow.rb:199 +#: src/lib/registration/ui/migration_repos_workflow.rb:212 msgid "No migration product found." msgstr "" -#. TRANSLATORS: Progress label -#: src/lib/registration/ui/migration_repos_workflow.rb:246 -#, fuzzy -#| msgid "Registration" -msgid "Registering Migration Products..." -msgstr "Registration" - #. TRANSLATORS: progress message -#: src/lib/registration/ui/migration_repos_workflow.rb:272 +#: src/lib/registration/ui/migration_repos_workflow.rb:289 #, fuzzy msgid "Preparing Migration Repositories..." msgstr "Online Repositories" #. TRANSLATORS: dialog title -#: src/lib/registration/ui/migration_selection_dialog.rb:61 +#: src/lib/registration/ui/migration_selection_dialog.rb:62 msgid "Select the Migration Target" msgstr "" #. 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 msgid "<p>Use the <b>%s</b> check box to manually select the migration repositories later.</p>" msgstr "" -#. 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 msgid "Manually Select Migration Repositories" msgstr "" #. 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 msgid "Select the target migration." msgstr "" +#. 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 msgid "Possible Migration Targets" msgstr "" #. 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" @@ -1043,38 +1074,38 @@ #. 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 msgid "%s <b>will be installed.</b>" msgstr "" #. 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" @@ -1136,6 +1167,16 @@ msgstr "Registration" #, fuzzy +#~| msgid "Online Repositories" +#~ msgid "Migration Repositories" +#~ msgstr "Online Repositories" + +#, fuzzy +#~| msgid "Registration" +#~ msgid "Registering Migration Products..." +#~ msgstr "Registration" + +#, fuzzy #~ msgid "SSL Certificate" #~ msgstr "S&erver Certificate" Modified: trunk/yast/en_US/po/storage.en_US.po =================================================================== --- trunk/yast/en_US/po/storage.en_US.po 2015-10-01 11:25:25 UTC (rev 92990) +++ trunk/yast/en_US/po/storage.en_US.po 2015-10-01 11:25:25 UTC (rev 92991) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: YaST (@memory@)\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: 2008-12-02 10:12+0100\n" "Last-Translator: proofreader \n" "Language-Team: English \n" @@ -791,7 +791,7 @@ msgstr "" #. 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" @@ -801,7 +801,7 @@ msgstr "" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:259 +#: src/include/partitioning/custom_part_check_generated.rb:264 #, fuzzy msgid "" "You tried to mount a FAT partition to one of the following mount\n" @@ -814,7 +814,7 @@ "Use a Linux file system, such as ext2 or reiserfs, for this mount point.\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:272 +#: src/include/partitioning/custom_part_check_generated.rb:277 #, fuzzy msgid "" "You tried to mount a FAT partition to the\n" @@ -827,7 +827,7 @@ "Use a Linux file system, such as ext2 or reiserfs, for this mount point.\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:286 +#: src/include/partitioning/custom_part_check_generated.rb:291 #, fuzzy msgid "" "You have mounted a partition with Btrfs to the\n" @@ -839,8 +839,19 @@ "You tried to mount a fat partition to the mount point /boot.\n" "Use a Linux file system, such as ext2 or reiserfs, for this mount point.\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" @@ -853,7 +864,7 @@ msgstr "" #. 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" @@ -863,7 +874,7 @@ msgstr "" #. /////////////////////////// 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" @@ -875,19 +886,18 @@ #. 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 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 "" #. 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" @@ -899,7 +909,7 @@ "Really use this setup?\n" msgstr "" -#: 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" @@ -908,7 +918,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" @@ -919,7 +929,7 @@ msgstr "" #. 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" @@ -934,7 +944,7 @@ msgstr "" #. 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" @@ -949,12 +959,12 @@ msgstr "" #. 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 "" #. 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" @@ -967,7 +977,7 @@ msgstr "" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:504 +#: src/include/partitioning/custom_part_check_generated.rb:520 #, fuzzy msgid "" "\n" @@ -983,7 +993,7 @@ "particularly in any of the following cases:\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" @@ -992,7 +1002,7 @@ msgstr "" #. 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" @@ -1000,7 +1010,7 @@ msgstr "" #. 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" @@ -1008,41 +1018,41 @@ msgstr "" #. 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" msgstr "" #. 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" msgstr "" #. 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" msgstr "" #. 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" msgstr "" #. 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" msgstr "" -#: src/include/partitioning/custom_part_check_generated.rb:656 +#: src/include/partitioning/custom_part_check_generated.rb:672 #, fuzzy msgid "It cannot be deleted while mounted." msgstr "" @@ -1051,14 +1061,14 @@ "%1" #. 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" msgstr "" #. 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" @@ -1067,7 +1077,7 @@ msgstr "" #. popup text, Do not translate LVM. -#: src/include/partitioning/custom_part_check_generated.rb:786 +#: src/include/partitioning/custom_part_check_generated.rb:802 #, fuzzy msgid "" "\n" @@ -1083,7 +1093,7 @@ "deleting the device.\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 #, fuzzy msgid "" "\n" @@ -1099,7 +1109,7 @@ "deleting the device.\n" #. popup text -#: src/include/partitioning/custom_part_check_generated.rb:808 +#: src/include/partitioning/custom_part_check_generated.rb:824 #, fuzzy msgid "" "\n" @@ -1114,37 +1124,37 @@ "deleting the device.\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 "" #. 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 "" -#: 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 "" #. 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 "" #. 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" msgstr "" #. 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 "" @@ -1152,7 +1162,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 "" @@ -1163,18 +1173,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 "" #. Cancel button -#: src/include/partitioning/custom_part_dialogs.rb:160 +#: src/include/partitioning/custom_part_dialogs.rb:159 msgid "&Skip" msgstr "" #. 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" @@ -1183,8 +1193,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" @@ -1192,31 +1202,31 @@ #. 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" msgstr "" -#: src/include/partitioning/custom_part_dialogs.rb:238 +#: src/include/partitioning/custom_part_dialogs.rb:237 msgid "No floating point number." msgstr "" #. heading text -#: src/include/partitioning/custom_part_dialogs.rb:362 +#: src/include/partitioning/custom_part_dialogs.rb:361 msgid "File system options:" msgstr "" #. 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" msgstr "" #. 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" @@ -1227,7 +1237,7 @@ msgstr "" #. 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" @@ -1236,47 +1246,47 @@ msgstr "" #. 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 "" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:502 +#: src/include/partitioning/custom_part_dialogs.rb:501 #, fuzzy msgid "&Device Name" msgstr "Device Type" #. 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 "" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:516 +#: src/include/partitioning/custom_part_dialogs.rb:515 msgid "&UUID" msgstr "" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:526 +#: src/include/partitioning/custom_part_dialogs.rb:525 msgid "Device &ID" msgstr "" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:533 +#: src/include/partitioning/custom_part_dialogs.rb:532 msgid "Device &Path" msgstr "" #. heading text -#: src/include/partitioning/custom_part_dialogs.rb:673 +#: src/include/partitioning/custom_part_dialogs.rb:672 #, fuzzy #| msgid "ASK Options" msgid "Fstab Options:" msgstr "ASK Options" #. 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" @@ -1284,65 +1294,65 @@ msgstr "" #. 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 "" #. 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 "" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1050 +#: src/include/partitioning/custom_part_dialogs.rb:1046 #, fuzzy msgid "File &System" msgstr "F&ile System to Use:" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1057 +#: src/include/partitioning/custom_part_dialogs.rb:1053 #, fuzzy msgid "O&ptions..." msgstr "O&ptional Files..." #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1073 +#: src/include/partitioning/custom_part_dialogs.rb:1069 #, fuzzy msgid "&Encrypt Device" msgstr "Root Device" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1148 +#: src/include/partitioning/custom_part_dialogs.rb:1144 msgid "File system &ID:" msgstr "" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1180 +#: src/include/partitioning/custom_part_dialogs.rb:1176 msgid "Format" msgstr "" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1190 +#: src/include/partitioning/custom_part_dialogs.rb:1186 msgid "Do ¬ format" msgstr "" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1200 +#: src/include/partitioning/custom_part_dialogs.rb:1196 msgid "&Format" msgstr "" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1253 +#: src/include/partitioning/custom_part_dialogs.rb:1249 msgid "Fs&tab Options" msgstr "" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1260 +#: src/include/partitioning/custom_part_dialogs.rb:1256 msgid "&Mount Point" msgstr "" #. 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" @@ -1357,7 +1367,7 @@ msgstr "" #. 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" @@ -1365,7 +1375,7 @@ msgstr "" #. 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" @@ -1373,21 +1383,21 @@ msgstr "" #. 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 "" #. 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 "" -#: src/include/partitioning/custom_part_dialogs.rb:1330 +#: src/include/partitioning/custom_part_dialogs.rb:1326 msgid "Continue?" msgstr "" #. 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" @@ -1395,27 +1405,27 @@ msgstr "" #. 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" "Only fat, ext2, ext3, ext4, xfs, and reiser allow extending a file system." msgstr "" -#: src/include/partitioning/custom_part_dialogs.rb:1361 +#: src/include/partitioning/custom_part_dialogs.rb:1357 msgid "Continue resizing?" msgstr "" #. 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 "" -#: 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 "" -#: 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" @@ -1425,7 +1435,7 @@ msgstr "" #. 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" @@ -1434,7 +1444,7 @@ msgstr "" #. popup text, Do not translate LVM. -#: src/include/partitioning/custom_part_dialogs.rb:1464 +#: src/include/partitioning/custom_part_dialogs.rb:1460 #, fuzzy msgid "" "\n" @@ -1450,7 +1460,7 @@ "deleting the device.\n" #. popup text, Do not translate RAID. -#: src/include/partitioning/custom_part_dialogs.rb:1475 +#: src/include/partitioning/custom_part_dialogs.rb:1471 #, fuzzy msgid "" "\n" @@ -1466,7 +1476,7 @@ "deleting the device.\n" #. popup text -#: src/include/partitioning/custom_part_dialogs.rb:1486 +#: src/include/partitioning/custom_part_dialogs.rb:1482 #, fuzzy msgid "" "\n" @@ -1481,26 +1491,26 @@ "deleting the device.\n" #. help text, richtext format -#: src/include/partitioning/custom_part_dialogs.rb:1547 +#: src/include/partitioning/custom_part_dialogs.rb:1543 msgid "<p>Create and remove subvolumes from a Btrfs filesystem.</p>\n" msgstr "" -#: 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 "" #. label text -#: src/include/partitioning/custom_part_dialogs.rb:1572 +#: src/include/partitioning/custom_part_dialogs.rb:1568 msgid "New Subvolume" msgstr "" #. button text -#: src/include/partitioning/custom_part_dialogs.rb:1578 +#: src/include/partitioning/custom_part_dialogs.rb:1574 #, fuzzy #| msgid "Add Lan&guage" msgid "Add new" @@ -1508,42 +1518,42 @@ #. 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 "" #. 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 #, fuzzy #| msgid "Signature Handling" msgid "Subvolume Handling" msgstr "Signature Handling" -#: src/include/partitioning/custom_part_dialogs.rb:1670 +#: src/include/partitioning/custom_part_dialogs.rb:1666 msgid "Empty subvolume name not allowed." msgstr "" -#: 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." msgstr "" -#: src/include/partitioning/custom_part_dialogs.rb:1684 +#: src/include/partitioning/custom_part_dialogs.rb:1680 msgid "Subvolume name %1 already exists." msgstr "" -#: 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 "" @@ -1677,17 +1687,17 @@ msgstr "" #. 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 "" #. 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 "" #. 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" @@ -1698,7 +1708,7 @@ msgstr "" #. 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" @@ -1707,7 +1717,7 @@ msgstr "" #. 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" @@ -1721,40 +1731,40 @@ #. @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 "" #. 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 "" #. 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 "" #. && 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 "" #. 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." msgstr "" #. 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 "" #. 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" @@ -1762,12 +1772,12 @@ msgstr "" #. 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 "" #. error popup text -#: src/include/partitioning/custom_part_lib.rb:283 +#: src/include/partitioning/custom_part_lib.rb:272 msgid "" "It is not allowed to assign the mount point swap\n" "to a device without a swap file system." @@ -1775,21 +1785,21 @@ #. 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" msgstr "" #. 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." msgstr "" #. 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" @@ -1804,12 +1814,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 "" -#: 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." @@ -1817,26 +1827,26 @@ #. 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 "" -#: 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." msgstr "" -#: 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 "" -#: 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 "" -#: 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 "" @@ -2767,7 +2777,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 "" @@ -3245,18 +3255,26 @@ msgid "<p>No changes to partitioning.</p>" msgstr "" -#: src/include/partitioning/ep-lib.rb:485 +#: src/include/partitioning/ep-lib.rb:484 msgid "<p>Changes to partitioning:</p>" msgstr "" -#: src/include/partitioning/ep-lib.rb:490 +#: src/include/partitioning/ep-lib.rb:487 msgid "<p>No changes to storage settings.</p>" msgstr "" -#: src/include/partitioning/ep-lib.rb:493 +#: src/include/partitioning/ep-lib.rb:489 msgid "<p>Storage settings:</p>" msgstr "" +#: src/include/partitioning/ep-lib.rb:498 +msgid "<p>Packages to install:</p>" +msgstr "" + +#: src/include/partitioning/ep-lib.rb:500 +msgid "<p>No packages need to be installed.</p>" +msgstr "" + #. heading #. tree node label #: src/include/partitioning/ep-log.rb:43 @@ -5159,7 +5177,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 "" @@ -5172,7 +5190,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" @@ -5181,7 +5199,7 @@ msgstr "" #. 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" @@ -5189,7 +5207,7 @@ msgstr "" #. 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" @@ -5198,26 +5216,26 @@ #. 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 "" #. Clear password fields on every round. -#: src/modules/Storage.rb:4089 +#: src/modules/Storage.rb:4090 #, fuzzy #| msgid "root Password" msgid "Provide Password" msgstr "root Password" -#: src/modules/Storage.rb:4108 +#: src/modules/Storage.rb:4109 msgid "The following encrypted volumes are already available." msgstr "" -#: src/modules/Storage.rb:4123 +#: src/modules/Storage.rb:4124 msgid "Encrypted Volume Activation" msgstr "" -#: 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" @@ -5225,14 +5243,14 @@ "during an update or if they contain an encrypted LVM physical volume." msgstr "" -#: src/modules/Storage.rb:4139 +#: src/modules/Storage.rb:4140 #, fuzzy #| msgid "Do you want to create directory\n" msgid "Do you want to provide encryption passwords?" msgstr "Do you want to create a directory?\n" #. 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" @@ -5240,60 +5258,71 @@ msgstr "" #. header text -#: src/modules/Storage.rb:4202 +#: src/modules/Storage.rb:4203 msgid "Enter Encryption Password" msgstr "" -#: src/modules/Storage.rb:4205 +#: src/modules/Storage.rb:4206 msgid "There are no encrypted volume to unlock." msgstr "" #. 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 "" #. label text, one device name follows -#: src/modules/Storage.rb:4221 +#: src/modules/Storage.rb:4222 #, fuzzy #| msgid "Password for the Menu Interface" msgid "Provide password for the following device:" msgstr "Password for the Menu Interface" -#: src/modules/Storage.rb:4234 +#: src/modules/Storage.rb:4235 msgid "Trying to unlock encrypted volumes..." msgstr "" -#: src/modules/Storage.rb:4258 +#: src/modules/Storage.rb:4259 msgid "Password did not unlock any volume." msgstr "" -#: src/modules/Storage.rb:4344 +#: src/modules/Storage.rb:4345 msgid "IDE Disk" msgstr "" -#: src/modules/Storage.rb:4350 +#: src/modules/Storage.rb:4351 msgid "SCSI Disk" msgstr "" -#: src/modules/Storage.rb:4356 +#: src/modules/Storage.rb:4357 msgid "Disk" msgstr "" -#: src/modules/Storage.rb:4384 +#: src/modules/Storage.rb:4385 msgid "DM RAID" msgstr "" -#: src/modules/Storage.rb:4397 +#: src/modules/Storage.rb:4398 msgid "MD RAID" msgstr "" +#. 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 "" + +#. TRANSLATORS: error popup +#: src/modules/Storage.rb:5252 msgid "Partitions cannot be created since other partitions on the disk are used." msgstr "" -#: src/modules/Storage.rb:5249 +#: src/modules/Storage.rb:5278 #, fuzzy msgid "" "\n" @@ -5304,7 +5333,7 @@ "Device %1 cannot be removed because this would indirectly change\n" "device %2 which contains data needed to perform the installation.\n" -#: src/modules/Storage.rb:5263 +#: src/modules/Storage.rb:5292 #, fuzzy msgid "" "\n" @@ -5315,7 +5344,7 @@ "Device %1 cannot be removed because this would indirectly change\n" "device %2 which contains data needed to perform the installation.\n" -#: src/modules/Storage.rb:5292 +#: src/modules/Storage.rb:5321 #, fuzzy msgid "" "\n" @@ -5326,7 +5355,7 @@ "Device %1 cannot be removed because this would indirectly change\n" "device %2 which contains data needed to perform the installation.\n" -#: src/modules/Storage.rb:5301 +#: src/modules/Storage.rb:5330 #, fuzzy msgid "" "\n" @@ -5337,7 +5366,7 @@ "Device %1 cannot be removed because this would indirectly change\n" "device %2 which contains data needed to perform the installation.\n" -#: src/modules/Storage.rb:5330 +#: src/modules/Storage.rb:5359 #, fuzzy msgid "" "\n" @@ -5349,7 +5378,7 @@ "Device %1 cannot be removed because this would indirectly change\n" "device %2 which contains data needed to perform the installation.\n" -#: src/modules/Storage.rb:5341 +#: src/modules/Storage.rb:5370 #, fuzzy #| msgid "" #| "\n" @@ -5365,7 +5394,7 @@ "device %2 which contains data needed to perform the installation.\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" @@ -5373,20 +5402,20 @@ msgstr "" #. FIXME: please, add description of the list that is returned by this function. -#: src/modules/Storage.rb:5452 +#: src/modules/Storage.rb:5481 #, fuzzy #| msgid "Set default root filesystem" msgid "Nothing assigned as root filesystem!" msgstr "Set default root file system" -#: src/modules/Storage.rb:5453 +#: src/modules/Storage.rb:5482 msgid "Installation will most certainly fail fatally!" msgstr "" #. 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 "" @@ -5399,10 +5428,6 @@ msgid "System error code was: %1" msgstr "" -#: src/modules/StorageClients.rb:159 -msgid "Continue despite the error?" -msgstr "" - #. Label: get password for device #. Please use newline if label is longer than 40 characters #: src/modules/StorageClients.rb:199 Modified: trunk/yast/en_US/po/vpn.en_US.po =================================================================== --- trunk/yast/en_US/po/vpn.en_US.po 2015-10-01 11:25:25 UTC (rev 92990) +++ trunk/yast/en_US/po/vpn.en_US.po 2015-10-01 11:25:25 UTC (rev 92991) @@ -6,7 +6,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-07-18 14:04+0200\n" "Last-Translator: proofreader \n" "Language-Team: English \n" @@ -190,32 +190,39 @@ msgid "Client - Certificate" msgstr "S&erver Certificate" +#. 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 msgid "The connection name is already used." msgstr "" #. 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 msgid "The user name is already used." msgstr "" #. Set client certificate/key for a connection to remote gateway. Return true if successful, otherwise false. -#: src/lib/vpn/ipsec.rb:496 +#: src/lib/vpn/ipsec.rb:503 msgid "Cannot find a matching client connection." msgstr ""