Mailinglist Archive: opensuse-commit (1059 mails)

< Previous Next >
commit yast2-network
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Mon, 07 Jan 2008 15:47:46 +0100
  • Message-id: <20080107144746.8D240678168@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-network
checked in at Mon Jan 7 15:47:46 CET 2008.

--------
--- yast2-network/yast2-network.changes 2008-01-07 11:10:56.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes
2008-01-07 15:44:17.149180000 +0100
@@ -1,0 +2,8 @@
+Mon Jan 7 11:49:33 CET 2008 - kmachalkova@xxxxxxx
+
+- Enable setting a route without interface (use '-' which stands for
+ 'any') (#93996)
+- Merged proofread texts
+- Dependency on yast2-country replaced with yast2-country-data
+
+-------------------------------------------------------------------

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

Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.b16534/_old 2008-01-07 15:47:36.000000000 +0100
+++ /var/tmp/diff_new_pack.b16534/_new 2008-01-07 15:47:36.000000000 +0100
@@ -12,7 +12,7 @@

Name: yast2-network
Version: 2.16.18
-Release: 1
+Release: 2
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -33,7 +33,7 @@
Requires: sysconfig yast2-packager
#GetLanguageCountry
#(in newly created yast2-country-data)
-Requires: yast2-country-data >=2.16.3
+Requires: yast2-country-data >= 2.16.3
PreReq: /bin/rm
Provides: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
Obsoletes: y2c_lan y2c_dial yast2-config-adsl y2c_adsl
@@ -49,7 +49,7 @@

%package devel-doc
Version: 2.16.18
-Release: 1
+Release: 2
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -140,6 +140,11 @@
%exclude %{prefix}/share/doc/packages/yast2-network/COPYING
%exclude %{prefix}/share/doc/packages/yast2-network/README
%changelog
+* Mon Jan 07 2008 - kmachalkova@xxxxxxx
+- Enable setting a route without interface (use '-' which stands for
+ 'any') (#93996)
+- Merged proofread texts
+- Dependency on yast2-country replaced with yast2-country-data
* Thu Dec 13 2007 - mzugec@xxxxxxx
- interface names manage support - FaTE #300636
- 2.16.18

++++++ yast2-network-2.16.18.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/configure
new/yast2-network-2.16.18/configure
--- old/yast2-network-2.16.18/configure 2007-12-13 21:55:16.000000000 +0100
+++ new/yast2-network-2.16.18/configure 2007-11-09 15:12:04.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-network 2.16.17.
+# Generated by GNU Autoconf 2.61 for yast2-network 2.16.7.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-network'
PACKAGE_TARNAME='yast2-network'
-PACKAGE_VERSION='2.16.17'
-PACKAGE_STRING='yast2-network 2.16.17'
+PACKAGE_VERSION='2.16.7'
+PACKAGE_STRING='yast2-network 2.16.7'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'

ac_unique_file="RPMNAME"
@@ -1197,7 +1197,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-network 2.16.17 to adapt to many kinds of
systems.
+\`configure' configures yast2-network 2.16.7 to adapt to many kinds of systems.

Usage: $0 [OPTION]... [VAR=VALUE]...

@@ -1268,7 +1268,7 @@

if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-network 2.16.17:";;
+ short | recursive ) echo "Configuration of yast2-network 2.16.7:";;
esac
cat <<\_ACEOF

@@ -1346,7 +1346,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-network configure 2.16.17
+yast2-network configure 2.16.7
generated by GNU Autoconf 2.61

Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1360,7 +1360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

-It was created by yast2-network $as_me 2.16.17, which was
+It was created by yast2-network $as_me 2.16.7, which was
generated by GNU Autoconf 2.61. Invocation command line was

$ $0 $@
@@ -2181,7 +2181,7 @@

# Define the identity of the package.
PACKAGE='yast2-network'
- VERSION='2.16.17'
+ VERSION='2.16.7'


cat >>confdefs.h <<_ACEOF
@@ -2408,8 +2408,7 @@



-
-VERSION="2.16.17"
+VERSION="2.16.7"
RPMNAME="yast2-network"
MAINTAINER="Michal Zugec <mzugec@xxxxxxx>"

@@ -3304,7 +3303,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-network $as_me 2.16.17, which was
+This file was extended by yast2-network $as_me 2.16.7, which was
generated by GNU Autoconf 2.61. Invocation command line was

CONFIG_FILES = $CONFIG_FILES
@@ -3347,7 +3346,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-network config.status 2.16.17
+yast2-network config.status 2.16.7
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`\\"

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/configure.in
new/yast2-network-2.16.18/configure.in
--- old/yast2-network-2.16.18/configure.in 2007-12-13 21:55:09.000000000
+0100
+++ new/yast2-network-2.16.18/configure.in 2007-11-09 15:11:59.000000000
+0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-network
dnl
-dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

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

@@ -14,11 +14,10 @@

AC_PREFIX_DEFAULT(/usr)

-dnl long filenames; we use GNU Make extensions and that's ok
-AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
+AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs

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

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/COPYRIGHT.english
new/yast2-network-2.16.18/COPYRIGHT.english
--- old/yast2-network-2.16.18/COPYRIGHT.english 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-network-2.16.18/COPYRIGHT.english 2008-01-07 15:43:09.000000000
+0100
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/Makefile.am
new/yast2-network-2.16.18/Makefile.am
--- old/yast2-network-2.16.18/Makefile.am 2007-12-13 21:55:09.000000000
+0100
+++ new/yast2-network-2.16.18/Makefile.am 2007-11-09 15:11:59.000000000
+0100
@@ -23,14 +23,13 @@
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)

-COPYRIGHT_files_gpl = README COPYING
+COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english

COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish

extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast),
$(COPYRIGHT_files_gpl))

-# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/Makefile.in
new/yast2-network-2.16.18/Makefile.in
--- old/yast2-network-2.16.18/Makefile.in 2007-12-13 21:55:20.000000000
+0100
+++ new/yast2-network-2.16.18/Makefile.in 2007-11-09 15:12:06.000000000
+0100
@@ -217,13 +217,11 @@
DEVTOOLS_DIR = $(if
$(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if
$(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)
-COPYRIGHT_files_gpl = README COPYING
+COPYRIGHT_files_gpl = README COPYING COPYRIGHT.english
COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \
COPYRIGHT.french COPYRIGHT.german COPYRIGHT.spanish

extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast),
$(COPYRIGHT_files_gpl))
-
-# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
@@ -505,10 +503,6 @@
tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)

-dist-lzma: distdir
- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
- $(am__remove_distdir)
-
dist-tarZ: distdir
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__remove_distdir)
@@ -535,8 +529,6 @@
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
@@ -693,10 +685,10 @@
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
all all-am am--refresh check check-am clean clean-generic \
ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
- dist-hook dist-lzma dist-shar dist-tarZ dist-zip distcheck \
- distclean distclean-generic distclean-tags distcleancheck \
- distdir distuninstallcheck dvi dvi-am html html-am info \
- info-am install install-am install-data install-data-am \
+ dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
install-data-local install-dvi install-dvi-am install-exec \
install-exec-am install-html install-html-am install-info \
install-info-am install-man install-pdf install-pdf-am \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/network.pot
new/yast2-network-2.16.18/network.pot
--- old/yast2-network-2.16.18/network.pot 1970-01-01 01:00:00.000000000
+0100
+++ new/yast2-network-2.16.18/network.pot 2008-01-07 11:35:35.000000000
+0100
@@ -0,0 +1,344 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-08-10 14:07+0200\n"
+"PO-Revision-Date: 2007-08-20 12:52+0200\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/clients/lan_auto.ycp:279
+msgid "Configuration Error : not initialized interface!"
+msgstr "Configuration Error : uninitialized interface!"
+
+#. translators: command line help for HTTP server module
+#: src/clients/network.ycp:133
+msgid ""
+"Configuration of network.\n"
+"This is only executer of network sub-modules.\n"
+"You can run this network modules:\n"
+"\n"
+"lan\t"
+msgstr ""
+"Configuration of network.\n"
+"This is only an executer of network sub-modules.\n"
+"You can run this network modules:\n"
+"\n"
+"lan\t"
+
+#. RadioButton label
+#: src/installation/dialogs.ycp:110
+msgid "&Yes, Test Connection to the Internet via"
+msgstr "&Yes, Test Connection to the Internet Via"
+
+#: src/installation/inst_do_net_test.ycp:626
+msgid "There is no URL for release notes defined. Internet test can't be
performed."
+msgstr "There is no URL for release notes defined. Internet test cannot be
performed."
+
+#: src/lan/address.ycp:340
+msgid "No valid Netmask."
+msgstr "No valid netmask."
+
+#: src/lan/address.ycp:480
+msgid "<p>Select the bond driver options, and edit it if you need. </p>"
+msgstr "<p>Select the bond driver options, and edit it if necessary. </p>"
+
+#: src/lan/cmdline.ycp:130
+msgid "Not possible value for type!"
+msgstr "Impossible value for type!"
+
+#: src/lan/cmdline.ycp:135 src/lan/cmdline.ycp:222
+msgid "Not possible value for bootproto!"
+msgstr "Impossible value for bootproto!"
+
+#: src/lan/cmdline.ycp:142 src/lan/cmdline.ycp:235
+msgid "Not possible value for startmode!"
+msgstr "Impossible value for startmode!"
+
+#. IPv6 help
+#: src/lan/help.ycp:57
+msgid ""
+"<p><b><big>IPv6 Protocol Settings</big></b></p>\n"
+"<p>Check <b>Enable IPv6</b> to enable ipv6 module in the kernel.\n"
+"It is possible to use IPv6 together with IPv4. This is default option.\n"
+"To disable IPv6, uncheck this option (this will blacklist kernel \n"
+"module for ipv6). When ipv6 protocol is not used on your network, response \n"
+"time can be faster."
+msgstr ""
+"<p><b><big>IPv6 Protocol Settings</big></b></p>\n"
+"<p>Check <b>Enable IPv6</b> to enable the ipv6 module in the kernel.\n"
+"It is possible to use IPv6 together with IPv4. This is a default option.\n"
+"To disable IPv6, uncheck this option (this will blacklist the kernel \n"
+"module for ipv6). If the ipv6 protocol is not used on your network, the
response \n"
+"time can be faster."
+
+#: src/lan/help.ycp:78
+msgid ""
+"<p>If you are using DHCP to get an IP address, check whether to get\n"
+"a hostname via DHCP. The hostname of your host (which can be seen\n"
+"by issuing <i>hostname</i> command) will be set automatically by \n"
+"DHCP client.\n"
+"You may want to disable this option if you connect to different \n"
+"networks that might each assign a different hostname, because changing\n"
+"the hostname at runtime may confuse the graphical desktop.\n"
+"</p> "
+msgstr ""
+"<p>If you are using DHCP to get an IP address, check whether to get\n"
+"a hostname via DHCP. The hostname of your host (which can be seen\n"
+"by issuing the <i>hostname</i> command) will be set automatically by the \n"
+"DHCP client.\n"
+"You may want to disable this option if you connect to different \n"
+"networks that assign different hostnames, because changing\n"
+"the hostname at runtime may confuse the graphical desktop.\n"
+"</p> "
+
+#: src/lan/help.ycp:88
+msgid ""
+"<p>If you are using DHCP to get an IP address, your hostname will be
written\n"
+"to /etc/hosts and be resolvable as 127.0.0.2 IP address.\n"
+"This is default behavior. If you want to disable this, uncheck this box\n"
+"but your hostname will not be resolvable without active network.\n"
+"</p> "
+msgstr ""
+"<p>If you are using DHCP to get an IP address, your hostname will be
written\n"
+"to /etc/hosts and be resolvable as a 127.0.0.2 IP address.\n"
+"This is the default behavior. If you want to disable this, uncheck this box\n"
+"but your hostname will not be resolvable without an active network.\n"
+"</p> "
+
+#. Address dialog help 1-6/8: dynamic address preferred
+#. Address dialog help 1/8
+#: src/lan/help.ycp:134
+msgid ""
+"<p><b><big>Address Setup</big></b></p>\n"
+"<p>Select <b>No Address Setup</b> if you don't want any IP address for this
device.\n"
+"This is particularly useful for bonding ethernet devices.</p>"
+msgstr ""
+"<p><b><big>Address Setup</big></b></p>\n"
+"<p>Select <b>No Address Setup</b> if you do not want any IP address for this
device.\n"
+"This is particularly useful for bonding ethernet devices.</p>"
+
+#. Address dialog help 3/8
+#: src/lan/help.ycp:143
+msgid ""
+"<p>You can choose one of dynamic address assignment method. Select
<b>DHCP</b>\n"
+"if you have a DHCP server running on your local network. Network addresses
are then \n"
+"obtained automatically from the server.<p>"
+msgstr ""
+"<p>You can choose one of the dynamic address assignment method. Select
<b>DHCP</b>\n"
+"if you have a DHCP server running on your local network. Network addresses
are then \n"
+"obtained automatically from the server.<p>"
+
+#: src/lan/help.ycp:155
+msgid ""
+"<p>Enter <b>IP Address</b> (e.g., 192.168.100.99)\n"
+"for your computer and the <b>Remote IP Address</b> (e.g., 192.168.100.254)\n"
+"of your peer.</p>"
+msgstr ""
+"<p>Enter the <b>IP Address</b> (e.g., 192.168.100.99)\n"
+"for your computer and the <b>Remote IP Address</b> (e.g., 192.168.100.254)\n"
+"for your peer.</p>"
+
+#: src/lan/help.ycp:161
+msgid ""
+"<p>For <b>Static Address Setup</b> enter static IP address (e.g.,
192.168.100.99) \n"
+"for your computer and the network mask (usually 255.255.255.0). Optionally,
you can enter\n"
+"fully qualified hostname for this IP address. It will be written to
<i>/etc/hosts</i>.</p>"
+msgstr ""
+"<p>For <b>Static Address Setup</b> enter the static IP address (e.g.,
192.168.100.99) \n"
+"for your computer and the network mask (usually 255.255.255.0). Optionally,
you can enter\n"
+"a fully qualified hostname for this IP address. It will be written to
<i>/etc/hosts</i>.</p>"
+
+#: src/lan/help.ycp:186
+msgid ""
+"<p><b><big>Maximum Transfer Unit</big></b></p>\n"
+"<p>Maximum transfer unit (<b>MTU</b>) is the maximum size of the packet\n"
+"transferred in one frame over the network. Normally, you don't need to\n"
+"set MTU, but using lower MTU values may improve network performance\n"
+"especially on slow dial-up connections. Select one of the recommended
values\n"
+"or define your own one.</p>"
+msgstr ""
+"<p><b><big>Maximum Transfer Unit</big></b></p>\n"
+"<p>Maximum transfer unit (<b>MTU</b>) is the maximum size of the packet\n"
+"transferred in one frame over the network. Normally, you do not need to\n"
+"set MTU, but using lower MTU values may improve network performance,\n"
+"especially on slow dial-up connections. Select one of the recommended
values\n"
+"or define your own one.</p>"
+
+#: src/lan/help.ycp:194
+msgid "<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>"
+msgstr "<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>"
+
+#. DHCP dialog help 4/8
+#: src/lan/help.ycp:214
+msgid ""
+"<p>The <b>Hostname to Send</b> specifies a string used for the\n"
+"hostname option field when dhcpcd sends messages to DHCP server. Some \n"
+"DHCP servers update name server zones (forward and reverse records) \n"
+"according to this hostname (dynamic DNS).\n"
+"\n"
+"Also, some DHCP servers require the <b>Hostname to Send</b> option field to\n"
+"contain a specific string in the DHCP messages from clients. Leave
<i>AUTO</i>\n"
+"to send the current hostname (i.e. the one defined in <i>/etc/HOSTNAME</i>).
\n"
+"Leave empty not to send a hostname.</p>"
+msgstr ""
+"<p>The <b>Hostname to Send</b> specifies a string used for the\n"
+"hostname option field when dhcpcd sends messages to the DHCP server. Some \n"
+"DHCP servers update name server zones (forward and reverse records) \n"
+"according to this hostname (dynamic DNS).\n"
+"\n"
+"Also, some DHCP servers require the <b>Hostname to Send</b> option field to\n"
+"contain a specific string in the DHCP messages from clients. Leave
<i>AUTO</i>\n"
+"to send the current hostname (i.e. the one defined in <i>/etc/HOSTNAME</i>).
\n"
+"Leave the field empty for not sending a hostname.</p>"
+
+#. Wireless dialog help
+#: src/lan/help.ycp:278
+msgid ""
+"<p>In some networks, you need to set an <b>Authentication Mode</b>.\n"
+"It depends on the protection technology used, WEP or WPA. <b>WEP</b>\n"
+"(Wired Equivalent Privacy) is a system to encrypt wireless network\n"
+"traffic with an optional authentication based on the encryption\n"
+"key used. In most cases where WEP is used, <b>WEP-Open</b> mode (no\n"
+"authentication at all) is fine. This does not mean that you cannot\n"
+"use WEP encryption (in that case use <b>No Encryption</b>). \n"
+"Some networks may require <b>WEP-Shared Key</b> authentication. \n"
+"NOTE: Shared key authentication makes it easier for a\n"
+"potential attacker to break into your network. Unless you have\n"
+"specific needs for shared key authentication, use the <b>Open</b>\n"
+"mode. Because WEP has been proven insecure, <b>WPA</b> (Wi-Fi Protected
Access)\n"
+"was defined to close its security holes, but not all hardware supports\n"
+"WPA. If you want to use WPA, select <b>WPA-PSK</b> or <b>WPA-EAP</b> as the\n"
+"authentication mode. This is only possible in the operation mode\n"
+"<b>Managed</b>.</p>\n"
+msgstr ""
+"<p>In some networks, you need to set an <b>Authentication Mode</b>.\n"
+"It depends on the protection technology used, WEP or WPA. <b>WEP</b>\n"
+"(Wired Equivalent Privacy) is a system to encrypt wireless network\n"
+"traffic with an optional authentication, based on the encryption\n"
+"key used. In most cases where WEP is used, the <b>WEP-Open</b> mode (no\n"
+"authentication at all) is fine. This does not mean that you cannot\n"
+"use WEP encryption (in that case use <b>No Encryption</b>). \n"
+"Some networks may require <b>WEP-Shared Key</b> authentication. \n"
+"NOTE: Shared key authentication makes it easier for a\n"
+"potential attacker to break into your network. Unless you have\n"
+"specific needs for shared key authentication, use the <b>Open</b>\n"
+"mode. Because WEP has been proven insecure, <b>WPA</b> (Wi-Fi Protected
Access)\n"
+"was defined to close its security holes, but not all hardware supports\n"
+"WPA. If you want to use WPA, select <b>WPA-PSK</b> or <b>WPA-EAP</b> as the\n"
+"authentication mode. This is only possible in the operation mode\n"
+"<b>Managed</b>.</p>\n"
+
+#. Progress step 2/3
+#: src/modules/DNS.ycp:296 src/modules/Remote.ycp:200
+msgid "Runing SuSEconfig..."
+msgstr "Running SuSEconfig..."
+
+#: src/modules/Lan.ycp:293
+msgid "To apply this change reboot is needed."
+msgstr "To apply this change a reboot is needed."
+
+#: src/modules/LanItems.ycp:369
+msgid "<p>Unable to configure network card because kernel device is not
present</p>"
+msgstr "<p>Unable to configure the network card because the kernel device is
not present</p>"
+
+#. Connection dialog help 4/9
+#: src/provider/connection.ycp:125
+msgid ""
+"<p>When <b>Automatically Reconnect</b> is enabled, connection will\n"
+"be automatically reestablished after failure.</p>"
+msgstr ""
+"<p>When <b>Automatically Reconnect</b> is enabled, the connection will\n"
+"be automatically reestablished after failure.</p>"
+
+#: src/remote/dialogs.ycp:51
+msgid ""
+"<p><b><big>Remote administration settings</big></b></p>\n"
+"<p>If this feature is enabled, you can\n"
+"administer this machine remotely from another machine. Use a VNC\n"
+"client, such as krdc (connect to <i>&lt;hostname&gt;:%1</i>), or\n"
+"a Java-capable web browser (connect to <i>http://&lt;hostname&gt;:%2/</i>).\n"
+"This form of remote administration is less secure than using SSH.</p>\n"
+msgstr ""
+"<p><b><big>Remote administration settings</big></b></p>\n"
+"<p>If this feature is enabled, you can\n"
+"administer this machine remotely from another machine. Use a VNC\n"
+"client, such as krdc (connect to <i>&lt;hostname&gt;:%1</i>), or\n"
+"a Java-capable Web browser (connect to <i>http://&lt;hostname&gt;:%2/</i>).\n"
+"This form of remote administration is less secure than using SSH.</p>\n"
+
+#: src/routines/complex.ycp:665
+msgid "<P><UL><LI>The device is not configured</LI><LI>Press <B>Configure</B>
to configure</LI></UL></P>"
+msgstr "<P><UL><LI>The device is not configured</LI><LI>Press <B>Configure</B>
for configuration</LI></UL></P>"
+
+#. CheckBox label
+#. is the interface administrable by users (as opposed to root)
+#: src/routines/widgets.ycp:43
+msgid "E&nable Device Control for Non-root User via KInternet"
+msgstr "E&nable Device Control for Non-root User Via KInternet"
+
+#. Details dialog help
+#: src/routines/widgets.ycp:47
+msgid ""
+"<p><b><big>Device Control</big></b></p>\n"
+"<p>Normally only the system administrator is allowed to activate and\n"
+"deactivate a network interface. With <b>Enable Device Control for Non-root
User\n"
+"via KInternet</b>, an ordinary user may control the interface with
KInternet.</p>\n"
+msgstr ""
+"<p><b><big>Device Control</big></b></p>\n"
+"<p>Normally only the system administrator is allowed to activate and\n"
+"deactivate a network interface. With <b>Enable Device Control for Non-root
User\n"
+"Via KInternet</b>, an ordinary user may control the interface with
KInternet.</p>\n"
+
+#. Device activation main help. The individual parts will be
+#. substituted as %1
+#: src/routines/widgets.ycp:168
+msgid ""
+"<p><b><big>Device Activation</big></b></p> \n"
+"<p>Choose when the network interface should be brought up. <b>At Boot
Time</b> starts it during system boot. \n"
+"<b>Never</b> does not start the device.\n"
+"%1</p>\n"
+msgstr ""
+"<p><b><big>Device Activation</big></b></p> \n"
+"<p>Choose, when the network interface should be brought up. <b>At Boot
Time</b> starts it during system boot. \n"
+"<b>Never</b> does not start the device.\n"
+"%1</p>\n"
+
+#. Proxy dialog help 5/8
+#: src/services/proxy.ycp:312
+msgid ""
+"<p>With <b>Use the Same Proxy for All Protocols</b> option checked, it is\n"
+"enough to fill in HTTP proxy URL, which will then be used for all protocols\n"
+"(HTTP, HTTPS and FTP)."
+msgstr ""
+"<p>With the <b>Use the Same Proxy for All Protocols</b> option checked, it
is\n"
+"enough to fill in the HTTP proxy URL, which will then be used for all
protocols\n"
+"(HTTP, HTTPS and FTP)."
+
+#. Proxy dialog help 7/8
+#: src/services/proxy.ycp:325
+msgid ""
+"<p>If you are using a proxy server with authorization, enter\n"
+"<b>Proxy User Name</b> and <b>Proxy Password</b>. A valid username\n"
+"consists of printable ASCII characters (except for quotation marks)
only.</p>\n"
+msgstr ""
+"<p>If you are using a proxy server with authorization, enter\n"
+"the <b>Proxy User Name</b> and <b>Proxy Password</b>. A valid username\n"
+"consists of printable ASCII characters (except for quotation marks)
only.</p>\n"
+
+#. Popup error text - http, https and ftp proxy URLs are blank
+#: src/services/proxy.ycp:470
+msgid ""
+"Proxy is enabled, but no proxy URL has been specified.\n"
+"Really use these settings?"
+msgstr ""
+"Proxy is enabled, but no proxy URL has been specified.\n"
+"Really use these settings?"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/README
new/yast2-network-2.16.18/README
--- old/yast2-network-2.16.18/README 2007-12-13 22:08:08.000000000 +0100
+++ new/yast2-network-2.16.18/README 2008-01-07 15:43:09.000000000 +0100
@@ -1,2 +1,2 @@
This program/library is part of YaST2
-See the file COPYING for license terms
+See the file COPYRIGHT.english for license terms
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/src/clients/lan_auto.ycp
new/yast2-network-2.16.18/src/clients/lan_auto.ycp
--- old/yast2-network-2.16.18/src/clients/lan_auto.ycp 2007-12-10
12:20:47.000000000 +0100
+++ new/yast2-network-2.16.18/src/clients/lan_auto.ycp 2008-01-07
11:45:27.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Lan configuration proposal
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: lan_auto.ycp 40239 2007-08-13 16:33:42Z mzugec $
+ * $Id: lan_auto.ycp 43296 2008-01-07 10:45:26Z kmachalkova $
*/

