March 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67759 - in /trunk/dhcp-server: ./ package/ src/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 14:35:01 2012 New Revision: 67759 URL: http://svn.opensuse.org/viewcvs/yast?rev=67759&view=rev Log: - merged proofed texts - confirmed license - 2.22.0 Modified: trunk/dhcp-server/VERSION trunk/dhcp-server/package/yast2-dhcp-server.changes trunk/dhcp-server/src/dialogs2.ycp trunk/dhcp-server/src/dns-helps.ycp trunk/dhcp-server/src/dns-server-dialogs.ycp trunk/dhcp-server/src/dns-server-management.ycp trunk/dhcp-server/src/dns-server-wizard.ycp trunk/dhcp-server/src/helps.ycp trunk/dhcp-server/yast2-dhcp-server.spec.in Modified: trunk/dhcp-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/VERSION?rev=67759&r1… ============================================================================== --- trunk/dhcp-server/VERSION (original) +++ trunk/dhcp-server/VERSION Thu Mar 29 14:35:01 2012 @@ -1 +1 @@ -2.21.2 +2.22.0 Modified: trunk/dhcp-server/package/yast2-dhcp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/package/yast2-dhcp-s… ============================================================================== --- trunk/dhcp-server/package/yast2-dhcp-server.changes (original) +++ trunk/dhcp-server/package/yast2-dhcp-server.changes Thu Mar 29 14:35:01 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 29 14:28:18 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Mon Sep 26 13:11:34 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/dhcp-server/src/dialogs2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dialogs2.ycp?rev… ============================================================================== --- trunk/dhcp-server/src/dialogs2.ycp (original) +++ trunk/dhcp-server/src/dialogs2.ycp Thu Mar 29 14:35:01 2012 @@ -274,7 +274,7 @@ if (size(configured_interfaces) <= 0) { // TRANSLATORS: popup error, DHCP Server requires selected interface to have // at least minimal configuration - return Popup::ContinueCancel(_("The selected network interface has currently no configuration (no assigned IP address + return Popup::ContinueCancel(_("The selected network interface is not configured (no assigned IP address and netmask). Using it in the DHCP server configuration may not work. Really use this interface? ")); @@ -1663,9 +1663,9 @@ UI::SetFocus(`id("other_opts")); correct = (Popup::ContinueCancel(sformat(_("You have specified an alternate configuration file for the DHCP server. -This is not supported by YaST, as the DHCP server module can only read and write -/etc/dhcpd.conf. The new configuration from %1 will not be imported and all changes -will be saved to the default configuration file. +YaST does not supported this. The DHCP server module can only read and write +/etc/dhcpd.conf. The new configuration from %1 will not be imported. All +changes will be saved to the default configuration file. Really continue? "), v))); @@ -1880,7 +1880,7 @@ ], "other_options" : $[ "widget" : `custom, - "custom_widget" : `TextEntry (`id("other_opts"), _("DHCP Server Start-Up Arguments")), + "custom_widget" : `TextEntry (`id("other_opts"), _("DHCP Server Start-up Arguments")), "init" : OtherOptionsInit, "validate_type" : `function, "validate_function" : OtherOptionsValidate, Modified: trunk/dhcp-server/src/dns-helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dns-helps.ycp?re… ============================================================================== --- trunk/dhcp-server/src/dns-helps.ycp (original) +++ trunk/dhcp-server/src/dns-helps.ycp Thu Mar 29 14:35:01 2012 @@ -19,7 +19,7 @@ First IP Address defines the starting address of the range and Last IP Address defines the last one. Hostname Base is a string that determines how hostnames -should be created (such as <tt>dhcp-%i</tt> or <tt>e25-%i-a</tt>). +are created (such as <tt>dhcp-%i</tt> or <tt>e25-%i-a</tt>). <tt>%i</tt> is replaced with the number of the host in the range. If no <tt>%i</tt> is defined, the number is added at the end of the string. <tt>%i</tt> can be used only once in Hostname Base. @@ -30,15 +30,16 @@ map <string, string> DNS_HELPS = $[ // TRANSLATORS: DNS Wizard - step 1 (part 1) "wizard-zones" : _("<big>DNS Wizard</big> -This wizard helps you create a new DNS zone +In this wizard, create a new DNS zone directly from the DHCP server configuration. This DNS zone is important -if you also want to identify your DHCP clients by hostname. The DNS zone -translates names to the IP addresses assigned to them. You can also -create a reverse zone that translates IP addresses to names.\n") + +if you want to identify your DHCP clients by hostname. The DNS zone +translates names to the assigned IP addresses. You can also +create a reverse zone that translates IP addresses to names. +") + // TRANSLATORS: DNS Wizard - step 1 (part 2) _("New Zone Name or Reverse Zone Name -are taken from your current DHCP server and network settings and, therefore, cannot be changed. +are taken from your current DHCP server and network settings and cannot be changed. ") + // TRANSLATORS: DNS Wizard - step 1 (part 3) @@ -54,12 +55,12 @@ // TRANSLATORS: DNS Wizard - step 2 (part 2) _("<big>DNS Queries</big> -Every DNS query that must find out, for example, an IP address for a -hostname in a DNS zone, first asks the parent zone +Every DNS query (for example searching an IP address for a +hostname in a DNS zone) first asks the parent zone (<tt>com</tt> for <tt>example.com</tt>) for the current zone -name servers, and then sends a DNS query to these name servers to get -a reply containing the desired IP address. -This is why you should mention the current DNS server hostname as one of +name servers. Then it sends a DNS query to these name servers requesting +the desired IP address. +Therefore, always specify the current DNS server hostname as one of the zone name servers. ") + @@ -77,10 +78,10 @@ // TRANSLATORS: DNS Wizard - step 3 (part 1) "wizard-ranges" : _("<big>DNS Records</big> -Here, define DNS hostnames for all DHCP clients. You do not need to define -all hostnames one by one. Only set one or more simple rules for how +Define DNS hostnames for all DHCP clients. You do not need to define +all hostnames one by one. Set simple rules for how the hostnames are created. These rules define the ranges of IP addresses to use -and the string that is used to generate hostnames for a range. +and the string from which hostnames are generated for a range. ") + // TRANSLATORS: DNS Wizard - step 3 (part 2) @@ -125,7 +126,7 @@ // TRANSLATORS: DNS for Experts (editing current settings) (part 2) _("Current Subnet and Netmask show the current network settings. Domain is taken from the current DHCP configuration. -First IP Address and Second ID Address match the current +First IP Address and Second IP Address match the current Dynamic DHCP range. ") + Modified: trunk/dhcp-server/src/dns-server-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dns-server-dialo… ============================================================================== --- trunk/dhcp-server/src/dns-server-dialogs.ycp (original) +++ trunk/dhcp-server/src/dns-server-dialogs.ycp Thu Mar 29 14:35:01 2012 @@ -158,7 +158,7 @@ if (last_ip_mask != network_bits) { Report::Error ( sformat (_("IP address %1 does not match -the current network %2/%3 +the current network %2/%3. "), last_ip, current_d_settings["network"]:"", current_d_settings["netmask"]:"" )); @@ -190,7 +190,8 @@ Report::Error (sformat ( // TRANSLATORS: popup error, %1 an IP address // %2 is the first IP address of the range, %3 is the last one - _("The IP address %1 is out of the current + _("The IP address %1 is +outside the current dynamic DHCP range %2-%3. "), first_ip, current_d_settings["from_ip"]:"", current_d_settings["to_ip"]:"" @@ -204,7 +205,7 @@ // TRANSLATORS: popup error, %1 an IP address // %2 is the first IP address of the range, %3 is the last one _("The IP address %1 is -out of the current +outside the current dynamic DHCP range %2-%3. "), last_ip, current_d_settings["from_ip"]:"", current_d_settings["to_ip"]:"" Modified: trunk/dhcp-server/src/dns-server-management.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dns-server-manag… ============================================================================== --- trunk/dhcp-server/src/dns-server-management.ycp (original) +++ trunk/dhcp-server/src/dns-server-management.ycp Thu Mar 29 14:35:01 2012 @@ -737,7 +737,7 @@ } // TRANSLATORS: popup question - canceling dns synchronization with dhcp - if (Popup::YesNo(_("If you cancel, all changes made in the DNS server will be lost. + if (Popup::YesNo(_("If you cancel, all changes made to the DNS server will be lost. Really cancel this operation? "))) { // Changes currently made will be reverted Modified: trunk/dhcp-server/src/dns-server-wizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dns-server-wizar… ============================================================================== --- trunk/dhcp-server/src/dns-server-wizard.ycp (original) +++ trunk/dhcp-server/src/dns-server-wizard.ycp Thu Mar 29 14:35:01 2012 @@ -195,8 +195,7 @@ UI::SetFocus (`id("ip")); // TRANSLATORS: popup question if (! Popup::YesNo(_("No IP address has been provided for a name server in the current DNS zone. -This might not work because each zone needs its name server name and IP -defined. +This may not work because each zone needs the name and IP of its name server defined. Really use the current settings? "))) continue; } Modified: trunk/dhcp-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/helps.ycp?rev=67… ============================================================================== --- trunk/dhcp-server/src/helps.ycp (original) +++ trunk/dhcp-server/src/helps.ycp Thu Mar 29 14:35:01 2012 @@ -181,16 +181,16 @@ // Wizard Installation - Step 3 1/4 "dynamic_dhcp" :_("<big>Subnet Information</big> -Here you can view the information about the current subnet, such as its address, -netmask and minimum and maximum IP addresses available for the clients. +View information about the current subnet, such as its address, +netmask, minimum and maximum IP addresses available for the clients. ") + // Wizard Installation - Step 3 2/4 _("<big>IP Address Range</big> Set the First IP Address and the Last IP Address -to lease to the clients. These addresses must have the same netmask. -For instance, <tt>192.168.1.1</tt> and <tt>192.168.1.64</tt>. Check +of the address range to be leased to clients. These addresses must have the same netmask. +For instance, <tt>192.168.1.1</tt> and <tt>192.168.1.64</tt>. Check the Allow Dynamic BOOTP flag if the specified range may be dynamically assigned to BOOTP clients as well as DHCP clients. ") + Modified: trunk/dhcp-server/yast2-dhcp-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/yast2-dhcp-server.sp… ============================================================================== --- trunk/dhcp-server/yast2-dhcp-server.spec.in (original) +++ trunk/dhcp-server/yast2-dhcp-server.spec.in Thu Mar 29 14:35:01 2012 @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0 BuildRequires: perl-Digest-SHA1 perl-X500-DN perl-XML-Writer docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-perl-bindings yast2-testsuite yast2-dns-server Requires: perl-gettext yast2-perl-bindings bind-utils perl-X500-DN yast2-ldap perl-Digest-SHA1 perl-Parse-RecDescent -- 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] r67758 - /tags/stable-2_22_5/country/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 14:25:05 2012 New Revision: 67758 URL: http://svn.opensuse.org/viewcvs/yast?rev=67758&view=rev Log: Created tag stable-2_22_5 for country Added: tags/stable-2_22_5/country/ - copied from r67757, trunk/country/ -- 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] r67757 - in /trunk/country: VERSION language/src/proposal/language_proposal.ycp language/src/select_language.ycp package/yast2-country.changes timezone/src/dialogs.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 14:24:42 2012 New Revision: 67757 URL: http://svn.opensuse.org/viewcvs/yast?rev=67757&view=rev Log: - merged proofed texts - 2.22.5 Modified: trunk/country/VERSION trunk/country/language/src/proposal/language_proposal.ycp trunk/country/language/src/select_language.ycp trunk/country/package/yast2-country.changes trunk/country/timezone/src/dialogs.ycp Modified: trunk/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=67757&r1=677… ============================================================================== --- trunk/country/VERSION (original) +++ trunk/country/VERSION Thu Mar 29 14:24:42 2012 @@ -1 +1 @@ -2.22.4 +2.22.5 Modified: trunk/country/language/src/proposal/language_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/proposal/la… ============================================================================== --- trunk/country/language/src/proposal/language_proposal.ycp (original) +++ trunk/country/language/src/proposal/language_proposal.ycp Thu Mar 29 14:24:42 2012 @@ -120,9 +120,9 @@ ret = $[ // label text - "rich_text_title" : _( "Language" ), + "rich_text_title" : _("Language"), // menue label text - "menu_title" : _( "&Language" ), + "menu_title" : _("&Language"), "id" : "language_stuff" ]; } Modified: trunk/country/language/src/select_language.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/language/src/select_lang… ============================================================================== --- trunk/country/language/src/select_language.ycp (original) +++ trunk/country/language/src/select_language.ycp Thu Mar 29 14:24:42 2012 @@ -375,7 +375,7 @@ { // help text, continued help_text = help_text + _(" -You can select Abort Installation at any time to abort the +You can select Abort at any time to abort the installation process. "); Modified: trunk/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.ch… ============================================================================== --- trunk/country/package/yast2-country.changes (original) +++ trunk/country/package/yast2-country.changes Thu Mar 29 14:24:42 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 29 14:24:10 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts +- 2.22.5 + +------------------------------------------------------------------- Fri Jan 13 11:35:23 CET 2012 - jsuchome(a)suse.cz - call GfxMenu::Update from client, so we do not have to require Modified: trunk/country/timezone/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/country/timezone/src/dialogs.ycp… ============================================================================== --- trunk/country/timezone/src/dialogs.ycp (original) +++ trunk/country/timezone/src/dialogs.ycp Thu Mar 29 14:24:42 2012 @@ -132,7 +132,7 @@ string ntp_help_text = (string) ntp_call("ui_help_text", $[]); // help text for set time dialog - string htext = _("The current system time and date are displayed. If required change them to the correct values manually, or use Network Time Protocol (NTP).") + + string htext = _("The current system time and date are displayed. If required, change them to the correct values manually or use Network Time Protocol (NTP).") + // help text, cont. _("Press Accept to save your changes.") + @@ -601,7 +601,7 @@ term hwclock_term = `VBox ( `CheckBox (`id (`hwclock), `opt(`hstretch, `notify), // check box label - _("&Hardware Clock Set To UTC"), hwclock == "-u" + _("&Hardware Clock Set to UTC"), hwclock == "-u" ), textmode ? `Label ("") : `Empty () ); -- 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] r67756 - in /trunk/cluster: package/yast2-cluster.changes src/Cluster.ycp src/helps.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 14:16:19 2012 New Revision: 67756 URL: http://svn.opensuse.org/viewcvs/yast?rev=67756&view=rev Log: - merged proofed texts Modified: trunk/cluster/package/yast2-cluster.changes trunk/cluster/src/Cluster.ycp trunk/cluster/src/helps.ycp Modified: trunk/cluster/package/yast2-cluster.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/package/yast2-cluster.ch… ============================================================================== --- trunk/cluster/package/yast2-cluster.changes (original) +++ trunk/cluster/package/yast2-cluster.changes Thu Mar 29 14:16:19 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 14:12:20 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts + +------------------------------------------------------------------- Mon Sep 26 13:14:34 CEST 2011 - visnov(a)suse.cz - set dialog title Modified: trunk/cluster/src/Cluster.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/Cluster.ycp?rev=6775… ============================================================================== --- trunk/cluster/src/Cluster.ycp (original) +++ trunk/cluster/src/Cluster.ycp Thu Mar 29 14:16:19 2012 @@ -306,7 +306,7 @@ global boolean Read() { /* Cluster read dialog caption */ - string caption = _("Initializing cluster Configuration"); + string caption = _("Initializing Cluster Configuration"); // TODO FIXME Set the right number of stages integer steps = 4; @@ -349,7 +349,7 @@ ret = false; ret = LoadClusterConfig(); if (ret == false) { - Report::Error(_("Cannot load existing configuration")); + Report::Error(_("Cannot load existing configuration.")); return false; } if (SCR::Read(.target.size, "/etc/corosync/corosync.conf") <= 1) { @@ -407,7 +407,7 @@ global boolean Write() { /* Cluster read dialog caption */ - string caption = _("Saving cluster Configuration"); + string caption = _("Saving Cluster Configuration"); // TODO FIXME And set the right number of stages integer steps = 2; Modified: trunk/cluster/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/cluster/src/helps.ycp?rev=67756&… ============================================================================== --- trunk/cluster/src/helps.ycp (original) +++ trunk/cluster/src/helps.ycp Thu Mar 29 14:16:19 2012 @@ -58,8 +58,8 @@ "), /* Read dialog help 1/2 */ - "read" : _("<big>Initializing cluster Configuration</big> -Please wait... + "read" : _("<big>Initializing Cluster Configuration</big> + ") + /* Read dialog help 2/2 */ @@ -69,7 +69,7 @@ /* Write dialog help 1/2 */ "write" : _("<big>Saving cluster Configuration</big> -Please wait... + ") + /* Write dialog help 2/2 */ -- 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] r67755 - in /trunk/ca-management: package/yast2-ca-management.changes src/ca_mgm_proposal.ycp src/crlExport.ycp src/request.ycp src/util.ycp
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 14:10:12 2012 New Revision: 67755 URL: http://svn.opensuse.org/viewcvs/yast?rev=67755&view=rev Log: - merged proofed texts Modified: trunk/ca-management/package/yast2-ca-management.changes trunk/ca-management/src/ca_mgm_proposal.ycp trunk/ca-management/src/crlExport.ycp trunk/ca-management/src/request.ycp trunk/ca-management/src/util.ycp Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-m… ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Thu Mar 29 14:10:12 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 14:09:43 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts + +------------------------------------------------------------------- Wed Jan 11 17:17:41 CET 2012 - jdsn(a)suse.de - mark missing string for translation (bnc#722462) Modified: trunk/ca-management/src/ca_mgm_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/ca_mgm_proposa… ============================================================================== --- trunk/ca-management/src/ca_mgm_proposal.ycp (original) +++ trunk/ca-management/src/ca_mgm_proposal.ycp Thu Mar 29 14:10:12 2012 @@ -276,8 +276,8 @@ } if ( size(pw1) < 4) { - Popup::Error(_("The password is too short for use as the password for the certificates. - Enter a valid password for the certificates or disable certificate creation. + Popup::Error(_("The password is too short to use for the certificates. +Enter a valid password for the certificates or disable certificate creation. ")); continue; } Modified: trunk/ca-management/src/crlExport.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/crlExport.ycp?… ============================================================================== --- trunk/ca-management/src/crlExport.ycp (original) +++ trunk/ca-management/src/crlExport.ycp Thu Mar 29 14:10:12 2012 @@ -211,7 +211,7 @@ string help_para1 = sformat("%1", caption); string help_para2 = _("Export the CRL of this CA once by selecting Export once."); - string help_para3 = _("To set up a repeated recreation of the CRL select Repeated recreation and export. In this case set the interval for the recreation in Periodic interval. If you set the interval to 24 hours you can additionally select the hour for the export. Please make sure you read and understood the Security Information."); + string help_para3 = _("To set up a repeated recreation of the CRL, select Repeated recreation and export. In this case, set the interval for the recreation in Periodic interval. If you set the interval to 24 hours, you can additionally select the hour for the export. Make sure you read and understand the Security Information."); string help_para4 = _("You can activate an export of the CRL to a local file or to an LDAP server or both. Set up the respective parameters in Export to local file and Export to LDAP."); string helptext = help_para1 + help_para2 + help_para3 + help_para4; @@ -372,12 +372,12 @@ y2milestone ("ExportCRL(%1) returned %2", $["caName": ca, "exportFormat" : exportFormat, "destinationFile" : crlfile], ret); if (strret == nil || strret != "1") { - if ( Popup::YesNoHeadline(_("Export to file failed"), _("Do you want to retry?")) ) + if ( Popup::YesNoHeadline(_("Export to file failed."), _("Do you want to retry?")) ) { ui = `retry; } } - else { Popup::Message(_("Saved to file successfully")); } + else { Popup::Message(_("Saved to file successfully.")); } } if (ldap_active) @@ -392,7 +392,7 @@ } else { - if ( Popup::YesNoHeadline(_("Export to LDAP failed"), _("Do you want to retry?")) ) + if ( Popup::YesNoHeadline(_("Export to LDAP failed."), _("Do you want to retry?")) ) { ui = `retry; } Modified: trunk/ca-management/src/request.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/request.ycp?re… ============================================================================== --- trunk/ca-management/src/request.ycp (original) +++ trunk/ca-management/src/request.ycp Thu Mar 29 14:10:12 2012 @@ -413,7 +413,7 @@ "destinationFile": newreqfile]); if (ret != nil && ret == "1") { - Popup::Message(_("Saved to file successfully")); + Popup::Message(_("Saved to file successfully.")); } else { Modified: trunk/ca-management/src/util.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/util.ycp?rev=6… ============================================================================== --- trunk/ca-management/src/util.ycp (original) +++ trunk/ca-management/src/util.ycp Thu Mar 29 14:10:12 2012 @@ -202,8 +202,8 @@ } else if ( size(newPassword) < 4) { - Popup::Error(_("The new password is too short for use as the password for the certificates. - Enter a valid password for the certificates. + Popup::Error(_("The new password is too short to use it for the certificates. +Enter a valid password for the certificates. ")); ui = `again; } -- 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] r67754 - /tags/stable-2_22_6/yast2/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 14:06:19 2012 New Revision: 67754 URL: http://svn.opensuse.org/viewcvs/yast?rev=67754&view=rev Log: Created tag stable-2_22_6 for yast2 Added: tags/stable-2_22_6/yast2/ (props changed) - copied from r67753, trunk/yast2/ -- 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] r67753 - in /trunk/yast2: ./ library/commandline/src/ library/desktop/src/ library/log/src/ library/network/src/ library/packages/src/ library/system/src/ library/wizard/src/ package/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 14:04:52 2012 New Revision: 67753 URL: http://svn.opensuse.org/viewcvs/yast?rev=67753&view=rev Log: - merged proofed texts - 2.22.6 Modified: trunk/yast2/VERSION trunk/yast2/library/commandline/src/CommandLine.ycp trunk/yast2/library/desktop/src/menu.ycp trunk/yast2/library/log/src/ALog.ycp trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp trunk/yast2/library/network/src/NetworkService.ycp trunk/yast2/library/network/src/SuSEFirewallProposal.ycp trunk/yast2/library/packages/src/PackageCallbacks.ycp trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp trunk/yast2/library/packages/src/SlideShow.ycp trunk/yast2/library/system/src/FileChanges.ycp trunk/yast2/library/wizard/src/Confirm.ycp trunk/yast2/library/wizard/src/Wizard.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/VERSION?rev=67753&r1=67752… ============================================================================== --- trunk/yast2/VERSION (original) +++ trunk/yast2/VERSION Thu Mar 29 14:04:52 2012 @@ -1 +1 @@ -2.22.5 +2.22.6 Modified: trunk/yast2/library/commandline/src/CommandLine.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/commandline/src/Co… ============================================================================== --- trunk/yast2/library/commandline/src/CommandLine.ycp (original) +++ trunk/yast2/library/commandline/src/CommandLine.ycp Thu Mar 29 14:04:52 2012 @@ -564,7 +564,7 @@ } // translators: default module description if none is provided by the module itself - Print( modulecommands["help"]: _("This is a YaST2 module.")+"\n" ); + Print( modulecommands["help"]: _("This is a YaST module.")+"\n" ); // translators: short help title for command line Print(_("Basic Syntax:")); Modified: trunk/yast2/library/desktop/src/menu.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/desktop/src/menu.y… ============================================================================== --- trunk/yast2/library/desktop/src/menu.ycp (original) +++ trunk/yast2/library/desktop/src/menu.ycp Thu Mar 29 14:04:52 2012 @@ -55,7 +55,7 @@ `HBox( `HSpacing(2), /* Heading for NCurses Control Center */ - `HCenter(`Heading( _("YaST2 Control Center")) ), + `HCenter(`Heading( _("YaST Control Center")) ), `HSpacing(2) ), `VSpacing(0.4) @@ -139,7 +139,7 @@ define void ShowNcursesHelp() { /* NCurses (textmode) Control Center headline */ - string headline = _("Controlling YaST2 ncurses with the Keyboard"); + string headline = _("Controlling YaST ncurses with the Keyboard"); /* NCurses Control Center help 1/ */ string help = _("1) General Modified: trunk/yast2/library/log/src/ALog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/log/src/ALog.ycp?r… ============================================================================== --- trunk/yast2/library/log/src/ALog.ycp (original) +++ trunk/yast2/library/log/src/ALog.ycp Thu Mar 29 14:04:52 2012 @@ -77,7 +77,7 @@ * that she did using YaST, logs it using @ref Note */ global void CommitPopup() { - string i = uiInput(_("Enter a log message to describe the changes that you did")); + string i = uiInput(_("Enter a log message that describes the changes you made.")); string msg = (i == nil)? "*empty log message*": i; Note(msg); } Modified: trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/CWMFir… ============================================================================== --- trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp (original) +++ trunk/yast2/library/network/src/CWMFirewallInterfaces.ycp Thu Mar 29 14:04:52 2012 @@ -96,10 +96,10 @@ // bnc #429861 if (Stage::initial()) { // label - label = _("Firewall cannot be adjusted during first stage installation"); + label = _("Firewall cannot be adjusted during first stage installation."); } else { // label - label = _("Firewall package is not installed"); + label = _("Firewall package is not installed."); } } else if (status == `off) @@ -469,8 +469,9 @@ Report::Message ( sformat ( - _("These network interfaces assigned to internal network cannot be unselected: -%1"), + _("These network interfaces assigned to internal network cannot be deselected: +%1 +"), mergestring (int_not_selected, "\n") ) ); Modified: trunk/yast2/library/network/src/NetworkService.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/Networ… ============================================================================== --- trunk/yast2/library/network/src/NetworkService.ycp (original) +++ trunk/yast2/library/network/src/NetworkService.ycp Thu Mar 29 14:04:52 2012 @@ -165,7 +165,7 @@ y2internal("RunningNetworkPopup %1", isNetworkRunning()); if (isNetworkRunning()) return true; else { - string error_text = sformat("%1\n%2 %3", _("No running network detected!"), + string error_text = sformat("%1\n%2 %3", _("No running network detected."), Mode::installation() ? _("Restart installation and configure network in Linuxrc") : _("Configure network with YaST or Network Manager plug-in Modified: trunk/yast2/library/network/src/SuSEFirewallProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFi… ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewallProposal.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewallProposal.ycp Thu Mar 29 14:04:52 2012 @@ -517,7 +517,7 @@ is_ssh_enabled = true; // TRANSLATORS: Network proposal informative text with link around // IMPORTANT: Please, do not change the HTML link <a href="...">...</a>, only visible text - output = output + "<li>" + _("SSH port is open (<a href=\"firewall--disable_ssh_in_proposal\">close</a>), but there are still no network interfaces configured") + "</li>"; + output = output + "<li>" + _("SSH port is open (<a href=\"firewall--disable_ssh_in_proposal\">close</a>), but\nthere are no network interfaces configured") + "</li>"; } y2milestone("SSH is " + (is_ssh_enabled ? "":"not ") + "enabled"); Modified: trunk/yast2/library/packages/src/PackageCallbacks.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Packa… ============================================================================== --- trunk/yast2/library/packages/src/PackageCallbacks.ycp (original) +++ trunk/yast2/library/packages/src/PackageCallbacks.ycp Thu Mar 29 14:04:52 2012 @@ -435,7 +435,8 @@ // TODO: add "Don't show again" checkbox // a warning popup displayed after pressing [Ignore] after a download error Popup::Warning(_("Ignoring a download failure may result in a broken system. -The system should be later verified by running the Software Management module.")); +Verify the system later by running the Software Management module. +")); } return "I"; @@ -1305,7 +1306,7 @@ y2milestone ("Source create: error: url: %1, error: %2, description: %3", URL::HidePassword(url), error, description); // error message - a label followed by a richtext with details - string message = _("Error occurred while creating the repository."); + string message = _("An error occurred while creating the repository."); if (error == `NOT_FOUND) // error message - a label followed by a richtext with details Modified: trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Signa… ============================================================================== --- trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp (original) +++ trunk/yast2/library/packages/src/SignatureCheckDialogs.ycp Thu Mar 29 14:04:52 2012 @@ -377,10 +377,12 @@ // %3 is URL of the repository _("The file %1 from repository %2 %3 -is not digitally signed. This means that the origin and integrity of the file -cannot be verified. Using the file may put the integrity of your system at risk. +is not digitally signed. The origin and integrity of the file +cannot be verified. Using the file anyway puts the integrity of your +system at risk. -Use it anyway?") +Use it anyway? +") ), item_name, repo["name"]:_("Unknown"), repo["url"]:_("Unknown")); UI::OpenDialog( @@ -425,11 +427,12 @@ string description_text = sformat((item_type == `package ? // popup question, %1 stands for the package name _("No checksum for package %1 was found in the repository. -This means that the package is part of the signed repository, but the list of checksums -in this repository does not mention this package. Installing the package may put +While the package is part of the signed repository, it is not contained +in the list of checksums in this repository. Installing the package puts the integrity of your system at risk. -Install it anyway?") +Install it anyway? +") : // popup question, %1 stands for the filename _("No checksum for file %1 was found in the repository. @@ -530,22 +533,24 @@ %3 is signed with the following GnuPG key, but the integrity check failed: %4 -This means that the package has been changed by accident or by an attacker +The package has been changed, either by accident or by an attacker, since the repository creator signed it. Installing it is a big risk for the integrity and security of your system. -Install it anyway?") +Install it anyway? +") : // popup question, %1 stands for the filename, %2 for the complete description of the GnuPG key (multiline) _("File %1 from repository %2 %3 is signed with the following GnuPG key, but the integrity check failed: %4 -This means that the file has been changed by accident or by an attacker +The file has been changed, either by accident or by an attacker, since the repository creator signed it. Using it is a big risk for the integrity and security of your system. -Use it anyway?") +Use it anyway? +") ), item_name, repo["name"]:_("Unknown"), @@ -673,23 +678,25 @@ _("The package %1 is digitally signed with key '%2 (%3)'. -There is no trust relationship to the owner of the key. +There is no trust relationship with the owner of the key. If you trust the owner, mark the key as trusted. -Installing a package from an unknown repository can put +Installing a package from an unknown repository puts the integrity of your system at risk. It is safest -to skip the package.") +to skip the package. +") : // popup question, %1 stands for the filename, %2 for the key ID, %3 for the key name _("The file %1 is digitally signed with key '%2 (%3)'. -There is no trust relationship to the owner of the key. +There is no trust relationship with the owner of the key. If you trust the owner, mark the key as trusted. -Installing a file from an unknown repository can put +Installing a file from an unknown repository puts the integrity of your system at risk. It is safest -to skip it.") +to skip it. +") ), item_name, key["id"]:"", key["name"]:""); UI::OpenDialog( @@ -880,11 +887,12 @@ is %2, but the current checksum is %3. -This means that the file has been changed by accident or by an attacker +The file has been changed by accident or by an attacker since the repository creator signed it. Using it is a big risk for the integrity and security of your system. -Use it anyway?"), +Use it anyway? +"), filename, requested_digest, found_digest @@ -912,9 +920,10 @@ but the expected checksum is not known. This means that the origin and integrity of the file -cannot be verified. Using the file may put the integrity of your system at risk. +cannot be verified. Using the file puts the integrity of your system at risk. -Use it anyway?"), +Use it anyway? +"), filename, digest ); Modified: trunk/yast2/library/packages/src/SlideShow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/packages/src/Slide… ============================================================================== --- trunk/yast2/library/packages/src/SlideShow.ycp (original) +++ trunk/yast2/library/packages/src/SlideShow.ycp Thu Mar 29 14:04:52 2012 @@ -647,7 +647,7 @@ string HelpText() { // Help text while software packages are being installed (displayed only in rare cases) - string help_text = _("Please wait while packages are being installed.") + string help_text = _("Packages are being installed.") + _("Aborting Installation Package installation can be aborted using the Abort button. However, the system then can be in an inconsistent or unusable state or it may not boot if the basic system component is not installed."); return help_text; Modified: trunk/yast2/library/system/src/FileChanges.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/system/src/FileCha… ============================================================================== --- trunk/yast2/library/system/src/FileChanges.ycp (original) +++ trunk/yast2/library/system/src/FileChanges.ycp Thu Mar 29 14:04:52 2012 @@ -156,7 +156,8 @@ { // Continue/Cancel question, %1 is a file name string msg = _("File %1 has been changed manually. -YaST might lose some of the changes"); +YaST might lose some of the changes. +"); if (size (files) > 1) // Continue/Cancel question, %1 is a coma separated list of file names msg = _("Files %1 have been changed manually. Modified: trunk/yast2/library/wizard/src/Confirm.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Confirm… ============================================================================== --- trunk/yast2/library/wizard/src/Confirm.ycp (original) +++ trunk/yast2/library/wizard/src/Confirm.ycp Thu Mar 29 14:04:52 2012 @@ -74,7 +74,7 @@ `VSpacing(0.5), // This is in information message. Next come the // hardware class name (network cards). - `HVCenter(`Label(_("YaST2 will detect the following hardware:"))), + `HVCenter(`Label(_("YaST will detect the following hardware:"))), `HVCenter(`HBox(icon, `HSpacing(0.5), `Heading(class))), `VSpacing(0.5) ))), Modified: trunk/yast2/library/wizard/src/Wizard.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/wizard/src/Wizard.… ============================================================================== --- trunk/yast2/library/wizard/src/Wizard.ycp (original) +++ trunk/yast2/library/wizard/src/Wizard.ycp Thu Mar 29 14:04:52 2012 @@ -235,7 +235,9 @@ `VSpacing(0.2), `HBox( // translators: dialog title to appear before any content is initialized - `Heading(`id(`title), `opt (`hstretch), _("YaST2\nInitializing ...")), + `Heading(`id(`title), `opt (`hstretch), _("YaST +Initializing ... +")), `HStretch() ), `VWeight( 1, // Layout trick: Lower layout priority with weight @@ -415,7 +417,7 @@ if ( haveFancyUI() ) { UI::OpenDialog(`opt(`wizardDialog ), - `Wizard(`apply, _( "&Apply" ), + `Wizard(`apply, _("&Apply"), `abort, Label::AbortButton(), `finish, Label::FinishButton() ) ); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Mar 29 14:04:52 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 29 14:02:47 CEST 2012 - jsuchome(a)suse.cz + +- merged proofed texts +- 2.22.6 + +------------------------------------------------------------------- Wed Mar 28 11:58:34 CEST 2012 - gs(a)suse.de - Revert the change in FileUtils::Exists() (change is not needed -- 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] r67752 - /tags/stable-2_22_1/backup/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 13:59:02 2012 New Revision: 67752 URL: http://svn.opensuse.org/viewcvs/yast?rev=67752&view=rev Log: Created tag stable-2_22_1 for backup Added: tags/stable-2_22_1/backup/ - copied from r67751, trunk/backup/ -- 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] r67751 - in /trunk/backup: VERSION package/yast2-backup.changes src/ui.ycp yast2-backup.spec.in
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 13:58:32 2012 New Revision: 67751 URL: http://svn.opensuse.org/viewcvs/yast?rev=67751&view=rev Log: - merged proofread texts - confirmed license - 2.22.1 Modified: trunk/backup/VERSION trunk/backup/package/yast2-backup.changes trunk/backup/src/ui.ycp trunk/backup/yast2-backup.spec.in Modified: trunk/backup/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/VERSION?rev=67751&r1=6775… ============================================================================== --- trunk/backup/VERSION (original) +++ trunk/backup/VERSION Thu Mar 29 13:58:32 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/backup/package/yast2-backup.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/package/yast2-backup.chan… ============================================================================== --- trunk/backup/package/yast2-backup.changes (original) +++ trunk/backup/package/yast2-backup.changes Thu Mar 29 13:58:32 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Mar 29 13:57:41 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts +- confirmed license +- 2.22.1 + +------------------------------------------------------------------- Fri Jan 13 15:53:45 CET 2012 - locilka(a)suse.cz - Fixed parsing output from verification of packages (bnc #736233) Modified: trunk/backup/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/src/ui.ycp?rev=67751&r1=6… ============================================================================== --- trunk/backup/src/ui.ycp (original) +++ trunk/backup/src/ui.ycp Thu Mar 29 13:58:32 2012 @@ -1241,7 +1241,7 @@ // check box label `Left(`CheckBox(`id(`search), `opt(`notify), _("&Back Up Files Not Belonging to Any Package"), Backup::do_search)), // check box label - `Left(`CheckBox(`id(`all_rpms_content), `opt(`notify), _("Back Up Content of &All Packages"), Backup::backup_all_rpms_content)), + `Left(`CheckBox(`id(`all_rpms_content), `opt(`notify), _("Back up Content of &All Packages"), Backup::backup_all_rpms_content)), `VSpacing(0.3), // check box label `Left(`CheckBox(`id(`display), _("Display List of Files Before &Creating Archive"), Backup::display)), Modified: trunk/backup/yast2-backup.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/backup/yast2-backup.spec.in?rev=… ============================================================================== --- trunk/backup/yast2-backup.spec.in (original) +++ trunk/backup/yast2-backup.spec.in Thu Mar 29 13:58:32 2012 @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0 Summary: YaST2 - System Backup BuildArchitectures: noarch -- 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] r67750 - in /trunk/autoinstallation: package/ src/clients/ src/dialogs/ src/modules/
by jsuchome＠svn2.opensuse.org 29 Mar '12

