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=66819&r2=66820&view=diff ============================================================================== --- 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-server.changes?rev=66820&r1=66819&r2=66820&view=diff ============================================================================== --- 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@suse.cz + +- merged texts from proofreading +- 2.22.0 + +------------------------------------------------------------------- Mon Sep 12 12:21:22 UTC 2011 - lslezak@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=66820&r1=66819&r2=66820&view=diff ============================================================================== --- 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=66820&r1=66819&r2=66820&view=diff ============================================================================== --- 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-installwizard.ycp?rev=66820&r1=66819&r2=66820&view=diff ============================================================================== --- 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?rev=66820&r1=66819&r2=66820&view=diff ============================================================================== --- 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=66820&r1=66819&r2=66820&view=diff ============================================================================== --- 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" : _("<p><b><big>Zone Direction</big></b><br> 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 <b>Forward</b>) or from IP addresses to domain names -(select <b>Reverse</b>).</p>"), +addresses (<b>Forward</b>) or from IP addresses to domain names +(<b>Reverse</b>).</p> +"), // firewall dialog // help text 1/2 "iface_classes" : _("<p><b><big>Interface Classes</big></b><br> -Select through which interface classes access to the DNS server should be -allowed. The interface classes are defined in the -firewall configuration component.</p>"), +Select which interface classes should have access to the DNS server. The +interface classes are defined in the firewall configuration component.</p> +"), // help text 2/2 "adapt_firewall" : _("<p><b><big>Adapting Firewall Settings</big></b><br> -To adapt the firewall settings so the DNS server can be accessed -through all network interfaces to which it listens, check -<b>Adapt Firewall Settings</b>.</p>"), +To adapt the firewall settings so that the DNS server can be accessed +via all network interfaces to which it listens, check +<b>Adapt Firewall Settings</b>.</p> +"), // soa dialog // help text 1/9 @@ -137,12 +139,14 @@ // help text 4/9 - Administrator's mail + _("<p><b>Administrator's Mail</b> must contain the e-mail address of -administrator responsible for the zone.</p>") +the administrator responsible for the zone.</p> +") // help text 5/9 - Serial + _("<p><b>Serial</b> 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).</p>") +the master servers (so that slave servers do not always need to synchronize the +entire zone).</p> +") // help text 6/9 - Refresh + _("<p><b>Refresh</b> sets how often the zone should be synchronized from @@ -254,7 +258,7 @@ /* Expert Mode Configuration - ACLs 2/2 */ _("<p>To add a new ACL entry, just enter the option's <b>Name</b> -and <b>Value</b> then click <b>Add</b>. To remove an already set +and <b>Value</b> then click <b>Add</b>. To remove an ACL entry, select it and click <b>Delete</b>.</p> "), @@ -342,8 +346,9 @@ /* Zone Editor - Help */ _("<p> Reverse zone records can be generated from another master zone. -If you want this, select the <b>Automatically Generate Records From</b> -check-box and choose the zone to generate the records from.</p>") + +Select the <b>Automatically Generate Records From</b> +check-box and choose the zone to generate the records from.</p> +") + /* Zone Editor - Help */ _("<p> @@ -372,8 +377,9 @@ /* Zone Editor - Help for tab - Zone (SOA) 2/7 */ + _("<p><b>Serial</b> 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).</p>") +the master servers (then slave servers do not always need to synchronize the +entire zone).</p> +") /* Zone Editor - Help for tab - Zone (SOA) 3/7 */ + _("<p><b>TTL</b> specifies the time to live for all records in the @@ -474,7 +480,8 @@ // Final step of the installation wizard - 3/5 _("<p> To start the DNS server every time your computer is booted, set the -start-up behavior to <b>On</b>. Otherwise set <b>Off</b>.</p> ") + +start-up behavior to <b>On</b>. Otherwise set it to <b>Off</b>.</p> +") + ((DnsServer::ExpertUI()) ? // Final step of the installation wizard - 4/5 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org