Author: jsuchome Date: Wed Nov 16 11:12:14 2011 New Revision: 66806 URL: http://svn.opensuse.org/viewcvs/yast?rev=66806&view=rev Log: - merged texts from proofreading - 2.22.0 Modified: trunk/product-creator/VERSION trunk/product-creator/package/yast2-product-creator.changes trunk/product-creator/src/complex.ycp trunk/product-creator/src/dialogs.ycp trunk/product-creator/src/helps.ycp trunk/product-creator/src/image-creator.ycp trunk/product-creator/src/kiwi_dialogs.ycp trunk/product-creator/src/product-creator.ycp Modified: trunk/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/VERSION?rev=66806&r1=66805&r2=66806&view=diff ============================================================================== --- trunk/product-creator/VERSION (original) +++ trunk/product-creator/VERSION Wed Nov 16 11:12:14 2011 @@ -1 +1 @@ -2.21.12 +2.22.0 Modified: trunk/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/package/yast2-product-creator.changes?rev=66806&r1=66805&r2=66806&view=diff ============================================================================== --- trunk/product-creator/package/yast2-product-creator.changes (original) +++ trunk/product-creator/package/yast2-product-creator.changes Wed Nov 16 11:12:14 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 11:11:37 CET 2011 - jsuchome@suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Tue Oct 25 09:58:49 CEST 2011 - jsuchome@suse.cz - added UI for disk encryption (fate#312486) Modified: trunk/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/complex.ycp?rev=66806&r1=66805&r2=66806&view=diff ============================================================================== --- trunk/product-creator/src/complex.ycp (original) +++ trunk/product-creator/src/complex.ycp Wed Nov 16 11:12:14 2011 @@ -316,9 +316,7 @@ import "Progress"; - string help = _("<P> - Please wait while the directory structure for the new ISO image is created. - </P> + string help = _("<P>Creating the directory structure for the new ISO image.</P> "); help = help + _("<p>Press <b>Next</b> to start creating the ISO file.</p>"); @@ -460,7 +458,7 @@ if (!Mode::commandline()) { - Popup::ShowFeedback(_("Creating CD Image..."), _("This may take a while")); + Popup::ShowFeedback(_("Creating CD Image..."), _("This may take a while.")); } string command = sformat("/usr/lib/YaST2/bin/y2mkiso '%1' '%2' '%3'", String::Quote(isodir), String::Quote(isofile), String::Quote(boot_arch)); @@ -507,7 +505,7 @@ term contents = `RichText(html); - string help_text = _("<p>Verify if the data in the summary box is correct then + string help_text = _("<p>Verify the data in the summary box then press Finish to return to main dialog.</p> "); @@ -538,9 +536,10 @@ // caption string caption = _("Custom CDs"); - string help = _("<p>Please wait while the data and packages are verified... + string help = _("<p>Verifying data and packages... </p> - "); + +"); help = help + _("<p>If there is something missing, the process will be aborted. Fix the problem and try again.</p> "); @@ -715,13 +714,13 @@ } // help text - string help_text = _("<p>Start the creating of new image configuration with <b>Add</b>.</p>") + + string help_text = _("<p>Start creating a new image configuration with <b>Add</b>.</p>") + // help text _("<p>Use <b>Edit</b> to change selected image configuration or create the image.</p>") + // help text - _("<p>Delete the directory with selected configuration using <b>Delete</b>.</p>") + + _("<p>Delete the directory with the selected configuration by selecting <b>Delete</b>.</p>") + // help text, %1 is directory sformat (_("<p>All image configurations are saved in <tt>%1</tt> directory.</p>"), images_dir); Modified: trunk/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/dialogs.ycp?rev=66806&r1=66805&r2=66806&view=diff ============================================================================== --- trunk/product-creator/src/dialogs.ycp (original) +++ trunk/product-creator/src/dialogs.ycp Wed Nov 16 11:12:14 2011 @@ -837,8 +837,9 @@ Report::Error(_("There is a mismatch between the selected repositories and the machine architecture. -Either select another repositories or -change the target architecture.")); +Either select a different repository or +change the target architecture. +")); // don't leave the dialog continue; @@ -1372,7 +1373,7 @@ { string details = (string)SCR::Read(.target.string, "/var/log/YaST2/badlist"); // error message, %1 = details - Report::LongError(sformat(_("The dependencies cannot be resolved. + Report::LongError(sformat(_("Dependencies cannot be resolved. %1 "), details)); @@ -1549,7 +1550,7 @@ This key is checked when the product is added as a repository.</p>") // part of the help text (signing dialog), the URL can be modified to the translated language // (if the page exists in that language, you have to check that!) - + _("<P>If the product is not signed Yast automatically adds option 'Insecure: 1' to the linuxrc configuration file, otherwise linuxrc would deny loading unsigned installation system at boot. See http://en.opensuse.org/Linuxrc for more information.</P>") + + _("<P>If the product is not signed, Yast automatically adds the option 'Insecure:\n1' to the linuxrc configuration file, otherwise linuxrc would deny loading an unsigned installation system at boot. See http://en.opensuse.org/Linuxrc for more information.</P>") ] ]; } @@ -1695,9 +1696,9 @@ term contents = `RichText(summary); - string help_text = _("<p>Verify if the data in the summary is correct then -press Next to continue. -</p>"); + string help_text = _("<p>Verify the data in the summary then press Next to continue. +</p> +"); Wizard::SetContentsButtons ( caption, contents, Modified: trunk/product-creator/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/helps.ycp?rev=66806&r1=66805&r2=66806&view=diff ============================================================================== --- trunk/product-creator/src/helps.ycp (original) +++ trunk/product-creator/src/helps.ycp Wed Nov 16 11:12:14 2011 @@ -17,7 +17,7 @@ map HELPS = $[ "bootconfig": _("<p><b><big>Boot Options</big></b><br> -Here, add additional boot menu entries with some boot options. +Add additional boot menu entries with boot options. </p> ") + _("<p>For example, @@ -26,8 +26,7 @@ "), /* Read dialog help 1/2 */ - "read" : _("<p><b><big>Initializing Configuration</big></b><br> -Please wait...<br></p> + "read" : _("<p><b><big>Initializing Configuration</big></b></p> ") + /* Read dialog help 2/2 */ @@ -36,14 +35,13 @@ "), /* Write dialog help 1/2 */ - "write" : _("<p><b><big>Saving Configuration</big></b><br> -Please wait...<br></p> + "write" : _("<p><b><big>Saving Configuration</big></b></p> ") + /* Write dialog help 2/2 */ _("<p><b><big>Aborting Saving:</big></b><br> Abort the save procedure by pressing <b>Abort</b>. -An additional dialog informs whether it is safe to do so. +An additional dialog will inform you whether it is safe to do so. </p> "), @@ -61,11 +59,11 @@ /* Ovreview dialog help 3/3 */ _("<p><b><big>Editing or Deleting:</big></b><br> Choose a configuration to change or remove. -Then press <b>Edit</b> or <b>Delete</b> as desired.</p> +Then press <b>Edit</b> or <b>Delete</b> respectively.</p> ") + // overview dialog help part 4 -_("<p>Use <b>Create Product</b> to create the ISO image or installation repository directory with selected product.</p>") + +_("<p>Use <b>Create Product</b> to create the ISO image or installation\nrepository directory with the selected product.</p>") + // overview dialog help part 5 _("<p>Press <b>Create Image with KIWI</b> for additional configuration of various @@ -97,10 +95,11 @@ ") /* Source selection help 2/2 */ + _("<p><b><big>Target Architecture</big></b><br> -It is possible to create a product for different architecture than the architecture of this machine. +It is possible to create a product for a different architecture than that of +the machine you are currently working on. All selected repositories must support the target architecture.<br> -<b>Note:</b> KIWI does not support different architectures yet, do not change the -architecture if you intend to create a KIWI image from the current configuration.</p> +<b>Note:</b> KIWI does not support different architectures yet, do not change +the architecture if you intend to create a KIWI image from the current configuration.</p> ") , @@ -113,7 +112,7 @@ ") + /* Configure2 dialog help 2/3 */ -_("<p>Create an ISO image or just a directory that is suitable for +_("<p>Create an ISO image or a directory that is suitable for creating an ISO image at a later time. </p> ") + @@ -137,8 +136,9 @@ /* help text - the base selection dialog 4/4 */ + _("<p>The product creator solves dependencies of the selected products and proposes -the base product. If the proposed value is wrong then select the right base -repository from the list.</p>"), +the base product. If the proposed value is wrong, select the right base +repository from the list.</p> +"), ]; Modified: trunk/product-creator/src/image-creator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/image-creator.ycp?rev=66806&r1=66805&r2=66806&view=diff ============================================================================== --- trunk/product-creator/src/image-creator.ycp (original) +++ trunk/product-creator/src/image-creator.ycp Wed Nov 16 11:12:14 2011 @@ -49,7 +49,7 @@ map cmdline_description = $[ "id" : "image-creator", // transltors: command line help text for the Xproduct-creator module - "help" : _("Configuration of Image creator"), + "help" : _("Configuration of Image Creator"), "guihandler" : ICSequence, ]; Modified: trunk/product-creator/src/kiwi_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/kiwi_dialogs.ycp?rev=66806&r1=66805&r2=66806&view=diff ============================================================================== --- trunk/product-creator/src/kiwi_dialogs.ycp (original) +++ trunk/product-creator/src/kiwi_dialogs.ycp Wed Nov 16 11:12:14 2011 @@ -437,7 +437,7 @@ label = type; if (pmap["profiles"]:"" != "") // combo box label, %1 is profile name - label = sformat(_("Image, profile %1"),pmap["profiles"]:""); + label = sformat(_("Image, Profile %1"),pmap["profiles"]:""); items = add (items, `item (`id (i), label, package_set == i)); i = i + 1; }); @@ -793,7 +793,7 @@ UI::OpenDialog (`opt(`decorated), `HBox (`HSpacing (0.5), `VBox ( `VSpacing (0.5), // popup label - `Label (`id (`label), _("Add new user")), + `Label (`id (`label), _("Add New User")), // text entry label `InputField (`id (`username), `opt (`hstretch), _("Login &Name")), // text entry label @@ -1195,18 +1195,19 @@ `Left(`Heading (_("Missing packages"))), `VSpacing(0.2), // popup text - `RichText (sformat (_("<p>These packages from section '%1' are not available with selected repositories:</p> + `RichText (sformat (_("<p>Packages from section '%1' are not available with selected repositories:</p> <p>%2.</p> <p> -You can remove the packages from the section, check the detailed package selection or ignore the situation.</p> +Either remove the packages from the section, check the detailed package selection or ignore the situation.</p> <p> Going to detailed package selection and accepting the view without any further changes results in removal of problematic packages from the section. -</p>"), type_label, mergestring (sort (n_a), "<br>"))), +</p> +"), type_label, mergestring (sort (n_a), "<br>"))), `HBox ( // button label - `PushButton (`id (`remove), `opt (`default), _("Remove the packages")), + `PushButton (`id (`remove), `opt (`default), _("Remove Packages")), // button label - `PushButton (`id (`selection), _("Check package selection")), + `PushButton (`id (`selection), _("Check Package Selection")), // button label `PushButton (`id (`ignore), ignore_allowed ? _("Ignore") : _("Cancel")) ) @@ -1854,7 +1855,7 @@ // textentry label "label" : _("Co&mpression"), // help text - "help" :_("<p>Select the value for image <b>Compression</b>. This will modify the <i>flags</i> value of the image type. Check the kiwi manual for the meaning of the available values.</p>"), + "help" :_("<p>Select the value for image <b>Compression</b>. This will modify the\n<i>flags</i> value of the image type. Check the kiwi manual for an explanation of available values.</p>"), "init" : InitCompressionCombo, "store" : StoreCompressionCombo, "handle" : HandleCompressionCombo, @@ -1892,7 +1893,7 @@ "store" : StoreSWIgnore, "handle" : HandleSWIgnore, // help text for "&Ignored software" - "help" : _("<p>For <b>ignored software</b>, enter each entry (like 'smtp_daemon') on new line</p>"), + "help" : _("<p>For <b>ignored software</b>, enter each entry (like 'smtp_daemon') on a new line.</p>"), ], "delete_sw" : $[ "widget" : `multi_line_edit, @@ -1946,7 +1947,7 @@ // check box label "label" : _("Encrypt Image with LUKS"), // help text - "help" : _("<p>For creating encrypted file system, check <b>Encrypt Image with LUKS</b> and enter the password.</p>"), + "help" : _("<p>To create an encrypted file system, check <b>Encrypt Image with LUKS</b> and enter the password.</p>"), "handle" : HandleEncryptDisk, ], "disk_password" : $[ @@ -1962,12 +1963,12 @@ "general_scripts" : $[ "widget" : `empty, // general help for directory structure tab - "help" : _("<p>Here, edit the configuration scripts used to build your image.</p>"), + "help" : _("<p>Edit the configuration scripts used to build your image.</p>"), ], "general_directories" : $[ "widget" : `empty, // general help for directory structure tab - "help" : _("<p>Here, point to the configuration directories that should help to build your image.</p>"), + "help" : _("<p>Point to the configuration directories for building your image.</p>"), ], "root_dir" : $[ "widget" : `textentry, @@ -2145,30 +2146,30 @@ "widget" : `combobox, "opt" : [ `hstretch, `notify, `editable ], // textentry label - "label" : _("&Keyboard layout"), + "label" : _("&Keyboard Layout"), "init" : InitKeytableCombo, "store" : StorePreferences, "handle" : HandlePreferences, // help text for keytable - "help" : _("<p><b>Keyboard layout</b> specifies the name of the console keymap to use. The value corresponds to a map file in <tt>/usr/share/kbd/keymaps</tt>.</p>"), + "help" : _("<p><b>Keyboard Layout</b> specifies the name of the console keymap to use. The value corresponds to a map file in <tt>/usr/share/kbd/keymaps</tt>.</p>"), ], "timezone" : $[ "widget" : `combobox, "opt" : [ `hstretch, `notify ], "items" : [], // textentry label - "label" : _("&Time zone"), + "label" : _("&Time Zone"), "init" : InitTimezoneCombo, "store" : StorePreferences, "handle" : HandlePreferences, // help text for timezone - "help" : _("<p>It is also possible to set a specific <b>Time zone</b>. Available time zones are located in the <tt>/usr/share/zoneinfo</tt> directory.</p>"), + "help" : _("<p>It is possible to set a specific <b>Time zone</b>. Available time zones are located in the <tt>/usr/share/zoneinfo</tt> directory.</p>"), ], // ---------------- widgtes for users tab "general_users" : $[ "widget" : `empty, // general help for users tab - "help" : _("<p>Here, create users that should be available in the target system.</p>"), + "help" : _("<p>Create users that should be available on the target system.</p>"), ], "userstable" : $[ "widget" : `custom, @@ -2317,7 +2318,7 @@ _("<p>Modify the list of <b>Package Repositories</b> that will be used for creating the image. Use <b>Add From System</b> to add one of the current system repositories.</p>") + // help text for kiwi UI preparation, cont. - _("<p>Use <b>Next</b> to continue with the configuration.</p>"); + _("<p>Click <b>Next</b> to continue with the configuration.</p>"); list basic_type_items = [ // combo box item @@ -2425,7 +2426,7 @@ { y2warning ("%1 does not have 'system' image type, skipping", dir); // error popup - Popup::Error (_("Selected directory does not contain valid description of system configuration")); + Popup::Error (_("Selected directory does not contain valid description of system configuration.")); return false; } @@ -2498,12 +2499,12 @@ `VBox ( `InputField (`id (`config), `opt (`hstretch), // text entry label - _("&Kiwi configuration"), name), + _("&Kiwi Configuration"), name), `RadioButtonGroup (`id (`imp), `HBox (`HSpacing (), `VBox ( `VSpacing (0.2), `Left (`RadioButton (`id ("rb_new"), `opt (`notify), // radio button label - _("Create from beginning"), true) + _("Create from Scratch"), true) ), template_items == [] ? `VSpacing (0) : `Left (`RadioButton (`id ("rb_template"), `opt (`notify), @@ -2535,7 +2536,7 @@ `HBox ( `InputField (`id (`out_dir), `opt (`hstretch), // text entry label - _("&Output directory"), out_dir), + _("&Output Directory"), out_dir), `VBox ( `Label (""), `PushButton (`id (`browse), Label::BrowseButton ()) @@ -2550,7 +2551,7 @@ `HBox ( `PushButton (`id (`add), Label::AddButton ()), // menu butto label - `MenuButton (`id (`addsystem), _("A&dd From System"), + `MenuButton (`id (`addsystem), _("A&dd from System"), system_repo_items), `PushButton (`id (`edit), Label::EditButton ()), `PushButton (`id (`delete), Label::DeleteButton ()), @@ -2658,7 +2659,8 @@ Report::Error (sformat ( // popup error message, %1 is the package name _("Cannot search for SLP repositories -without having %1 package installed"), +without having %1 package installed. +"), required_package )); y2warning ("Not searching for SLP repositories"); Modified: trunk/product-creator/src/product-creator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/product-creator/src/product-creator.ycp?rev=66806&r1=66805&r2=66806&view=diff ============================================================================== --- trunk/product-creator/src/product-creator.ycp (original) +++ trunk/product-creator/src/product-creator.ycp Wed Nov 16 11:12:14 2011 @@ -29,8 +29,8 @@ map cmdline_description = $[ "id" : "product-creator", - // transltors: command line help text for the Xproduct-creator module - "help" : _("Configuration of Product creator"), + // transltors: command line help text for the product-creator module + "help" : _("Configuration of Product Creator"), "guihandler" : ProductCreatorSequence, "initialize" : ProductCreator::Read, "finish" : ProductCreator::Write, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org