Mailinglist Archive: opensuse-commit (2130 mails)

< Previous Next >
commit yast2-network
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sun, 20 Apr 2008 15:46:42 +0200
  • Message-id: <20080420134642.7A65E67816D@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-network
checked in at Sun Apr 20 15:46:42 CEST 2008.


--------
--- yast2-network/yast2-network.changes 2008-04-15 09:01:46.000000000 +0200
+++ yast2-network/yast2-network.changes 2008-04-18 15:49:48.349925000 +0200
@@ -1,0 +2,6 @@
+Fri Apr 18 15:46:22 CEST 2008 - jsrain@xxxxxxx
+
+- merged texts from proofread
+- 2.16.39
+
+-------------------------------------------------------------------



Old:
----
yast2-network-2.16.38.tar.bz2

New:
----
yast2-network-2.16.39.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.X32393/_old 2008-04-20 15:46:04.000000000 +0200
+++ /var/tmp/diff_new_pack.X32393/_new 2008-04-20 15:46:04.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-network (Version 2.16.38)
+# spec file for package yast2-network (Version 2.16.39)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@


Name: yast2-network
-Version: 2.16.38
+Version: 2.16.39
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-network-2.16.38.tar.bz2
+Source0: yast2-network-2.16.39.tar.bz2
Prefix: /usr
# should be required by devtools
BuildRequires: perl-XML-Writer pkgconfig rpm
@@ -69,7 +69,7 @@
Michal Svec <msvec@xxxxxxx>

%prep
-%setup -n yast2-network-2.16.38
+%setup -n yast2-network-2.16.39

%build
%{prefix}/bin/y2tool y2autoconf
@@ -133,6 +133,9 @@
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Fri Apr 18 2008 jsrain@xxxxxxx
+- merged texts from proofread
+- 2.16.39
* Tue Apr 15 2008 jsuchome@xxxxxxx
- fixed testsuite again (do not save the logs)
- 2.16.38

++++++ yast2-network-2.16.38.tar.bz2 -> yast2-network-2.16.39.tar.bz2 ++++++
++++ 8307 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/configure.in new/yast2-network-2.16.39/configure.in
--- old/yast2-network-2.16.38/configure.in 2008-04-15 08:54:46.000000000
+0200
+++ new/yast2-network-2.16.39/configure.in 2008-04-18 15:49:27.000000000
+0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.7 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-network, 2.16.38, http://bugs.opensuse.org/, yast2-network)
+AC_INIT(yast2-network, 2.16.39, http://bugs.opensuse.org/, yast2-network)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])

@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)

