Mailinglist Archive: yast-commit (275 mails)

< Previous Next >
[yast-commit] r67787 - in /trunk/network: package/ src/clients/ src/installation/ src/lan/ src/modules/ src/provider/ src/routines/ src/services/
Author: jsuchome
Date: Thu Mar 29 15:26:58 2012
New Revision: 67787

URL: http://svn.opensuse.org/viewcvs/yast?rev=67787&view=rev
Log:
- merged proofread texts


Modified:
trunk/network/package/yast2-network.changes
trunk/network/src/clients/lan_auto.ycp
trunk/network/src/clients/routing.ycp
trunk/network/src/installation/inst_do_net_test.ycp
trunk/network/src/lan/address.ycp
trunk/network/src/lan/cmdline.ycp
trunk/network/src/lan/complex.ycp
trunk/network/src/lan/hardware.ycp
trunk/network/src/lan/help.ycp
trunk/network/src/modules/Lan.ycp
trunk/network/src/provider/provider.ycp
trunk/network/src/routines/routines.ycp
trunk/network/src/services/proxy.ycp

Modified: trunk/network/package/yast2-network.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=67787&r1=67786&r2=67787&view=diff
==============================================================================
--- trunk/network/package/yast2-network.changes (original)
+++ trunk/network/package/yast2-network.changes Thu Mar 29 15:26:58 2012
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Thu Mar 29 15:26:35 CEST 2012 - jsuchome@xxxxxxx
+
+- merged proofread texts
+
+-------------------------------------------------------------------
Wed Mar 14 12:00:35 CET 2012 - mvidner@xxxxxxx

- No need to chmod /etc/sysconfig/network/providers after placing

Modified: trunk/network/src/clients/lan_auto.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_auto.ycp?rev=67787&r1=67786&r2=67787&view=diff
==============================================================================
--- trunk/network/src/clients/lan_auto.ycp (original)
+++ trunk/network/src/clients/lan_auto.ycp Thu Mar 29 15:26:58 2012
@@ -356,7 +356,7 @@
if (Lan::isAnyInterfaceDown()){
integer timeout =
LanItems::autoinstall_settings["strict_IP_check_timeout"]:0;
y2debug("timeout %1", timeout);
- string error_text = _("Configuration Error : uninitialized
interface!");
+ string error_text = _("Configuration Error: uninitialized interface.");
if (timeout == 0) Popup::Error(error_text);
else Popup::TimedError(error_text, timeout);
}

Modified: trunk/network/src/clients/routing.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/routing.ycp?rev=67787&r1=67786&r2=67787&view=diff
==============================================================================
--- trunk/network/src/clients/routing.ycp (original)
+++ trunk/network/src/clients/routing.ycp Thu Mar 29 15:26:58 2012
@@ -163,7 +163,7 @@
if (addedit == `add)
{
if ( destination == "" || gateway == "" ) {
- CommandLine::Error( _("At least destination and gateway IP
addresses must be specified"));
+ CommandLine::Error( _("At least destination and gateway IP
addresses must be specified."));
return false;
}

@@ -180,7 +180,7 @@
else if ( addedit == `edit)
{
if ( destination == "") {
- CommandLine::Error( _("Destination IP address must be specified"));
+ CommandLine::Error( _("Destination IP address must be specified."));
return false;
}
if ( size( options) < 2 ) {

Modified: trunk/network/src/installation/inst_do_net_test.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/inst_do_net_test.ycp?rev=67787&r1=67786&r2=67787&view=diff
==============================================================================
--- trunk/network/src/installation/inst_do_net_test.ycp (original)
+++ trunk/network/src/installation/inst_do_net_test.ycp Thu Mar 29 15:26:58 2012
@@ -649,11 +649,12 @@
//popup informing user about the failure to retrieve
release notes
//most likely due to server-side error
ret = Popup::ContinueCancel(_("Download of latest release
notes failed due to server-side error.
-This does not necessarily mean misconfigured network.
+This does not necessarily imply a faulty network configuration.

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

Modified: trunk/network/src/lan/address.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/address.ycp?rev=67787&r1=67786&r2=67787&view=diff
==============================================================================
--- trunk/network/src/lan/address.ycp (original)
+++ trunk/network/src/lan/address.ycp Thu Mar 29 15:26:58 2012
@@ -580,10 +580,12 @@
} else {
// There'll be no 127.0.0.2 -> remind user to define some hostname
if( !Host::NeedDummyIP() &&
- !Popup::YesNo( _("No hostname has been specified. It is
recommended to associate
-some hostname with static IP, otherwise the machine name will
-not be resolvable without active network connection.\n
-Really leave the hostname blank?")) ) {
+ !Popup::YesNo( _("No hostname has been specified. We recommend
to associate
+a hostname with a static IP, otherwise the machine name will
+not be resolvable without an active network connection.
+
+Really leave the hostname blank?
+")) ) {
UI::SetFocus(`hostname);
return false;
}
@@ -741,7 +743,7 @@
"custom_widget":
`HBox(
`ComboBox(`id(`vlan_eth), `opt(`notify), _("Real Interface
for &VLAN"), []),
- `IntField(`id(`vlan_id), `opt(`notify), _("VLAN id"), 0,
9999, 0)
+ `IntField(`id(`vlan_id), `opt(`notify), _("VLAN ID"), 0,
9999, 0)
),
"opt": [`hstretch],
"init": InitVLANSlave,
@@ -768,7 +770,7 @@
/* ComboBox label */
"label": _("&Bond Driver Options"),
"opt": [`hstretch, `editable],
- "help": _("<p>Select the bond driver options, and edit it if
necessary. </p>"),
+ "help": _("<p>Select the bond driver options and edit them if
necessary. </p>"),
"items" : [["mode=balance-rr miimon=100"], ["mode=active-backup
miimon=100"], ["mode=balance-xor miimon=100"],
["mode=broadcast miimon=100"], ["mode=802.3ad miimon=100"],
["mode=balance-tlb miimon=100"], ["mode=balance-alb miimon=100"]]
],
@@ -1004,7 +1006,7 @@
if ( fw_is_installed )
wd["FWZONE", "items"] =
SuSEFirewall4Network::FirewallZonesComboBoxItems();
else
- wd["FWZONE", "items"] = [ ["", _("Firewall is not installed") ] ];
+ wd["FWZONE", "items"] = [ ["", _("Firewall is not installed.") ] ];


term label = `HBox (

Modified: trunk/network/src/lan/cmdline.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/cmdline.ycp?rev=67787&r1=67786&r2=67787&view=diff
==============================================================================
--- trunk/network/src/lan/cmdline.ycp (original)
+++ trunk/network/src/lan/cmdline.ycp Thu Mar 29 15:26:58 2012
@@ -115,7 +115,7 @@

LanItems::bootproto = options["bootproto"]:"none";
if (!contains(["none", "static", "dhcp"], LanItems::bootproto)){
- Report::Error(_("Impossible value for bootproto!"));
+ Report::Error(_("Impossible value for bootproto."));
return false;
}

@@ -124,7 +124,7 @@
LanItems::netmask = options["netmask"]:"255.255.255.0";
LanItems::startmode = options["startmode"]:"auto";
if (!contains(["auto", "ifplugd", "nfsroot"], LanItems::startmode)){
- Report::Error(_("Impossible value for startmode!"));
+ Report::Error(_("Impossible value for startmode."));
return false;
}

@@ -157,12 +157,12 @@

LanItems::bootproto = options["bootproto"]:"none";
if (!contains(["none", "static", "dhcp"], LanItems::bootproto)){
- Report::Error(_("Impossible value for bootproto!"));
+ Report::Error(_("Impossible value for bootproto."));
return false;
}
if (LanItems::bootproto=="static"){
if (!(size(options["ip"]:"")>0)){
- Report::Error(_("For static configuration \"ip\" option is
needed!"));
+ Report::Error(_("For static configuration, the \"ip\" option
is needed."));
return false;
}
LanItems::ipaddr = options["ip"]:"";
@@ -178,7 +178,7 @@

LanItems::startmode = options["startmode"]:"auto";
if (!contains(["auto", "ifplugd", "nfsroot"], LanItems::startmode)){
- Report::Error(_("Impossible value for startmode!"));
+ Report::Error(_("Impossible value for startmode."));
return false;
}


Modified: trunk/network/src/lan/complex.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=67787&r1=67786&r2=67787&view=diff
==============================================================================
--- trunk/network/src/lan/complex.ycp (original)
+++ trunk/network/src/lan/complex.ycp Thu Mar 29 15:26:58 2012
@@ -112,8 +112,8 @@
if (fw != ""){
if ((!Package::Installed(fw) && !Package::Available(fw))){
Popup::Message(sformat(_("Firmware is needed. Install it from
-Add-On CD.
-First add the Add-On CD to your YaST software repositories then return
+the add-on CD.
+First add the add-on CD to your YaST software repositories then return
to this configuration dialog.
")));
return false;
@@ -121,9 +121,12 @@
if (!contains(LanItems::Requires, fw)) LanItems::Requires =
add(LanItems::Requires, fw);
}
else {
- return (Popup::ContinueCancel(_("The device needs a firmware to
function properly. It can be usually downloaded from your driver vendor web
page.\nIf you have already downloaded and installed the firmware, click
<b>Continue</b>
-to configure the device. Otherwise click <b>Cancel</b> and return to this
dialog
-once you have installed the firmware.")));
+ return (Popup::ContinueCancel(_("The device needs a firmware to
function properly. Usually, it can be
+downloaded from your driver vendor's Web page.
+If you have already downloaded and installed the firmware, click
+<b>Continue</b> to configure the device. Otherwise click <b>Cancel</b> and
+return to this dialog once you have installed the firmware.
+")));
}
}

@@ -136,7 +139,7 @@
if(PackagesInstall(LanItems::Requires) != `next)
return false;
if (fw=="b43-fwcutter"){
- if(Popup::ContinueCancelHeadline(_("Installing firmware"), _("For
successful firmware installation the, 'install_bcm43xx_firmware' script needs
to be executed. Execute it now ?"))){
+ if(Popup::ContinueCancelHeadline(_("Installing firmware"), _("For
successful firmware installation, the 'install_bcm43xx_firmware' script needs
to be executed. Execute it now?"))){
map<string, any> command = (map<string,
any>)SCR::Execute(.target.bash_output, "/usr/sbin/install_bcm43xx_firmware");
if (command["exit"]:-1!=0)
Popup::ErrorDetails(_("An error occurred during firmware
installation."), command["stderr"]:"");

Modified: trunk/network/src/lan/hardware.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev=67787&r1=67786&r2=67787&view=diff
==============================================================================
--- trunk/network/src/lan/hardware.ycp (original)
+++ trunk/network/src/lan/hardware.ycp Thu Mar 29 15:26:58 2012
@@ -32,9 +32,9 @@

/* Manual network card setup help 2/4 */
/* translators: do not translated udev, MAC, BusID*/
-_("<p><b>Udev Rules</b> are rules for the Kernel device manager that allow
-associating MAC address or BusID of the network device with its name (for
example,
-eth1, wlan0 ) and assures a persistent device name upon reboot.
+_("<p><b>Udev Rules</b> are rules for the kernel device manager that allow
+associating the MAC address or BusID of the network device with its name (for
+example, eth1, wlan0 ) and assures a persistent device name upon reboot.
") +

_("<p><b>Show visible port identification</b> allows you to physically
identify now configured NIC.
@@ -48,13 +48,12 @@
") +

/* Manual networ card setup help 3/4 */
-_("<p>Additionally, you may specify <b>Options</b> for the Kernel module. Use
this format: <i>option</i>=<i>value</i>. Each entry should be space
-separated,for example: <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are
-configured with the same module name, options will be merged while saving.</p>
+_("<p>Additionally, specify <b>Options</b> for the kernel module. Use this
+format: <i>option</i>=<i>value</i>. Each entry should be space-separated, for
example: <i>io=0x300 irq=5</i>. <b>Note:</b> If two cards are
+configured with the same module name, the options will be merged while
saving.</p>
") +

-_("<p>If you write something into <b>Ethtool options</b>, ifup will call
ethtool with this options.</p>
-");
+_("<p>If you specify options via <b>Ethtool options</b>, ifup will call
ethtool with these options.</p>\n");

if(!(LanItems::operation == `edit || Arch::s390 ()))
{
@@ -483,7 +482,7 @@
// when dev_name changed, rename ifcfg (both in NetworkInterfaces and
LanItems)
if (new_name!=old_name){
if (contains(NetworkInterfaces::List(""), new_name)){
- Popup::Error(_("Configuration name already exists!"));
+ Popup::Error(_("Configuration name already exists."));
ret=nil;
} else{
y2internal("LanItems::GetReplacedItemUdev2 %1",
LanItems::GetReplacedItemUdev("NAME", new_name));

Modified: trunk/network/src/lan/help.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/help.ycp?rev=67787&r1=67786&r2=67787&view=diff
==============================================================================
--- trunk/network/src/lan/help.ycp (original)
+++ trunk/network/src/lan/help.ycp Thu Mar 29 15:26:58 2012
@@ -30,9 +30,9 @@
/* Network setup method help */
// NetworkManager and ifup are programs
_("<p><b><big>Network Setup Method</big></b></p>
-<p>Use the <b>NetworkManager</b> to have a desktop applet
+<p>Use the <b>NetworkManager</b> as a desktop applet
managing connections for all interfaces. It is well suited
-for switching among wired and multiple wireless networks.</p>
+for switching among wired and wireless networks.</p>
") +
/* Network setup method help */
// NetworkManager and ifup are programs
@@ -49,16 +49,16 @@
Press <b>Add</b> to configure a new network card manually.</p>
") + _("<p><b><big>Configuring or Deleting:</big></b><br>
Choose a network card to change or remove.
-Then press <b>Edit</b> or <b>Delete</b> as desired.</p>
+Then press <b>Edit</b> or <b>Delete</b> respectively.</p>
"),

"ipv6" :
/* IPv6 help */
_("<p><b><big>IPv6 Protocol Settings</big></b></p>
<p>Check <b>Enable IPv6</b> to enable the ipv6 module in the kernel.
-It is possible to use IPv6 together with IPv4. This is a default option.
-To disable IPv6, uncheck this option (this will blacklist the kernel
-module for ipv6). If the IPv6 protocol is not used on your network, the
response
+It is possible to use IPv6 together with IPv4. This is the default option.
+To disable IPv6, uncheck this option. This will blacklist the kernel
+module for ipv6. If the IPv6 protocol is not used on your network, the
response
time can be faster.</p>
")
+
@@ -74,17 +74,17 @@
") +

_("<p>For each route, enter destination network IP address, gateway address,
-and netmask. To omit any of these values, use dash sign \"-\". Select
-the device through which the traffic to the defined network will be routed,
-as well.\"-\" is an alias for any interface.</p>
+and netmask. To omit any of these values, use a dash sign \"-\". Select
+the device through which the traffic to the defined network will be
routed.\"-\" is an alias for any interface.</p>
") +
/* Routing dialog help 2/2 */
_("<p>Enable <b>IP Forwarding</b> (forwarding packets from external networks
to the internal one) if this system is a router. Both IPv4 and IPv6
connectivity
will be affected by this setting.
<b>Important:</b> if the firewall is enabled, allowing IP forwarding alone is
not enough.
-You should enable masquerade and/or set at least one redirect rule in
firewall. You may
-use YaST firewall module for that.</p>"),
+You should enable masquerading and/or set at least one redirect rule in the
+firewall configuration. Use the YaST firewall module.</p>
+"),

"dhcp_hostname":
_("<p>If you are using DHCP to get an IP address, check whether you get
@@ -95,10 +95,11 @@

"write_hostname":
_("<p><b>Assign Hostname to Loopback IP</b> associates your hostname with
-<tt>127.0.0.2</tt> (loopback) IP address in <tt>/etc/hosts</tt>. This is an
+the IP address <tt>127.0.0.2</tt> (loopback) in <tt>/etc/hosts</tt>. This is a
useful option if you want to have the hostname resolvable at all times, even
-without active network. In all other cases, use it carefully, especially
-if this computer provides some network services.</p>"),
+without an active network. In all other cases, use it carefully, especially
+if this computer provides some network services.</p>
+"),

"searchlist_s":
_("<p>Enter the name servers and domain search list for resolving
@@ -123,29 +124,33 @@
command.</p>"),

"dns_config_policy" :
-_("<p>Select the way how DNS configuration (name servers, search list, the
content of
-<i>/etc/resolv.conf</i> file) will be modified. Normally, it is handled by
<i>netconfig</i>
-script which merges the data statically defined here with those obtained
dynamically (e.g. from
-DHCP client, NetworkManager etc.). This is the default, <b>Use Default
Policy</b> option and
-it is sufficient for most of the configurations.</p>") +
+_("<p>Select the way how the DNS configuration will be modified (name servers,
+search list, the content of <i>/etc/resolv.conf</i>). Normally, it is handled
+by the <i>netconfig</i> script, which merges statically defined data with
+dynamically obtained data (e.g. from the DHCP client, NetworkManager,
+etc.). This is the default. <b>Use Default Policy</b> is sufficient for most
+configurations.</p>
+") +

-_("<p>By choosing <b>Only Manually</b> option, <i>netconfig</i> will no longer
be allowed to modify
-<i>/etc/resolv.conf</i>. You can however edit the file manually. By choosing
<b>Use Custom Policy</b>
-option, you may specify a custom policy string, which consists of
comma-separated list of interface
-names, including wildcards, with STATIC and STATIC_FALLBACK as predefined
special values. For more
-information, see <i>netconfig</i> manual page. Note: leaving the field blank
is the same as using <b>
-Only Manually</b> policy.</p>"),
+_("<p>By choosing <b>Only Manually</b>, <i>netconfig</i> will no longer be
+allowed to modify <i>/etc/resolv.conf</i>. You can however edit the file
+manually. By choosing <b>Use Custom Policy</b>, you may specify a custom
+policy string, which consists of a comma-separated list of interface names,
+including wildcards, with STATIC and STATIC_FALLBACK as predefined special
+values. For more information, see the <i>netconfig</i> manual page. Note:
+Leaving the field blank is the same as using the <b> Only Manually</b>
+policy.</p>
+"),

"bootproto":
/* Address dialog help 1-6/8: dynamic address preferred */
/* Address dialog help 1/8 */
_("<p><b><big>Address Setup</big></b></p>
-<p>Select <b>No Address Setup</b> if you do not want any IP address for this
device.
+<p>Select <b>No Address Setup</b> if you do not want to assign an IP address
to this device.
This is particularly useful for bonding ethernet devices.</p>
")
+
- _("<p>Check <b>iBFT</b> if you want to keep network configured in your
BIOS.</p>
-")
+ _("<p>Check <b>iBFT</b> if you want to keep the network configured in your
BIOS.</p>\n")
+
/* Address dialog help 2/8 */
_("<p>Select <b>Dynamic Address</b> if you do not have a static IP address
@@ -153,9 +158,9 @@
")
+
/* Address dialog help 3/8 */
- _("<p>You can choose one of the dynamic address assignment methods. Select
<b>DHCP</b>
-if you have a DHCP server running on your local network. Network addresses are
then
-obtained automatically from the server.</p>
+ _("<p>Choose one of the dynamic address assignment methods. Select
<b>DHCP</b>
+if you have a DHCP server running on your local network. Network addresses
+are then automatically obtained from the server.</p>
")
+
/* Address dialog help 4/8 */
@@ -204,8 +209,8 @@
<p>Maximum transfer unit (<b>MTU</b>) is the maximum size of the packet,
transferred over the network in one frame. Usually, you do not need to
set a MTU, but using lower MTU values may improve the network performance,
-especially on slow dial-up connections. Either, select one of the recommended
values,
-or define another one.</p>
+especially on slow dial-up connections. Either select one of the recommended
+values or define another one.</p>
"),

"bondslave":
@@ -224,13 +229,13 @@

/* DHCP dialog help 3/7 */
_("<p>The <b>Hostname to Send</b> specifies a string used for the
-hostname option field, when dhcpcd sends messages to the 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).</p>
Some DHCP servers require the <b>Hostname to Send</b> option field to
contain a specific string in the DHCP messages from clients. Leave <b>AUTO</b>
to send the current hostname (for example, the one defined in
<tt>/etc/HOSTNAME</tt>).
-For not sending a hostname leave the field empty.</p>
+If you do not want to send a hostname, leave the field empty.</p>
"),

"additional":
@@ -258,11 +263,11 @@
"wep_key" :
_("<p>Choose between three <b>Key Input Types</b> for your key.
<br><b>Passphrase</b>: The key is generated from the phrase entered.
-<br><b>ASCII</b>: The ASCII values of the characters entered form the
+<br><b>ASCII</b>: The ASCII values of the characters entered constitute the
key. Enter 5 characters for 64-bit keys, up to 13
characters for 128-bit keys, up to 16 characters for 156-bit keys, and
up to 29 characters for 256-bit keys.
-<br><b>Hexadecimal</b>: Enter the hex codes of the key, directly. Enter
+<br><b>Hexadecimal</b>: Enter the hex codes of the key directly. Enter
10 hex digits for 64-bit keys, 26 digits for 128-bit keys, 32 digits
for 156-bit keys, and 58 digits for 256-bit keys. You can
use hyphens <tt>-</tt> to separate pairs or groups of digits, for example,

Modified: trunk/network/src/modules/Lan.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=67787&r1=67786&r2=67787&view=diff
==============================================================================
--- trunk/network/src/modules/Lan.ycp (original)
+++ trunk/network/src/modules/Lan.ycp Thu Mar 29 15:26:58 2012
@@ -232,19 +232,20 @@

if(Abort()) return false;
/* Progress step 1/9 */
- if (gui) ProgressNextStage(_("Detecting for ndiswrapper..."));
+ if (gui) ProgressNextStage(_("Detecting ndiswrapper..."));
// modprobe ndiswrapper before hwinfo when needed (#343893)
if (!Mode::autoinst() && PackageSystem::Installed("ndiswrapper")){
y2milestone("ndiswrapper: installed");
if (size((list<string>)SCR::Read(.target.dir, "/etc/ndiswrapper"))>0){
y2milestone("ndiswrapper: configuration found");
if ((integer)SCR::Execute(.target.bash, "lsmod |grep -q ndiswrapper")!=0
- && Popup::YesNo(_("There is a ndiswrapper configuration
detected,
-but the Kernel module was not modprobed.
+ && Popup::YesNo(_("Detected a ndiswrapper configuration,
+but the kernel module was not modprobed.
Do you want to modprobe ndiswrapper?
"))) {
- if (ModuleLoading::Load("ndiswrapper", "", "", "", false, true)==`fail)
Popup::Error(_("ndiswrapper kernel module wasn't loaded.
-Check configuration manually."));
+ if (ModuleLoading::Load("ndiswrapper", "", "", "", false, true)==`fail)
Popup::Error(_("ndiswrapper kernel module has not been loaded.
+Check configuration manually.
+"));
}
}
}
@@ -339,7 +340,7 @@
global void SetIPv6(boolean status){
if(ipv6 != status) {
ipv6=status;
- Popup::Warning(_("To apply this change a reboot is needed."));
+ Popup::Warning(_("To apply this change, a reboot is needed."));
LanItems::SetModified();
}
}
@@ -505,7 +506,7 @@
`VSpacing(0.5),
// This is in information message. Next come the
// hardware class name (network cards).
- `HVCenter(`Label(_("Because of bridged network YaST2 needs to
restart network to apply the settings."))),
+ `HVCenter(`Label(_("Because of the bridged network, YaST2
needs to restart the network to apply the settings."))),
`VSpacing(0.5)
))),
`ButtonBox (

Modified: trunk/network/src/provider/provider.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/provider/provider.ycp?rev=67787&r1=67786&r2=67787&view=diff
==============================================================================
--- trunk/network/src/provider/provider.ycp (original)
+++ trunk/network/src/provider/provider.ycp Thu Mar 29 15:26:58 2012
@@ -505,7 +505,7 @@
} */
// NM doesn't ask for password (#225793)
else if(ask_pass && NetworkService::IsManaged ()){
- Popup::Warning(_("NetworkManager does not have the ability to
ask for the password.
+ Popup::Warning(_("NetworkManager cannot ask for the password.
Use KInternet (without NetworkManager) or store passwords on the system.
"));
continue;

Modified: trunk/network/src/routines/routines.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.ycp?rev=67787&r1=67786&r2=67787&view=diff
==============================================================================
--- trunk/network/src/routines/routines.ycp (original)
+++ trunk/network/src/routines/routines.ycp Thu Mar 29 15:26:58 2012
@@ -825,9 +825,11 @@
if (show_popup)
{
Popup::Warning( _("Network is currently controlled by NetworkManager and
its settings
-cannot be edited by YaST.\n
-To edit the settings, use NetworkManager connection editor, or
-switch the network setup method to Traditional method with ifup."));
+cannot be edited by YaST.
+
+To edit the settings, use the NetworkManager connection editor or
+switch the network setup method to Traditional with ifup.
+"));
UI::FakeUserInput ($["ID": "global"]);
}
} else disable=false;

Modified: trunk/network/src/services/proxy.ycp
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/proxy.ycp?rev=67787&r1=67786&r2=67787&view=diff
==============================================================================
--- trunk/network/src/services/proxy.ycp (original)
+++ trunk/network/src/services/proxy.ycp Thu Mar 29 15:26:58 2012
@@ -393,9 +393,10 @@

/* Proxy dialog help 5/8 */

- _("<p>If you have the <b>Use the Same Proxy for All Protocols</b>
option checked, it is
+ _("<p>If you check <b>Use the Same Proxy for All Protocols</b>, it is
enough to fill in the HTTP proxy URL. It will be used for all protocols
-(HTTP, HTTPS and FTP).\n") +
+(HTTP, HTTPS and FTP).
+") +

/* Proxy dialog help 6/8 */

@@ -408,7 +409,7 @@
/* Proxy dialog help 7/8 */
_("<p>If you are using a proxy server with authorization, enter
the <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 only (except for quotation marks).</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