Author: jsuchome
Date: Wed Nov 16 11:49:26 2011
New Revision: 66818
URL: http://svn.opensuse.org/viewcvs/yast?rev=66818&view=rev
Log:
- merged texts from proofreading
- 2.22.0
Modified:
trunk/wagon/VERSION
trunk/wagon/package/yast2-wagon.changes
trunk/wagon/src/clients/wagon.ycp
trunk/wagon/src/clients/wagon_congratulate.ycp
trunk/wagon/src/clients/wagon_dup_repositories.ycp
trunk/wagon/src/clients/wagon_migration_products.ycp
trunk/wagon/src/clients/wagon_registration_check.ycp
trunk/wagon/src/clients/wagon_registration_handler.ycp
trunk/wagon/src/clients/wagon_update_url.ycp
trunk/wagon/src/include/common_func.ycp
trunk/wagon/src/modules/Wagon.ycp
Modified: trunk/wagon/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/VERSION?rev=66818&r1=66817&r2=66818&view=diff
==============================================================================
--- trunk/wagon/VERSION (original)
+++ trunk/wagon/VERSION Wed Nov 16 11:49:26 2011
@@ -1 +1 @@
-2.21.6
+2.22.0
Modified: trunk/wagon/package/yast2-wagon.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.changes?rev=66818&r1=66817&r2=66818&view=diff
==============================================================================
--- trunk/wagon/package/yast2-wagon.changes (original)
+++ trunk/wagon/package/yast2-wagon.changes Wed Nov 16 11:49:26 2011
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Nov 16 11:47:43 CET 2011 - jsuchome@suse.cz
+
+- merged texts from proofreading
+- 2.22.0
+
+-------------------------------------------------------------------
Wed Sep 14 13:19:49 UTC 2011 - lslezak@suse.cz
- yast2-wagon-control-openSUSE.rpm - fixed online_migration.xml
Modified: trunk/wagon/src/clients/wagon.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon.ycp?rev=66818&r1=66817&r2=66818&view=diff
==============================================================================
--- trunk/wagon/src/clients/wagon.ycp (original)
+++ trunk/wagon/src/clients/wagon.ycp Wed Nov 16 11:49:26 2011
@@ -169,8 +169,9 @@
y2warning ("Cannot revert the previous state of products, sorry. Installed products were: %1, Migration products were: %2",
Wagon::products_before_migration, Wagon::migration_products);
- Report::Warning (_("Cannot revert the previous state of installed products.
-You will have to revert them manually."));
+ Report::Warning (_("Cannot revert to the previous state of installed products.
+You will have to revert manually.
+"));
return false;
}
@@ -266,7 +267,8 @@
if (Pkg::TargetRemove (package_name) != true) {
y2error ("Cannot remove package %1", package_name);
Report::Error (sformat(_("Cannot remove product %1.
-Remove package %2 manually"), remove_product["name"]:_("Unknown product"), package_name));
+Remove package %2 manually.
+"), remove_product["name"]:_("Unknown product"), package_name));
return;
}
Modified: trunk/wagon/src/clients/wagon_congratulate.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_congratulate.ycp?rev=66818&r1=66817&r2=66818&view=diff
==============================================================================
--- trunk/wagon/src/clients/wagon_congratulate.ycp (original)
+++ trunk/wagon/src/clients/wagon_congratulate.ycp Wed Nov 16 11:49:26 2011
@@ -37,12 +37,13 @@
y2warning ("Using fallback migration_congratulate text");
text =
_("<p><b>Congratulations!</b><br>
-You have just successfully finished the on-line migration.</p>
+You have successfully finished the on-line migration.</p>
<p>The whole system has been upgraded. It should be rebooted
-it as soon as possible.</p>
+as soon as possible.</p>
<p>Please visit us at http://www.novell.com/linux/.</p>
<p>Have a nice day!<br>
-Your SUSE Linux Team</p>");
+Your SUSE Linux Team</p>
+");
}
term contents = `VBox (
@@ -58,8 +59,9 @@
`VSpacing (2)
);
- string help = _("<p><b>Finish</b> will close the migration
-and you should restart the system as soon as possible.</b>");
+ string help = _("<p><b>Finish</b> will close the migration.
+Restart the system as soon as possible.</b>
+");
Wizard::SetContents (caption, contents, help,
GetInstArgs::enable_back(), GetInstArgs::enable_next());
Modified: trunk/wagon/src/clients/wagon_dup_repositories.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_dup_repositories.ycp?rev=66818&r1=66817&r2=66818&view=diff
==============================================================================
--- trunk/wagon/src/clients/wagon_dup_repositories.ycp (original)
+++ trunk/wagon/src/clients/wagon_dup_repositories.ycp Wed Nov 16 11:49:26 2011
@@ -64,7 +64,7 @@
);
// help text
- string help_text = "<p>" + _("Here select the repositories which will be used for migration.")
+ string help_text = "<p>" + _("Select the repositories which will be used for migration.")
+ "</p><p>" + _("The installed packages will be switched to the versions available in the selected migration repositories.") + "</p>";
Wizard::SetContents (heading_text, contents, help_text,
@@ -184,9 +184,9 @@
// help text
string help_text = "<p>" + _("Select the requested migration type.")
// help text
- + "</p><p>" + _("Minimal migration only uses the repositories added by registration, full migration migrates all packages to the latest version available in any enabled repository. Full migration might use third party repositories.")
+ + "</p><p>" + _("Minimal migration only uses the repositories added by registration, full migration migrates all packages to the latest versions available in any enabled repository. Full migration might use third party repositories.")
// help text
- + "</p><p>" + _("Press <b>Advanced</b> button to manually select the repositories used for upgrading.") + "</p>";
+ + "</p><p>" + _("Press <b>Advanced</b> to manually select the repositories used for upgrading.") + "</p>";
Wizard::SetContents (heading_text, contents, help_text,
GetInstArgs::enable_back(), GetInstArgs::enable_next());
@@ -244,7 +244,7 @@
else
{
// error popup message
- Popup::Error(sformat(_("Selected unknown migration type: %1"), mtype));
+ Popup::Error(sformat(_("Selected unknown migration type: %1."), mtype));
y2error("Unknown migratinon type: %1", mtype);
continue;
Modified: trunk/wagon/src/clients/wagon_migration_products.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_migration_products.ycp?rev=66818&r1=66817&r2=66818&view=diff
==============================================================================
--- trunk/wagon/src/clients/wagon_migration_products.ycp (original)
+++ trunk/wagon/src/clients/wagon_migration_products.ycp Wed Nov 16 11:49:26 2011
@@ -106,7 +106,7 @@
if (! haskey (supported_upgrade, "product") || supported_upgrade["product"]:"" == "") {
y2error ("Erroneous product upgrades: %1 (%2)", p, supported_upgrade);
Report::Error (sformat (_("Cannot upgrade product %1 (%2).
-Migration path is erroneous."), p["display_name"]:p["short_name"]:_("Unknown"), p["name"]:_("not-defined")));
+Migration path is erroneous."), p["display_name"]:p["short_name"]:_("Unknown"), p["name"]:_("undefined")));
return;
}
Modified: trunk/wagon/src/clients/wagon_registration_check.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_registration_check.ycp?rev=66818&r1=66817&r2=66818&view=diff
==============================================================================
--- trunk/wagon/src/clients/wagon_registration_check.ycp (original)
+++ trunk/wagon/src/clients/wagon_registration_check.ycp Wed Nov 16 11:49:26 2011
@@ -81,7 +81,7 @@
if (!status["registered_system"]:false)
{
- msg = msg + "<p>" + _("The system is not registered") + "</p>";
+ msg = msg + "<p>" + _("The system is not registered.") + "</p>";
}
else
{
@@ -89,14 +89,14 @@
foreach(string prod, (list<string>)status["registered"]:[],
{
- msg = msg + "<li>" + sformat(_("Product <b>%1</b> has a valid registration"),
+ msg = msg + "<li>" + sformat(_("Product <b>%1</b> has a valid registration."),
InstalledProduct(prod)["display_name"]:prod) + "</li>";
}
);
foreach(string prod, (list<string>)status["no_subscription"]:[],
{
- msg = msg + "<li>" + sformat(_("Product <b>%1</b> does not need a subscription"),
+ msg = msg + "<li>" + sformat(_("Product <b>%1</b> does not need a subscription."),
InstalledProduct(prod)["display_name"]:prod) + "</li>";
}
);
@@ -104,7 +104,7 @@
foreach(map prod, UnknownProducts(status),
{
msg = msg + "<li>"
- + sformat(_("Registration status of product <b>%1</b> is unknown"), prod["display_name"]:"")
+ + sformat(_("Registration status of product <b>%1</b> is unknown."), prod["display_name"]:"")
+ "</li>";
}
);
@@ -112,7 +112,7 @@
foreach(string prod, (list<string>)status["failed"]:[],
{
msg = msg + "<li>"
- + sformat(_("Product <b>%1</b> is not registered, registration failed"),
+ + sformat(_("Product <b>%1</b> is not registered, registration failed."),
InstalledProduct(prod)["display_name"]:prod)
+ "</font></li>";
}
@@ -121,7 +121,7 @@
foreach(string prod, (list<string>)status["rma"]:[],
{
msg = msg + "<li>"
- + sformat(_("Registration for product <b>%1</b> has been refunded, the product is not registered"),
+ + sformat(_("Registration for product <b>%1</b> has been refunded, the product is not registered."),
InstalledProduct(prod)["display_name"]:prod)
+ "</font></li>";
}
@@ -130,7 +130,7 @@
foreach(string prod, (list<string>)status["expired"]:[],
{
msg = msg + "<li>"
- + sformat(_("Registration for product <b>%1</b> has expired, the registration is not valid anymore"),
+ + sformat(_("Registration for product <b>%1</b> has expired, the registration is not valid anymore."),
InstalledProduct(prod)["display_name"]:prod)
+ "</font></li>";
}
@@ -164,8 +164,8 @@
|| size(UnknownProducts(status)) > 0 || !status["registered_system"]:false)
{
msg = msg + "<p><b>" + _("Warning:") + " </b>"
- + _("It is strongly recommended to register the unregistered or expired products before starting migration.")
- + "<br>" + _("Migrating unregistered or partly registered system might result in broken system.")
+ + _("We strongly recommend to register unregistered or expired products before starting migration.")
+ + "<br>" + _("Migrating an unregistered or partly registered system might result in a broken system.")
+ "</p>";
}
@@ -187,7 +187,7 @@
// help text
string help_text = "<p>" + _("YaST checks whether the installed products are registered.")
- + "</p><p>" + _("Migrating unregistered or partly registered system might result in broken system.") + "</p>";
+ + "</p><p>" + _("Migrating an unregistered or partly registered system might result in a broken system.") + "</p>";
Wizard::SetContents (heading_text, contents, help_text,
GetInstArgs::enable_back(), GetInstArgs::enable_next());
Modified: trunk/wagon/src/clients/wagon_registration_handler.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_registration_handler.ycp?rev=66818&r1=66817&r2=66818&view=diff
==============================================================================
--- trunk/wagon/src/clients/wagon_registration_handler.ycp (original)
+++ trunk/wagon/src/clients/wagon_registration_handler.ycp Wed Nov 16 11:49:26 2011
@@ -124,14 +124,14 @@
// dialog caption
_("Warning"),
// pop-up question
- _("No changes were made to list of the registered repositories.
-This means that you might have skipped the registration or there might
-have been an error in configuration. Eventually, repositories might
-have been already added before.
+ _("No changes were made to the list of registered repositories.
+This means that you either skipped the registration, there has been an
+error in the configuration, or the repositories have been added before.
-Do you want to rerun the registration?"),
+Do you want to rerun the registration?
+"),
_("&Yes"),
- _("&No, Skip It"),
+ _("&No, Skip it"),
`focus_yes
) == false) {
y2warning ("User does not want to rerun the registration");
Modified: trunk/wagon/src/clients/wagon_update_url.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_update_url.ycp?rev=66818&r1=66817&r2=66818&view=diff
==============================================================================
--- trunk/wagon/src/clients/wagon_update_url.ycp (original)
+++ trunk/wagon/src/clients/wagon_update_url.ycp Wed Nov 16 11:49:26 2011
@@ -66,13 +66,15 @@
string heading_text = _("Update Method");
// help text 1
- string help_text = _("<p>Here you can choose whether to use the <b>Customer Center</b>
-to handle the installation repositories during migration or use <b>Custom &URL</b>
-if you want to set them manually.</p>") +
+ string help_text = _("<p>Choose whether to use the <b>Customer Center</b>
+to handle the installation repositories during migration or use
+<b>Custom &URL</b> to set them manually.</p>
+") +
// help text 2
- _("<p>Additionally, select <b>Check Automatic Repository Changes</b> to ensure
-that Customer Center has modified the repositories correctly. You can also modify
-them there too.</p>");
+ _("<p>Select <b>Check Automatic Repository Changes</b> to ensure
+that Customer Center has modified the repositories correctly.
+You can also modify them there.</p>
+");
Wizard::SetContents (heading_text, contents, help_text,
GetInstArgs::enable_back(), GetInstArgs::enable_next());
Modified: trunk/wagon/src/include/common_func.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/include/common_func.ycp?rev=66818&r1=66817&r2=66818&view=diff
==============================================================================
--- trunk/wagon/src/include/common_func.ycp (original)
+++ trunk/wagon/src/include/common_func.ycp Wed Nov 16 11:49:26 2011
@@ -82,7 +82,8 @@
_("Aborting the Upgrade"),
// TRANSLATORS: pop-up question
_("Cannot continue without installing the required patches.
-Are sure you want to abort the upgrade process?"),
+Are you sure you want to abort the upgrade process?
+"),
_("Abort Upgrade"),
Label::NoButton(),
`yes_button
@@ -207,7 +208,7 @@
// undefined product file
if (product_file == nil || product_file == "") {
y2error ("Cannot remove product: %1, no product file defined", product);
- Report::Error (sformat(_("Cannot remove product %1"), product["name"]:_("Unknown product")));
+ Report::Error (sformat(_("Cannot remove product %1."), product["name"]:_("Unknown product")));
return "";
}
@@ -229,7 +230,7 @@
// no package owns the file
if (package_name == nil || package_name == "") {
y2error ("Cannot find out file owner %1", product_file);
- Report::Error (sformat(_("Cannot find out owner of product %1"), product["name"]:_("Unknown product")));
+ Report::Error (sformat(_("Cannot find out owner of product %1."), product["name"]:_("Unknown product")));
return "";
}
Modified: trunk/wagon/src/modules/Wagon.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=66818&r1=66817&r2=66818&view=diff
==============================================================================
--- trunk/wagon/src/modules/Wagon.ycp (original)
+++ trunk/wagon/src/modules/Wagon.ycp Wed Nov 16 11:49:26 2011
@@ -99,7 +99,8 @@
} else {
y2error ("Unknown migration method: %1", m_method);
Report::Error (sformat(_("Error switching migration method.
-Unknown migration method: %1"), m_method));
+Unknown migration method: %1.
+"), m_method));
return false;
}
@@ -331,7 +332,7 @@
if (commands["command"]:"" == "help" || commands["command"]:"" == "longhelp") {
CommandLine::Print(_("
This module does not support command-line interface.
-To do so, please, use zypper instead.
+Use zypper instead.
"));
} else if (commands["command"]:"" == "xmlhelp") {
if (! haskey (commands["options"]:$[], "xmlfile")) {
@@ -555,7 +556,7 @@
list <string> products_to_be_installed = [];
foreach (map product, products, {
if (product["status"]:`unknown != `selected) return;
- name = product["name"]:_("No short name defined");
+ name = product["name"]:_("No short name defined.");
products_to_be_installed = add (products_to_be_installed, name);
});
@@ -569,8 +570,8 @@
if (product["status"]:`unknown != `removed) return;
product = MinimizeProductMap (product);
- display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined");
- name = product["name"]:_("No short name defined");
+ display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined.");
+ name = product["name"]:_("No short name defined.");
transact_by = product["transact_by"]:`unknown;
// Removing product and installing the same one (name) means -> upgrade
@@ -593,7 +594,7 @@
} else if (transact_by == `user || transact_by == `app_high) {
y2warning ("Product will be removed: %1 (%2)", product, transact_by);
ret = ret + "<li>" + sformat (
- _("<font color='red'><b>Warning:</b> Product <b>%1</b> will be removed</font>"),
+ _("<font color='red'><b>Warning:</b> Product <b>%1</b> will be removed.</font>"),
GetDisplayName (display_name, name)
) + "</li>\n";
// Not selected by user
@@ -601,7 +602,7 @@
} else {
y2warning ("Product will be removed: %1 (%2)", product, transact_by);
ret = ret + "<li>" + sformat (
- _("<font color='red'><b>Error:</b> Product <b>%1</b> will be automatically removed</font>"),
+ _("<font color='red'><b>Error:</b> Product <b>%1</b> will be automatically removed.</font>"),
GetDisplayName (display_name, name)
) + "</li>\n";
products_removed_by_solver = products_removed_by_solver + 1;
@@ -613,8 +614,8 @@
if (product["status"]:`unknown != `selected) return;
product = MinimizeProductMap (product);
- display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined");
- name = product["name"]:_("No short name defined");
+ display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined.");
+ name = product["name"]:_("No short name defined.");
// Product is going to be upgraded (removed + installed new version)
if (contains (products_to_be_upgraded, name)) {
@@ -638,12 +639,12 @@
if (product["status"]:`unknown != `installed) return;
product = MinimizeProductMap (product);
- display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined");
- name = product["name"]:_("No short name defined");
+ display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined.");
+ name = product["name"]:_("No short name defined.");
y2milestone ("Product will keep: %1", product);
ret = ret + "<li>" + sformat (
- _("Product <b>%1</b> will keep installed"),
+ _("Product <b>%1</b> will stay installed"),
GetDisplayName (display_name, name)
) + "</li>\n";
});
@@ -666,13 +667,15 @@
summary["warning_level"] = `blocker;
summary["warning"] = "<ul>" + (
products_removed_by_solver > 1 ?
- sformat(_("<li><b>%1 products are going to be removed.
-Go to packages proposal and solve the issue manually.<br>
-It it also safe to abort the migration now.</b></li>"), products_removed_by_solver)
+ sformat(_("<li><b>%1 products will be removed.
+Go to the packages proposal and resolve the issue manually.<br>
+It is safe to abort the migration now.</b></li>
+"), products_removed_by_solver)
:
- _("<li><b>One product is going to be removed.
-Go to packages proposal and solve the issue manually.<br>
-It it also safe to abort the migration now.</b></li>")
+ _("<li><b>One product will be removed.
+Go to the packages proposal and solve the issue manually.<br>
+It is safe to abort the migration now.</b></li>
+")
) + "</ul>";
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org