Author: jsuchome Date: Thu Mar 29 13:49:16 2012 New Revision: 67745 URL: http://svn.opensuse.org/viewcvs/yast?rev=67745&view=rev Log: - merged proofread texts - confirmed license - 2.22.0 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp trunk/add-on/src/add-on.ycp trunk/add-on/src/add-on_auto.ycp trunk/add-on/src/add-on_proposal.ycp trunk/add-on/src/inst_language_add-on.ycp trunk/add-on/yast2-add-on.spec.in Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=67745&r1=67744&r2=67745&view=diff ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Thu Mar 29 13:49:16 2012 @@ -1 +1 @@ -2.21.6 +2.22.0 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.changes?rev=67745&r1=67744&r2=67745&view=diff ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Thu Mar 29 13:49:16 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 29 13:48:15 CEST 2012 - jsuchome@suse.cz + +- merged proofread texts +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Mon Oct 24 07:41:54 UTC 2011 - jsrain@suse.cz - adjust installation workflow after integrating add-on products Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?rev=67745&r1=67744&r2=67745&view=diff ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Thu Mar 29 13:49:16 2012 @@ -135,7 +135,7 @@ AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[ "media" : AddOnProduct::src_id, // table cell - "product" : source_data["name"]:source_data["alias"]:_("No product found in the repository"), + "product" : source_data["name"]:source_data["alias"]:_("No product found in the repository."), "media_url" : source_data["url"]:"", "product_dir" : source_data["product_dir"]:"", ]); @@ -509,7 +509,7 @@ AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[ "media" : AddOnProduct::src_id, // table cell - "product" : ((new_addon_name != "" && new_addon_name != nil) ? new_addon_name : _("No product found in the repository")), + "product" : ((new_addon_name != "" && new_addon_name != nil) ? new_addon_name : _("No product found in the repository.")), "media_url" : url, "product_dir" : product_dir, ]); @@ -1076,14 +1076,14 @@ Wizard::SetContents ( // TRANSLATORS: dialog caption - _("Installed Add-On Products"), + _("Installed Add-on Products"), `VBox ( `Table ( `id ("list_of_addons"), `opt (`notify, `immediate), `header ( // TRANSLATORS: table header item - _("Add-On Product"), + _("Add-on Product"), // TRANSLATORS: table header item _("URL") ), @@ -1105,9 +1105,9 @@ ) ), // TRANSLATORS: dialog help adp/1 - _("<p>Here you can see all of the add-on products which are installed on your system.</p>") + + _("<p>All add-on products installed on your system are displayed.</p>") + // TRANSLATORS: dialog help adp/2 - _("<p>Use the <b>Add</b> button to add a new add-on product, or the <b>Delete</b> button to remove an add-on which is in use.</p>"), + _("<p>Click <b>Add</b> to add a new add-on product, or <b>Delete</b> to remove an add-on which is in use.</p>"), false, true ); @@ -1346,8 +1346,8 @@ AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[ "media" : src_id, "product_dir" : repo_data["product_dir"]:"/", - "product" : repo_data["name"]:repo_data["alias"]:_("No product found in the repository"), - "autoyast_product" : product_desc["product","name"]:repo_data["name"]:repo_data["alias"]:_("No product found in the repository"), + "product" : repo_data["name"]:repo_data["alias"]:_("No product found in the repository."), + "autoyast_product" : product_desc["product","name"]:repo_data["name"]:repo_data["alias"]:_("No product found in the repository."), "media_url" : Pkg::SourceURL(src_id) ]); }); Modified: trunk/add-on/src/add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on.ycp?rev=67745&r1=67744&r2=67745&view=diff ============================================================================== --- trunk/add-on/src/add-on.ycp (original) +++ trunk/add-on/src/add-on.ycp Thu Mar 29 13:49:16 2012 @@ -34,7 +34,7 @@ Mode::SetUI ("commandline"); // TRANSLATORS: commandline help CommandLine::Print(_(" -Add-On Module Help +Add-on Module Help ------------------ To add a new add-on product via the command-line, use this syntax: Modified: trunk/add-on/src/add-on_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on_auto.ycp?rev=67745&r1=67744&r2=67745&view=diff ============================================================================== --- trunk/add-on/src/add-on_auto.ycp (original) +++ trunk/add-on/src/add-on_auto.ycp Thu Mar 29 13:49:16 2012 @@ -185,7 +185,7 @@ Report::Error (_("Failed to add add-on product.")); } else if( (srcid == -1 || srcid == nil) && prod["ask_on_error"]:false) { prod["ask_on_error"] = Popup::ContinueCancel ( - sformat (_("Please make the add-on \"%1\" available via \"%2\""), prod["product"]:"", media) + sformat (_("Make the add-on \"%1\" available via \"%2\"."), prod["product"]:"", media) ); } Modified: trunk/add-on/src/add-on_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on_proposal.ycp?rev=67745&r1=67744&r2=67745&view=diff ============================================================================== --- trunk/add-on/src/add-on_proposal.ycp (original) +++ trunk/add-on/src/add-on_proposal.ycp Thu Mar 29 13:49:16 2012 @@ -70,9 +70,9 @@ ret = $[ // this is a heading - "rich_text_title" : _( "Add-On Products" ), + "rich_text_title" : _("Add-On Products"), // this is a menu entry - "menu_title" : _( "Add-&On Products" ), + "menu_title" : _("Add-&on Products"), "id" : "add_on" ]; } Modified: trunk/add-on/src/inst_language_add-on.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/inst_language_add-on.ycp?rev=67745&r1=67744&r2=67745&view=diff ============================================================================== --- trunk/add-on/src/inst_language_add-on.ycp (original) +++ trunk/add-on/src/inst_language_add-on.ycp Thu Mar 29 13:49:16 2012 @@ -167,14 +167,14 @@ `MultiSelectionBox ( `id ("languages"), // TRANSLATORS:: multi-selection box - _("&Select Language Extensions to be Installed"), + _("&Select Language Extensions to Be Installed"), items ), `HStretch () ) ), // TRANSLATORS: help text - _("<p>Select the language extensions to be installed and then click the <b>OK</b> button.</p>"), + _("<p>Select the language extensions to be installed then click <b>OK</b>.</p>"), Label::BackButton(), Label::OKButton() ); Modified: trunk/add-on/yast2-add-on.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/yast2-add-on.spec.in?rev=67745&r1=67744&r2=67745&view=diff ============================================================================== --- trunk/add-on/yast2-add-on.spec.in (original) +++ trunk/add-on/yast2-add-on.spec.in Thu Mar 29 13:49:16 2012 @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0 Requires: autoyast2-installation # PackagesUI module, BNC #469320 # Wizard::SetDesktopTitleAndIcon -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org