Author: locilka Date: Fri Jul 1 14:54:54 2011 New Revision: 64704 URL: http://svn.opensuse.org/viewcvs/yast?rev=64704&view=rev Log: - Fixed a typo (BNC #703099) - Texts changed to be easily translatable - not to confuse translators with constant strings Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/dialog-masterzone.ycp trunk/dns-server/src/helps.ycp Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-serv... ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Fri Jul 1 14:54:54 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Fri Jul 1 14:42:45 CEST 2011 - locilka@suse.cz + +- Fixed a typo (BNC #703099) +- Texts changed to be easily translatable - not to confuse + translators with constant strings + +------------------------------------------------------------------ Tue Jun 21 09:40:41 CEST 2011 - locilka@suse.cz - Fixed RPM requirements Modified: trunk/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-masterzone.... ============================================================================== --- trunk/dns-server/src/dialog-masterzone.ycp (original) +++ trunk/dns-server/src/dialog-masterzone.ycp Fri Jul 1 14:54:54 2011 @@ -1444,10 +1444,11 @@ if (! regexpmatch (key, "^[ \\t]*([0-9a-fA-F]\\.){32}ip6\\.arpa\\.[ \\t]*$")) { y2error ("Wrong reverse IPv6: '%1'", key); UI::SetFocus (`id ("add_record_name")); - Popup::Error (_("Invalid IPv6 reverse IP. + // Pop-up error message, %1 is replaced with an example + Popup::Error (sformat(_("Invalid IPv6 reverse IP. -IPv6 reverse records are supported either in the full form (*.ip6.arpa.) -or in the relative form to the current zone.")); +IPv6 reverse records are supported either in the full form (%1) +or in the relative form to the current zone."), "*.ip6.arpa.")); return false; } // IPv4 reverse zone @@ -2052,7 +2053,7 @@ // Automatically Generate Records From is a feature that makes YaST to generate // DNS records manually from selected zone show_warning = sformat (_("Current zone records are automatically generated from %1 zone. -To change records manualy disable the Automatically Generate Records From feature."), current_zone["connected_with"]:""); +To change records manually disable the Automatically Generate Records From feature."), current_zone["connected_with"]:""); } // Switch contents Modified: trunk/dns-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/helps.ycp?rev=6470... ============================================================================== --- trunk/dns-server/src/helps.ycp (original) +++ trunk/dns-server/src/helps.ycp Fri Jul 1 14:54:54 2011 @@ -238,7 +238,7 @@ /* Expert Mode Configuration - Logging 3/3 */ _("<p>In <b>Additional Logging</b>, -set which loggable actions should be logged. Common actions are always logged. +set which actions should be logged. Common actions are always logged. <b>Log All DNS Queries</b> logs all queries from clients to the DNS server. <b>Log Zone Updates</b> logs when DNS has been updated. <b>Log Zone Transfers</b> logs when zone is completely transferred to the @@ -293,14 +293,17 @@ the <b>Zone Type</b>, and click <b>Add</b>.</p> ") + -/* Expert Mode Configuration - Zones #4 */ -_("<p>To add a new IPv6 reverse zone, enter a part of the reverse IPv6 address followed by -<tt>.ip6.arpa</tt> as its <b>Zone Name</b>. Several formats for entering the zone name are -supported: Standard form: <tt>4.5.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa.</tt>; -Forward form: <tt>2001:db8:0:54::/64</tt>; -Forward form without netmask bits: <tt>2001:db8:0:54::</tt> -(default <tt>64</tt> netmask bits are used).</p> -") + +/* + * Expert Mode Configuration - Zones #4 + * %1, %2, %3, and %4 are replaced with examples + */ +sformat(_("<p>To add a new IPv6 reverse zone, enter a part of the reverse IPv6 address followed by +<tt>%1</tt> as its <b>Zone Name</b>. Several formats for entering the zone name are +supported: Standard form: <tt>%2</tt>; +Forward form: <tt>%3</tt>; +Forward form without netmask bits: <tt>%4</tt> +(by default <tt>64</tt> netmask bits are used).</p> +"), ".ip6.arpa.", "4.5.0.0.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa.", "2001:db8:0:54::/64", "2001:db8:0:54::") + /* Expert Mode Configuration - Zones #5 */ _("<p>To modify settings for a zone, such as zone transport and name and -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org