Author: jsuchome Date: Thu Mar 29 13:46:24 2012 New Revision: 67743 URL: http://svn.opensuse.org/viewcvs/yast?rev=67743&view=rev Log: - merged proofread texts - 2.22.1 Modified: trunk/add-on-creator/VERSION trunk/add-on-creator/package/yast2-add-on-creator.changes trunk/add-on-creator/src/AddOnCreator.ycp trunk/add-on-creator/src/add-on-creator.ycp trunk/add-on-creator/src/complex.ycp trunk/add-on-creator/src/helps.ycp trunk/add-on-creator/src/patterns.ycp Modified: trunk/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=67743&r1=67742&r2=67743&view=diff ============================================================================== --- trunk/add-on-creator/VERSION (original) +++ trunk/add-on-creator/VERSION Thu Mar 29 13:46:24 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add-on-creator.changes?rev=67743&r1=67742&r2=67743&view=diff ============================================================================== --- trunk/add-on-creator/package/yast2-add-on-creator.changes (original) +++ trunk/add-on-creator/package/yast2-add-on-creator.changes Thu Mar 29 13:46:24 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 29 13:45:12 CEST 2012 - jsuchome@suse.cz + +- merged proofread texts +- 2.22.1 + +------------------------------------------------------------------- Wed Jan 11 10:26:12 CET 2012 - jsuchome@suse.cz - Confirmed license Modified: trunk/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.ycp?rev=67743&r1=67742&r2=67743&view=diff ============================================================================== --- trunk/add-on-creator/src/AddOnCreator.ycp (original) +++ trunk/add-on-creator/src/AddOnCreator.ycp Thu Mar 29 13:46:24 2012 @@ -139,7 +139,7 @@ // label of content file key "label" : _("Content file style"), // help text for content file CONTENTSTYLE key - "help" : _("Must be the first tag of the content file"), + "help" : _("Must be the first tag of the content file."), "value" : "11", "mandatory" : true, ], @@ -171,7 +171,7 @@ "RELEASE" : $[ "key" : "RELEASE", // table item label - "label" : _("The release number"), + "label" : _("Release number"), "value" : "0", "mandatory" : true, ], @@ -578,7 +578,7 @@ // label of key "label" : _("Products that must be installed"), // help text for 'REQUIRES' key - "help" : _("<p>Resolvables that must be installed on the system to meet the needs of this product.</p>"), + "help" : _("<p>Resolvables that must be installed on the system to meet product requirements.</p>"), "type" : "dependency", ], "provides" : $[ @@ -624,12 +624,12 @@ "release" : $[ "key" : "release", // table item label - "label" : _("The release number"), + "label" : _("Release number"), ], "releasenotes" : $[ "key" : "releasenotes", // table item label - "label" : _("The URL for release notes rpm"), + "label" : _("The URL for release notes RPM"), ], "description" : $[ "key" : "description", @@ -651,7 +651,7 @@ // table item label "label" : _("Product line"), // help text for 'productline' key - "help" : _("A short name of the product which do not change between service packs and versions."), + "help" : _("A short name for the product, which does not change between service packs and versions."), ], "updaterepokey" : $[ "key" : "updaterepokey", Modified: trunk/add-on-creator/src/add-on-creator.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/add-on-creator.ycp?rev=67743&r1=67742&r2=67743&view=diff ============================================================================== --- trunk/add-on-creator/src/add-on-creator.ycp (original) +++ trunk/add-on-creator/src/add-on-creator.ycp Thu Mar 29 13:46:24 2012 @@ -498,7 +498,7 @@ else { // error message - Report::Error (_("Specify the add-on product that should be built.")); + Report::Error (_("Specify the add-on product to build.")); return false; } } @@ -662,7 +662,7 @@ ], "resign_packages" : $[ // command line help text for 'passphrase' option - "help" : _("Resign all packages with selected key"), + "help" : _("Resign all packages with selected key."), ], "workflow" : $[ // command line help text for 'workflow' option @@ -701,7 +701,7 @@ ], "do_not_build" : $[ // command line help text for 'do_not_build' option - "help" : _("Do not build the product, only save new configuration"), + "help" : _("Do not build the product, only save new configuration."), ], "number" : $[ // help text for 'number' option; do not translate 'list' @@ -714,7 +714,7 @@ ], "no_release_package" : $[ // command line help text for 'no_release_package' option - "help" : _("Do not generate the release package"), + "help" : _("Do not generate the release package."), ], "product_file" : $[ // command line help text for 'product_file' option Modified: trunk/add-on-creator/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/complex.ycp?rev=67743&r1=67742&r2=67743&view=diff ============================================================================== --- trunk/add-on-creator/src/complex.ycp (original) +++ trunk/add-on-creator/src/complex.ycp Thu Mar 29 13:46:24 2012 @@ -108,7 +108,7 @@ any SummaryDialog () { // dialog caption - string caption = _("Add-On Creator Configuration Overview"); + string caption = _("Add-on Creator Configuration Overview"); list<map> add_on_products = AddOnCreator::add_on_products; @@ -151,7 +151,7 @@ _("<p>Delete the selected configuration using <b>Delete</b>.</p>") + // help text - _("<p>Build the fresh add-on product based on the selected configuration with <b>Build</b>.</p>"); + _("<p>Build the new add-on product based on the selected configuration with <b>Build</b>.</p>"); term contents = `VBox ( `VWeight (3, `Table (`id (`table), `opt (`notify, `immediate), @@ -735,7 +735,7 @@ term contents = `HBox (`HSpacing (), `VBox ( // label - `Left (`Label (_("content File"))), + `Left (`Label (_("Content File"))), `Table (`id(`content_table), `opt(`notify), `header ( // table header _("Key"), @@ -1337,7 +1337,7 @@ string file = UI::AskForExistingFile ( AddOnCreator::current_product["base_output_path"]:"", "", // popup for file selection dialog - _("Choose the file with the text to be imported") + _("Choose the file with the text to be imported.") ); if (file != nil) { @@ -1816,7 +1816,7 @@ AddOnCreator::passphrases[gpg_key]:""), // checkbox label `Left (`CheckBox (`id (`resign), - _("Re&sign all packages with selected key"), + _("Re&sign all packages with selected key."), current_product["resign_packages"]:false) ), `VSpacing (0.7) Modified: trunk/add-on-creator/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/helps.ycp?rev=67743&r1=67742&r2=67743&view=diff ============================================================================== --- trunk/add-on-creator/src/helps.ycp (original) +++ trunk/add-on-creator/src/helps.ycp Thu Mar 29 13:46:24 2012 @@ -43,7 +43,8 @@ // Write dialog help "write" : _("<p>Writing the add-on configurations<br> -Please wait...<br></p>\n"), +</p> +"), // help text for start menu "start" : _("<p>This module offers guidance for the creation of an add-on product.</p>") + @@ -108,13 +109,13 @@ + // help text for patterns, cont. - _("<p>Check <b>Required pattern</b> if you want to set selected pattern as required for the add-on product. Such pattern will be automatically preselected when the installation of the add-on product is started.</p>"), + _("<p>Check <b>Required pattern</b> to mark the selected pattern as required for\nthe add-on product. Such a pattern will be automatically preselected when the installation of the add-on product is started.</p>"), // help text for the 'various settings' dialog "output" : _("<p>Specify the path to the directory in which the add-on product should be created. Select <b>Create ISO Image</b> to create the ISO image of the product in the output directory.</p>") + // help text for the 'various settings' dialog - _("<p>Use <b>Generate Changelog</b> to generate a Changelog file with all the changes of packages on the add-on product made in the last two years.</p>") + + _("<p>Use <b>Generate Changelog</b> to generate a changelog file containing all changes of packages on the add-on product made in the last two years.</p>") + // help text for the 'various settings' dialog _("<p>Adapt the workflow of the add-on product with <b>Configure Workflow</b>. Use <b>Optional Files</b> to configure texts of <tt>README</tt> files, licenses, and other optional values.</p>"), @@ -143,7 +144,7 @@ _("<p>Enter the passphrase needed to unlock the secret key.</p>") + // help text for signing dialog, cont. - _("<p>Select if you want to <b>Sign All Packages</b> of the add-on product with selected key. All previous package signatures will be removed.</p>"), + _("<p>Decide if you want to <b>Sign All Packages</b> of the add-on product with the selected key. All previous package signatures will be removed.</p>"), // help text for generating new key dialog "generate" : _("<p>Enter the values necessary for generating the new primary key pair.</p>") + Modified: trunk/add-on-creator/src/patterns.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/patterns.ycp?rev=67743&r1=67742&r2=67743&view=diff ============================================================================== --- trunk/add-on-creator/src/patterns.ycp (original) +++ trunk/add-on-creator/src/patterns.ycp Thu Mar 29 13:46:24 2012 @@ -116,8 +116,9 @@ if (contains (conflicts[name]:[], arch)) { // popup message - Popup::Error (_("Such pattern already exists. -Choose a different name or architecture.")); + Popup::Error (_("Such a pattern already exists. +Choose a different name or architecture. +")); continue; } foreach (string key, ["name", "version", "release", "arch"], { @@ -295,7 +296,7 @@ `PushButton (`id(`delete), `opt(`key_F8), Label::DeleteButton ()), `HStretch (), // check box label - `CheckBox (`id (`required), `opt (`notify, `key_F8), _("R&equired pattern"), false) + `CheckBox (`id (`required), `opt (`notify, `key_F8), _("R&equired Pattern"), false) ), `VSpacing (0.5) ), `HSpacing ()); @@ -467,8 +468,9 @@ if (conflict) { // error message - Popup::Error (_("Such pattern already exists. -Choose a different architecture.")); + Popup::Error (_("Such a pattern already exists. +Choose a different architecture. +")); continue; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org