{
@@ -278,7 +278,7 @@
if (Lan::isAnyInterfaceDown()){
integer timeout =
LanItems::autoinstall_settings["strict_IP_check_timeout"]:0;
y2debug("timeout %1", timeout);
- string error_text = _("Configuration Error : not initialized
interface!");
+ string error_text = _("Configuration Error : uninitialized
interface!");
if (timeout == 0) Popup::Error(error_text);
else Popup::TimedError(error_text, timeout);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/src/installation/dialogs.ycp
new/yast2-network-2.16.18/src/installation/dialogs.ycp
--- old/yast2-network-2.16.18/src/installation/dialogs.ycp 2007-12-10
12:20:47.000000000 +0100
+++ new/yast2-network-2.16.18/src/installation/dialogs.ycp 2008-01-07
11:45:27.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Michal Svec <msvec@xxxxxxx>
* Arvin Schnell <arvin@xxxxxxx>
*
- * $Id: dialogs.ycp 41746 2007-11-02 14:34:48Z locilka $
+ * $Id: dialogs.ycp 43296 2008-01-07 10:45:26Z kmachalkova $
*/

{
@@ -132,7 +132,7 @@
term buttons = `VBox(
`VSpacing(1),
/* RadioButton label */
- `Left(`RadioButton(`id(`yes), `opt(`notify), _("&Yes, Test Connection
to the Internet via"), Internet::do_test)),
+ `Left(`RadioButton(`id(`yes), `opt(`notify), _("&Yes, Test Connection
to the Internet Via"), Internet::do_test)),
getDeviceContens(current),
/* RadioButton label */
`Left(`RadioButton(`id(`no), `opt(`notify), _("N&o, Skip This Test"),
!Internet::do_test)),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore
old/yast2-network-2.16.18/src/installation/inst_do_net_test.ycp
new/yast2-network-2.16.18/src/installation/inst_do_net_test.ycp
--- old/yast2-network-2.16.18/src/installation/inst_do_net_test.ycp
2007-12-10 12:20:47.000000000 +0100
+++ new/yast2-network-2.16.18/src/installation/inst_do_net_test.ycp
2008-01-07 11:45:27.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Michal Svec <msvec@xxxxxxx>
* Arvin Schnell <arvin@xxxxxxx>
*
- * $Id: inst_do_net_test.ycp 40755 2007-09-05 08:55:39Z kmachalkova $
+ * $Id: inst_do_net_test.ycp 43296 2008-01-07 10:45:26Z kmachalkova $
*/

{
@@ -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 can't be performed."));
+ Popup::Warning(_("There is no URL for release notes defined. Internet
test cannot be performed."));
ret = false;
} else
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/src/lan/address.ycp
new/yast2-network-2.16.18/src/lan/address.ycp
--- old/yast2-network-2.16.18/src/lan/address.ycp 2007-12-13
18:40:02.000000000 +0100
+++ new/yast2-network-2.16.18/src/lan/address.ycp 2008-01-07
11:45:27.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network card adresss configuration dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: address.ycp 43066 2007-12-13 16:40:00Z mzugec $
+ * $Id: address.ycp 43296 2008-01-07 10:45:26Z kmachalkova $
*/

{
@@ -406,7 +406,7 @@
return false;
}
if (!IP::Check((string) UI::QueryWidget (`netmask, `Value))){
- Popup::Error(_("No valid Netmask."));
+ Popup::Error(_("No valid netmask."));
UI::SetFocus(`netmask);
return false;
}
@@ -569,7 +569,7 @@
/* ComboBox label */
"label": _("&Bond Driver Options"),
"opt": [`hstretch, `editable],
- "help": _("<p>Select the bond driver options, and edit it if you need.
</p>"),
+ "help": _("<p>Select the bond driver options, and edit it if
necessary. </p>"),
"items": [["mode=balance-rr"], ["mode=active-backup"],
["mode=balance-xor"],
["mode=broadcast"], ["mode=802.3ad"], ["mode=balance-tlb"],
["mode=balance-alb"]],
],
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/src/lan/cmdline.ycp
new/yast2-network-2.16.18/src/lan/cmdline.ycp
--- old/yast2-network-2.16.18/src/lan/cmdline.ycp 2007-12-10
12:20:49.000000000 +0100
+++ new/yast2-network-2.16.18/src/lan/cmdline.ycp 2008-01-07
11:45:27.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network cards cmdline handlers
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: cmdline.ycp 40026 2007-08-06 15:37:14Z mzugec $
+ * $Id: cmdline.ycp 43296 2008-01-07 10:45:26Z kmachalkova $
*/

{
@@ -127,19 +127,19 @@
define boolean AddHandler(map<string, string> options) {
LanItems::type = options["type"]:"ethernet";
if (!contains(["arcnet", "bluetooth", "dummy", "ethernet", "fddi",
"myrinet", "token-ring", "usb", "wireless"], LanItems::type)){
- Report::Error(_("Not possible value for type!"));
+ Report::Error(_("Impossible value for type!"));
return false;
}
LanItems::bootproto = options["bootproto"]:"none";
if (!contains(["none", "static", "dhcp"], LanItems::bootproto)){
- Report::Error(_("Not possible value for bootproto!"));
+ Report::Error(_("Impossible value for bootproto!"));
return false;
}
LanItems::ipaddr = options["ip"]:"";
LanItems::netmask = options["netmask"]:"255.255.255.0";
LanItems::startmode = options["startmode"]:"auto";
if (!contains(["auto", "ifplugd", "nfsroot"], LanItems::startmode)){
- Report::Error(_("Not possible value for startmode!"));
+ Report::Error(_("Impossible value for startmode!"));
return false;
}

@@ -219,7 +219,7 @@

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

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

diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/src/lan/help.ycp
new/yast2-network-2.16.18/src/lan/help.ycp
--- old/yast2-network-2.16.18/src/lan/help.ycp 2007-12-13 19:49:39.000000000
+0100
+++ new/yast2-network-2.16.18/src/lan/help.ycp 2008-01-07 11:36:59.000000000
+0100
@@ -55,11 +55,12 @@
"ipv6" :
/* IPv6 help */
_("<p><b><big>IPv6 Protocol Settings</big></b></p>
-<p>Check <b>Enable IPv6</b> to enable ipv6 module in the kernel.
-It is possible to use IPv6 together with IPv4. This is default option.
-To disable IPv6, uncheck this option (this will blacklist kernel
-module for ipv6). When ipv6 protocol is not used on your network, response
-time can be faster.")
+<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
+time can be faster.
+")
+
_("<p>All changes will be applied after reboot.</p>"),

@@ -82,19 +83,21 @@
"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 <i>hostname</i> command) will be set automatically by
+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 might each assign a different hostname, because changing
+networks that assign different hostnames, because changing
the hostname at runtime may confuse the graphical desktop.
-</p> "),
+</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 127.0.0.2 IP address.
-This is default behavior. If you want to disable this, uncheck this box
-but your hostname will not be resolvable without active network.
-</p> "),
+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.
+</p>
+"),

"searchlist_s":
_("<p>Enter the name servers and domain search list for resolving
@@ -137,17 +140,19 @@
/* 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 don't want any IP address for this
device.
-This is particularly useful for bonding ethernet devices.</p>")
+<p>Select <b>No Address Setup</b> if you do not want any IP address for this
device.
+This is particularly useful for bonding ethernet devices.</p>
+")
+
/* 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>")
+
/* Address dialog help 3/8 */
- _("<p>You can choose one of dynamic address assignment method. Select
<b>DHCP</b>
+ _("<p>You can choose one of the dynamic address assignment method. 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>")
+obtained automatically from the server.<p>
+")
+
/* Address dialog help 4/8 */
_("To automatically search for free IP and then assign it statically,
select
@@ -157,15 +162,17 @@
/* Address dialog help 5/8 */

"remoteip":
-_("<p>Enter <b>IP Address</b> (e.g., 192.168.100.99)
+_("<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)
-of your peer.</p>"),
+for your peer.</p>
+"),

/* Address dialog help 6/8 */
"netmask":
- _("<p>For <b>Static Address Setup</b> enter static IP address (e.g.,
192.168.100.99)
+ _("<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
-fully qualified hostname for this IP address. It will be written to
<i>/etc/hosts</i>.</p>")
+a fully qualified hostname for this IP address. It will be written to
<i>/etc/hosts</i>.</p>
+")
+
/* Address dialog help 8/8 */
_("<p>Contact your <b>network administrator</b> for more information about
@@ -190,13 +197,14 @@
"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 don't need to
-set MTU, but using lower MTU values may improve network performance
+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>"),
+or define your own 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. Only the devices whose
Device Activation is set to 'Never' and have 'No Address Setup are
available'.</p>"),

"dhclient_help" :
/* DHCP dialog help 1/8 */
@@ -217,14 +225,15 @@

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

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

"additional":
/* Aliases dialog help 1/3 */
@@ -283,8 +292,8 @@
_("<p>In some networks, you need to set an <b>Authentication Mode</b>.
It depends on the protection technology used, WEP or WPA. <b>WEP</b>
(Wired Equivalent Privacy) is a system to encrypt wireless network
-traffic with an optional authentication based on the encryption
-key used. In most cases where WEP is used, <b>WEP-Open</b> mode (no
+traffic with an optional authentication, based on the encryption
+key used. In most cases where WEP is used, the <b>WEP-Open</b> mode (no
authentication at all) is fine. This does not mean that you cannot
use WEP encryption (in that case use <b>No Encryption</b>).
Some networks may require <b>WEP-Shared Key</b> authentication.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/src/modules/DNS.ycp
new/yast2-network-2.16.18/src/modules/DNS.ycp
--- old/yast2-network-2.16.18/src/modules/DNS.ycp 2007-12-10
12:20:48.000000000 +0100
+++ new/yast2-network-2.16.18/src/modules/DNS.ycp 2008-01-07
11:45:27.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Hostname and DNS data
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: DNS.ycp 40999 2007-09-20 16:40:02Z kmachalkova $
+ * $Id: DNS.ycp 43296 2008-01-07 10:45:26Z kmachalkova $
*
* Manages resolv.conf and (fully qualified) hostname, also
* respecting DHCP.
@@ -294,7 +294,7 @@
sleep(sl);

/* Progress step 2/3 */
- ProgressNextStage(_("Runing SuSEconfig..."));
+ ProgressNextStage(_("Running SuSEconfig..."));

/* Finish him */
RunSuSEconfig();
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/src/modules/LanItems.ycp
new/yast2-network-2.16.18/src/modules/LanItems.ycp
--- old/yast2-network-2.16.18/src/modules/LanItems.ycp 2007-12-13
21:43:16.000000000 +0100
+++ new/yast2-network-2.16.18/src/modules/LanItems.ycp 2008-01-07
11:44:01.000000000 +0100
@@ -457,7 +457,7 @@
rich = HTML::Bold ( descr ) + rich;

if (!hasAnyValue(Items[key, "hwinfo", "dev_name"]:"") && size(Items[key,
"hwinfo"]:$[])>0)
- rich = rich + _("<p>Unable to configure network card because
kernel device is not present</p>");
+ rich = rich + _("<p>Unable to configure the network card
because the kernel device is not present</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>Configure</B>
to configure</LI></UL>");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/src/modules/Lan.ycp
new/yast2-network-2.16.18/src/modules/Lan.ycp
--- old/yast2-network-2.16.18/src/modules/Lan.ycp 2007-12-13
22:02:08.000000000 +0100
+++ new/yast2-network-2.16.18/src/modules/Lan.ycp 2008-01-07
11:45:27.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Network card data
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: Lan.ycp 43291 2008-01-07 10:04:04Z mzugec $
+ * $Id: Lan.ycp 43296 2008-01-07 10:45:26Z kmachalkova $
*
* Representation of the configuration of network cards.
* Input and output routines.
@@ -303,7 +303,7 @@
global void SetIPv6(boolean status){
if(ipv6 != status) {
ipv6=status;
- Popup::Warning(_("To apply this change reboot is needed."));
+ Popup::Warning(_("To apply this change a reboot is needed."));
LanItems::SetModified();
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/src/modules/Remote.ycp
new/yast2-network-2.16.18/src/modules/Remote.ycp
--- old/yast2-network-2.16.18/src/modules/Remote.ycp 2007-12-10
12:20:48.000000000 +0100
+++ new/yast2-network-2.16.18/src/modules/Remote.ycp 2008-01-07
11:45:27.000000000 +0100
@@ -5,7 +5,7 @@
* Authors: Arvin Schnell <arvin@xxxxxxx>
* Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: Remote.ycp 37814 2007-05-03 14:53:24Z kmachalkova $
+ * $Id: Remote.ycp 43296 2008-01-07 10:45:26Z kmachalkova $
*
*/

@@ -197,7 +197,7 @@
sleep(sl);

if(Mode::normal ()) {
- ProgressNextStage(_("Runing SuSEconfig..."));
+ ProgressNextStage(_("Running SuSEconfig..."));
/* no longer needed - have been dropped from SuSEconfig
SCR::Execute(.target.bash, "/sbin/SuSEconfig --module xdm");
SCR::Execute(.target.bash, "/sbin/SuSEconfig --module kde3");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/src/provider/connection.ycp
new/yast2-network-2.16.18/src/provider/connection.ycp
--- old/yast2-network-2.16.18/src/provider/connection.ycp 2007-12-10
12:20:49.000000000 +0100
+++ new/yast2-network-2.16.18/src/provider/connection.ycp 2008-01-07
11:45:27.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Connection configuration dialogs
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: connection.ycp 41134 2007-09-27 12:21:01Z kmachalkova $
+ * $Id: connection.ycp 43296 2008-01-07 10:45:26Z kmachalkova $
*/

{
@@ -122,8 +122,9 @@
manually enter the DNS.</p>") +

/* Connection dialog help 4/9 */
-_("<p>When <b>Automatically Reconnect</b> is enabled, connection will
-be automatically reestablished after failure.</p>") +
+_("<p>When <b>Automatically Reconnect</b> is enabled, the connection will
+be automatically reestablished after failure.</p>
+") +

/* Connection dialog help 5/9 */
_("<p><b>Name Servers</b> are required to convert hostnames
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/src/remote/dialogs.ycp
new/yast2-network-2.16.18/src/remote/dialogs.ycp
--- old/yast2-network-2.16.18/src/remote/dialogs.ycp 2007-12-10
12:20:49.000000000 +0100
+++ new/yast2-network-2.16.18/src/remote/dialogs.ycp 2008-01-07
11:45:27.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Dialog for Remote Administration
* Authors: Arvin Schnell <arvin@xxxxxxx>
*
- * $Id: dialogs.ycp 37814 2007-05-03 14:53:24Z kmachalkova $
+ * $Id: dialogs.ycp 43296 2008-01-07 10:45:26Z kmachalkova $
*/

{
@@ -52,7 +52,7 @@
<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>).
+a Java-capable Web browser (connect to <i>http://&lt;hostname&gt;:%2/</i>).
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 old/yast2-network-2.16.18/src/routines/complex.ycp
new/yast2-network-2.16.18/src/routines/complex.ycp
--- old/yast2-network-2.16.18/src/routines/complex.ycp 2007-12-13
18:40:02.000000000 +0100
+++ new/yast2-network-2.16.18/src/routines/complex.ycp 2008-01-07
11:45:27.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Summary and overview functions
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: complex.ycp 43066 2007-12-13 16:40:00Z mzugec $
+ * $Id: complex.ycp 43296 2008-01-07 10:45:26Z kmachalkova $
*
*/

@@ -594,7 +594,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> to configure</LI></UL></P>");
+ 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>");
return $[
"id":id,
"table_descr":desc,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/src/routines/widgets.ycp
new/yast2-network-2.16.18/src/routines/widgets.ycp
--- old/yast2-network-2.16.18/src/routines/widgets.ycp 2007-12-10
12:20:48.000000000 +0100
+++ new/yast2-network-2.16.18/src/routines/widgets.ycp 2008-01-07
11:45:27.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Widgets for CWM
* Authors: Martin Vidner <mvidner@xxxxxxx>
*
- * $Id: widgets.ycp 42289 2007-11-21 15:32:51Z mzugec $
+ * $Id: widgets.ycp 43296 2008-01-07 10:45:26Z kmachalkova $
*/

{
@@ -40,14 +40,14 @@
"widget": `checkbox,
/* CheckBox label */
// is the interface administrable by users (as opposed to root)
- "label": _("E&nable Device Control for Non-root User via KInternet"),
+ "label": _("E&nable Device Control for Non-root User Via KInternet"),
"opt": [`notify],
"help":
// Details dialog help
_("<p><b><big>Device Control</big></b></p>
<p>Normally 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>, an ordinary user may control the interface with
KInternet.</p>
"),
],

@@ -166,7 +166,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 the network interface should be brought up. <b>At Boot
Time</b> starts it during system boot.
<b>Never</b> does not start the device.
%1</p>
"),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn
--exclude=.svnignore old/yast2-network-2.16.18/src/services/proxy.ycp
new/yast2-network-2.16.18/src/services/proxy.ycp
--- old/yast2-network-2.16.18/src/services/proxy.ycp 2007-12-10
12:20:48.000000000 +0100
+++ new/yast2-network-2.16.18/src/services/proxy.ycp 2008-01-07
11:45:27.000000000 +0100
@@ -4,7 +4,7 @@
* Summary: Proxy configuration
* Authors: Michal Svec <msvec@xxxxxxx>
*
- * $Id: proxy.ycp 42298 2007-11-21 16:45:32Z kmachalkova $
+ * $Id: proxy.ycp 43296 2008-01-07 10:45:26Z kmachalkova $
*/

{
@@ -309,9 +309,10 @@

/* Proxy dialog help 5/8 */

- _("<p>With <b>Use the Same Proxy for All Protocols</b> option checked,
it is
-enough to fill in HTTP proxy URL, which will then be used for all protocols
-(HTTP, HTTPS and FTP).") +
+ _("<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).
+") +

/* Proxy dialog help 6/8 */

@@ -323,7 +324,7 @@

/* Proxy dialog help 7/8 */
_("<p>If you are using a proxy server with authorization, enter
-<b>Proxy User Name</b> and <b>Proxy Password</b>. A valid username
+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>
") +



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



Remember to have fun...

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

< Previous Next >