November 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r66823 - /tags/stable-2_22_0/fcoe-client/
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 12:28:19 2011 New Revision: 66823 URL: http://svn.opensuse.org/viewcvs/yast?rev=66823&view=rev Log: Created tag stable-2_22_0 for fcoe-client Added: tags/stable-2_22_0/fcoe-client/ - copied from r66822, trunk/fcoe-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66822 - in /trunk/fcoe-client: VERSION package/yast2-fcoe-client.changes src/FcoeClient.ycp src/complex.ycp src/helps.ycp
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 12:27:45 2011 New Revision: 66822 URL: http://svn.opensuse.org/viewcvs/yast?rev=66822&view=rev Log: - merged texts from proofreading - 2.22.0 Modified: trunk/fcoe-client/VERSION trunk/fcoe-client/package/yast2-fcoe-client.changes trunk/fcoe-client/src/FcoeClient.ycp trunk/fcoe-client/src/complex.ycp trunk/fcoe-client/src/helps.ycp Modified: trunk/fcoe-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/VERSION?rev=66822&r1… ============================================================================== --- trunk/fcoe-client/VERSION (original) +++ trunk/fcoe-client/VERSION Wed Nov 16 12:27:45 2011 @@ -1 +1 @@ -2.21.12 +2.22.0 Modified: trunk/fcoe-client/package/yast2-fcoe-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/package/yast2-fcoe-c… ============================================================================== --- trunk/fcoe-client/package/yast2-fcoe-client.changes (original) +++ trunk/fcoe-client/package/yast2-fcoe-client.changes Wed Nov 16 12:27:45 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 12:26:34 CET 2011 - jsuchome(a)suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Thu Oct 27 13:41:55 CEST 2011 - gs(a)suse.de - Don't enable service start at boot during installation (is Modified: trunk/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/FcoeClient.ycp?r… ============================================================================== --- trunk/fcoe-client/src/FcoeClient.ycp (original) +++ trunk/fcoe-client/src/FcoeClient.ycp Wed Nov 16 12:27:45 2011 @@ -894,7 +894,7 @@ /* Progress stage 3/3 */ _("Detect network cards"), /* Progress stage 4/4 */ - _("Read /etc/fcoe/config" ) + _("Read /etc/fcoe/config") ], [ /* Progress step 1/3 */ _("Checking for installed packages..."), @@ -903,7 +903,7 @@ /* Progress step 3/3 */ _("Detecting network cards..."), /* Progress step 4/4 */ - _("Reading /etc/fcoe/config" ), + _("Reading /etc/fcoe/config"), /* Progress finished */ _("Finished") ], @@ -1020,7 +1020,8 @@ success = WriteCfgFiles(); if( !success ) Report::Error (_("Cannot write settings for FCoE interfaces. -For details see /var/log/YaST2/y2log") ); +For details, see /var/log/YaST2/y2log. +") ); if(PollAbort()) return false; Progress::NextStage(); Modified: trunk/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/complex.ycp (original) +++ trunk/fcoe-client/src/complex.ycp Wed Nov 16 12:27:45 2011 @@ -287,7 +287,7 @@ string ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1\.%2", dev_name, card["vlan_interface"]:"" ); // headline of a popup: creating and starting Fibre Channel over Ethernet - boolean ret = Popup::YesNoHeadline( _("Creating and starting FCoE on detected VLAN device"), + boolean ret = Popup::YesNoHeadline( _("Creating and Starting FCoE on Detected VLAN Device"), // question to the user: really create and start FCoE sformat( _("Do you really want to create a FCoE network interface for discovered FCoE VLAN interface @@ -305,7 +305,7 @@ if ( output["exit"]:255 != 0 ) { // text of an error popup - Popup::Error( sformat( _("Cannot create and start FCoE on %1"), dev_name ) ); + Popup::Error( sformat( _("Cannot create and start FCoE on %1."), dev_name ) ); return nil; } } @@ -395,11 +395,11 @@ if ( !Stage::initial() ) { // popup text continues - popup_text = popup_text + "\n" + _( "Please note: The device won't be restored on 'Cancel'." ); + popup_text = popup_text + "\n" + _("Please note: The device won't be restored on 'Cancel'."); } // headline of a popup - boolean ret = Popup::YesNoHeadline( _("Removing FCoE VLAN device"), + boolean ret = Popup::YesNoHeadline( _("Removing FCoE VLAN Device"), popup_text ); if ( ret == true ) @@ -450,7 +450,7 @@ } else { - Popup::Error( sformat( _("Removing of interface %1 failed"), card["fcoe_vlan"]:"") ); + Popup::Error( sformat( _("Removing of interface %1 failed."), card["fcoe_vlan"]:"") ); y2error( "Removing of interface %1 failed", card["fcoe_vlan"]:"" ); } } @@ -483,7 +483,8 @@ { // text of a warning popup Popup::Warning( _("DCB Required is set to \"yes\" but the -interface isn't DCB capable") ); +interface isn't DCB capable. +") ); y2warning( "DCB_REQUIRED is set to yes but the interface isn't DCB capable" ); } } Modified: trunk/fcoe-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/helps.ycp?rev=66… ============================================================================== --- trunk/fcoe-client/src/helps.ycp (original) +++ trunk/fcoe-client/src/helps.ycp Wed Nov 16 12:27:45 2011 @@ -64,7 +64,7 @@ /* Summary dialog help 2/3 */ _("<big>Adding a fcoe-client:</big> -Choose an fcoe-client from the list of detected fcoe-clients. +Choose a fcoe-client from the list of detected fcoe-clients. If your fcoe-client was not detected, use Other (not detected). Then press Configure. ") + @@ -77,37 +77,37 @@ /* Services dialog help 1/3 */ "services" : _("<big>Starting of services</big> -There is the possibility to enable or disable the start of the services -fcoe and lldpad at boot time. +Enable or disable the start of the services fcoe and lldpad at boot time. ") + /* Services dialog help 2/3 */ _("Starting the service fcoe means starting the Fibre Channel over Ethernet service daemon fcoemon which controls the FCoE interfaces and -establishes a connection with the daemon lldpad." ) + +establishes a connection with the daemon lldpad.") + /* Services dialog help 3/3 */ - _("The lldpad service provides the Link Layer Discovery Protocol agent daemon lldpad which informs fcoemon about DCB (Data Center Bridging) features and configuration of the interfaces."), + _("The lldpad service provides the Link Layer Discovery Protocol agent daemon lldpad, which informs fcoemon about DCB (Data Center Bridging) features and configuration of the interfaces."), /* Interfaces dialog help 1/4 */ "interfaces" : _("<big>Network interface overview</big>") + /* Interfaces dialog help 2/4 */ -_("The interfaces dialog shows all detected netcards including the status of VLAN and FCoE configuration. FCoE is possible if a VLAN interface is configured for FCoE on the switch. For every netcard (network interface) this is shown in column FCoE VLAN Interface.") + +_("The interfaces dialog shows all detected netcards including the status of VLAN and FCoE configuration. FCoE is possible if a VLAN interface is configured for FCoE on the switch. For every netcard (network interface), this is shown in column FCoE VLAN Interface.") + /* Interfaces dialog help 3/4 */ _("The values for FCoE VLAN Interface in detail: -not available: Fibre Channel over Ethernet isn't possible (must be enabled on the switch first) -not configured: FCoE is possible but not yet activated, press Create FCoE VLAN Interface to do this. - If the FCoE VLAN interface is already created the name is shown in the column, e.g. eth3.200.") + +not available: Fibre Channel over Ethernet is not possible (must be enabled on the switch first). +not configured: FCoE is possible but not yet activated. Press Create FCoE VLAN Interface to activate. + If the FCoE VLAN interface has already been created, the name is shown in the column, e.g. eth3.200. +") + /* Interfaces dialog help 3/4 */ - _("To change the configuration of an existing FCoE VLAN interface press button Change Settings." ), + _("To change the configuration of an existing FCoE VLAN interface, click onChange Settings."), /* Configuration dialog help 1/3 */ - "configuration" : _("<big>General configuration of FCoE</big>") + + "configuration" : _("<big>General Configuration of FCoE</big>") + /* Configuration dialog help 2/3 */ - _("Here you can configure the general settings for the FCoE system service. The settings are written to '/etc/fcoe/config'.") + + _("Configure the general settings for the FCoE system service. The settings are written to '/etc/fcoe/config'.") + /* Configuration dialog help 3/3 */ _("The values are: @@ -117,21 +117,21 @@ Messages are sent to the system log if set to yes (data are logged to /var/log/messages)."), /* edit dialog help 1/3 */ - "change" : _("Edit settings in /etc/fcoe/ethx" ) + + "change" : _("Edit Settings in /etc/fcoe/ethx") + /* Edit dialog help 2/3 */ - _( "The daemon fcoemon reads these configuration files on initialization. + _("The daemon fcoemon reads these configuration files on initialization. There is a file for every interface and the values indicate whether FCoE instances - should be created and if DCB is required." ) + + should be created and if DCB is required.") + /* Edit dialog help 3/3 */ - _( "The values are: + _("The values are: FCoE Enable: yes or no Enable or disable the creation of FCoE instances. DCB Required: yes or no The default is yes, DCB is usually required. AUTO VLAN: yes or no If set to yes 'fcoemon' will create the VLAN -interfaces automatically." ), +interfaces automatically."), ]; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66821 - /tags/stable-2_22_0/dns-server/
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 11:56:28 2011 New Revision: 66821 URL: http://svn.opensuse.org/viewcvs/yast?rev=66821&view=rev Log: Created tag stable-2_22_0 for dns-server Added: tags/stable-2_22_0/dns-server/ - copied from r66820, trunk/dns-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66820 - in /trunk/dns-server: VERSION package/yast2-dns-server.changes src/DnsServer.pm src/cmdline.ycp src/dialog-installwizard.ycp src/dialog-main.ycp src/helps.ycp
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 11:56:18 2011 New Revision: 66820 URL: http://svn.opensuse.org/viewcvs/yast?rev=66820&view=rev Log: - merged texts from proofreading - 2.22.0 Modified: trunk/dns-server/VERSION trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/DnsServer.pm trunk/dns-server/src/cmdline.ycp trunk/dns-server/src/dialog-installwizard.ycp trunk/dns-server/src/dialog-main.ycp trunk/dns-server/src/helps.ycp Modified: trunk/dns-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/VERSION?rev=66820&r1=… ============================================================================== --- trunk/dns-server/VERSION (original) +++ trunk/dns-server/VERSION Wed Nov 16 11:56:18 2011 @@ -1 +1 @@ -2.21.3 +2.22.0 Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Wed Nov 16 11:56:18 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 11:55:12 CET 2011 - jsuchome(a)suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Mon Sep 12 12:21:22 UTC 2011 - lslezak(a)suse.cz - updated testsuite (systemd support) Modified: trunk/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsServer.pm?rev=… ============================================================================== --- trunk/dns-server/src/DnsServer.pm (original) +++ trunk/dns-server/src/DnsServer.pm Wed Nov 16 11:56:18 2011 @@ -1543,13 +1543,13 @@ if ($start_service) { # summary string - push (@ret, __("The DNS server starts when booting the system")); + push (@ret, __("The DNS server starts when booting the system.")); } else { push (@ret, # summary string - __("The DNS server does not start when booting the system")); + __("The DNS server does not start when booting the system.")); } my @zones_descr = map { Modified: trunk/dns-server/src/cmdline.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/cmdline.ycp?rev=6… ============================================================================== --- trunk/dns-server/src/cmdline.ycp (original) +++ trunk/dns-server/src/cmdline.ycp Wed Nov 16 11:56:18 2011 @@ -77,10 +77,10 @@ string content = ""; if (DnsServer::GetStartService()) { // TRANSLATORS: commandline DNS service status information - content = _("DNS server is enabled in the boot process"); + content = _("DNS server is enabled in the boot process."); } else { // TRANSLATORS: commandline DNS service status information - content = _("DNS server needs manual starting"); + content = _("DNS server needs manual starting."); } // TRANSLATORS: commandline section header ScreenWizard(_("Start-Up Settings:"), content); @@ -976,12 +976,12 @@ "retry" : $[ "type" : "string", // TRANSLATORS: commandline short help for command - "help" : _("An interval between retries of failed refresh"), + "help" : _("Interval between retries of failed refresh"), ], "expiry" : $[ "type" : "string", // TRANSLATORS: commandline short help for command - "help" : _("An interval after which zone records are no longer authoritative"), + "help" : _("Interval after which zone records are no longer authoritative"), ], "minimum" : $[ "type" : "string", Modified: trunk/dns-server/src/dialog-installwizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-installwiz… ============================================================================== --- trunk/dns-server/src/dialog-installwizard.ycp (original) +++ trunk/dns-server/src/dialog-installwizard.ycp Wed Nov 16 11:56:18 2011 @@ -185,7 +185,7 @@ firewall_layout, ldap_support, // Label for Radiobuttons - DNS starting - `Left ( `Label ( _("Start-Up Behavior") ) ), + `Left ( `Label ( _("Start-up Behavior") ) ), `Left ( `RadioButtonGroup( `id ( "dns_server_type" ), `opt( `shrinkable ), `VBox ( Modified: trunk/dns-server/src/dialog-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-main.ycp?r… ============================================================================== --- trunk/dns-server/src/dialog-main.ycp (original) +++ trunk/dns-server/src/dialog-main.ycp Wed Nov 16 11:56:18 2011 @@ -77,7 +77,7 @@ `Label (_("Current Status: ")), `ReplacePoint (`id ("service_status_rp"), // service status - label - `Label (_("DNS server is running")) + `Label (_("DNS server is running.")) ), `HStretch () ), @@ -109,9 +109,9 @@ UI::ReplaceWidget (`id ("service_status_rp"), `Label (status // service sttus - label - ? _("DNS server is running") + ? _("DNS server is running.") // service sttus - label - : _("DNS server is not running") + : _("DNS server is not running.") ) ); } @@ -476,7 +476,7 @@ if (ret == nil) { // An error message, %1 is replaced with a variable IP - Report::Error (sformat(_("Cannot find local equivalent for IP %1"), ret)); + Report::Error (sformat(_("Cannot find local equivalent for IP %1."), ret)); } else { // TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP Report::Warning (sformat(_("Forwarding DNS queries to itself would create an infinite loop. @@ -1773,9 +1773,9 @@ "start_stop" : CWMServiceStart::CreateStartStopWidget ($[ "service_id" : "named", // label - service status, informative text - "service_running_label" : _("DNS server is running"), + "service_running_label" : _("DNS server is running."), // label - service status, informative text - "service_not_running_label" : _("DNS server is not running"), + "service_not_running_label" : _("DNS server is not running."), // push button (DNS service handling) "start_now_button" : _("&Start DNS Server Now"), // push button (DNS service handling) Modified: trunk/dns-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/helps.ycp?rev=668… ============================================================================== --- trunk/dns-server/src/helps.ycp (original) +++ trunk/dns-server/src/helps.ycp Wed Nov 16 11:56:18 2011 @@ -106,21 +106,23 @@ "zone_direction" : _("<big>Zone Direction</big> DNS is used both for translating from domain names to IP addresses and back. Select if this zone will be used to translate from domain names to IP -addresses (select Forward) or from IP addresses to domain names -(select Reverse)."), +addresses (Forward) or from IP addresses to domain names +(Reverse). +"), // firewall dialog // help text 1/2 "iface_classes" : _("<big>Interface Classes</big> -Select through which interface classes access to the DNS server should be -allowed. The interface classes are defined in the -firewall configuration component."), +Select which interface classes should have access to the DNS server. The +interface classes are defined in the firewall configuration component. +"), // help text 2/2 "adapt_firewall" : _("<big>Adapting Firewall Settings</big> -To adapt the firewall settings so the DNS server can be accessed -through all network interfaces to which it listens, check -Adapt Firewall Settings."), +To adapt the firewall settings so that the DNS server can be accessed +via all network interfaces to which it listens, check +Adapt Firewall Settings. +"), // soa dialog // help text 1/9 @@ -137,12 +139,14 @@ // help text 4/9 - Administrator's mail + _("Administrator's Mail must contain the e-mail address of -administrator responsible for the zone.") +the administrator responsible for the zone. +") // help text 5/9 - Serial + _("Serial number is used for determining if the zone has changed on -master servers (so slave servers do not always need to synchronize the -entire zone).") +the master servers (so that slave servers do not always need to synchronize the +entire zone). +") // help text 6/9 - Refresh + _("Refresh sets how often the zone should be synchronized from @@ -254,7 +258,7 @@ /* Expert Mode Configuration - ACLs 2/2 */ _("To add a new ACL entry, just enter the option's Name -and Value then click Add. To remove an already set +and Value then click Add. To remove an ACL entry, select it and click Delete. "), @@ -342,8 +346,9 @@ /* Zone Editor - Help */ _(" Reverse zone records can be generated from another master zone. -If you want this, select the Automatically Generate Records From -check-box and choose the zone to generate the records from.") + +Select the Automatically Generate Records From +check-box and choose the zone to generate the records from. +") + /* Zone Editor - Help */ _(" @@ -372,8 +377,9 @@ /* Zone Editor - Help for tab - Zone (SOA) 2/7 */ + _("Serial is the number used for determining if the zone has changed on -master servers (so slave servers do not always need to synchronize the -entire zone).") +the master servers (then slave servers do not always need to synchronize the +entire zone). +") /* Zone Editor - Help for tab - Zone (SOA) 3/7 */ + _("TTL specifies the time to live for all records in the @@ -474,7 +480,8 @@ // Final step of the installation wizard - 3/5 _(" To start the DNS server every time your computer is booted, set the -start-up behavior to On. Otherwise set Off. ") + +start-up behavior to On. Otherwise set it to Off. +") + ((DnsServer::ExpertUI()) ? // Final step of the installation wizard - 4/5 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66819 - /tags/stable-2_22_0/wagon/
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 11:49:52 2011 New Revision: 66819 URL: http://svn.opensuse.org/viewcvs/yast?rev=66819&view=rev Log: Created tag stable-2_22_0 for wagon Added: tags/stable-2_22_0/wagon/ (props changed) - copied from r66818, trunk/wagon/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66818 - in /trunk/wagon: ./ package/ src/clients/ src/include/ src/modules/
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

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… ============================================================================== --- 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.change… ============================================================================== --- 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(a)suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Wed Sep 14 13:19:49 UTC 2011 - lslezak(a)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=… ============================================================================== --- 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_congratu… ============================================================================== --- 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 = _("Congratulations! -You have just successfully finished the on-line migration. +You have successfully finished the on-line migration. The whole system has been upgraded. It should be rebooted -it as soon as possible. +as soon as possible. Please visit us at http://www.novell.com/linux/. Have a nice day! -Your SUSE Linux Team"); +Your SUSE Linux Team +"); } term contents = `VBox ( @@ -58,8 +59,9 @@ `VSpacing (2) ); - string help = _("Finish will close the migration -and you should restart the system as soon as possible."); + string help = _("Finish will close the migration. +Restart the system as soon as possible. +"); 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_repo… ============================================================================== --- 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 = "" + _("Here select the repositories which will be used for migration.") + string help_text = "" + _("Select the repositories which will be used for migration.") + "" + _("The installed packages will be switched to the versions available in the selected migration repositories.") + ""; Wizard::SetContents (heading_text, contents, help_text, @@ -184,9 +184,9 @@ // help text string help_text = "" + _("Select the requested migration type.") // help text - + "" + _("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.") + + "" + _("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 - + "" + _("Press Advanced button to manually select the repositories used for upgrading.") + ""; + + "" + _("Press Advanced to manually select the repositories used for upgrading.") + ""; 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_migratio… ============================================================================== --- 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_registra… ============================================================================== --- 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 + "" + _("The system is not registered") + ""; + msg = msg + "" + _("The system is not registered.") + ""; } else { @@ -89,14 +89,14 @@ foreach(string prod, (list<string>)status["registered"]:[], { - msg = msg + "<li>" + sformat(_("Product %1 has a valid registration"), + msg = msg + "<li>" + sformat(_("Product %1 has a valid registration."), InstalledProduct(prod)["display_name"]:prod) + "</li>"; } ); foreach(string prod, (list<string>)status["no_subscription"]:[], { - msg = msg + "<li>" + sformat(_("Product %1 does not need a subscription"), + msg = msg + "<li>" + sformat(_("Product %1 does not need a subscription."), InstalledProduct(prod)["display_name"]:prod) + "</li>"; } ); @@ -104,7 +104,7 @@ foreach(map<string,any> prod, UnknownProducts(status), { msg = msg + "<li>" - + sformat(_("Registration status of product %1 is unknown"), prod["display_name"]:"") + + sformat(_("Registration status of product %1 is unknown."), prod["display_name"]:"") + "</li>"; } ); @@ -112,7 +112,7 @@ foreach(string prod, (list<string>)status["failed"]:[], { msg = msg + "<li>" - + sformat(_("Product %1 is not registered, registration failed"), + + sformat(_("Product %1 is not registered, registration failed."), InstalledProduct(prod)["display_name"]:prod) + "</li>"; } @@ -121,7 +121,7 @@ foreach(string prod, (list<string>)status["rma"]:[], { msg = msg + "<li>" - + sformat(_("Registration for product %1 has been refunded, the product is not registered"), + + sformat(_("Registration for product %1 has been refunded, the product is not registered."), InstalledProduct(prod)["display_name"]:prod) + "</li>"; } @@ -130,7 +130,7 @@ foreach(string prod, (list<string>)status["expired"]:[], { msg = msg + "<li>" - + sformat(_("Registration for product %1 has expired, the registration is not valid anymore"), + + sformat(_("Registration for product %1 has expired, the registration is not valid anymore."), InstalledProduct(prod)["display_name"]:prod) + "</li>"; } @@ -164,8 +164,8 @@ || size(UnknownProducts(status)) > 0 || !status["registered_system"]:false) { msg = msg + "" + _("Warning:") + " " - + _("It is strongly recommended to register the unregistered or expired products before starting migration.") - + " " + _("Migrating unregistered or partly registered system might result in broken system.") + + _("We strongly recommend to register unregistered or expired products before starting migration.") + + " " + _("Migrating an unregistered or partly registered system might result in a broken system.") + ""; } @@ -187,7 +187,7 @@ // help text string help_text = "" + _("YaST checks whether the installed products are registered.") - + "" + _("Migrating unregistered or partly registered system might result in broken system.") + ""; + + "" + _("Migrating an unregistered or partly registered system might result in a broken system.") + ""; 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_registra… ============================================================================== --- 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_u… ============================================================================== --- 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 = _("Here you can choose whether to use the Customer Center -to handle the installation repositories during migration or use Custom &URL -if you want to set them manually.") + + string help_text = _("Choose whether to use the Customer Center +to handle the installation repositories during migration or use +Custom &URL to set them manually. +") + // help text 2 - _("Additionally, select Check Automatic Repository Changes to ensure -that Customer Center has modified the repositories correctly. You can also modify -them there too."); + _("Select Check Automatic Repository Changes to ensure +that Customer Center has modified the repositories correctly. +You can also modify them there. +"); 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.yc… ============================================================================== --- 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=… ============================================================================== --- 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 <string,any> 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 ( - _("Warning: Product %1 will be removed"), + _("Warning: Product %1 will be removed."), 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 ( - _("Error: Product %1 will be automatically removed"), + _("Error: Product %1 will be automatically removed."), 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 %1 will keep installed"), + _("Product %1 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>%1 products are going to be removed. -Go to packages proposal and solve the issue manually. -It it also safe to abort the migration now.</li>"), products_removed_by_solver) + sformat(_("<li>%1 products will be removed. +Go to the packages proposal and resolve the issue manually. +It is safe to abort the migration now.</li> +"), products_removed_by_solver) : - _("<li>One product is going to be removed. -Go to packages proposal and solve the issue manually. -It it also safe to abort the migration now.</li>") + _("<li>One product will be removed. +Go to the packages proposal and solve the issue manually. +It is safe to abort the migration now.</li> +") ) + "</ul>"; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66817 - /tags/stable-2_22_0/packager/
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 11:36:56 2011 New Revision: 66817 URL: http://svn.opensuse.org/viewcvs/yast?rev=66817&view=rev Log: Created tag stable-2_22_0 for packager Added: tags/stable-2_22_0/packager/ (props changed) - copied from r66816, trunk/packager/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66816 - in /trunk/packager: ./ package/ src/clients/ src/include/ src/include/checkmedia/ src/modules/
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 11:36:37 2011 New Revision: 66816 URL: http://svn.opensuse.org/viewcvs/yast?rev=66816&view=rev Log: - merged texts from proofreading - 2.22.0 Modified: trunk/packager/VERSION trunk/packager/package/yast2-packager.changes trunk/packager/src/clients/do_not_show_again_editor.ycp trunk/packager/src/clients/inst_desktop.ycp trunk/packager/src/clients/inst_productsources.ycp trunk/packager/src/clients/inst_rpmcopy.ycp trunk/packager/src/clients/media_proposal.ycp trunk/packager/src/clients/repositories.ycp trunk/packager/src/clients/sw_single.ycp trunk/packager/src/clients/webpin_package_search.ycp trunk/packager/src/include/checkmedia/ui.ycp trunk/packager/src/include/key_manager_dialogs.ycp trunk/packager/src/include/repositories_include.ycp trunk/packager/src/modules/AddOnProduct.ycp trunk/packager/src/modules/KeyManager.ycp trunk/packager/src/modules/PackageInstallation.ycp trunk/packager/src/modules/Packages.ycp trunk/packager/src/modules/ProductLicense.ycp trunk/packager/src/modules/SourceDialogs.ycp trunk/packager/src/modules/SourceManager.ycp trunk/packager/src/modules/SourceManagerSLP.ycp trunk/packager/src/modules/SpaceCalculation.ycp Modified: trunk/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/VERSION?rev=66816&r1=66… ============================================================================== --- trunk/packager/VERSION (original) +++ trunk/packager/VERSION Wed Nov 16 11:36:37 2011 @@ -1 +1 @@ -2.21.22 +2.22.0 Modified: trunk/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/package/yast2-packager.… ============================================================================== --- trunk/packager/package/yast2-packager.changes (original) +++ trunk/packager/package/yast2-packager.changes Wed Nov 16 11:36:37 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 11:35:38 CET 2011 - jsuchome(a)suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Tue Nov 1 13:21:19 UTC 2011 - lslezak(a)suse.cz - fixed free space check for very small partitions (~15MB), do not Modified: trunk/packager/src/clients/do_not_show_again_editor.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/do_not_show… ============================================================================== --- trunk/packager/src/clients/do_not_show_again_editor.ycp (original) +++ trunk/packager/src/clients/do_not_show_again_editor.ycp Wed Nov 16 11:36:37 2011 @@ -59,9 +59,10 @@ string caption = _("Editor for 'Do Not Show Again'"); // help text - string helptext = _("You can remove entries by selecting them -in the table and clicking the Delete button. -The entry will be removed immediately from the current configuration."); + string helptext = _("Remove entries by selecting them in the table and clicking the +Delete button. The entries will be removed immediately from +the current configuration. +"); term contents = `VBox( `Table( Modified: trunk/packager/src/clients/inst_desktop.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_deskto… ============================================================================== --- trunk/packager/src/clients/inst_desktop.ycp (original) +++ trunk/packager/src/clients/inst_desktop.ycp Wed Nov 16 11:36:37 2011 @@ -53,16 +53,16 @@ string gnome_blurb = // explanation text for GNOME _("GNOME is a powerful and intuitive desktop -environment that uses Evolution as its mailer, -Firefox as its browser, and Nautilus as its -file manager."); +environment that uses Evolution as mailer, +Firefox as browser, and Nautilus as file manager. +"); string kde_blurb = // explanation text for KDE _("KDE is a powerful and intuitive desktop -environment that uses Kontact as its mailer, -Konqueror as its file manager, and offers -both, Firefox and Konqueror as its Web browser. +environment that uses Kontact as mailer, +Dolphin as file manager, and offers +both Firefox and Konqueror as Web browsers. "); // help text 1/3 Modified: trunk/packager/src/clients/inst_productsources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_produc… ============================================================================== --- trunk/packager/src/clients/inst_productsources.ycp (original) +++ trunk/packager/src/clients/inst_productsources.ycp Wed Nov 16 11:36:37 2011 @@ -261,7 +261,7 @@ // Network is not running if (! Popup::AnyQuestion ( // TRANSLATORS: popup header - _("Network is not configured"), + _("Network is not configured."), // TRANSLATORS: popup question _("Online sources defined by product require an Internet connection. @@ -602,8 +602,8 @@ actions_todo, actions_doing, // TRANSLATORS: dialog help - _("Please wait while the packager is being initialized -and the list of servers downloaded from the Web. + _("The packager is being initialized and +the list of servers downloaded from the Web. "), [icons_for_progress] ); @@ -702,8 +702,9 @@ if (! ReadControlFile()) { y2milestone ("Feature not supported by the product"); // TRANSLATORS: light-warning message - Report::Message (_("No product URL defined to download -list of repositories from.")); + Report::Message (_("No product URL defined from which to download +list of repositories. +")); return `nosources; } @@ -1120,22 +1121,20 @@ ) ), // TRANSLATORS: dialog help 1/3 - _("Here you can see default online repositories downloaded from the Internet. -Click on the repository to see its details. + _("List of default online repositories. +Click on a repository for details. ") + (Stage::initial() ? // TRANSLATORS: dialog help 2/3 (version for installation) - _("If you want one or more online repositories to be used, -select those you want and click Next. + _("Select the online repositories you want to use then click Next. ") : // TRANSLATORS: dialog help 2/3 (version for running system) - _("If you want one or more online repositories to be used, -select those you want and click Finish. + _("Select the online repositories you want to use then click Finish. ") ) + // TRANSLATORS: dialog help 3/3 - (skip_already_used_repos != true ? _("To remove a used repository, just deselect it."):""), + (skip_already_used_repos != true ? _("To remove a used repository, simply deselect it."):""), (Mode::installation() ? GetInstArgs::enable_back():false), (Mode::installation() ? GetInstArgs::enable_next():true) ); @@ -1232,7 +1231,7 @@ actions_todo, actions_doing, // TRANSLATORS: dialog help - _("Please wait while the repository manager downloads the repository details...") + _("The repository manager is downloading repository details...") ); Wizard::SetTitleIcon ("yast-sw_source"); @@ -1309,7 +1308,7 @@ Report::Error (sformat ( // TRANSLATORS: pop-up error message // %1 is replaced with a repository name or URL - _("Adding repository %1 failed"), + _("Adding repository %1 failed."), (repo_name != "" ? repo_name : url) ) + error + details @@ -1328,7 +1327,7 @@ Report::Error (sformat ( // TRANSLATORS: pop-up error message // %1 is replaced with a repository name or URL - _("Adding repository %1 failed"), + _("Adding repository %1 failed."), (repo_name != "" ? repo_name : url)) + "\n" + Pkg::LastError() ); @@ -1340,7 +1339,7 @@ Report::Error (sformat ( // TRANSLATORS: pop-up error message // %1 is replaced with a repository name or URL - _("Adding repository %1 failed"), + _("Adding repository %1 failed."), (repo_name != "" ? repo_name : url)) + "\n" + Pkg::LastError() ); Modified: trunk/packager/src/clients/inst_rpmcopy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/inst_rpmcop… ============================================================================== --- trunk/packager/src/clients/inst_rpmcopy.ycp (original) +++ trunk/packager/src/clients/inst_rpmcopy.ycp Wed Nov 16 11:36:37 2011 @@ -178,7 +178,7 @@ // Solve dependencies // if( !Pkg::PkgSolve(false) ) { - Report::Error( _("The package resolver run failed. Please check your software section in the autoyast profile.") ); + Report::Error( _("The package resolver run failed. Check your software section in the AutoYaST profile.") ); } } @@ -215,7 +215,7 @@ string failed = mergestring(commit_result[1]:[], "\n"); // error message - displayed in a scrollable text area // %1 - an error message (details) - Report::LongError(sformat(_("Installation Failed + Report::LongError(sformat(_("Installation failed. Details: %1 @@ -367,7 +367,7 @@ // FIXME error checking is missing all around here, initialization could actually fail! if (Pkg::TargetInitialize (Installation::destdir) != true) { // continue-cancel popup - if(Popup::ContinueCancel(_("Initializing the target directory failed")) == false) { + if(Popup::ContinueCancel(_("Initializing the target directory failed.")) == false) { return `abort; } } Modified: trunk/packager/src/clients/media_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/media_propo… ============================================================================== --- trunk/packager/src/clients/media_proposal.ycp (original) +++ trunk/packager/src/clients/media_proposal.ycp Wed Nov 16 11:36:37 2011 @@ -32,7 +32,7 @@ UI::OpenDialog (`opt(`decorated), // intermediate popup while initializing internal packagemanagement - `Label(_("Reading package information. One moment please..."))); + `Label(_("Reading package information..."))); Packages::Init (true); Modified: trunk/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/repositorie… ============================================================================== --- trunk/packager/src/clients/repositories.ycp (original) +++ trunk/packager/src/clients/repositories.ycp Wed Nov 16 11:36:37 2011 @@ -283,7 +283,7 @@ } // heading - in case repo name not found - string name = info["name"]:_("Unknown repository name"); + string name = info["name"]:_("Unknown Repository Name"); // label to be used instead of URL if not found string url = sformat (_("URL: %1"), info["url"]:_("Unknown") ); @@ -669,9 +669,9 @@ // push button - refresh the selected repository now string refreshButtonLabel = _("Re&fresh Selected"); // push button - disable/enable the selected repository - string enableButtonLabel = _("Status &On or Off"); + string enableButtonLabel = _("Status &on or off"); // push button - disable/enable automatic refresh of the selected repository - string refreshOnOffButtonLabel = _("Refre&sh On or Off"); + string refreshOnOffButtonLabel = _("Refre&sh on or off"); // push button - set name of the selected repository string setAliasButtonLabel = _("Set &Name..."); @@ -720,9 +720,9 @@ `MenuButton (`id(`menu_button), `opt(`key_F6), _("Refresh"), [ `item(`id(`refresh), refreshButtonLabel ), // menu button label - `item(`id(`autorefresh_all), _("Refresh All Autor&efreshed")), + `item(`id(`autorefresh_all), _("Refresh all Autor&efreshed")), // menu button label - `item(`id(`refresh_enabled), _("Refresh All &Enabled")) + `item(`id(`refresh_enabled), _("Refresh all &Enabled")) ]) ) ); @@ -732,15 +732,17 @@ // help string help_text = _(" -In this dialog, manage configured software repositories and services."); +Manage configured software repositories and services. +"); help_text = help_text + _("A service or Repository Index Service (RIS) is a protocol for package repository management. A service can offer one or more software repositories which can be dynamically changed by the service administrator."); help_text = help_text + _(" -Adding a New Repository or a Service +Adding a new Repository or a Service To add a new repository, use Add and specify the software repository or service. -Yast will automatically detect whether a service or a repository is available at the entered location. -"); +YaST will automatically detect whether a service or a repository is available at the entered location. + +"); // help, continued help_text = help_text + _(" @@ -771,12 +773,13 @@ // help text, continued help_text = help_text + _("Priority of a Repository -Priority of a repository is an integer value between 0 (the highest priority) and 200 (the lowest priority). Default priority is 99. If a package is available in more repositories the repository with the highest priority is used."); +Priority of a repository is an integer value between 0 (the highest priority) and 200 (the lowest priority). Default is 99. If a package is available in more repositories, the repository with the highest priority is used. +"); // help text, continued help_text = help_text + _("Select the appropriate option on top of the window for navigation in repositories and services."); // help text, continued - help_text = help_text + _("Keep Downloaded Packages Check this option to keep downloaded packages in a local cache so they can be reused later when the packages are reinstalled. If unchecked the downloaded packages are deleted after installation.") + _("The default local cache is located in directory /var/cache/zypp/packages, the location can be changed in /etc/zypp/zypp.conf file."); + help_text = help_text + _("Keep Downloaded Packages Check this option to keep downloaded\npackages in a local cache so they can be reused later when the packages are\nreinstalled. If not checked, the downloaded packages are deleted after installation.") + _("The default local cache is located in directory /var/cache/zypp/packages. Change the location in /etc/zypp/zypp.conf file."); Wizard::SetNextButton(`next, Label::OKButton() ); Wizard::SetAbortButton(`abort, Label::CancelButton() ); @@ -1609,7 +1612,7 @@ boolean cont = Popup::AnyQuestionRichText( Label::ErrorMsg(), // Error popup - _("There were errors while restoring the repository configuration.\n") + "" + Pkg::LastError() + "", + _("Errors occurred while restoring the repository configuration.\n") + "" + Pkg::LastError() + "", 50, 15, Label::ContinueButton(), Label::CancelButton(), `focus_no ); @@ -1685,7 +1688,7 @@ map cmdline_description = $[ "id" : "inst_source", /* Command line help text for the repository module, %1 is "zypper" */ - "help" : sformat(_("Installation Repositories - this module doesn't support the command line interface, use '%1' instead."), "zypper"), + "help" : sformat(_("Installation Repositories - This module does not support the command line interface, use '%1' instead."), "zypper"), "guihandler" : StartInstSource, ]; Modified: trunk/packager/src/clients/sw_single.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/sw_single.y… ============================================================================== --- trunk/packager/src/clients/sw_single.ycp (original) +++ trunk/packager/src/clients/sw_single.ycp Wed Nov 16 11:36:37 2011 @@ -307,7 +307,7 @@ boolean mgr_ok = Pkg::SourceStartManager(enabled_only); if (!mgr_ok) { - Report::LongWarning(_("There was an error in the repository initialization.") + "\n" + Pkg::LastError ()); + Report::LongWarning(_("An error occurred during repository initialization.") + "\n" + Pkg::LastError ()); } if (size(Pkg::SourceGetCurrent(enabled_only)) == 0) { @@ -502,8 +502,8 @@ SCR::Read (.target.ycp, "/var/lib/YaST2/failed_packages"); } if (size (old_failed_packs) > 0 && Popup::YesNo ( -_("During the last package installation, -several package failed to install. +_("During the last package installation +several packages failed to install. Install them now? "))) { @@ -580,7 +580,9 @@ mergestring (nonexisting, ", ")); Report::LongError (sformat ( // error report, %1 is a list of packages - _("Following packages haven't been found on the medium:\n%1"), + _("The following packages have not been found on the medium: +%1 +"), mergestring (nonexisting, "\n"))); return `cancel; } @@ -755,7 +757,7 @@ map cmdline_description = $[ "id" : "sw_single", /* Command line help text for the software management module, %1 is "zypper" */ - "help" : sformat(_("Software installation - this module doesn't support the command line interface, use '%1' instead."), "zypper"), + "help" : sformat(_("Software Installation - This module does not support the command line interface, use '%1' instead."), "zypper"), "guihandler" : StartSWSingle, ]; Modified: trunk/packager/src/clients/webpin_package_search.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/clients/webpin_pack… ============================================================================== --- trunk/packager/src/clients/webpin_package_search.ycp (original) +++ trunk/packager/src/clients/webpin_package_search.ycp Wed Nov 16 11:36:37 2011 @@ -199,7 +199,7 @@ size(steps), steps, actions, - _("Please wait while packager is initializing...") + _("Packager is initializing...") ); Progress::NextStage(); @@ -237,7 +237,7 @@ ), `MultiSelectionBox( `id("search_in"), - _("Search &In"), + _("Search &in"), [ `item( `id("name"),_("Name"), true ), `item( `id("description"), _("Description"), true ), @@ -280,13 +280,12 @@ ) ), _("<big>Package Search</big> -This YaST module enables you to use the functionality of Webpin package search. -It searches within all known openSUSE build-service and openSUSE community repositories.") + +Use the functionality of Webpin package search to search in all known openSUSE build-service and openSUSE community repositories. +") + -_("<big>Security</big> -The software found is often not part of the distribution itself and the level of trust -depends on yourself. We do not take any responsibility for installing -such software. +_("<big>Security</big> The software found is often not part of the +distribution itself. You need to decide whether to trust the source of a +package. We do not take any responsibility for installing such software. "), //We don't need back button false, @@ -312,7 +311,7 @@ list <map> selected_packages = SelectedPackages(); if (selected_packages == nil || size (selected_packages) == 0) { - Report::Message (_("Select some packages to install.")); + Report::Message (_("Select packages to install.")); UI::SetFocus(`id("results")); continue; } @@ -348,7 +347,7 @@ // error message UI::ChangeWidget(`id("description"), `Value, _("Search failed")); else if (search_results == $[]) - UI::ChangeWidget(`id("description"), `Value, _("No packages matching entered criteria were found")); + UI::ChangeWidget(`id("description"), `Value, _("No packages matching entered criteria were found.")); else CreatePackageDescription(); } Modified: trunk/packager/src/include/checkmedia/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/checkmedia/… ============================================================================== --- trunk/packager/src/include/checkmedia/ui.ycp (original) +++ trunk/packager/src/include/checkmedia/ui.ycp Wed Nov 16 11:36:37 2011 @@ -289,23 +289,22 @@ // help text - media check 4/8 _("If the check of the medium fails, you should not continue the installation. -It may fail or you may lose your data. You should replace the broken -medium. +It may fail or you may lose your data. Better replace the broken medium. ") + // help text - media check 5/8 -_("After the check you can insert the next medium and start the procedure again. -The order of the media is irrelevant.") + +_("After the check, insert the next medium and start the procedure again. +The order of the media is irrelevant. +") + // help text - media check 6/8 _("Note: You cannot change the medium while it is used by the system.") + // help text - media check 7/8 -_("To check media before starting installation use the media check item in the boot menu.") + +_("To check media before the installation, use the media check item in the boot menu.") + // help text - media check 8/8 -_("If you burn the media yourself, use the pad option in your recording software. It avoids read errors at the end of media during the check. -"); +_("If you burn the media yourself, use the pad option in your recording\nsoftware. It avoids read errors at the end of the media during the check.\n"); // advice check of the media // for translators: split the message to more lines if needed, use max. 50 characters per line @@ -419,7 +418,7 @@ if (res != 0) { // error message: the medium cannot be read or no medium in the drive; %1 = drive, e.g. /dev/hdc - LogLine("" + sformat(_("Cannot read medium in the drive %1."), selecteddrive) + ""); + LogLine("" + sformat(_("Cannot read medium in drive %1."), selecteddrive) + ""); } else { Modified: trunk/packager/src/include/key_manager_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/key_manager… ============================================================================== --- trunk/packager/src/include/key_manager_dialogs.ycp (original) +++ trunk/packager/src/include/key_manager_dialogs.ycp Wed Nov 16 11:36:37 2011 @@ -168,13 +168,15 @@ // help string help_text = _(" -In this dialog, manage known GPG public keys."); +Manage known GPG public keys. +"); help_text = help_text + _(" Adding a New GPG Key -To add a new GPG key specify the path to the key file. +To add a new GPG key, specify the path to the key file. Check the Trusted check box if the key is trusted. -"); + +"); Wizard::SetNextButton(`next, Label::OKButton()); Wizard::SetContents(title, contents, help_text, true, true); @@ -251,7 +253,8 @@ // help string help_text = _(" -In this dialog, manage known GPG public keys."); +Manage known GPG public keys. +"); help_text = help_text + _(" Adding a New GPG Key Modified: trunk/packager/src/include/repositories_include.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/include/repositorie… ============================================================================== --- trunk/packager/src/include/repositories_include.ycp (original) +++ trunk/packager/src/include/repositories_include.ycp Wed Nov 16 11:36:37 2011 @@ -72,7 +72,7 @@ [ _("Check Repository Type"), _("Add Repository"), _("Read Repository License") ], [ _("Checking Repository Type"), _("Adding Repository"), _("Reading Repository License") ], // TRANSLATORS: dialog help - _("Please wait while the repository manager downloads the repository details...") + _("The repository manager is downloading repository details...") ); Progress::NextStage(); @@ -198,10 +198,11 @@ Popup::NoHeadline (), // continue-back popup _("There is no product information available at the given location. -If you expected to address a product, return back and enter +If you expected to to point a product, go back and enter the correct location. To make rpm packages located at the specified location available -in the packages selection, continue."), +in the packages selection, continue. +"), Label::ContinueButton (), Label::BackButton (), `focus_no)) @@ -399,7 +400,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/packager/src/modules/AddOnProduct.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/AddOnProduc… ============================================================================== --- trunk/packager/src/modules/AddOnProduct.ycp (original) +++ trunk/packager/src/modules/AddOnProduct.ycp Wed Nov 16 11:36:37 2011 @@ -1153,8 +1153,9 @@ ), `VSpacing (0.5), // TRANSLATORS: additional dialog information - `Left (`Label (_("The installation repository contains also the listed additional repositories. -Select those you want to use."))), + `Left (`Label (_("The installation repository also contains the listed additional repositories. +Select the ones you want to use. +"))), `VSpacing (0.5), `MinSize ( 70, 16, Modified: trunk/packager/src/modules/KeyManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/KeyManager.… ============================================================================== --- trunk/packager/src/modules/KeyManager.ycp (original) +++ trunk/packager/src/modules/KeyManager.ycp Wed Nov 16 11:36:37 2011 @@ -237,7 +237,8 @@ else { Report::Error(sformat(_("File '%1' -doesn't contain a valid GPG key."), file)); +does not contain a valid GPG key. +"), file)); return nil; } Modified: trunk/packager/src/modules/PackageInstallation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/PackageInst… ============================================================================== --- trunk/packager/src/modules/PackageInstallation.ycp (original) +++ trunk/packager/src/modules/PackageInstallation.ycp Wed Nov 16 11:36:37 2011 @@ -60,7 +60,7 @@ `VBox( `HSpacing(40), // dialog headline - `Left(`Heading(_("Installation of Some Packages Failed"))), + `Left(`Heading(_("Installation of some Packages Failed"))), rbuttons, `RichText(`id(`text), `opt(`plainText), Modified: trunk/packager/src/modules/Packages.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/Packages.yc… ============================================================================== --- trunk/packager/src/modules/Packages.ycp (original) +++ trunk/packager/src/modules/Packages.ycp Wed Nov 16 11:36:37 2011 @@ -285,7 +285,7 @@ if (contains (flags, "lm")) { // warning text - return _("Your computer is a 64-bit x86-64 system. However, you are trying to install a 32-bit distribution."); + return _("Your computer is a 64-bit x86-64 system, but you are trying to install a 32-bit distribution."); } } return ""; @@ -308,7 +308,9 @@ // translators: help text for software proposal _("The proposal reports the total size of files which will be installed to the system. However, the system will contain some other files (temporary and working files) so the used space will be slightly larger than the proposed value. Therefore it is a good idea to have at least 25% (or about 300MB) free space before starting the installation.") + // help text for software proposal - _("The total 'size to download' is the size of the packages which will be downloaded from remote (network) repositories.\n This value is important when the connection is slow or when there is a data limit for downloading."); + _("The total 'size to download' is the size of the packages which will be +downloaded from remote (network) repositories. This value is important if the connection is slow or if there is a data limit for downloading. +"); } @@ -424,7 +426,7 @@ }); warning = sformat ( - _("These Add-On products have been marked for auto-removal: %1"), + _("These add-on products have been marked for auto-removal: %1"), "<ul>\n" + warning + "</ul>\n" ); @@ -436,10 +438,10 @@ if (size (ret["warning"]:"") > 0) { ret["warning"] = ret["warning"]:"" + " \n" + (size (products) > 1 ? // Warning message when some add-ons are marked to be removed automatically - _("Please, contact the vendors of these add-ons to provide you with new the installation media.") + _("Contact the vendors of these add-ons to provide you with new installation media.") : // Warning message when some add-ons are marked to be removed automatically - _("Please, contact the vendor of the add-on to provide you with the new installation media.") + _("Contact the vendor of the add-on to provide you with a new installation media.") ); } @@ -1343,10 +1345,10 @@ if (load_release_notes (source)) { // TRANSLATORS: beginning of the rich text with the release notes - SlideShow::relnotes = _("These are the release notes made for the first initial release. They are -part of the installation media. During the configuration steps, if a connection -to the Internet is available, you can download updated release notes -from the SUSE Linux Web server.") + media_text; + SlideShow::relnotes = _("The release notes for the initial release are part of the installation +media. If an Internet connection is available during configuration, you can +download updated release notes from the SUSE Linux Web server. +") + media_text; } } Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLice… ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Wed Nov 16 11:36:37 2011 @@ -317,7 +317,7 @@ `Left(`RadioButton(`id (sformat("no_%1", id)), `opt(`notify), // radio button - _("N&o, I Do Not Agree") + _("N&o, I Do not Agree") )) ), `HSpacing (2*space) Modified: trunk/packager/src/modules/SourceDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceDialo… ============================================================================== --- trunk/packager/src/modules/SourceDialogs.ycp (original) +++ trunk/packager/src/modules/SourceDialogs.ycp Wed Nov 16 11:36:37 2011 @@ -872,9 +872,10 @@ "validate_function" : DirValidate, "help" : _("<big>Local Directory</big> Use Path to Directory to specify the path to the -directory. If the directory contains just RPM packages without -any metadata (i.e. there is no product information) then check option -Plain RPM Directory.") +directory. If the directory contains only RPM packages without +any metadata (i.e. there is no product information), then check option +Plain RPM Directory. +") + multi_cd_help, ]; @@ -1104,17 +1105,19 @@ "init" : USBInit, "store" : USBStore, "help" : _("<big>USB Stick or Disk</big> -Select the USB device where the repository is located. +Select the USB device on which the repository is located. Use Path to Directory to specify the directory of the repository. -If the path is omitted the system will use the root directory of the disk. -If the directory contains just RPM packages without -any metadata (i.e. there is no product information) then check option -Plain RPM Directory.") +If the path is omitted, the system will use the root directory of the disk. +If the directory contains only RPM packages without +any metadata (i.e. there is no product information), then check option +Plain RPM Directory. +") // 'auto' is a value in the combo box widget, do not translate it! -+ _("The file system which is used on the device will be automatically -detected if file system 'auto' is selected. If the detection fails or you -want to use a certain file system then select it from the list.") ++ _("The file system used on the device will be detected automatically +if you select file system 'auto'. If the detection fails or you +want to use a certain file system, select it from the list. +") ]; } @@ -1173,17 +1176,19 @@ "init" : DiskInit, "store" : DiskStore, "help" : _("<big>Disk</big> -Select the disk where the repository is located. +Select the disk on which the repository is located. Use Path to Directory to specify the directory of the repository. -If the path is omitted the system will use the root directory of the disk. -If the directory contains just RPM packages without -any metadata (i.e. there is no product information) then check option -Plain RPM Directory.") +If the path is omitted, the system will use the root directory of the disk. +If the directory contains only RPM packages without +any metadata (i.e. there is no product information), then check option +Plain RPM Directory. +") // 'auto' is a value in the combo box widget, do not translate it! -+ _("The file system which is used on the device will be automatically -detected if file system 'auto' is selected. If the detection fails or you -want to use a certain file system then select it from the list.") ++ _("The file system used on the device will be detected automatically +if you select file system 'auto'. If the detection fails or you +want to use a certain file system, select it from the list. +") ]; } @@ -1856,16 +1861,15 @@ // help, continued help_text = help_text + _(" The product CDs can be copied to the hard disk. -Insert the path where the first -CD is located, for example, /data1/CD1. +Enter the path to the first CD, for example, /data1/CD1. Only the base path is required if all CDs are copied -into one directory. +into the same directory. "); // help, continued help_text = help_text + _(" Network installation requires a working network connection. -Specify the directory where the packages from +Specify the directory in which the packages from the first CD are located, such as /data1/CD1. "); return help_text; @@ -1876,7 +1880,7 @@ if (selected == nil) { // error popup - Popup::Message (_("Select the media type.")); + Popup::Message (_("Select the media type")); return false; } if (selected == `cd || selected == `dvd) @@ -2033,9 +2037,9 @@ string SelectWidgetHelpDl() { return _("Download Files -Each repository has description files which describe content of the repository. -Check the Download repository description files to download the files -when closing this YaST module. If the option is unchecked, YaST will +Each repository has description files which describe the content of the +repository. Check Download repository description files to download the +files when closing this YaST module. If the option is unchecked, YaST will automatically download the files when it needs them later. "); } Modified: trunk/packager/src/modules/SourceManager.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceManag… ============================================================================== --- trunk/packager/src/modules/SourceManager.ycp (original) +++ trunk/packager/src/modules/SourceManager.ycp Wed Nov 16 11:36:37 2011 @@ -369,10 +369,11 @@ Popup::NoHeadline (), // continue-back popup _("There is no product information available at the given location. -If you expected to address a product, return back and enter +If you expected to to point a product, go back and enter the correct location. To make rpm packages located at the specified location available -in the packages selection, continue."), +in the packages selection, continue. +"), Label::ContinueButton (), Label::BackButton (), `focus_yes)) Modified: trunk/packager/src/modules/SourceManagerSLP.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SourceManag… ============================================================================== --- trunk/packager/src/modules/SourceManagerSLP.ycp (original) +++ trunk/packager/src/modules/SourceManagerSLP.ycp Wed Nov 16 11:36:37 2011 @@ -311,8 +311,9 @@ if (current == nil || current < 0) { // message popup - Report::Message (_("Please select one of offered options. -This product has more repositories available.")); + Report::Message (_("Select one of the offered options. +More repositories are available for this product. +")); return nil; } else { Modified: trunk/packager/src/modules/SpaceCalculation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/SpaceCalcul… ============================================================================== --- trunk/packager/src/modules/SpaceCalculation.ycp (original) +++ trunk/packager/src/modules/SpaceCalculation.ycp Wed Nov 16 11:36:37 2011 @@ -874,13 +874,14 @@ if (Mode::update ()) message = add (message, "\n" + // popup message -_("Deselect some packages or delete some data -or temporary files before updating the system.")); +_("Deselect packages or delete data or temporary files +before updating the system. +")); else message = add (message, "\n" + // popup message -_("Please deselect some packages.")); +_("Deselect some packages.")); } } return message; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66815 - /tags/stable-2_22_0/update/
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 11:23:34 2011 New Revision: 66815 URL: http://svn.opensuse.org/viewcvs/yast?rev=66815&view=rev Log: Created tag stable-2_22_0 for update Added: tags/stable-2_22_0/update/ - copied from r66814, trunk/update/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r66814 - in /trunk/update: ./ package/ src/clients/ src/include/ src/modules/
by jsuchome＠svn2.opensuse.org 16 Nov '11

16 Nov '11

Author: jsuchome Date: Wed Nov 16 11:23:18 2011 New Revision: 66814 URL: http://svn.opensuse.org/viewcvs/yast?rev=66814&view=rev Log: - merged texts from proofreading - 2.22.0 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/clients/inst_backup.ycp trunk/update/src/clients/inst_update.ycp trunk/update/src/clients/update_proposal.ycp trunk/update/src/include/rootpart.ycp trunk/update/src/modules/RootPart.ycp Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=66814&r1=6681… ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Wed Nov 16 11:23:18 2011 @@ -1 +1 @@ -2.21.1 +2.22.0 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Wed Nov 16 11:23:18 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Nov 16 11:22:38 CET 2011 - jsuchome(a)suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Fri Sep 23 11:01:27 UTC 2011 - lslezak(a)suse.cz - code cleanup - removed obsoled code for handling selections Modified: trunk/update/src/clients/inst_backup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/inst_backup.y… ============================================================================== --- trunk/update/src/clients/inst_backup.ycp (original) +++ trunk/update/src/clients/inst_backup.ycp Wed Nov 16 11:23:18 2011 @@ -112,7 +112,7 @@ // help text for backup dialog during update 1/7 string help_text = _("To avoid any loss of information during update, -it is possible to create a backup prior to updating. +create a backup prior to updating. "); // help text for backup dialog during update 2/7 @@ -126,13 +126,13 @@ // help text for backup dialog during update 4/7 help_text = help_text + _("Create a Backup of Modified Files: -Stores those modified files that are replaced during update. +Stores only those modified files that will be replaced during update. "); // help text for backup dialog during update 5/7 help_text = help_text + _("Create a Complete Backup of /etc/sysconfig: This covers all configuration files that are part of the -sysconfig mechanism, even those that are not replaced. +sysconfig mechanism, even those that will not be replaced. "); // help text for backup dialog during update 6/7 Modified: trunk/update/src/clients/inst_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/inst_update.y… ============================================================================== --- trunk/update/src/clients/inst_update.ycp (original) +++ trunk/update/src/clients/inst_update.ycp Wed Nov 16 11:23:18 2011 @@ -95,8 +95,8 @@ // help text for dialog "update options" 1/4 - string helptext = _("The update option differs between two modes. In -either case, it is recommended to make a backup of your personal data. + string helptext = _("The update option offers two different modes. In +either case, we recommend to make a backup of your personal data. "); // help text for dialog "update options" 2/4, %1 is a product name @@ -110,7 +110,7 @@ helptext = helptext + _("Only Installed Packages: This selection only updates the packages already installed on your system. Note: New software in the predefined software selection, such as new YaST modules, is -not available after the update. You might miss advertised features. +not available after the update. You might miss new features. "); // help text for dialog "update options" 4/4 Modified: trunk/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update_propos… ============================================================================== --- trunk/update/src/clients/update_proposal.ycp (original) +++ trunk/update/src/clients/update_proposal.ycp Wed Nov 16 11:23:18 2011 @@ -332,8 +332,9 @@ // TRANSLATORS: proposal error, %1 is the version of installed system // %2 is the version being installed _("Updating system to another version (%1 -> %2) is not supported on the running system. -Please, boot from the installation media and use a normal upgrade -or disable software repositories of products with different versions."), +Boot from the installation media and use a normal upgrade +or disable software repositories of products with different versions. +"), update_from, update_to ), "warning_level" : `fatal, @@ -406,10 +407,11 @@ SpaceCalculation::GetPartitionInfo(); // TRANSLATORS: proposal dialog help - string update_options_help = _("<big>Update Options</big> -Here you can choose how your system is going to be updated. -Choose whether only installed packages should be updated or whether new ones should be installed also -(the default selection), and whether unmaintained packages should be deleted."); + string update_options_help = _("<big>Update Options</big> Select how your system will be updated. +Choose if only installed packages should be updated or new ones should be +installed as well (default). Decide whether unmaintained packages should be +deleted. +"); ret = $[ "preformatted_proposal" : HTML::ListStart() + summary_text + HTML::ListEnd(), Modified: trunk/update/src/include/rootpart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/include/rootpart.ycp?… ============================================================================== --- trunk/update/src/include/rootpart.ycp (original) +++ trunk/update/src/include/rootpart.ycp Wed Nov 16 11:23:18 2011 @@ -327,7 +327,8 @@ cont = Popup::ContinueCancel ( // continue-cancel popup _("The architecture of the system installed in the selected partition -is different than the one of this product.")); +is different from the one of this product. +")); } if (! cont) Modified: trunk/update/src/modules/RootPart.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/RootPart.ycp?… ============================================================================== --- trunk/update/src/modules/RootPart.ycp (original) +++ trunk/update/src/modules/RootPart.ycp Wed Nov 16 11:23:18 2011 @@ -443,7 +443,8 @@ // %1 is a device name such as /dev/hda5 _("The file system check of device %1 has failed. -Would you like to continue in the mounting the device?"), device +Do you want to continue mounting the device? +"), device ), Label::ContinueButton(), // button @@ -961,11 +962,12 @@ // %2 with the recommended size sformat ( _("Your /boot partition is too small (%1 MB). -We recommend a size not less than %2 MB. It might happen, that the -new Kernel does not fit, so it would be safer to either enlarge that partition -or not to use the /boot partition at all. +We recommend a size of no less than %2 MB or else the new Kernel may not fit. +It is safer to either enlarge the partition +or not use a /boot partition at all. -Would you like to continue updating the current system?"), +Do you want to continue updating the current system? +"), current_bs, suggested_bs ) @@ -1037,9 +1039,10 @@ %2 If you are sure that the partition is not necessary for the -update (it is not any system partition), click Continue. +update (not a system partition), click Continue. To check or fix the mount options, click Specify Mount Options. -To abort update, click Cancel."), +To abort the update, click Cancel. +"), spec, mount_err) ), `VSpacing (1), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0