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=67758&r2=67759&view=diff
==============================================================================
--- 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-server.changes?rev=67759&r1=67758&r2=67759&view=diff
==============================================================================
--- 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@suse.cz
+
+- merged proofed texts
+- confirmed license
+- 2.22.0
+
+-------------------------------------------------------------------
Mon Sep 26 13:11:34 CEST 2011 - visnov@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=67759&r1=67758&r2=67759&view=diff
==============================================================================
--- 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?rev=67759&r1=67758&r2=67759&view=diff
==============================================================================
--- 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 @@
<b>First IP Address</b> defines
the starting address of the range and <b>Last IP Address</b> defines
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>).
+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 <b>Hostname Base</b>.
@@ -30,15 +30,16 @@
map DNS_HELPS = $[
// TRANSLATORS: DNS Wizard - step 1 (part 1)
"wizard-zones" : _("<p><b><big>DNS Wizard</big></b><br />
-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.</p>\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.</p>
+") +
// TRANSLATORS: DNS Wizard - step 1 (part 2)
_("<p><b>New Zone Name</b> or <b>Reverse Zone Name</b>
-are taken from your current DHCP server and network settings and, therefore, cannot be changed.</p>
+are taken from your current DHCP server and network settings and cannot be changed.</p>
") +
// TRANSLATORS: DNS Wizard - step 1 (part 3)
@@ -54,12 +55,12 @@
// TRANSLATORS: DNS Wizard - step 2 (part 2)
_("<p><b><big>DNS Queries</big></b><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
+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.<br />
-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.<br />
+Therefore, always specify the current DNS server hostname as one of
the zone name servers.</p>
") +
@@ -77,10 +78,10 @@
// TRANSLATORS: DNS Wizard - step 3 (part 1)
"wizard-ranges" : _("<p><b><big>DNS Records</big></b><br />
-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.</p>
+and the string from which hostnames are generated for a range.</p>
") +
// TRANSLATORS: DNS Wizard - step 3 (part 2)
@@ -125,7 +126,7 @@
// TRANSLATORS: DNS for Experts (editing current settings) (part 2)
_("<b>Current Subnet</b> and <b>Netmask</b> show the current network settings.
<b>Domain</b> is taken from the current DHCP configuration.
-<b>First IP Address</b> and <b>Second ID Address</b> match the current
+<b>First IP Address</b> and <b>Second IP Address</b> match the current
Dynamic DHCP range.</p>
") +
Modified: trunk/dhcp-server/src/dns-server-dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/src/dns-server-dialogs.ycp?rev=67759&r1=67758&r2=67759&view=diff
==============================================================================
--- 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-management.ycp?rev=67759&r1=67758&r2=67759&view=diff
==============================================================================
--- 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-wizard.ycp?rev=67759&r1=67758&r2=67759&view=diff
==============================================================================
--- 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=67759&r1=67758&r2=67759&view=diff
==============================================================================
--- 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" :_("<p><b><big>Subnet Information</big></b></br>
-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.
</p>
") +
// Wizard Installation - Step 3 2/4
_("<p><b><big>IP Address Range</big></b><br>
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>
+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 <b>
Allow Dynamic BOOTP</b> flag if the specified range may be dynamically
assigned to BOOTP clients as well as DHCP clients</p>.
") +
Modified: trunk/dhcp-server/yast2-dhcp-server.spec.in
URL: http://svn.opensuse.org/viewcvs/yast/trunk/dhcp-server/yast2-dhcp-server.spec.in?rev=67759&r1=67758&r2=67759&view=diff
==============================================================================
--- 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@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
