Author: jsuchome Date: Wed Jun 13 14:55:12 2007 New Revision: 38426 URL: http://svn.opensuse.org/viewcvs/yast?rev=38426&view=rev Log: - merged texts from proofreading - fixed the help text for signing (#283235) - 2.13.6 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/dialogs.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp branches/SuSE-SLE-10-SP1-Branch/product-creator/src/product-creator.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION?rev=38426&r1=38425&r2=38426&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/VERSION Wed Jun 13 14:55:12 2007 @@ -1 +1 @@ -2.13.5 +2.13.6 Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes?rev=38426&r1=38425&r2=38426&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/package/yast2-product-creator.changes Wed Jun 13 14:55:12 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Jun 13 14:44:47 CEST 2007 - jsuchome@suse.cz + +- merged texts from proofreading +- fixed the help text for signing (#283235) +- 2.13.6 + +------------------------------------------------------------------- Tue Jun 5 15:35:29 CEST 2007 - jsuchome@suse.cz - kiwi UI: create output directly in output directory to prevent Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp?rev=38426&r1=38425&r2=38426&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/Kiwi.ycp Wed Jun 13 14:55:12 2007 @@ -416,7 +416,7 @@ `HSpacing(85), `VSpacing(0.5), // label - `ReplacePoint (`id (`rpl), `Left (`Label(_("Preparing physical extend...")))), + `ReplacePoint (`id (`rpl), `Left (`Label(_("Preparing for Image Creation")))), `VSpacing(0.5), `LogView (`id (`log), "", 8, 0), `VSpacing(0.5), @@ -449,7 +449,7 @@ { UI::ReplaceWidget (`id (`rp), `HBox ( // label (command result) - `Label (`opt (`boldFont), _("KIWI failed.")), + `Label (`opt (`boldFont), _("Image creation failed.")), `PushButton (`id(`close), Label::CloseButton ()) )); ret = (symbol) UI::UserInput (); @@ -466,7 +466,7 @@ tmp_dir, out_dir); y2milestone ("calling '%1'", cmd); // label - UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image...")))); + UI::ReplaceWidget (`id (`rpl), `Left (`Label (_("Creating Image")))); SCR::Execute (.background.run_output_err, cmd); ret = nil; continue; @@ -475,7 +475,7 @@ { UI::ReplaceWidget (`id (`rp), `HBox ( // label (command result) - `Label (`opt (`boldFont), _("KIWI succeeded.")), + `Label (`opt (`boldFont), _("Image creation succeeded.")), `PushButton (`id(`ok), Label::OKButton ()) )); ret = (symbol) UI::UserInput (); Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp?rev=38426&r1=38425&r2=38426&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/ProductCreator.ycp Wed Jun 13 14:55:12 2007 @@ -1655,7 +1655,9 @@ if (!inserted) { - Report::Error(sformat(_("Could not add GPG key %1 to initrd\n%2"), gpg_key, initrd)); + Report::Error(sformat(_("Could not add GPG key %1 to initrd +%2. +"), gpg_key, initrd)); ret = false; } } @@ -1734,7 +1736,9 @@ // yes/no popup: error message if (!signed) { - if (Popup::YesNo(_("Error: Could not digitally sign the source.\nTry it again?"))) + if (Popup::YesNo(_("Error: Could not digitally sign the source. +Try again? +"))) { passphrase = (Mode::commandline()) ? gpg_passphrase : GPGWidgets::AskPassphrasePopup(gpg_key); } @@ -2183,7 +2187,9 @@ if (l_packge == nil || l_packge == "") { - Report::Error(sformat(_("Cannot download package %1\n from source %2"), package["path"]:"", source)); + Report::Error(sformat(_("Cannot download package %1 + from source %2. +"), package["path"]:"", source)); ret = false; break; } Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp?rev=38426&r1=38425&r2=38426&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/commandline.ycp Wed Jun 13 14:55:12 2007 @@ -32,12 +32,12 @@ if (name != "") { - CommandLine::PrintVerbose(sformat(_("Loading Configuration '%1'..."), name)); + CommandLine::PrintVerbose(sformat(_("Loading configuration %1..."), name)); // load the requested configuration if (!ProductCreator::LoadConfig(name)) { - CommandLine::Print(sformat(_("Cannot load configuration '%1'"), name)); + CommandLine::Print(sformat(_("Cannot load configuration %1."), name)); return false; } @@ -68,7 +68,7 @@ integer image_size = (integer)SCR::Read(.target.size, iso_name); if (SCR::Read(.target.size, iso_name) < 0) { - CommandLine::Print(sformat(_("Cannot create ISO image %1"), iso_name)); + CommandLine::Print(sformat(_("Cannot create ISO image %1."), iso_name)); return false; } else Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp?rev=38426&r1=38425&r2=38426&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/complex.ycp Wed Jun 13 14:55:12 2007 @@ -92,15 +92,15 @@ // push button label `PushButton(`id(`create_button), _("&Create ISO Image")), // menu button label - `MenuButton (`id (`kiwi), _("Cre&ate Image with Kiwi..."), [ + `MenuButton (`id (`kiwi), _("Cre&ate Image with KIWI..."), [ // push button label `item(`id(`iso_button), _("Live ISO Image")), // push button label - `item(`id(`xen_button), _("XEN Image")), + `item(`id(`xen_button), _("Xen Image")), // push button label - `item(`id(`usb_button), _("USB stick Image")), + `item(`id(`usb_button), _("USB Stick Image")), // push button label - `item(`id(`vmx_button), _("Virtual disk Image")), + `item(`id(`vmx_button), _("Virtual Disk Image")), ]) ) ); @@ -252,9 +252,9 @@ if (gpg_key != "") { // label - progress_stages = add(progress_stages, _("Sign the Source With a GPG Key")); + progress_stages = add(progress_stages, _("Sign the source with a GPG key")); // progressbar label - progress_descriptions = add(progress_descriptions, _("Signing the Source With a GPG Key...")); + progress_descriptions = add(progress_descriptions, _("Signing the source with a GPG key...")); } Progress::New( Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/dialogs.ycp?rev=38426&r1=38425&r2=38426&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/dialogs.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/dialogs.ycp Wed Jun 13 14:55:12 2007 @@ -539,7 +539,9 @@ } else { - Report::Error(sformat(_("The source does not support architecture of this machine (%1).\nSelect another source."), Arch::architecture())); + Report::Error(sformat(_("The source does not support the architecture of this machine (%1). +Select another source. +"), Arch::architecture())); } } else if (ret == `remove) @@ -1102,7 +1104,10 @@ { string details = (string)SCR::Read(.target.string, "/var/log/YaST2/badlist"); // error message, %1 = details - Report::LongError(sformat(_("The dependecies cannot be resolved.\n\n%1"), details)); + Report::LongError(sformat(_("The dependencies cannot be resolved. + +%1 +"), details)); return $["ui" : `failed]; } @@ -1253,7 +1258,8 @@ // TODO: validate the dialog (is a key selected if the checkbox is selected? // "validate_help" : _("Select a gpg key in the table. Create...") "help" : _("<p><big><b>Sign</b></big><br> -adsfsdfsddsfsdfdsf</p>") +To make it possible for users to verify your product, sign it with a GPG key. +This key is checked when the product is added as an installation source.</p>") ] ]; } @@ -1310,21 +1316,25 @@ ProductCreator::CommitConfig(); - // caption string summary = ""; + // summary caption summary = Summary::AddHeader(summary, _("Package Source") ); summary = Summary::OpenList(summary); foreach(string s, ProductCreator::Config["sources"]:[], ``{ summary = Summary::AddListItem(summary, s); }); summary = Summary::CloseList(summary); + // summary caption summary = Summary::AddHeader(summary, _("Packages") ); + // summary line summary = Summary::AddLine(summary, sformat(_("Selected %1 packages"), size(Pkg::GetPackages(`selected, true)))); + // summary caption summary = Summary::AddHeader(summary,_("Output Directory")); + // summary line summary = Summary::AddLine(summary,sformat(_("Creating directory tree in <b> %1/%2 </b>"), ProductCreator::Config["iso-directory"]:"", ProductCreator::Config["name"]:"") ); Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp?rev=38426&r1=38425&r2=38426&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/kiwi.ycp Wed Jun 13 14:55:12 2007 @@ -159,7 +159,7 @@ `item (`id ("image"), _("Image"), sw_selection == "image"), ]; if (kiwi_task == "xen") - items = add (items, `item (`id ("xen"), _("XEN specific" ), sw_selection == "xen")); + items = add (items, `item (`id ("xen"), _("Xen Specific"), sw_selection == "xen")); UI::ChangeWidget (`id (id), `Items, items); } @@ -351,7 +351,7 @@ UI::ChangeWidget (`id (`pw1), `Value, "*****"); UI::ChangeWidget (`id (`pw2), `Value, "*****"); // popup label - UI::ChangeWidget (`id (`label), `Value, _("Edit user")); + UI::ChangeWidget (`id (`label), `Value, _("Edit User")); } any ret = nil; repeat @@ -429,7 +429,7 @@ if (event["ID"]:nil != key) return nil; // popup for file selection dialog - string dir = UI::AskForExistingDirectory ("", _("Choose the directory to import")); + string dir = UI::AskForExistingDirectory ("", _("Directory to Import")); if (dir!= nil) { KiwiConfig["root_dir"] = union (KiwiConfig["root_dir"]:[], [dir]); @@ -465,7 +465,7 @@ if (event["ID"]:nil != key) return nil; // popup for file selection dialog - string dir = UI::AskForExistingFile ("", "", _("Choose the script to import")); + string dir = UI::AskForExistingFile ("", "", _("Script to Import")); if (dir!= nil) { KiwiConfig["config_dir"] = union (KiwiConfig["config_dir"]:[], [dir]); @@ -504,8 +504,8 @@ */ symbol HandleBrowseRootDirectory (string key, map event) { if (event["ID"]:nil != key) return nil; - // popup for file selection dialog - BrowseDirectoryHandler ("root_dir", _("Choose the path to 'root' directory")); + // popup for file selection dialog ('root' is a name, do not translate) + BrowseDirectoryHandler ("root_dir", _("Path to root Directory")); return nil; } @@ -514,8 +514,8 @@ */ symbol HandleBrowseConfigDirectory (string key, map event) { if (event["ID"]:nil != key) return nil; - // popup for file selection dialog - BrowseDirectoryHandler ("config_dir", _("Choose the path to 'config' directory")); + // popup for file selection dialog ('config' is a name, do not translate) + BrowseDirectoryHandler ("config_dir", _("Path to config Directory")); return nil; } @@ -525,7 +525,7 @@ symbol HandleBrowseOutputDirectory (string key, map event) { if (event["ID"]:nil != key) return nil; // popup for file selection dialog - BrowseDirectoryHandler ("output_dir", _("Choose the path to the output directory")); + BrowseDirectoryHandler ("output_dir", _("Path to the Output Directory")); return nil; } @@ -551,7 +551,7 @@ symbol HandleBrowseImagesFile (string key, map event) { if (event["ID"]:nil != key) return nil; // popup for file selection dialog - BrowseFileHandler ("images_path", _("Choose the path to 'images.sh' file")); + BrowseFileHandler ("images_path", _("Path to images.sh File")); return nil; } @@ -561,7 +561,7 @@ symbol HandleBrowseAutoYaSTFile (string key, map event) { if (event["ID"]:nil != key) return nil; // popup for file selection dialog - BrowseFileHandler ("autoyast_path", _("Choose the path to autoYaST profile")); + BrowseFileHandler ("autoyast_path", _("Path to AutoYaST Profile")); return nil; } @@ -571,7 +571,7 @@ symbol HandleImportConfigFile (string key, map event) { if (event["ID"]:nil != key) return nil; // popup for file selection dialog - string file = BrowseFileHandler ("config.sh", _("Choose the path to 'config.sh' file")); + string file = BrowseFileHandler ("config.sh", _("Path to config.sh File")); if (file != nil) { if (FileUtils::Exists (file)) @@ -594,7 +594,7 @@ symbol HandleImportImagesFile (string key, map event) { if (event["ID"]:nil != key) return nil; // popup for file selection dialog - string file = BrowseFileHandler ("images.sh", _("Choose the path to 'images.sh' file")); + string file = BrowseFileHandler ("images.sh", _("Path to images.sh File")); if (file != nil) { if (FileUtils::Exists (file)) @@ -631,7 +631,7 @@ // popup question "iso" : _("Create ISO image now?"), // popup question - "xen" : _("Create XEN image now?"), + "xen" : _("Create Xen image now?"), // popup question "usb" : _("Create USB stick image now?"), // popup question @@ -644,9 +644,10 @@ %1 directory."), // popup message, %1 is a dir - "xen" : _("XEN image files successfully created in + "xen" : _("Xen image files successfully created in %1 -directory."), +directory. +"), // popup message, %1 is a dir "usb" : _("USB stick image successfully created in %1 @@ -708,7 +709,7 @@ KiwiConfig = ProductCreator::Config; // busy popup - Popup::ShowFeedback (_("Reading current Live image configuration..."), _("Please wait...")); + Popup::ShowFeedback (_("Reading current live image configuration..."), _("Please wait...")); map default_dirmap = $[ "iso" : sformat ("%1/kwliveDVD-suse-10.3", images_dir), @@ -812,7 +813,7 @@ return $[ "config.xml" : $[ // tab header - "header" : _("Image configuration"), + "header" : _("Image Configuration"), "contents" : `HBox (`HSpacing(1), `VBox ( `VSpacing (0.2), @@ -833,7 +834,7 @@ "sw_selection", `HBox ( `HWeight (1, `VBox ( - `Left (`Label (_("Installed software"))), "rt_sw", `Right ("configure_sw") + `Left (`Label (_("Installed Software"))), "rt_sw", `Right ("configure_sw") )), `HWeight (1, "ignore") ), @@ -939,9 +940,10 @@ // combo box label "label" : _("C&D Boot Image"), // help text for "C&D Boot Image", %1/%2 is path (on extra line) - "help" : sformat (_("<p>Choose one <b>CD Boot Image</b> from <br> + "help" : sformat (_("<p>Choose one <b>CD Boot Image</b> from the<br> <tt>%1/%2</tt><br> -directory.</p>"), +directory.</p> +"), Kiwi::images_dir, boot_image_widget ()), "items" : [], "init" : InitBootCombo, @@ -952,11 +954,12 @@ "widget" : `combobox, "opt" : [ `hstretch, `notify ], // combo box label - "label" : _("&XEN Boot Image"), + "label" : _("&Xen Boot Image"), // help text for "XEN Boot Image" - "help" : sformat (_("<p>Choose one <b>XEN Boot Image</b> from <br> + "help" : sformat (_("<p>Choose one <b>Xen Boot Image</b> from the<br> <tt>%1/%2</tt><br> -directory.</p>"), +directory.</p> +"), Kiwi::images_dir, boot_image_widget ()), "items" : [], "init" : InitBootCombo, @@ -967,11 +970,12 @@ "widget" : `combobox, "opt" : [ `hstretch, `notify ], // combo box label - "label" : _("&USB stick Boot Image"), + "label" : _("&USB Stick Boot Image"), // help text for "XEN Boot Image" - "help" : sformat (_("<p>Choose one <b>USB stick Boot Image</b> from<br> + "help" : sformat (_("<p>Choose one <b>USB stick Boot Image</b> from the<br> <tt>%1/%2</tt><br> -directory.</p>"), +directory.</p> +"), Kiwi::images_dir, boot_image_widget ()), "items" : [], "init" : InitBootCombo, @@ -984,9 +988,10 @@ // combo box label "label" : _("&Virtual Disk Boot Image"), // help text for "XEN Boot Image" - "help" : sformat (_("<p>Choose one <b>Virtual Disk Boot Image</b> from<br> + "help" : sformat (_("<p>Choose one <b>Virtual Disk Boot Image</b> from the<br> <tt>%1/%2</tt><br> -directory.</p>"), +directory.</p> +"), Kiwi::images_dir, boot_image_widget ()), "items" : [], "init" : InitBootCombo, @@ -997,14 +1002,14 @@ "widget" : `push_button, // pusbutton label "label" : _("C&onfigure..."), - "help" : _("<p>Create new boot image with <b>Configure</b>.</p>"), + "help" : _("<p>Create a new boot image with <b>Configure</b>.</p>"), "handle" : NotImplementedHandler ], "compressed" : $[ "widget" : `checkbox, // textentry label "label" : _("Co&mpress"), - "help" : _("<p>compressed: FIXME - still not supported?</p>"), + "help" : _("<p>Check <b>Compress</b> if the final image should be based \non the squashfs compressed file system."), "init" : InitCompressCheckBox, "store" : StoreCompressCheckBox, "handle" : HandleCompressCheckBox, @@ -1013,7 +1018,7 @@ "widget" : `combobox, "opt" : [ `hstretch, `notify ], // combo box label - "label" : _("So&ftware selection"), + "label" : _("So&ftware Selection"), // help text for "So&ftware selection" "help" : "", "items" : [], @@ -1034,13 +1039,13 @@ "widget" : `push_button, // pusbutton label "label" : _("Ch&ange..."), - "help" : _("<p>Adapt software selection with <b>Change</b>.</p>"), + "help" : _("<p>Adapt the software selection with <b>Change</b>.</p>"), "handle" : HandleSWSelection ], "ignore" : $[ "widget" : `multi_line_edit, // label - "label" : _("&Ignored software"), + "label" : _("&Ignored Software"), "init" : InitSWIgnore, "store" : StoreSWIgnore, "handle" : HandleSWIgnore, @@ -1050,7 +1055,7 @@ "output_dir" : $[ "widget" : `textentry, // textentry label - "label" : _("O&utput directory"), + "label" : _("O&utput Directory"), "help" : _("help for output dir"), "init" : InitOutputDir, ], @@ -1064,7 +1069,7 @@ "widget" : `textentry, // textentry label "label" : _("&Version"), - "help" : _("<p>Enter the <b>version</b> of your image configuration.</p>"), + "help" : _("<p>Enter the <b>Version</b> of your image configuration.</p>"), "valid_chars" : String::CDigit () + ".", "init" : InitVersion, "store" : StoreVersion, @@ -1075,7 +1080,7 @@ "opt" : [ `hstretch ], // textentry label "label" : _("&Size"), - "help" : _("<p>Set the image <b>size</b> in specified <b>unit</b>.</p>"), + "help" : _("<p>Set the image <b>Size</b> in the specified <b>Unit</b>.</p>"), "init" : InitSize, "store" : StoreDescription, "handle" : HandleDescription, @@ -1094,7 +1099,7 @@ "general_scripts" : $[ "widget" : `empty, // general help for directory structure tab - "help" : _("<p>Here, edit configuration scripts that are used to build your image.</p>"), + "help" : _("<p>Here, edit the configuration scripts used to build your image.</p>"), ], "general_directories" : $[ "widget" : `empty, @@ -1104,9 +1109,9 @@ "root_dir" : $[ "widget" : `textentry, // textentry label - "label" : _("P&ath to directory with system configuration"), + "label" : _("Directory with System Configur&ation"), // help text - "help" : _("<p>Define the path to the <b>directory with system configuration</b> (the <tt>root</tt> directory). The entire directory is copied into the root of the image tree using <tt>cp -a</tt>.</p>"), + "help" : _("<p>Define the path to the <b>Directory with System Configuration</b> (the <tt>root</tt> directory). The entire directory is copied into the root of the image tree using <tt>cp -a</tt>.</p>"), "init" : InitDescription, "store" : StoreDescription, "handle" : HandleDescription, @@ -1121,14 +1126,14 @@ "widget" : `custom, "custom_widget" : `VBox ( // label (above table) - `Left (`Label (_("Directory with system configuration"))), + `Left (`Label (_("Directory with System Configuration"))), `Table (`id("roottable"), `header ( // table header _("Path to Directory")) ) ), // help for table with users - "help" : _("<p>Configure the <b>directory with system configuration</b> (the <tt>root</tt> directory). The entire directory is copied into the root of the image tree using <tt>cp -a</tt>.</p>"), + "help" : _("<p>Configure the <b>Directory with System Configuration</b> (the <tt>root</tt> directory). The entire directory is copied into the root of the image tree using <tt>cp -a</tt>.</p>"), "init" : InitRootDirTable, ], "root_dir_add" : $[ @@ -1147,14 +1152,14 @@ "widget" : `custom, "custom_widget" : `VBox ( // label (above table) - `Left (`Label (_("Directory with scripts"))), + `Left (`Label (_("Directory with Scripts"))), `Table (`id("configtable"), `header ( // table header _("Path to File")) ) ), // help for table with users - "help" : _("<p>Configure the <b>directory with scripts</b> (the <tt>config</tt> directory). It contains scripts that are called after the installation of all the image packages.</p>"), + "help" : _("<p>Configure the <b>Directory with Scripts</b> (the <tt>config</tt> directory). It contains scripts that are run after the installation of all the image packages.</p>"), "init" : InitConfigDirTable, ], "config_dir_add" : $[ @@ -1172,8 +1177,8 @@ "config.sh" : $[ "widget" : `multi_line_edit, // textentry label - "label" : _("I&mage configuration script"), - "help" : _("<p>Edit your <b>Image configuration script</b>, called <tt>config.sh</tt>. This script is called at the end of the installation but before the package scripts have run.</p>"), + "label" : _("I&mage Configuration Script"), + "help" : _("<p>Edit your <b>Image Configuration Script</b>, called <tt>config.sh</tt>. This script is run at the end of the installation but before the package scripts have run.</p>"), "init" : InitDescription, "store" : StoreDescription, "handle" : HandleDescription, @@ -1188,8 +1193,8 @@ "config_dir" : $[ "widget" : `textentry, // textentry label - "label" : _("Pa&th to directory with scripts"), - "help" : _("<p>Optional <b>directory with scripts</b> (<tt>config</tt> directory) contains scripts that are called after the installation of all the image packages.</p>"), + "label" : _("Pa&th to Directory with Scripts"), + "help" : _("<p>The optional <b>Directory with Scripts</b> (<tt>config</tt> directory) contains scripts that are run after the installation of all the image packages.</p>"), "init" : InitDescription, "store" : StoreDescription, "handle" : HandleDescription, @@ -1204,8 +1209,8 @@ "autoyast_path" : $[ "widget" : `textentry, // textentry label - "label" : _("Path to Auto&YaST profile"), - "help" : _("<p>this is 'config-yast.xml'</p>"), + "label" : _("Path to Auto&YaST Profile"), + "help" : _("Choose the path to the AutoYaST profile (config.xml)."), ], "browse_autoyast" : $[ "widget" : `push_button, @@ -1217,8 +1222,8 @@ "images.sh" : $[ "widget" : `multi_line_edit, // textentry label - "label" : _("C&leanup script"), - "help" : _("<p>Edit your <b>cleanup script</b> (<tt>images.sh</tt>). This script is called at the beginning of the image creation process.</p>"), + "label" : _("C&leanup Script"), + "help" : _("<p>Edit your <b>Cleanup Script</b> (<tt>images.sh</tt>). This script is run at the beginning of the image creation process.</p>"), "init" : InitDescription, "store" : StoreDescription, "handle" : HandleDescription, @@ -1236,7 +1241,7 @@ // textentry label "label" : _("&Author"), // help text for Author, Contact and Specification widgets - "help" : _("<p>Set the values for <b>author</b> of the image, <b>contact information</b> and the image <b>specification</b>.</p>"), + "help" : _("<p>Set the values for <b>Author</b> of the image, <b>Contact Information</b>, and the image <b>Specification</b>.</p>"), "init" : InitDescription, "store" : StoreDescription, "handle" : HandleDescription, @@ -1269,7 +1274,7 @@ "widget" : `textentry, // textentry label "label" : _("&Group name"), - "help" : _("<p>Select the <b>group name</b> the users belong to.</p>"), + "help" : _("<p>Select the <b>Group Name</b> to which the users belong.</p>"), "init" : InitDescription, "store" : StoreDescription, "handle" : HandleDescription, @@ -1282,7 +1287,7 @@ // table header _("Home Directory"))), // help for table with users - "help" : _("<p>For each user, specify its <b>name</b>, <b>password</b> and <b>home directory</b>.</p>"), + "help" : _("<p>For each user, specify <b>Name</b>, <b>Password</b>, and <b>Home Directory</b>.</p>"), "init" : InitUsersTable, "handle" : HandleAddEditUser, ], @@ -1335,9 +1340,9 @@ // dialog caption "iso" : _("Live CD Configuration"), // dialog caption - "xen" : _("XEN Image Configuration"), + "xen" : _("Xen Image Configuration"), // dialog caption - "usb" : _("USB stick Image Configuration"), + "usb" : _("USB Stick Image Configuration"), // button label "vmx" : _("Virtual Disk Image"), ]; @@ -1345,9 +1350,9 @@ // button label "iso" : _("&Create ISO"), // button label - "xen" : _("&Create XEN Image"), + "xen" : _("&Create Xen Image"), // button label - "usb" : _("&Create USB stick Image"), + "usb" : _("&Create USB Stick Image"), // button label "vmx" : _("&Create Virtual Disk Image"), ]; Modified: branches/SuSE-SLE-10-SP1-Branch/product-creator/src/product-creator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/product-creator/src/product-creator.ycp?rev=38426&r1=38425&r2=38426&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/product-creator/src/product-creator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/product-creator/src/product-creator.ycp Wed Jun 13 14:55:12 2007 @@ -53,7 +53,7 @@ ], "passphrase" : $[ // translators: command line help text for the 'passhrase' option - "help" : _("File with GPG passhrase required for signing the source."), + "help" : _("File with GPG passhrase required for signing the source"), "type" : "string" ] ], -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org