Mailinglist Archive: yast-commit (687 mails)

< Previous Next >
[yast-commit] r43647 - in /branches/SuSE-SLE-10-SP2-Branch/network: package/ src/installation/ src/lan/ src/services/
  • From: kmachalkova@xxxxxxxxxxxxxxxx
  • Date: Wed, 16 Jan 2008 09:20:18 -0000
  • Message-id: <20080116092018.835E024085@xxxxxxxxxxxxxxxx>
Author: kmachalkova
Date: Wed Jan 16 10:20:17 2008
New Revision: 43647

URL: http://svn.opensuse.org/viewcvs/yast?rev=43647&view=rev
Log:
Merged proofread texts

Modified:
branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes

branches/SuSE-SLE-10-SP2-Branch/network/src/installation/inst_do_net_test.ycp
branches/SuSE-SLE-10-SP2-Branch/network/src/lan/address.ycp
branches/SuSE-SLE-10-SP2-Branch/network/src/lan/cmdline.ycp
branches/SuSE-SLE-10-SP2-Branch/network/src/lan/complex.ycp
branches/SuSE-SLE-10-SP2-Branch/network/src/lan/dhcp.ycp
branches/SuSE-SLE-10-SP2-Branch/network/src/lan/virtual.ycp
branches/SuSE-SLE-10-SP2-Branch/network/src/services/proxy.ycp

Modified: branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes?rev=43647&r1=43646&r2=43647&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes
(original)
+++ branches/SuSE-SLE-10-SP2-Branch/network/package/yast2-network.changes Wed
Jan 16 10:20:17 2008
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Jan 16 10:19:36 CET 2008 - kmachalkova@xxxxxxx
+
+- Merged proofread texts
+
+-------------------------------------------------------------------
Tue Jan 15 18:23:41 CET 2008 - mzugec@xxxxxxx

