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