Author: kmachalkova Date: Mon Jan 7 12:13:08 2008 New Revision: 43299 URL: http://svn.opensuse.org/viewcvs/yast?rev=43299&view=rev Log: Merged proofread texts Modified: 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-management.ycp trunk/dhcp-server/src/helps.ycp Modified: trunk/dhcp-server/package/yast2-dhcp-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/package/yast2-dhcp-server.changes?rev=43299&r1=43298&r2=43299&view=diff ============================================================================== --- trunk/dhcp-server/package/yast2-dhcp-server.changes (original) +++ trunk/dhcp-server/package/yast2-dhcp-server.changes Mon Jan 7 12:13:08 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon Jan 7 12:11:11 CET 2008 - kmachalkova@suse.cz + +- Merged proofread texts + +------------------------------------------------------------------- Fri Sep 7 19:51:44 CEST 2007 - kmachalkova@suse.cz - Do not use obsolete getcfg-interface to get network device name Modified: trunk/dhcp-server/src/dialogs2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dialogs2.ycp?rev=43299&r1=43298&r2=43299&view=diff ============================================================================== --- trunk/dhcp-server/src/dialogs2.ycp (original) +++ trunk/dhcp-server/src/dialogs2.ycp Mon Jan 7 12:13:08 2008 @@ -274,9 +274,10 @@ if (size(configured_interfaces) <= 0) { // TRANSLATORS: popup error, DHCP Server requires selected interface to have // at least minimal configuration - return Popup::ContinueCancel(_("Selected network interface has currently no configuration (no assigned IP address -and netmask). Using it in DHCP server configuration may not work. -Really use this interface?")); + return Popup::ContinueCancel(_("The selected network interface has currently no configuration (no assigned IP address +and netmask). Using it in the DHCP server configuration may not work. +Really use this interface? +")); } return true; } @@ -1660,12 +1661,14 @@ } if(k == "cf") { UI::SetFocus(`id("other_opts")); - correct = (Popup::ContinueCancel(sformat(_("You have specified an alternate configuration file for DHCP server.\n -This is not supported by YaST, as DHCP server module can only read and write -/etc/dhcpd.conf. New configuration from %1 will not be imported and all changes + 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. -Really continue?"), v))); +Really continue? +"), v))); break; } } Modified: trunk/dhcp-server/src/dns-helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dns-helps.ycp?rev=43299&r1=43298&r2=43299&view=diff ============================================================================== --- trunk/dhcp-server/src/dns-helps.ycp (original) +++ trunk/dhcp-server/src/dns-helps.ycp Mon Jan 7 12:13:08 2008 @@ -18,7 +18,7 @@ string new_range_help = _("<p><big><b>Adding a New Range of DNS Records</b></big><br /> <b>First IP Address</b> defines the starting address of the range. <b>Last IP Address</b> defines -the last one. <b>Hostname Base</b> is a string that sets how hostnames +the last one. <b>Hostname Base</b> is a string that determines how hostnames should be 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 @@ -30,7 +30,7 @@ map DNS_HELPS = $[ // TRANSLATORS: DNS Wizard - step 1 (part 1) "wizard-zones" : _("<p><big><b>DNS Wizard</b></big><br /> -This wizard can help you to create a new DNS zone +This wizard helps you 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 IP addresses assigned to them. You can also @@ -49,15 +49,16 @@ // TRANSLATORS: DNS Wizard - step 2 (part 1) "wizard-nameservers" : _("<p><big><b>Name Servers</b></big><br /> -Name servers are needed for the proper DNS server functionality. -They administer all the DNS zone records.</p>") + +Name servers are needed for proper DNS server functionality. +They administer all the DNS zone records.</p> +") + // TRANSLATORS: DNS Wizard - step 2 (part 2) _("<p><big><b>DNS Queries</b></big><br /> Every DNS query that must find out, for example, 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 then sends a DNS query to these name servers to get +name servers, and then sends a DNS query to these name servers to get a reply containing the desired IP address.<br /> This is why you should mention the current DNS server hostname as one of the zone name servers.</p> Modified: trunk/dhcp-server/src/dns-server-management.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dns-server-management.ycp?rev=43299&r1=43298&r2=43299&view=diff ============================================================================== --- trunk/dhcp-server/src/dns-server-management.ycp (original) +++ trunk/dhcp-server/src/dns-server-management.ycp Mon Jan 7 12:13:08 2008 @@ -470,7 +470,7 @@ Report::Error (sformat ( // TRANSLATORS: popup error, %1 is the zone name // please, do not translate 'master' (exact DNS definition) - _("Zone %1 is not type master. + _("Zone %1 is not of the type master. The DNS server cannot write any records to it. "), current_settings["reverse_domain"]:"" Modified: trunk/dhcp-server/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/helps.ycp?rev=43299&r1=43298&r2=43299&view=diff ============================================================================== --- trunk/dhcp-server/src/helps.ycp (original) +++ trunk/dhcp-server/src/helps.ycp Mon Jan 7 12:13:08 2008 @@ -188,8 +188,9 @@ Set the <b>First IP Address</b> and the <b>Last IP Address</b> 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 <b> -Allow Dynamic BOOTP</b> flag in the specified range may be dynamically -assigned to BOOTP clients as well as DHCP clients</p>") + +Allow Dynamic BOOTP</b> flag if the specified range may be dynamically +assigned to BOOTP clients as well as DHCP clients</p>. +") + // Wizard Installation - Step 3 3/4 _("<p><b><big>Lease Time</big></b><br> -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org