29 Mar '12

Author: jsuchome Date: Thu Mar 29 13:56:40 2012 New Revision: 67750 URL: http://svn.opensuse.org/viewcvs/yast?rev=67750&view=rev Log: - merged proofread texts Modified: trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/clients/autoyast.ycp trunk/autoinstallation/src/clients/ayast_setup.ycp trunk/autoinstallation/src/clients/inst_autoconfigure.ycp trunk/autoinstallation/src/dialogs/PartitionDialog.ycp trunk/autoinstallation/src/dialogs/general_dialogs.ycp trunk/autoinstallation/src/dialogs/helps.ycp trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp trunk/autoinstallation/src/modules/Profile.ycp trunk/autoinstallation/src/modules/ProfileLocation.ycp Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyas… ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Thu Mar 29 13:56:40 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 29 13:56:04 CEST 2012 - jsuchome(a)suse.cz + +- merged proofread texts + +------------------------------------------------------------------- Wed Feb 1 16:28:04 CET 2012 - ug(a)suse.de - 2.22.0 Modified: trunk/autoinstallation/src/clients/autoyast.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/aut… ============================================================================== --- trunk/autoinstallation/src/clients/autoyast.ycp (original) +++ trunk/autoinstallation/src/clients/autoyast.ycp Thu Mar 29 13:56:40 2012 @@ -79,7 +79,7 @@ map cmdline = $[ "id" : "autoyast2", - "help" : _("autoyast"), + "help" : _("AutoYaST"), "guihandler" : AutoSequence, "actions" : $[ "file" : $[ "handler":openFile, "help":"file operations" ], Modified: trunk/autoinstallation/src/clients/ayast_setup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/aya… ============================================================================== --- trunk/autoinstallation/src/clients/ayast_setup.ycp (original) +++ trunk/autoinstallation/src/clients/ayast_setup.ycp Thu Mar 29 13:56:40 2012 @@ -78,7 +78,7 @@ boolean openFile( map <string, any> options ) { if ( options["filename"]:nil == nil ) { - CommandLine::Error(_("Path to autoyast profile must be set")); + CommandLine::Error(_("Path to AutoYaST profile must be set.")); return false; } if( options["dopackages"]:"yes" == "no" ) @@ -99,18 +99,18 @@ map cmdline = $[ "id" : "ayast_setup", - "help" : _("Client for autoyast configuration on the running system"), + "help" : _("Client for AutoYaST configuration on the running system"), "guihandler": GUI, "actions" : $[ "setup" : $[ "handler" : openFile, - "help" : _("Configure the system using given autoyast profile"), + "help" : _("Configure the system using given AutoYaST profile"), "example" : "setup filename=/path/to/profile dopackages=no" ] ], "options" : $[ "filename": $[ "type" : "string", - "help" : _("Path to autoyast profile") + "help" : _("Path to AutoYaST profile") ], "dopackages": $[ "type" : "enum", Modified: trunk/autoinstallation/src/clients/inst_autoconfigure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autoconfigure.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autoconfigure.ycp Thu Mar 29 13:56:40 2012 @@ -59,7 +59,7 @@ if( process["name"]:"" == resource ) { if( haskey( process, "sleep" ) ) { if( process["sleep","feedback"]:false == true ) - Popup::ShowFeedback( "", sformat( _("processing resource %1"), resource)); + Popup::ShowFeedback( "", sformat( _("Processing resource %1"), resource)); sleep( 1000*process["sleep","time"]:0 ); if( process["sleep","feedback"]:false == true ) Popup::ClearFeedback(); Modified: trunk/autoinstallation/src/dialogs/PartitionDialog.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/Par… ============================================================================== --- trunk/autoinstallation/src/dialogs/PartitionDialog.ycp (original) +++ trunk/autoinstallation/src/dialogs/PartitionDialog.ycp Thu Mar 29 13:56:40 2012 @@ -126,7 +126,7 @@ stripes = (integer) UI::QueryWidget( `id(`numberStripes), `Value ); stripesize = (integer) UI::QueryWidget( `id(`stripesize), `Value ); if( "" == lvName ) { - Popup::Warning( _("Please provide a logical volume name.") ); + Popup::Warning( _("Provide a logical volume name.") ); } } else { UI::ChangeWidget( `id(`striping), `Enabled, false ); @@ -180,7 +180,9 @@ (boolean) UI::QueryWidget(`id(`resizePartition),`Value)); if( `keep == (symbol) UI::QueryWidget(`id(`cbFileSystem), `Value ) ){ if( ! reUse && lvmGroup == "" ){ /* for PV's its ok to have no fs */ - Popup::Warning( _("You selected to create the partition but you did not select a valid file system.\nPlease select a valid filesystem to continue.") ); + Popup::Warning( _("You selected to create the partition, but you did not select a valid file +system. Select a valid filesystem to continue. +") ); } part = AutoinstPartition::set( part, "format", false); part = AutoinstPartition::set( part, "filesystem",`Empty); @@ -460,7 +462,7 @@ UI::ChangeWidget(`id(`size), `Enabled, false); } else{ - Popup::Error(_("Size \"auto\" is only valid if mount point \"/boot\" or \"swap\" is selected")); + Popup::Error(_("Size \"auto\" is only valid if mount point \"/boot\" or \"swap\" is selected.")); UI::ChangeWidget(`id(`size), `Enabled, true); UI::ChangeWidget(`id(`unit), `Value, `GB ); } Modified: trunk/autoinstallation/src/dialogs/general_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/gen… ============================================================================== --- trunk/autoinstallation/src/dialogs/general_dialogs.ycp (original) +++ trunk/autoinstallation/src/dialogs/general_dialogs.ycp Thu Mar 29 13:56:40 2012 @@ -53,7 +53,7 @@ `Left(`CheckBox(`id(`confirm), _("Con&firm installation?"), confirm)), `Left(`CheckBox(`id(`second_stage), _("AutoYaST Second Stage"), second_stage)), `Left(`CheckBox(`id(`halt), _("Turn Off the Machine after the First Stage"), halt)), - `Left(`CheckBox(`id(`halt_second), _("Turn Off the Machine after the Second Stage"), halt_second)), + `Left(`CheckBox(`id(`halt_second), _("Turn off the Machine after the Second Stage"), halt_second)), `Left(`CheckBox(`id(`reboot_second), _("Reboot the Machine after the Second Stage"), reboot_second)), `Left(`Label( _("Signature Handling") )), `Left(`CheckBox(`id(`accept_unsigned_file), _("Accept &Unsigned Files"), accept_unsigned_file)), @@ -342,8 +342,8 @@ `MinSize( 10, 5, `SelectionBox( `id(`dialogs), `opt(`notify,`immediate), _("Title"), dialogs ) ), `HBox( `PushButton( `id( `deleteDialog ), `opt( `default, `hstretch ), _("Delete Dialog") ), - `PushButton( `id( `dialogUp ), `opt( `default, `hstretch ), _("Dialog Up") ), - `PushButton( `id( `dialogDown ), `opt( `default, `hstretch ), _("Dialog Down") ) + `PushButton( `id( `dialogUp ), `opt( `default, `hstretch ), _("Dialog up") ), + `PushButton( `id( `dialogDown ), `opt( `default, `hstretch ), _("Dialog down") ) ), `Label( _("Questions in dialog") ), `MinSize( 10,5, @@ -356,8 +356,8 @@ `PushButton( `id( `addQuestion ), `opt( `default, `hstretch ), _("Add Question") ), `PushButton( `id( `editQuestion ), `opt( `default, `hstretch ), _("Edit Question") ), `PushButton( `id( `deleteQuestion ), `opt( `default, `hstretch ), _("Delete Question") ), - `PushButton( `id( `questionUp ), `opt( `default, `hstretch ), _("Question Up") ), - `PushButton( `id( `questionDown ), `opt( `default, `hstretch ), _("Question Down") ) + `PushButton( `id( `questionUp ), `opt( `default, `hstretch ), _("Question up") ), + `PushButton( `id( `questionDown ), `opt( `default, `hstretch ), _("Question down") ) ) ) Modified: trunk/autoinstallation/src/dialogs/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/dialogs/hel… ============================================================================== --- trunk/autoinstallation/src/dialogs/helps.ycp (original) +++ trunk/autoinstallation/src/dialogs/helps.ycp Thu Mar 29 13:56:40 2012 @@ -63,7 +63,7 @@ + _("Advanced Options") - + _("By default, AutoYaST2 will create an extended partition and adds all new partitions as logical devices. It is possible, however, to instruct AutoYaST2 to create a certain partition as a primary partition or as extended partition. Additionally, it is possible to specify the size of a partition using sectors rather than size in MBytes.") + + _("By default, AutoYaST will create an extended partition and adds all new partitions as logical devices. It is possible, however, to instruct AutoYaST to create a certain partition as a primary partition or as extended partition. Additionally, it is possible to specify the size of a partition using sectors rather than size in MBytes.") + _("These options and other advanced options cannot be configured using this interface. Instead, add them manually to the control file. Modified: trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Aut… ============================================================================== --- trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp (original) +++ trunk/autoinstallation/src/modules/AutoinstPartPlan.ycp Thu Mar 29 13:56:40 2012 @@ -292,7 +292,7 @@ * the next instructions taints result */ if( ! found ){ - Popup::Error(sformat( _("Volume group '%1' must have at least one physical volume. Please provide one."), volGroupName) ); + Popup::Error(sformat( _("Volume group '%1' must have at least one physical volume. Provide one."), volGroupName) ); } sane = found; }); Modified: trunk/autoinstallation/src/modules/Profile.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Pro… ============================================================================== --- trunk/autoinstallation/src/modules/Profile.ycp (original) +++ trunk/autoinstallation/src/modules/Profile.ycp Thu Mar 29 13:56:40 2012 @@ -345,7 +345,7 @@ do { UI::OpenDialog( `VBox( - `Label(_("Encrypted AutoYaST profile. Please enter the password twice")), + `Label(_("Encrypted AutoYaST profile. Enter the password twice.")), `Password(`id(`password), ""), `Password(`id(`password2), ""), `PushButton(`id(`ok), Label::OKButton()) @@ -395,7 +395,7 @@ sectionFiles = add(sectionFiles, sectionName, sectionFileName); } else{ - y2error(sformat(_("Couldn't write section %1 to file %2"), sectionName, sectionFileName)); + y2error(sformat(_("Could not write section %1 to file %2."), sectionName, sectionFileName)); } }); return sectionFiles; @@ -552,7 +552,7 @@ while( out["stdout"]:"" == "" ) { UI::OpenDialog( `VBox( - `Label(_("Encrypted AutoYaST profile. Please enter the correct password.")), + `Label(_("Encrypted AutoYaST profile. Enter the correct password.")), `Password(`id(`password), ""), `PushButton(`id(`ok), Label::OKButton()) ) Modified: trunk/autoinstallation/src/modules/ProfileLocation.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/Pro… ============================================================================== --- trunk/autoinstallation/src/modules/ProfileLocation.ycp (original) +++ trunk/autoinstallation/src/modules/ProfileLocation.ycp Thu Mar 29 13:56:40 2012 @@ -126,7 +126,7 @@ y2milestone("encrypted profile found"); UI::OpenDialog( `VBox( - `Label( _("Encrypted AutoYaST profile. Please enter the correct password.") ), + `Label( _("Encrypted AutoYaST profile. Enter the correct password.") ), `Password(`id(`password), ""), `PushButton(`id(`ok), _("&OK") ) ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0