- during autoyast wait for network when set up (#195571)

Modified:
branches/SuSE-SLE-10-SP2-Branch/network/src/installation/inst_do_net_test.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/network/src/installation/inst_do_net_test.ycp?rev=43647&r1=43646&r2=43647&view=diff
==============================================================================
---
branches/SuSE-SLE-10-SP2-Branch/network/src/installation/inst_do_net_test.ycp
(original)
+++
branches/SuSE-SLE-10-SP2-Branch/network/src/installation/inst_do_net_test.ycp
Wed Jan 16 10:20:17 2008
@@ -620,9 +620,10 @@
ret = Popup::ContinueCancel(_("Download of latest release
notes failed due to server-side error.
This does not necessarily mean misconfigured network.

-Click 'Continue' to proceed to the next installation step. To skip any steps
+Click <b>Continue</b> to proceed to the next installation step. To skip any
steps
requiring internet connection or to get back to your network configuration,
-click 'Cancel'."));
+click <b>Cancel</b>.
+"));
}
// return code shows misconfigured network
// return false

Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/lan/address.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/network/src/lan/address.ycp?rev=43647&r1=43646&r2=43647&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/network/src/lan/address.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/network/src/lan/address.ycp Wed Jan 16
10:20:17 2008
@@ -535,7 +535,7 @@
"items" : [ ],
"init": InitSlave,
"store": StoreSlave,
- "help": _("<p>Select the salve devices for the bond device. Only the
deveices which's Device Activation is Never and set as None Address Setup are
available.</p>"),
+ "help": _("<p>Select the slave devices for the bond device. Only the
devices whose Device Activation is Never and set as None Address Setup are
available.</p>"),
],

"BONDOPTION": $[
@@ -543,7 +543,7 @@
/* ComboBox label */
"label": _("Bond Driver Options"),
"opt": [`hstretch, `editable],
- "help": _("<p>Select the bond driver options, and edit it if you need.
</p>"),
+ "help": _("<p>Select the bond driver options, and edit if needed.
</p>"),
"items": [["mode=balance-rr"], ["mode=active-backup"],
["mode=balance-xor"],
["mode=broadcast"], ["mode=802.3ad"], ["mode=balance-tlb"],
["mode=balance-alb"]],
],
@@ -575,7 +575,7 @@
"help":
/* Address dialog help 2-6/8: dynamic address preferred */
/* Address dialog help 2/8 */
- _("<p>You can select none address setup if you don't want any IP
address.</p>") +
+ _("<p>You can select <b>None Address Setup</b> if you do not want any IP
address.</p>") +

_("<p>You can select dynamic address assignment
if you have a <b>DHCP server</b> running on your local network.</p>

Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/lan/cmdline.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/network/src/lan/cmdline.ycp?rev=43647&r1=43646&r2=43647&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/network/src/lan/cmdline.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/network/src/lan/cmdline.ycp Wed Jan 16
10:20:17 2008
@@ -195,7 +195,7 @@
integer i = tointeger (substring (dev, 1));
if (! AddIface (i))
{
- CommandLine::Print(_("Couldn't add interface"));
+ CommandLine::Print(_("Could not add interface."));
return false;
}
} else

Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/lan/complex.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/network/src/lan/complex.ycp?rev=43647&r1=43646&r2=43647&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/network/src/lan/complex.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/network/src/lan/complex.ycp Wed Jan 16
10:20:17 2008
@@ -245,11 +245,11 @@
"help":
/* IPv6 help */
_("<p>Select <b>Enable</b> IPv6 to enable ipv6 module in kernel.
-It is possible to use IPv6 together with IPv4. This is default option.
+It is possible to use IPv6 together with IPv4. This is the default option.
") +
/* Network setup method help */
_("<p>Select <b>Disable</b> IPv6 to disable autoload kernel module for ipv6.
-When ipv6 protocol is not used on your network, response time will be faster.
+When the ipv6 protocol is not used on your network, the response time will be
faster.
") +
_("<p>All changes will be applied after reboot.</p>"),
"init": IPv6Init,

Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/lan/dhcp.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/network/src/lan/dhcp.ycp?rev=43647&r1=43646&r2=43647&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/network/src/lan/dhcp.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/network/src/lan/dhcp.ycp Wed Jan 16
10:20:17 2008
@@ -47,14 +47,15 @@

/* DHCP dialog help 4/8 */
_("<p>The <b>Hostname to Send</b> specifies a string used for the
-hostname option field when dhcpcd sends messages to DHCP server. Some
+hostname option field when dhcpcd sends messages to the DHCP server. Some
DHCP servers update name server zones (forward and reverse records)
according to this hostname (dynamic DNS).

Also, some DHCP servers require the <b>Hostname to Send</b> option field to
contain a specific string in the DHCP messages from clients. Leave <i>AUTO</i>
to send the current hostname (i.e. the one defined in <i>/etc/HOSTNAME</i>).
-Leave empty not to send a hostname.</p>");
+Leave empty to not send a hostname.</p>
+");

boolean dhclient_broadcast = false;
if(issubstring(NetworkConfig::DHCP["DHCLIENT_ADDITIONAL_OPTIONS"]:"",
"-B"))

Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/lan/virtual.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/network/src/lan/virtual.ycp?rev=43647&r1=43646&r2=43647&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/network/src/lan/virtual.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/network/src/lan/virtual.ycp Wed Jan 16
10:20:17 2008
@@ -72,7 +72,8 @@
{
// message popup
Report::Message (_("This setting is not available
-because NetworkManager does not support it."));
+because it is not supported by NetworkManager.
+"));
return `next;
}


Modified: branches/SuSE-SLE-10-SP2-Branch/network/src/services/proxy.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP2-Branch/network/src/services/proxy.ycp?rev=43647&r1=43646&r2=43647&view=diff
==============================================================================
--- branches/SuSE-SLE-10-SP2-Branch/network/src/services/proxy.ycp (original)
+++ branches/SuSE-SLE-10-SP2-Branch/network/src/services/proxy.ycp Wed Jan 16
10:20:17 2008
@@ -339,7 +339,7 @@
/* Proxy dialog help 7/8 */
_("<p>If you are using a proxy server with authorization, enter
<b>Proxy User Name</b> and <b>Proxy Password</b>. A valid username
-consists of printable ASCII characters (except for quotation marks) only.</p>
+consists of printable ASCII characters (except quotation marks) only.</p>
") +

/* Proxy dialog help 8/8 */

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages