Author: jsrain Date: Fri Apr 18 15:48:54 2008 New Revision: 46855 URL: http://svn.opensuse.org/viewcvs/yast?rev=46855&view=rev Log: merged texts from proofread Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/installation/inst_do_net_test.ycp trunk/network/src/lan/bridge.ycp trunk/network/src/lan/complex.ycp trunk/network/src/lan/hardware.ycp trunk/network/src/lan/help.ycp trunk/network/src/modules/DNS.ycp trunk/network/src/modules/Host.ycp trunk/network/src/modules/Lan.ycp trunk/network/src/modules/LanItems.ycp trunk/network/src/provider/connection.ycp trunk/network/src/provider/provider.ycp trunk/network/src/remote/dialogs.ycp trunk/network/src/routines/complex.ycp trunk/network/src/routines/runtime.ycp trunk/network/src/routines/widgets.ycp trunk/network/src/services/dns.ycp trunk/network/src/services/proxy.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Fri Apr 18 15:48:54 2008 @@ -1 +1 @@ -2.16.38 +2.16.39 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Fri Apr 18 15:48:54 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 18 15:46:22 CEST 2008 - jsrain@suse.cz + +- merged texts from proofread +- 2.16.39 + +------------------------------------------------------------------- Tue Apr 15 08:54:14 CEST 2008 - jsuchome@suse.cz - fixed testsuite again (do not save the logs) 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=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/installation/inst_do_net_test.ycp (original) +++ trunk/network/src/installation/inst_do_net_test.ycp Fri Apr 18 15:48:54 2008 @@ -623,7 +623,7 @@ y2milestone("Product::relnotesurl_all = %1", Product::relnotesurl_all); // Fallback for situation that mustn't exist if (Product::relnotesurl_all == nil || Product::relnotesurl_all == []) { - Popup::Warning(_("There is no URL for release notes defined. Internet test cannot be performed.")); + Popup::Warning(_("No URL for the release notes defined. Internet test cannot be performed.")); ret = false; } else { @@ -639,9 +639,9 @@ 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 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'.")); +click Cancel.")); } // return code shows misconfigured network // return false Modified: trunk/network/src/lan/bridge.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/bridge.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/lan/bridge.ycp (original) +++ trunk/network/src/lan/bridge.ycp Fri Apr 18 15:48:54 2008 @@ -55,8 +55,9 @@ if (contains(confs, device)){ if ((string)configurations[NetworkInterfaces::GetType(device), device, "IPADDR"]:"" != "0.0.0.0") { if(!confirmed) { - valid = Popup::ContinueCancel(_("One or more selected devices are already configured. -To work properly configuration must be removed.")); + valid = Popup::ContinueCancel(_("At least one selected device is already configured. +Remove the configuration. +")); confirmed=true; } if (valid) { Modified: trunk/network/src/lan/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/complex.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/lan/complex.ycp (original) +++ trunk/network/src/lan/complex.ycp Fri Apr 18 15:48:54 2008 @@ -133,9 +133,11 @@ fw = LanItems::GetFirmwareForCurrentItem(); if (fw != ""){ if ((!Package::Installed(fw) && !Package::Available(fw))){ - Popup::Message(sformat(_("The device needs a firmware to function properly. It can be installed from -%1 Add-On CD.\nTo install the firmware, add Add-On CD to your YaST software repositories and return -to this configuration dialog."), Product::name)); + Popup::Message(sformat(_("Firmware is needed. Install it from +%1 Add-On CD. +First add the Add-On CD to your YaST software repositories and return +to this configuration dialog. +"), Product::name)); return false; } else if (!contains(LanItems::Requires, fw)) LanItems::Requires = add(LanItems::Requires, fw); Modified: trunk/network/src/lan/hardware.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/hardware.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/lan/hardware.ycp (original) +++ trunk/network/src/lan/hardware.ycp Fri Apr 18 15:48:54 2008 @@ -26,27 +26,28 @@ * @return dialog result */ /* Manual network card setup help 1/4 */ - string hw_help = _("<p>Here, set up hardware-specific options for -your network device.</p>") + + string hw_help = _("<p>Set up hardware-specific options for +your network device here.</p> +") + /* Manual network card setup help 2/4 */ /* translators: do not translated udev, MAC, BusID*/ -_("<p><b>Udev rules</b> are the rules for kernel device manager that allow -associating MAC address or BusID of the network device with its name (e.g -eth1, wlan0 ) and make device name persistent upon reboot. If you don't -know what udev and its rules is, you probably don't need to use this option") + +_("<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 assure a persistent device name upon reboot. +") + /* Manual network card setup help 2/4 */ -_("<p><b>Kernel module</b>. Enter kernel module (in other words, driver) name -for your network device. If the device is already configured, you may select -one from the drop-down list if more than one driver for your device is -available. In most of the cases it is however OK to use the default value.</p>") + +_("<p><b>Kernel Module</b>. Enter the kernel module (driver) name +for your network device here. If the device is already configured, see if there are more than one drivers available for +your device in the drop-down list. If necessary, choose a driver from the list, but usually the default value works.</p> +") + /* Manual networ card setup help 3/4 */ -_("<p>Additionally, you may specify <b>options</b> for the kernel module. They should -be written in the 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, 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> +"); if(!(LanItems::operation == `edit /* FIXME: unique || Lan::unique != "" */ || Arch::s390 () == true)) { Modified: trunk/network/src/lan/help.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/lan/help.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/lan/help.ycp (original) +++ trunk/network/src/lan/help.ycp Fri Apr 18 15:48:54 2008 @@ -30,9 +30,9 @@ /* Network setup method help */ // NetworkManager and ifup are programs _("<p><b><big>Network Setup Method</big></b></p> -<p>Use <b>NetworkManager</b> to have a desktop applet -manage connections for all interfaces. It is well-suited -to switching among wired and multiple wireless networks.</p> +<p>Use the <b>NetworkManager</b> to have a desktop applet +managing connections for all interfaces. It is well suited +for switching among wired and multiple wireless networks.</p> ") + /* Network setup method help */ // NetworkManager and ifup are programs @@ -74,28 +74,26 @@ ") + _("For each route, enter destination network IP address, gateway address, -and netmask. To omit any of these values, use dash sign \"-\". Select also -the device through which the traffic to defined network will be routed ( -\"-\" stands for any interface).") + +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. +") + /* Routing dialog help 2/2 */ _("<p>Enable <b>IP Forwarding</b> if the system is a router.</p>"), "dhcp_hostname": -_("<p>If you are using DHCP to get an IP address, check whether to get -a hostname via DHCP. The hostname of your host (which can be seen -by issuing the <i>hostname</i> command) will be set automatically by the -DHCP client. -You may want to disable this option if you connect to different -networks that assign different hostnames, because changing -the hostname at runtime may confuse the graphical desktop. +_("<p>If you are using DHCP to get an IP address, check whether you get +a hostname via DHCP. You can see the hostname of you host using the <i>hostname</i> command. The hostname +will be set automatically by the DHCP client. +Changing the hostname at runtime may confuse the graphical Desktop. Therefore, disable this option if you connect to different +networks that assign different hostnames. </p> "), "write_hostname": _("<p>If you are using DHCP to get an IP address, your hostname will be written -to /etc/hosts and be resolvable as a 127.0.0.2 IP address. -This is the default behavior. If you want to disable this, uncheck this box -but your hostname will not be resolvable without an active network. +to <tt>/etc/hosts</tt> and be resolvable as a <tt>127.0.0.2</tt> IP address. +This is the default behavior. To disable this option, uncheck this box. +Now your hostname will not be resolvable without an active network. </p> "), @@ -130,11 +128,10 @@ has been temporarily modified by %1. You have two options:</p>") + /* Warning popup text 2/2 */ - _("<ol> -<li>Modify the current (changed) version of the file.</li> -<li>Press 'Accept' now and continue editing other (nonresolver) data. You -could return to this dialog later when the above service has terminated.</li> -</ol> "), + _("<p>Modify the current version of the file.</p> +<p>Press <b>Accept</b> and continue editing other data. You are able to return to this dialog at a later time, +when the above service has terminated.</p> +"), "bootproto": /* Address dialog help 1-6/8: dynamic address preferred */ @@ -145,33 +142,35 @@ ") + /* Address dialog help 2/8 */ - _("<p>Select <b>Dynamic address</b> if you do not have a static IP address -assigned by the system administrator or your cable or DSL provider.</p>") + _("<p>Select <b>Dynamic Address</b> if you do not have a static IP address +assigned by the system administrator or your Internet provider.</p> +") + /* Address dialog help 3/8 */ - _("<p>You can choose one of the dynamic address assignment method. Select <b>DHCP</b> + _("<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> ") + /* Address dialog help 4/8 */ - _("To automatically search for free IP and then assign it statically, select + _("To search for an IP address and assign it statically, select <b>Zeroconf</b>. To use DHCP and fall back to zeroconf, select <b>DHCP + Zeroconf -</b>. Otherwise, network addresses must be assigned <b>statically</b>.</p>"), +</b>. Otherwise, the network addresses must be assigned <b>Statically</b>.</p> +"), /* Address dialog help 5/8 */ "remoteip": -_("<p>Enter the <b>IP Address</b> (e.g., 192.168.100.99) -for your computer and the <b>Remote IP Address</b> (e.g., 192.168.100.254) +_("<p>Enter the <b>IP Address</b> (for example: <tt>192.168.100.99</tt>) for your computer, and the + <b>Remote IP Address</b> (for example: <tt>192.168.100.254</tt>) for your peer.</p> "), /* Address dialog help 6/8 */ "netmask": - _("<p>For <b>Static Address Setup</b> enter the static IP address (e.g., 192.168.100.99) -for your computer and the network mask (usually 255.255.255.0). Optionally, you can enter -a fully qualified hostname for this IP address. It will be written to <i>/etc/hosts</i>.</p> + _("<p>For <b>Static Address Setup</b> enter the static IP address for your computer (for example: <tt>192.168.100.99</tt>) and +the network mask (usually <tt>255.255.255.0</tt>). Optionally, you can enter +a fully qualified hostname for this IP address. The hostname will be written to <tt>/etc/hosts</tt>.</p> ") + /* Address dialog help 8/8 */ @@ -196,19 +195,19 @@ "mtu": _("<p><b><big>Maximum Transfer Unit</big></b></p> -<p>Maximum transfer unit (<b>MTU</b>) is the maximum size of the packet -transferred in one frame over the network. Normally, you do not need to -set MTU, but using lower MTU values may improve network performance, -especially on slow dial-up connections. Select one of the recommended values -or define your own one.</p> +<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> "), "bondslave": -_("<p>Select the slave devices for the bond device. Only the devices whose Device Activation is set to 'Never' and have 'No Address Setup are available'.</p>"), +_("<p>Select the slave devices for the bond device.\nOnly devices with the device activation set to <b>Never</b> and with <b>No Address Setup</b> are available.</p>"), "dhclient_help" : /* DHCP dialog help 1/8 */ -_("<p><b><big>DHCP client options</big></b></p>") + +_("<p><b><big>DHCP Client Options</big></b></p>") + /* DHCP dialog help 2/8 */ _("<p><b>Request Broadcast Response</b> causes the DHCP client @@ -225,20 +224,20 @@ /* 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 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). - -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 the field empty for not sending a hostname.</p> +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> "), "additional": /* Aliases dialog help 1/3 */ - _("<p><b><big>Additional addresses</big></b></p> -<p>Configure additional addresses of an interface (its aliases) in this table.</p>") + + _("<p><b><big>Additional Addresses</big></b></p> +<p>Configure additional addresses of an interface (its aliases) in this table.</p> +") + /* Aliases dialog help 2/3 */ _("<p>Enter an <b>Alias Name</b>, an <b>IP Address</b>, and @@ -252,18 +251,19 @@ // this is suited to the button-switched key typing // Translators: dialog help "wep_key" : - _("<p>Choose among three <b>key input types</b> for your 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 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>: Directly enter the hex codes of the key. 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 ('-') to separate pairs or groups of digits, for example, -'0a5f-41e6-48'. -</p> "), +use hyphens <tt>-</tt> to separate pairs or groups of digits, for example, +<tt>0a5f-41e6-48</tt>. +</p> +"), // Wireless dialog help "wireless": Modified: trunk/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DNS.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/modules/DNS.ycp (original) +++ trunk/network/src/modules/DNS.ycp Fri Apr 18 15:48:54 2008 @@ -309,7 +309,7 @@ if( update_resolv ) { /* Progress step 3/3 */ - ProgressNextStage(_("Updating /etc/resolv.conf...")); + ProgressNextStage(_("Updating <tt>/etc/resolv.conf</tt>...")); /* update /etc/resolv.conf */ SCR::Write(.etc.resolv_conf.search, searchlist); Modified: trunk/network/src/modules/Host.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Host.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/modules/Host.ycp (original) +++ trunk/network/src/modules/Host.ycp Fri Apr 18 15:48:54 2008 @@ -104,7 +104,7 @@ Progress::New(caption, " ", size(steps), steps, [], ""); - ProgressNextStage(_("Updating /etc/hosts...")); + ProgressNextStage(_("Updating <tt>/etc/hosts</tt>...")); /* Create if not exists, otherwise backup */ if(SCR::Read(.target.size, hosts_file) < 0) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Fri Apr 18 15:48:54 2008 @@ -209,9 +209,10 @@ 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 ndiswrapper configuration detected -but kernel module wasn't modprobed. -Should I modprobe ndiswrapper?"))) { + && Popup::YesNo(_("There is a ndiswrapper configuration detected, +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.")); } Modified: trunk/network/src/modules/LanItems.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/LanItems.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/modules/LanItems.ycp (original) +++ trunk/network/src/modules/LanItems.ycp Fri Apr 18 15:48:54 2008 @@ -474,8 +474,8 @@ } else overview = add(overview, Summary::Device(descr, Summary::NotConfigured())); - string conn = HTML::Bold ( (Items[key, "hwinfo", "link"]:false == true)?"":sformat("(%1)", _("not connected") )); - if (size(Items[key, "hwinfo"]:$[])==0) conn = HTML::Bold(sformat("(%1)", _("no hwinfo"))); + string conn = HTML::Bold ( (Items[key, "hwinfo", "link"]:false == true)?"":sformat("(%1)", _("Not connected") )); + if (size(Items[key, "hwinfo"]:$[])==0) conn = HTML::Bold(sformat("(%1)", _("No hwinfo"))); string mac_dev=""; if (hasAnyValue(Items[key, "hwinfo", "mac"]:"")) mac_dev= HTML::Bold ("MAC : ") + Items[key, "hwinfo", "mac"]:"" + "<br>"; else if (hasAnyValue(Items[key, "hwinfo", "busid"]:"")) mac_dev= HTML::Bold ("BusID : ") + Items[key, "hwinfo", "busid"]:"" + "<br>"; @@ -485,8 +485,9 @@ if (!hasAnyValue(Items[key, "hwinfo", "dev_name"]:"") && size(Items[key, "hwinfo"]:$[])>0) rich = rich + _("<p>Unable to configure the network card because the kernel device (eth0, wlan0) is not present. This is mostly caused by missing firmware (for wlan devices). See dmesg output for details.</p>"); else if (hasAnyValue(Items[key, "ifcfg"]:"") ) rich = rich + HTML::List (bullets); - else rich = rich + _("<UL><LI>The device is not configured</LI><LI>Press <B>Edit</B> -to configure</LI></UL>"); + else rich = rich + _("<p>The device is not configured. Press <b>Edit</b> +to configure.</p> +"); Items[key, "table_descr"] = $[ Modified: trunk/network/src/provider/connection.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/provider/connection.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/provider/connection.ycp (original) +++ trunk/network/src/provider/connection.ycp Fri Apr 18 15:48:54 2008 @@ -122,8 +122,8 @@ manually enter the DNS.</p>") + /* Connection dialog help 4/9 */ -_("<p>When <b>Automatically Reconnect</b> is enabled, the connection will -be automatically reestablished after failure.</p> +_("<p>If <b>Automatically Reconnect</b> is enabled, the connection will +be reestablished automatically after failure.</p> ") + /* Connection dialog help 5/9 */ Modified: trunk/network/src/provider/provider.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/provider/provider.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/provider/provider.ycp (original) +++ trunk/network/src/provider/provider.ycp Fri Apr 18 15:48:54 2008 @@ -505,8 +505,9 @@ } */ // NM doesn't ask for password (#225793) else if(ask_pass && NetworkService::IsManaged ()){ - Popup::Warning(_("NetworkManager doesn't have ability to ask for password. -Use KInternet (without NetworkManager) or store password on the system.")); + Popup::Warning(_("NetworkManager does not have the ability to ask for the password. +Use KInternet (without NetworkManager) or store passwords on the system. +")); continue; } else if(filterchars(phone, phonevalidchars) != phone && Modified: trunk/network/src/remote/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/remote/dialogs.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/remote/dialogs.ycp (original) +++ trunk/network/src/remote/dialogs.ycp Fri Apr 18 15:48:54 2008 @@ -48,11 +48,11 @@ /* Remote Administration dialog help %1 and %2 are port numbers for vnc and vnchttp, eg. 5901, 5801 */ string help = sformat ( -_("<p><b><big>Remote administration settings</big></b></p> +_("<p><b><big>Remote Administration Settings</big></b></p> <p>If this feature is enabled, you can administer this machine remotely from another machine. Use a VNC -client, such as krdc (connect to <i><hostname>:%1</i>), or -a Java-capable Web browser (connect to <i>http://<hostname>:%2/</i>). +client, such as krdc (connect to <tt><hostname>:%1</tt>), or +a Java-capable Web browser (connect to <tt>http://<hostname>:%2/</tt>). This form of remote administration is less secure than using SSH.</p> "), 5901, 5801) + firewall_help; Modified: trunk/network/src/routines/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/complex.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/routines/complex.ycp (original) +++ trunk/network/src/routines/complex.ycp Fri Apr 18 15:48:54 2008 @@ -589,7 +589,7 @@ break; default : y2warning (1, "invalid class %1", class); } - string rich = HTML::Bold(name) + getConnMacBusDescription((map)card, (list<map>)sum) + _("<P><UL><LI>The device is not configured</LI><LI>Press <B>Configure</B> for configuration</LI></UL></P>"); + string rich = HTML::Bold(name) + getConnMacBusDescription((map)card, (list<map>)sum) + _("<p>The device is not configured. Press <b>Configure</b> for configuration.</p>"); return $[ "id":id, "table_descr":desc, Modified: trunk/network/src/routines/runtime.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/runtime.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/routines/runtime.ycp (original) +++ trunk/network/src/routines/runtime.ycp Fri Apr 18 15:48:54 2008 @@ -96,7 +96,7 @@ { string message = // notification about package needed 1/2 - _("<p>Because Device Control for Non-root User has been enabled, the <b>%1</b> packages must be installed.</p>") + + _("<p>The <b>%1</b> packages must be installed because device control for non-root users has benn established.</p>") + // notification about package needed 2/2 _("<p>Do you want to install it now?</p>"); Modified: trunk/network/src/routines/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/widgets.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/routines/widgets.ycp (original) +++ trunk/network/src/routines/widgets.ycp Fri Apr 18 15:48:54 2008 @@ -48,9 +48,9 @@ "help": // Details dialog help _("<p><b><big>Device Control</big></b></p> -<p>Normally only the system administrator is allowed to activate and +<p>Usually, only the system administrator is allowed to activate and deactivate a network interface. With <b>Enable Device Control for Non-root User -Via KInternet</b>, an ordinary user may control the interface with KInternet.</p> +Via KInternet</b>, any user may control the interface via KInternet.</p> "), ], @@ -116,8 +116,9 @@ // Combo box option for Device Activation "label": _("Manually"), // help text for Device Activation - "help": _("<b>Manually</b>: You control the interface manually -via 'ifup' or 'KInternet' (See 'User Controlled' below)."), + "help": _("<p>Press <b>Manually</b> tocontrol the interface manually +via ifup or KInternet (See <b>User Controlled</b> below). +"), ], "ifplugd": $[ // Combo box option for Device Activation @@ -143,9 +144,9 @@ // Combo box option for Device Activation "label": _("On NFSroot"), // help text for Device Activation - "help": _("Using <b>On NFSroot</b> is nearly like 'auto'. But interfaces with this startmode will never -be shut down via 'rcnetwork stop'. 'ifdown <iface>' still works. -Use this when you have a nfs or iSCSI root filesystem. + "help": _("Using <b>On NFSroot</b> is similar to <tt>auto</tt>. Interfaces with this startmode will never +be shut down via <tt>rcnetwork stop</tt>. <tt>ifdown <iface></tt> is still available. +Use this if you have an NFS or iSCSI root filesystem. "), ], "nfsroot" : $[ @@ -169,7 +170,7 @@ // Device activation main help. The individual parts will be // substituted as %1 _("<p><b><big>Device Activation</big></b></p> -<p>Choose, when the network interface should be brought up. <b>At Boot Time</b> starts it during system boot. +<p>Choose when to bring up the network interface.<b>At Boot Time</b> activates it during system boot, <b>Never</b> does not start the device. %1</p> "), Modified: trunk/network/src/services/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/dns.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/services/dns.ycp (original) +++ trunk/network/src/services/dns.ycp Fri Apr 18 15:48:54 2008 @@ -147,7 +147,7 @@ */ define void InitDhcpHostname (string key) { UI::ChangeWidget (`id("DHCP_HOSTNAME"), `Enabled, has_dhcp); - if (!has_dhcp) UI::ReplaceWidget(`id ("dh_host_text"),`Label(_("no interface with dhcp"))); + if (!has_dhcp) UI::ReplaceWidget(`id ("dh_host_text"),`Label(_("No interface with dhcp"))); // the hostname dialog proposes to update it by DHCP on a laptop (#326102) else UI::ChangeWidget(`id("DHCP_HOSTNAME"), `Value, hn_settings["DHCP_HOSTNAME"]:true); return nil; @@ -162,7 +162,7 @@ */ define symbol HandleDhcpResolv (string key, map event) { UI::ChangeWidget (`id ("DHCP_RESOLV"), `Enabled, has_dhcp && resolver_modifiable); - if (!has_dhcp) UI::ReplaceWidget(`id ("dh_resolv_text"),`Label(_("no interface with dhcp"))); + if (!has_dhcp) UI::ReplaceWidget(`id ("dh_resolv_text"),`Label(_("No interface with dhcp"))); return nil; } Modified: trunk/network/src/services/proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/proxy.ycp?rev=46855&r1=46854&r2=46855&view=diff ============================================================================== --- trunk/network/src/services/proxy.ycp (original) +++ trunk/network/src/services/proxy.ycp Fri Apr 18 15:48:54 2008 @@ -286,7 +286,7 @@ string caption = _("Proxy Configuration"); /* Proxy dialog help 1/8 */ - string help = _("<p>Here, configure your Internet proxy (caching) settings.</p> + string help = _("<p>Configure your Internet proxy (caching) settings here.</p> <p><b>Note:</b> In some cases you may need to relogin for the settings to take effect</p>") + /* Proxy dialog help 2/8 */ @@ -309,10 +309,9 @@ /* Proxy dialog help 5/8 */ - _("<p>With the <b>Use the Same Proxy for All Protocols</b> option checked, it is -enough to fill in the HTTP proxy URL, which will then be used for all protocols -(HTTP, HTTPS and FTP). -") + + _("<p>If you have the <b>Use the Same Proxy for All Protocols</b> option checked, it is +enough to fill in the HTTP proxy URL. It will be used for all protocols +(HTTP, HTTPS and FTP).\n") + /* Proxy dialog help 6/8 */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org