dnl Important YaST2 variables
-VERSION="2.16.38"
+VERSION="2.16.39"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec <mzugec@xxxxxxx>"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/clients/dns.ycp
new/yast2-network-2.16.39/src/clients/dns.ycp
--- old/yast2-network-2.16.38/src/clients/dns.ycp 2006-03-09
08:56:51.000000000 +0100
+++ new/yast2-network-2.16.39/src/clients/dns.ycp 2008-04-18
15:40:51.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hostname and DNS client
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: dns.ycp 27593 2006-02-05 16:39:17Z mvidner $
+ * $Id: dns.ycp 46835 2008-04-18 12:40:33Z mvidner $
*
* Main file for hostname and DNS configuration.
* Uses all other files.
@@ -87,7 +87,7 @@
map cmdline = $[
/* Commandline help title */
"help" : _("DNS Configuration"),
- "id" : "routing",
+ "id" : "dns",
"guihandler": DNSGUI,
"initialize": DNS::Read,
"finish" : DNS::Write, // FIXME
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/config/networking.rnc
new/yast2-network-2.16.39/src/config/networking.rnc
--- old/yast2-network-2.16.38/src/config/networking.rnc 2007-09-19
13:53:30.000000000 +0200
+++ new/yast2-network-2.16.39/src/config/networking.rnc 2008-04-18
15:40:52.000000000 +0200
@@ -155,6 +155,8 @@
}
module_entry =
element module_entry {
+ element ccw_chan_ids { text }? &
+ element ccw_chan_num { text }? &
element device { text } & # overloaded
element module { text }? & # likely overloaded
element options { text }? # overloaded
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/dsl/dialogs.ycp
new/yast2-network-2.16.39/src/dsl/dialogs.ycp
--- old/yast2-network-2.16.38/src/dsl/dialogs.ycp 2008-01-28
10:39:11.000000000 +0100
+++ new/yast2-network-2.16.39/src/dsl/dialogs.ycp 2008-04-18
15:40:59.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Configuration dialogs for DSL
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: dialogs.ycp 43483 2008-01-08 17:49:13Z mzugec $
+ * $Id: dialogs.ycp 46777 2008-04-17 09:11:27Z kmachalkova $
*/

{
@@ -77,7 +77,7 @@
so by pressing <b>Configure Network Cards</b>.</p>") +

/* DSL dialog help 7/8 */
-_("<p>For PPTP, enter the server name or ip adress.</p>") +
+_("<p>For PPTP, enter the server name or IP address.</p>") +

widget_descr["STARTMODE", "help"]:"" +

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/installation/inst_do_net_test.ycp
new/yast2-network-2.16.39/src/installation/inst_do_net_test.ycp
--- old/yast2-network-2.16.38/src/installation/inst_do_net_test.ycp
2008-01-28 10:39:11.000000000 +0100
+++ new/yast2-network-2.16.39/src/installation/inst_do_net_test.ycp
2008-04-18 15:48:54.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Michal Svec <msvec@xxxxxxx>
* Arvin Schnell <arvin@xxxxxxx>
*
- * $Id: inst_do_net_test.ycp 43296 2008-01-07 10:45:26Z kmachalkova $
+ * $Id: inst_do_net_test.ycp 46855 2008-04-18 13:48:54Z jsrain $
*/

{
@@ -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
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/lan/bridge.ycp
new/yast2-network-2.16.39/src/lan/bridge.ycp
--- old/yast2-network-2.16.38/src/lan/bridge.ycp 2008-03-27
08:40:13.000000000 +0100
+++ new/yast2-network-2.16.39/src/lan/bridge.ycp 2008-04-18
15:40:59.000000000 +0200
@@ -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) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/lan/complex.ycp
new/yast2-network-2.16.39/src/lan/complex.ycp
--- old/yast2-network-2.16.38/src/lan/complex.ycp 2008-04-15
08:27:48.000000000 +0200
+++ new/yast2-network-2.16.39/src/lan/complex.ycp 2008-04-18
15:48:54.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary, overview and IO dialogs for network cards config
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: complex.ycp 46604 2008-04-14 15:11:16Z mzugec $
+ * $Id: complex.ycp 46855 2008-04-18 13:48:54Z jsrain $
*/

{
@@ -133,16 +133,17 @@
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);
}
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 \'Continue\'
+ 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
\'Continue\'
to configure the device. Otherwise click \'Cancel\' and return to this dialog
once you have installed the firmware.")));
}
@@ -156,16 +157,18 @@
if(LanItems::Requires != [] && LanItems::Requires != nil) {
if(PackagesInstall(LanItems::Requires) != `next)
return false;
- if (fw=="b43-fwcutter"){
- if(Popup::ContinueCancelHeadline(_("Installing firmware"), _("For
successful firmware installation it needs to execute install_bcm43xx_firmwar
script. Should I execute it?"))){
- map<string, any> command = (map<string,
any>)SCR::Execute(.target.bash_output, "/usr/sbin/install_bcm43xx_firmware");
- y2internal("command %1", command);
+ if (fw=="b43-fwcutter"){
+ if(Popup::ContinueCancelHeadline(_("Installing firmware"), _("For
successful firmware installation, '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");
+ //y2internal("command %1", command);
// Popup::ShowFile ("Boot Messages", "/tmp/bcm_firmware.log");
// Popup::LongText(command["stdout"]:"");
- if (command["exit"]:-1!=0) Popup::ErrorDetails(_("An error occured
during installation."), command["stderr"]:"");
- else Popup::Message("bcm43xx_firmware installed successfully");
- }
- }
+ if (command["exit"]:-1!=0)
+ Popup::ErrorDetails(_("An error occurred during firmware
installation."), command["stderr"]:"");
+ else
+ Popup::Message("bcm43xx_firmware installed successfully");
+ }
+ }
}
/*
TODO: Refresh hwinfo in LanItems
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/lan/hardware.ycp
new/yast2-network-2.16.39/src/lan/hardware.ycp
--- old/yast2-network-2.16.38/src/lan/hardware.ycp 2008-04-15
08:27:48.000000000 +0200
+++ new/yast2-network-2.16.39/src/lan/hardware.ycp 2008-04-18
15:48:54.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hardware dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: hardware.ycp 45884 2008-03-31 13:52:22Z kmachalkova $
+ * $Id: hardware.ycp 46855 2008-04-18 13:48:54Z jsrain $
*/

{
@@ -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))
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/lan/help.ycp
new/yast2-network-2.16.39/src/lan/help.ycp
--- old/yast2-network-2.16.38/src/lan/help.ycp 2008-03-27 08:40:13.000000000
+0100
+++ new/yast2-network-2.16.39/src/lan/help.ycp 2008-04-18 15:40:59.000000000
+0200
@@ -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
@@ -58,7 +58,7 @@
<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
+module for ipv6). If the IPv6 protocol is not used on your network, the
response
time can be faster.
")
+
@@ -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":
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/modules/DNS.ycp
new/yast2-network-2.16.39/src/modules/DNS.ycp
--- old/yast2-network-2.16.38/src/modules/DNS.ycp 2008-01-28
10:39:11.000000000 +0100
+++ new/yast2-network-2.16.39/src/modules/DNS.ycp 2008-04-18
15:48:54.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hostname and DNS data
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: DNS.ycp 43483 2008-01-08 17:49:13Z mzugec $
+ * $Id: DNS.ycp 46855 2008-04-18 13:48:54Z jsrain $
*
* Manages resolv.conf and (fully qualified) hostname, also
* respecting DHCP.
@@ -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);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/modules/Host.ycp
new/yast2-network-2.16.39/src/modules/Host.ycp
--- old/yast2-network-2.16.38/src/modules/Host.ycp 2007-12-03
09:25:34.000000000 +0100
+++ new/yast2-network-2.16.39/src/modules/Host.ycp 2008-04-18
15:48:54.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Hosts data (/etc/hosts)
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: Host.ycp 41925 2007-11-09 13:40:14Z kmachalkova $
+ * $Id: Host.ycp 46855 2008-04-18 13:48:54Z jsrain $
*/

{
@@ -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)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/modules/LanItems.ycp
new/yast2-network-2.16.39/src/modules/LanItems.ycp
--- old/yast2-network-2.16.38/src/modules/LanItems.ycp 2008-04-15
08:27:48.000000000 +0200
+++ new/yast2-network-2.16.39/src/modules/LanItems.ycp 2008-04-18
15:40:59.000000000 +0200
@@ -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"] = $[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/modules/Lan.ycp
new/yast2-network-2.16.39/src/modules/Lan.ycp
--- old/yast2-network-2.16.38/src/modules/Lan.ycp 2008-04-15
08:27:48.000000000 +0200
+++ new/yast2-network-2.16.39/src/modules/Lan.ycp 2008-04-18
15:48:54.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: Lan.ycp 46002 2008-04-02 20:51:07Z mzugec $
+ * $Id: Lan.ycp 46855 2008-04-18 13:48:54Z jsrain $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -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."));
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/provider/connection.ycp
new/yast2-network-2.16.39/src/provider/connection.ycp
--- old/yast2-network-2.16.38/src/provider/connection.ycp 2008-01-28
10:39:13.000000000 +0100
+++ new/yast2-network-2.16.39/src/provider/connection.ycp 2008-04-18
15:48:54.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Connection configuration dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: connection.ycp 43716 2008-01-17 14:23:48Z mzugec $
+ * $Id: connection.ycp 46855 2008-04-18 13:48:54Z jsrain $
*/

{
@@ -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 */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/provider/provider.ycp
new/yast2-network-2.16.39/src/provider/provider.ycp
--- old/yast2-network-2.16.38/src/provider/provider.ycp 2008-01-28
10:39:13.000000000 +0100
+++ new/yast2-network-2.16.39/src/provider/provider.ycp 2008-04-18
15:48:54.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Provider dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: provider.ycp 42593 2007-12-03 12:15:39Z mzugec $
+ * $Id: provider.ycp 46855 2008-04-18 13:48:54Z jsrain $
*/

{
@@ -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 &&
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/remote/dialogs.ycp
new/yast2-network-2.16.39/src/remote/dialogs.ycp
--- old/yast2-network-2.16.38/src/remote/dialogs.ycp 2008-04-15
08:27:48.000000000 +0200
+++ new/yast2-network-2.16.39/src/remote/dialogs.ycp 2008-04-18
15:48:54.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialog for Remote Administration
* Authors: Arvin Schnell <arvin@xxxxxxx>
*
- * $Id: dialogs.ycp 45830 2008-03-28 12:21:11Z kmachalkova $
+ * $Id: dialogs.ycp 46855 2008-04-18 13:48:54Z jsrain $
*/

{
@@ -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>&lt;hostname&gt;:%1</i>), or
-a Java-capable Web browser (connect to <i>http://&lt;hostname&gt;:%2/</i>).
+client, such as krdc (connect to <tt>&lt;hostname&gt;:%1</tt>), or
+a Java-capable Web browser (connect to <tt>http://&lt;hostname&gt;:%2/</tt>).
This form of remote administration is less secure than using SSH.</p>
"), 5901, 5801) + firewall_help;

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/routines/complex.ycp
new/yast2-network-2.16.39/src/routines/complex.ycp
--- old/yast2-network-2.16.38/src/routines/complex.ycp 2008-03-27
08:40:13.000000000 +0100
+++ new/yast2-network-2.16.39/src/routines/complex.ycp 2008-04-18
15:48:54.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Summary and overview functions
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: complex.ycp 45712 2008-03-26 08:11:15Z mzugec $
+ * $Id: complex.ycp 46855 2008-04-18 13:48:54Z jsrain $
*
*/

@@ -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,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/routines/runtime.ycp
new/yast2-network-2.16.39/src/routines/runtime.ycp
--- old/yast2-network-2.16.38/src/routines/runtime.ycp 2008-01-28
10:39:12.000000000 +0100
+++ new/yast2-network-2.16.39/src/routines/runtime.ycp 2008-04-18
15:48:54.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Runtime routines
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: runtime.ycp 43483 2008-01-08 17:49:13Z mzugec $
+ * $Id: runtime.ycp 46855 2008-04-18 13:48:54Z jsrain $
*/

{
@@ -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>");

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/routines/widgets.ycp
new/yast2-network-2.16.39/src/routines/widgets.ycp
--- old/yast2-network-2.16.38/src/routines/widgets.ycp 2008-04-15
08:27:48.000000000 +0200
+++ new/yast2-network-2.16.39/src/routines/widgets.ycp 2008-04-18
15:48:54.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Widgets for CWM
* Authors: Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: widgets.ycp 45773 2008-03-27 08:22:45Z mzugec $
+ * $Id: widgets.ycp 46855 2008-04-18 13:48:54Z jsrain $
*/

{
@@ -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>
"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/services/dns.ycp
new/yast2-network-2.16.39/src/services/dns.ycp
--- old/yast2-network-2.16.38/src/services/dns.ycp 2007-12-03
09:25:33.000000000 +0100
+++ new/yast2-network-2.16.39/src/services/dns.ycp 2008-04-18
15:48:54.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Michal Svec <msvec@xxxxxxx>
* Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: dns.ycp 41970 2007-11-12 14:21:18Z mzugec $
+ * $Id: dns.ycp 46855 2008-04-18 13:48:54Z jsrain $
*/

{
@@ -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;
}

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/src/services/proxy.ycp
new/yast2-network-2.16.39/src/services/proxy.ycp
--- old/yast2-network-2.16.38/src/services/proxy.ycp 2008-03-27
08:40:12.000000000 +0100
+++ new/yast2-network-2.16.39/src/services/proxy.ycp 2008-04-18
15:48:54.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Proxy configuration
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: proxy.ycp 45417 2008-03-13 09:42:28Z kmachalkova $
+ * $Id: proxy.ycp 46855 2008-04-18 13:48:54Z jsrain $
*/

{
@@ -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 */

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/yast2-network-2.16.38/VERSION new/yast2-network-2.16.39/VERSION
--- old/yast2-network-2.16.38/VERSION 2008-04-15 08:54:40.000000000 +0200
+++ new/yast2-network-2.16.39/VERSION 2008-04-18 15:46:38.000000000 +0200
@@ -1 +1 @@
-2.16.38
+2.16.39


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

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

< Previous Next >