July 2011 - openSUSE Commits - openSUSE Mailing Lists

commit pwdutils for openSUSE:11.3
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package pwdutils for openSUSE:11.3 checked in at Fri Jul 29 18:06:11 CEST 2011. Patchinfo file has no description Patchinfo file has no description Patchinfo file has no description -------- --- old-versions/11.3/all/pwdutils/pwdutils.changes 2010-07-01 14:10:29.000000000 +0200 +++ 11.3/pwdutils/pwdutils.changes 2011-07-20 17:22:42.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Jul 20 15:22:01 UTC 2011 - lnussel(a)suse.de + +- change blowfish id from 2a to 2y (bnc#700876, CVE-2011-2483) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.3/all/pwdutils Destination is old-versions/11.3/UPDATES/all/pwdutils calling whatdependson for 11.3-i586 New: ---- pwdutils-3.2.14-CVE-2011-2483.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pwdutils.spec ++++++ --- /var/tmp/diff_new_pack.j9fkPP/_old 2011-07-29 18:05:30.000000000 +0200 +++ /var/tmp/diff_new_pack.j9fkPP/_new 2011-07-29 18:05:30.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package pwdutils (Version 3.2.10) +# spec file for package pwdutils # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,14 +29,16 @@ Group: System/Base AutoReqProv: on Version: 3.2.10 -Release: 1 +Release: 2.<RELEASE2> Summary: Utilities to Manage User and Group Accounts Requires: pam-modules +Requires: libxcrypt-crypt_blowfish >= 1.2 Source: pwdutils-%{version}.tar.bz2 Source2: ldap.conf Source3: useradd.default Source4: baselibs.conf Patch0: %{name}-selinux-useradd.patch +Patch1: pwdutils-3.2.14-CVE-2011-2483.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -77,6 +79,7 @@ %prep %setup -q %patch0 +%patch1 -p1 %build %configure --with-ldap-conf-file=/etc/ldap.conf \ ++++++ pwdutils-3.2.14-CVE-2011-2483.diff ++++++ Index: pwdutils-3.2.10/src/chpasswd.c =================================================================== --- pwdutils-3.2.10.orig/src/chpasswd.c +++ pwdutils-3.2.10/src/chpasswd.c @@ -342,7 +342,7 @@ main (int argc, char *argv[]) /* blowfish has a limit of 72 characters */ if (use_crypt == BLOWFISH && strlen (cp) > 72) cp[72] = '\0'; - salt = make_crypt_salt ("$2a$", 0 /* XXX crypt_rounds */); + salt = make_crypt_salt ("$2y$", 0 /* XXX crypt_rounds */); if (salt != NULL) pw_data->newpassword = strdup (crypt_r (cp, salt, &output)); else Index: pwdutils-3.2.10/src/gpasswd.c =================================================================== --- pwdutils-3.2.10.orig/src/gpasswd.c +++ pwdutils-3.2.10/src/gpasswd.c @@ -432,7 +432,7 @@ main (int argc, char **argv) /* blowfish has a limit of 72 characters */ if (use_crypt == BLOWFISH && strlen (p1) > 72) p1[72] = '\0'; - salt = make_crypt_salt ("$2a$", 0 /* XXX crypt_rounds */); + salt = make_crypt_salt ("$2y$", 0 /* XXX crypt_rounds */); if (salt != NULL) gr_data->newpassword = strdup (crypt_r (p1, salt, &output)); else Index: pwdutils-3.2.10/etc/default/passwd =================================================================== --- pwdutils-3.2.10.orig/etc/default/passwd +++ pwdutils-3.2.10/etc/default/passwd @@ -26,3 +26,20 @@ BLOWFISH_CRYPT_FILES=10 # For NIS, we should always use DES: CRYPT_YP=des + +# In June 2011 it was discovered that the Linux crypt_blowfish +# implementation contained a bug that made passwords with non-ASCII +# characters easier to crack (CVE-2011-2483). Affected passwords are +# also incompatible with the original, correct OpenBSD +# implementation. Therefore the $2a hash identifier previously used +# for blowfish now is ambiguous as it could mean the hash was +# generated with the correct implementation on OpenBSD or the buggy +# one on Linux. To avoid the ambiguity two new identifier were +# introduced. $2x now explicitly identifies hashes that were +# generated with the buggy algorithm while $2y is used for hashes +# generated with the correct algorithm. New passwords are now +# generated with the $2y identifier. +# +# Setting the following option to "yes" tells the sytem that $2a +# hashes are to be treated as generated with the buggy algorithm. +BLOWFISH_2a2x=yes ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit glibc for openSUSE:11.3
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package glibc for openSUSE:11.3 checked in at Fri Jul 29 18:01:46 CEST 2011. Patchinfo file has no description Patchinfo file has no description Patchinfo file has no description -------- --- old-versions/11.3/UPDATES/all/glibc/glibc.changes 2010-10-27 03:24:40.000000000 +0200 +++ 11.3/glibc/glibc.changes 2011-07-27 10:18:03.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Jul 19 15:51:51 UTC 2011 - lnussel(a)suse.de + +- update crypt_blowfish to version 1.2 (bnc#700876, CVE-2011-2483) + * due to the signedness bug fix 2a hashes are incompatible with + previous versions if the password contains 8bit chracters! + +------------------------------------------------------------------- calling whatdependson for 11.3-i586 Old: ---- minmem New: ---- crypt_blowfish-1.2.tar.gz crypt_blowfish-1.2.tar.gz.sign crypt_blowfish-noasm.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glibc.spec ++++++ --- /var/tmp/diff_new_pack.moaLMX/_old 2011-07-29 18:00:57.000000000 +0200 +++ /var/tmp/diff_new_pack.moaLMX/_new 2011-07-29 18:00:57.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package glibc (Version 2.11.2) +# spec file for package glibc # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,6 +17,7 @@ # norootforbuild +%define crypt_bf_version 1.2 Name: glibc BuildRequires: gcc-c++ libstdc++-devel @@ -64,7 +65,7 @@ Provides: rtld(GNU_HASH) AutoReqProv: on Version: 2.11.2 -Release: 3.<RELEASE2> +Release: 3.<RELEASE5> Url: http://www.gnu.org/software/libc/libc.html PreReq: filesystem BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,6 +81,8 @@ Source12: glibc_post_upgrade.c Source15: glibc.rpmlintrc Source16: baselibs.conf +Source50: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz +Source51: http://www.openwall.com/crypt/crypt_blowfish-%{crypt_bf_version}.tar.gz.sign %if %_target_cpu == "i686" # We need to avoid to have only the src rpm from i686 on the media, # since it does not work on other architectures. @@ -92,6 +95,7 @@ Patch3: glibc-resolv-reload.diff Patch4: glibc-2.3.locales.diff.bz2 Patch5: crypt_blowfish-1.0-suse.diff +Patch6: crypt_blowfish-noasm.diff Patch7: glibc-version.diff Patch8: glibc-2.4.90-revert-only-euro.diff Patch9: glibc-2.3-regcomp.diff @@ -296,11 +300,12 @@ # add glibc-ports for arm # this is CURRENTLY BROKEN; ARM-interested contributors need to provide # new tested glibc-ports source -%setup -n glibc-%{version} -q -a 2 -a 3 -a 4 +%setup -n glibc-%{version} -q -a 2 -a 3 -a 4 -a 50 %else # any other leave out ports -%setup -n glibc-%{version} -q -a 3 -a 4 +%setup -n glibc-%{version} -q -a 3 -a 4 -a 50 %endif +mv crypt_blowfish-%crypt_bf_version/crypt_blowfish.[ch] crypt/ %patch0 # libNoVersion part is only active on ix86 %patch1 @@ -308,6 +313,7 @@ %patch3 %patch4 %patch5 +%patch6 %patch7 %patch8 %patch9 ++++++ crypt_blowfish-1.0-suse.diff ++++++ ++++ 773 lines (skipped) ++++ between old-versions/11.3/UPDATES/all/glibc/crypt_blowfish-1.0-suse.diff ++++ and 11.3/glibc/crypt_blowfish-1.0-suse.diff ++++++ crypt_blowfish-noasm.diff ++++++ Index: crypt/crypt_blowfish.c =================================================================== --- crypt/crypt_blowfish.c.orig +++ crypt/crypt_blowfish.c @@ -54,7 +54,7 @@ #include "crypt_blowfish.h" #ifdef __i386__ -#define BF_ASM 1 +#define BF_ASM 0 #define BF_SCALE 1 #elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__) #define BF_ASM 0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-sysconfig for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package yast2-sysconfig for openSUSE:Factory checked in at Fri Jul 29 16:57:27 CEST 2011. -------- --- yast2-sysconfig/yast2-sysconfig.changes 2009-06-17 16:41:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-sysconfig/yast2-sysconfig.changes 2011-07-27 14:57:20.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Jul 27 12:53:34 UTC 2011 - lslezak(a)suse.cz + +- command line help text - added description and example for full + file name specification (bnc#689844) +- 2.21.0 + +------------------------------------------------------------------ +Wed Jan 13 18:56:03 CET 2010 - kmachalkova(a)suse.cz + +- Adjusted .desktop file(s) to wrap /sbin/yast2/ calls in xdg-su + where root privileges are needed, removed X-KDE-SubstituteUID key + (bnc#540627) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-sysconfig-2.17.0.tar.bz2 New: ---- yast2-sysconfig-2.21.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.dEHK3i/_old 2011-07-29 16:54:25.000000000 +0200 +++ /var/tmp/diff_new_pack.dEHK3i/_new 2011-07-29 16:54:25.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package yast2-sysconfig (Version 2.17.0) +# spec file for package yast2-sysconfig # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,20 +19,26 @@ Name: yast2-sysconfig -Version: 2.17.0 -Release: 55 -License: GPL -Group: System/YaST +Version: 2.21.0 +Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-sysconfig-2.17.0.tar.bz2 +Source0: yast2-sysconfig-2.21.0.tar.bz2 + Prefix: /usr + +Group: System/YaST +License: GPL v2 or later BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: yast2 perl + BuildArch: noarch + Provides: y2c_rc_config yast2-config-rcconfig yast2-config-sysconfig Obsoletes: y2c_rc_config yast2-config-rcconfig yast2-config-sysconfig Provides: yast2-trans-sysconfig yast2-trans-rcconfig y2t_rc_config Obsoletes: yast2-trans-sysconfig yast2-trans-rcconfig y2t_rc_config + Summary: YaST2 - Sysconfig Editor %description @@ -40,17 +46,21 @@ information. %prep -%setup -n yast2-sysconfig-2.17.0 +%setup -n yast2-sysconfig-2.21.0 %build %{prefix}/bin/y2tool y2autoconf %{prefix}/bin/y2tool y2automake autoreconf --force --install + export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" + %{?suse_update_config:%{suse_update_config -f}} ./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} -make %{?jobs:-j%jobs} +# V=1: verbose build in case we used AM_SILENT_RULES(yes) +# so that RPM_OPT_FLAGS check works +make %{?jobs:-j%jobs} V=1 %install make install DESTDIR="$RPM_BUILD_ROOT" ++++++ yast2-sysconfig-2.17.0.tar.bz2 -> yast2-sysconfig-2.21.0.tar.bz2 ++++++ ++++ 7223 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-sysconfig-2.17.0/VERSION new/yast2-sysconfig-2.21.0/VERSION --- old/yast2-sysconfig-2.17.0/VERSION 2008-06-16 14:26:13.000000000 +0200 +++ new/yast2-sysconfig-2.21.0/VERSION 2011-07-27 14:55:18.000000000 +0200 @@ -1 +1 @@ -2.17.0 +2.21.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-sysconfig-2.17.0/autodocs-ycp.ami new/yast2-sysconfig-2.21.0/autodocs-ycp.ami --- old/yast2-sysconfig-2.17.0/autodocs-ycp.ami 2009-06-22 07:47:56.000000000 +0200 +++ new/yast2-sysconfig-2.21.0/autodocs-ycp.ami 2011-07-27 14:56:49.000000000 +0200 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 33394 2006-10-13 11:51:40Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -8,20 +8,25 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src -htmldir = $(docdir)/autodocs +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs -html_DATA = index.html $(wildcard *.html) +html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) CLEANFILES = $(html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done 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-sysconfig-2.17.0/configure.in new/yast2-sysconfig-2.21.0/configure.in --- old/yast2-sysconfig-2.17.0/configure.in 2009-06-22 07:47:56.000000000 +0200 +++ new/yast2-sysconfig-2.21.0/configure.in 2011-07-27 14:56:49.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-sysconfig dnl -dnl -- This file is generated by y2autoconf 2.18.5 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-sysconfig, 2.17.0, http://bugs.opensuse.org/, yast2-sysconfig) +AC_INIT(yast2-sysconfig, 2.21.0, http://bugs.opensuse.org/, yast2-sysconfig) 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.17.0" +VERSION="2.21.0" RPMNAME="yast2-sysconfig" MAINTAINER="Ladislav Slezak <lslezak(a)suse.cz>" 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-sysconfig-2.17.0/missing new/yast2-sysconfig-2.21.0/missing --- old/yast2-sysconfig-2.17.0/missing 2009-06-22 07:48:00.000000000 +0200 +++ new/yast2-sysconfig-2.21.0/missing 2011-07-27 14:56:51.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # 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., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <bug-automake(a)gnu.org>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: 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-sysconfig-2.17.0/src/sysconfig.desktop new/yast2-sysconfig-2.21.0/src/sysconfig.desktop --- old/yast2-sysconfig-2.17.0/src/sysconfig.desktop 2008-05-16 16:57:25.000000000 +0200 +++ new/yast2-sysconfig-2.21.0/src/sysconfig.desktop 2010-01-14 15:51:44.000000000 +0100 @@ -18,9 +18,8 @@ X-SuSE-YaST-AutoInstSchema=sysconfig.rnc Icon=yast-sysconfig -Exec=/sbin/yast2 sysconfig +Exec=xdg-su -c "/sbin/yast2 sysconfig" Name=/etc/sysconfig Editor GenericName=Change settings in /etc/sysconfig configuration files -X-KDE-SubstituteUID=true StartupNotify=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-sysconfig-2.17.0/src/sysconfig.ycp new/yast2-sysconfig-2.21.0/src/sysconfig.ycp --- old/yast2-sysconfig-2.17.0/src/sysconfig.ycp 2007-05-28 07:21:56.000000000 +0200 +++ new/yast2-sysconfig-2.21.0/src/sysconfig.ycp 2011-07-27 14:56:41.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Main file * Authors: Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: sysconfig.ycp 38151 2007-05-28 05:21:56Z lslezak $ + * $Id: sysconfig.ycp 65041 2011-07-27 12:56:41Z lslezak $ * * Main file for sysconfig configuration. Uses all other files. */ @@ -79,7 +79,11 @@ ], "variable" : $[ // help text for option 'variable' - "help" : _("Selected variable"), + "help" : [ _("Selected variable"), + _("If the variable is available in several files use"), + _("<variable>$<file_name> syntax,"), + _("for example CONFIG_TYPE$/etc/sysconfig/mail.") + ], "type" : "string" ], "value" : $[ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-security for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package yast2-security for openSUSE:Factory checked in at Fri Jul 29 16:54:15 CEST 2011. -------- --- yast2-security/yast2-security.changes 2011-04-05 11:05:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-security/yast2-security.changes 2011-07-20 11:05:17.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Jul 20 11:04:03 CEST 2011 - jsuchome(a)suse.cz + +- remove blowfish hash from selections (fate#312321) +- 2.21.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-security-2.21.0.tar.bz2 New: ---- yast2-security-2.21.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-security.spec ++++++ --- /var/tmp/diff_new_pack.uDhEis/_old 2011-07-29 16:54:01.000000000 +0200 +++ /var/tmp/diff_new_pack.uDhEis/_new 2011-07-29 16:54:01.000000000 +0200 @@ -19,16 +19,16 @@ Name: yast2-security -Version: 2.21.0 +Version: 2.21.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-security-2.21.0.tar.bz2 +Source0: yast2-security-2.21.1.tar.bz2 Prefix: /usr Group: System/YaST -License: GPLv2+ +License: GPL v2 or later BuildRequires: doxygen perl-XML-Writer pkg-config update-desktop-files yast2-devtools yast2-pam yast2-testsuite # new Pam.ycp API @@ -50,7 +50,7 @@ The YaST2 component for security settings configuration. %prep -%setup -n yast2-security-2.21.0 +%setup -n yast2-security-2.21.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-security-2.21.0.tar.bz2 -> yast2-security-2.21.1.tar.bz2 ++++++ ++++ 5460 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-security-2.21.0/VERSION new/yast2-security-2.21.1/VERSION --- old/yast2-security-2.21.0/VERSION 2011-04-05 11:03:54.000000000 +0200 +++ new/yast2-security-2.21.1/VERSION 2011-07-20 11:04:33.000000000 +0200 @@ -1 +1 @@ -2.21.0 +2.21.1 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-security-2.21.0/configure.in new/yast2-security-2.21.1/configure.in --- old/yast2-security-2.21.0/configure.in 2010-02-05 11:46:30.000000000 +0100 +++ new/yast2-security-2.21.1/configure.in 2011-06-23 15:51:43.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-security, 2.19.1, http://bugs.opensuse.org/, yast2-security) +AC_INIT(yast2-security, 2.21.0, http://bugs.opensuse.org/, yast2-security) 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.19.1" +VERSION="2.21.0" RPMNAME="yast2-security" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" 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-security-2.21.0/src/Security.ycp new/yast2-security-2.21.1/src/Security.ycp --- old/yast2-security-2.21.0/src/Security.ycp 2011-04-04 08:32:22.000000000 +0200 +++ new/yast2-security-2.21.1/src/Security.ycp 2011-07-20 11:02:31.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Data for the security configuration * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: Security.ycp 62809 2010-11-10 16:07:59Z jsuchome $ + * $Id: Security.ycp 63710 2011-04-05 09:05:11Z jsuchome $ */ { @@ -122,7 +122,7 @@ "GID_MIN" : "1000", "DISPLAYMANAGER_SHUTDOWN" : "all", "LASTLOG_ENAB" : "yes", - "PASSWD_ENCRYPTION" : "blowfish", + "PASSWD_ENCRYPTION" : "sha512", "GROUP_ENCRYPTION" : "md5", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", @@ -241,21 +241,11 @@ global map PasswordMaxLengths = $[ "des" : 8, "md5" : 127, - "blowfish" : 72, "sha256" : 127, "sha512" : 127 ]; /** - * List of supported password encryption ciphers - */ -list<string> Ciphers = [ - // "des", - "md5", - "blowfish", -]; - -/** * Abort function * return boolean return true if abort */ @@ -330,6 +320,7 @@ global define boolean Read() { Settings = $[]; + modified = false; /* Read security settings */ @@ -381,12 +372,19 @@ // read the password hash settings string method = PamSettings::GetDefaultValue ("CRYPT_FILES"); + // change old default to new default automatically + if (method == "blowfish") + { + y2milestone ("found 'blowfish', changing to new default 'sha512'"); + method = "sha512"; + modified = true; + } if (method == nil || method == "" || - !contains (["des","md5","blowfish","sha256","sha512"],method)) + !contains (["des","md5","sha256","sha512"],method)) { method = PamSettings::GetHashMethod (); } - if (method == "" || !contains (["des","md5","blowfish","sha256","sha512"],method)) + if (method == "" || !contains (["des","md5","sha256","sha512"],method)) method = "des"; Settings["PASSWD_ENCRYPTION"] = method; Settings["GROUP_ENCRYPTION"] = PamSettings::GetGroupHashMethod (); @@ -429,8 +427,6 @@ Settings["PERMISSION_SECURITY"] = perm; y2debug("Settings=%1", Settings); - modified = false; - // remeber the read values Settings_bak = Settings; return true; @@ -530,7 +526,7 @@ Progress::NextStage(); /* pam stuff */ - string encr = Settings["PASSWD_ENCRYPTION"]:"blowfish"; + string encr = Settings["PASSWD_ENCRYPTION"]:"sha512"; PamSettings::SetDefaultValue ("CRYPT_FILES", encr); // use cracklib? 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-security-2.21.0/src/helps.ycp new/yast2-security-2.21.1/src/helps.ycp --- old/yast2-security-2.21.0/src/helps.ycp 2011-04-05 11:03:28.000000000 +0200 +++ new/yast2-security-2.21.1/src/helps.ycp 2011-07-19 15:52:39.000000000 +0200 @@ -126,7 +126,7 @@ _("Password Encryption Method:") + /* Password dialog help 5b/8 */ -_("des, the Linux default method, works in all network environments, +_("DES, the Linux default method, works in all network environments, but it restricts you to passwords no longer than eight characters. If you need compatibility with other systems, use this method.") + @@ -135,9 +135,8 @@ distributions, but not by other systems or old software.") + /* Password dialog help 5d/8 */ -_("Blowfish is similar to MD5, but uses a different algorithm -to encrypt passwords. A lot of CPU power is needed to calculate the hash, -which makes it difficult to crack passwords with the help of a dictionary.") +_("SHA-512 is the current standard hash method, using other algorithms is not recommended unless needed for compatibility purpose.") + + /* Password dialog help 7/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-security-2.21.0/src/levels.ycp new/yast2-security-2.21.1/src/levels.ycp --- old/yast2-security-2.21.0/src/levels.ycp 2009-06-02 22:40:39.000000000 +0200 +++ new/yast2-security-2.21.1/src/levels.ycp 2011-07-19 15:26:37.000000000 +0200 @@ -66,7 +66,7 @@ "GID_MIN" : "1000", "DISPLAYMANAGER_SHUTDOWN" : "all", "LASTLOG_ENAB" : "yes", - "PASSWD_ENCRYPTION" : "blowfish", + "PASSWD_ENCRYPTION" : "sha512", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", "PASS_MIN_DAYS" : "0", @@ -108,7 +108,7 @@ "GID_MIN" : "1000", "DISPLAYMANAGER_SHUTDOWN" : "root", "LASTLOG_ENAB" : "yes", - "PASSWD_ENCRYPTION" : "blowfish", + "PASSWD_ENCRYPTION" : "sha512", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", "PASS_MIN_DAYS" : "1", @@ -150,7 +150,7 @@ "GID_MIN" : "1000", "DISPLAYMANAGER_SHUTDOWN" : "root", "LASTLOG_ENAB" : "yes", - "PASSWD_ENCRYPTION" : "blowfish", + "PASSWD_ENCRYPTION" : "sha512", "PASSWD_USE_CRACKLIB" : "yes", "PASS_MAX_DAYS" : "99999", "PASS_MIN_DAYS" : "1", 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-security-2.21.0/src/security.ycp new/yast2-security-2.21.1/src/security.ycp --- old/yast2-security-2.21.0/src/security.ycp 2011-04-01 16:32:49.000000000 +0200 +++ new/yast2-security-2.21.1/src/security.ycp 2011-07-19 15:26:54.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Main file * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: security.ycp 57402 2009-06-02 20:40:08Z jsuchome $ + * $Id: security.ycp 63710 2011-04-05 09:05:11Z jsuchome $ * * This is a main file of the module. There is in the file * only some calls to the basic functions. The settings are @@ -159,7 +159,7 @@ // command line help text for 'set passwd' option "help" : _("Password encryption method"), "type" : "enum", - "typespec" : [ "des", "md5", "blowfish", "sha256", "sha512" ], + "typespec" : [ "des", "md5", "sha256", "sha512" ], ], "crack" : $[ // command line help text for 'set crack' option 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-security-2.21.0/src/widgets.ycp new/yast2-security-2.21.1/src/widgets.ycp --- old/yast2-security-2.21.0/src/widgets.ycp 2011-04-05 11:04:36.000000000 +0200 +++ new/yast2-security-2.21.1/src/widgets.ycp 2011-07-19 15:28:32.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Security widgets definitions * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: widgets.ycp 60705 2010-02-05 11:39:47Z jsuchome $ + * $Id: widgets.ycp 63710 2011-04-05 09:05:11Z jsuchome $ * * This file contains the definitions of all widgets used by the * security module. They are all in one map (function) called @@ -166,7 +166,7 @@ /* ComboBox label */ "Label" : _("P&assword Encryption Method"), /* ComboBox values */ - "Options" : [["des","DES"],["md5","MD5"],["blowfish","Blowfish"], ["sha256", "SHA-256"], ["sha512", "SHA-512"]], + "Options" : [["des","DES"],["md5","MD5"],["sha256", "SHA-256"], ["sha512", "SHA-512"]], "Value" : "des", "Notify" : "yes", ], 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-security-2.21.0/testsuite/tests/Level1.out new/yast2-security-2.21.1/testsuite/tests/Level1.out --- old/yast2-security-2.21.0/testsuite/tests/Level1.out 2010-08-06 11:07:09.000000000 +0200 +++ new/yast2-security-2.21.1/testsuite/tests/Level1.out 2011-07-20 10:55:29.000000000 +0200 @@ -78,7 +78,7 @@ Write .etc.inittab nil true Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil -Write .etc.default.passwd."CRYPT_FILES" "blowfish" true +Write .etc.default.passwd."CRYPT_FILES" "sha512" true Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib-minlen" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --pwhistory-remember" $[] 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-security-2.21.0/testsuite/tests/Level2.out new/yast2-security-2.21.1/testsuite/tests/Level2.out --- old/yast2-security-2.21.0/testsuite/tests/Level2.out 2010-08-06 11:07:17.000000000 +0200 +++ new/yast2-security-2.21.1/testsuite/tests/Level2.out 2011-07-20 10:55:42.000000000 +0200 @@ -78,7 +78,7 @@ Write .etc.inittab nil true Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil -Write .etc.default.passwd."CRYPT_FILES" "blowfish" true +Write .etc.default.passwd."CRYPT_FILES" "sha512" true Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib-minlen" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --pwhistory-remember" $[] 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-security-2.21.0/testsuite/tests/Level3.out new/yast2-security-2.21.1/testsuite/tests/Level3.out --- old/yast2-security-2.21.0/testsuite/tests/Level3.out 2010-08-06 11:07:28.000000000 +0200 +++ new/yast2-security-2.21.1/testsuite/tests/Level3.out 2011-07-20 10:55:35.000000000 +0200 @@ -78,7 +78,7 @@ Write .etc.inittab nil true Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil -Write .etc.default.passwd."CRYPT_FILES" "blowfish" true +Write .etc.default.passwd."CRYPT_FILES" "sha512" true Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -a --cracklib-minlen=6" $[] 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-security-2.21.0/testsuite/tests/Read.out new/yast2-security-2.21.1/testsuite/tests/Read.out --- old/yast2-security-2.21.0/testsuite/tests/Read.out 2010-08-06 11:07:37.000000000 +0200 +++ new/yast2-security-2.21.1/testsuite/tests/Read.out 2011-07-20 10:59:24.000000000 +0200 @@ -56,3 +56,4 @@ Execute .target.bash_output "/usr/sbin/pam-config -q --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -q --pwhistory" $[] Return true +Dump sha512 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-security-2.21.0/testsuite/tests/Read.ycp new/yast2-security-2.21.1/testsuite/tests/Read.ycp --- old/yast2-security-2.21.0/testsuite/tests/Read.ycp 2009-06-02 22:40:39.000000000 +0200 +++ new/yast2-security-2.21.1/testsuite/tests/Read.ycp 2011-07-20 10:59:17.000000000 +0200 @@ -14,7 +14,7 @@ { -include "testsuite.ycp"; +import "Testsuite"; import "Security"; map scr_info = $[ @@ -97,6 +97,8 @@ ] ]; -TEST(``(Security::Read()),[scr_info,$[],E],nil); +Testsuite::Test (``(Security::Read()),[scr_info,$[],E],nil); +// read blowfish, changed to sha512 +Testsuite::Dump (Security::Settings["PASSWD_ENCRYPTION"]: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-security-2.21.0/testsuite/tests/Write.out new/yast2-security-2.21.1/testsuite/tests/Write.out --- old/yast2-security-2.21.0/testsuite/tests/Write.out 2010-08-06 11:07:43.000000000 +0200 +++ new/yast2-security-2.21.1/testsuite/tests/Write.out 2011-07-20 10:55:16.000000000 +0200 @@ -78,7 +78,7 @@ Write .etc.inittab nil true Execute .target.bash "/sbin/telinit q" 0 Read .etc.default.passwd."CRYPT_FILES" nil -Write .etc.default.passwd."CRYPT_FILES" "blowfish" true +Write .etc.default.passwd."CRYPT_FILES" "sha512" true Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --cracklib-minlen" $[] Execute .target.bash_output "/usr/sbin/pam-config -d --pwhistory-remember" $[] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-network for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at Fri Jul 29 16:53:53 CEST 2011. -------- --- yast2-network/yast2-network.changes 2011-05-26 17:44:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-network/yast2-network.changes 2011-07-22 18:10:11.000000000 +0200 @@ -1,0 +2,43 @@ +Fri Jul 22 17:49:47 CEST 2011 - mvidner(a)suse.cz + +- Support biosdevname=1 NIC naming scheme: don't write mac-based udev + rules (FATE#311332). +- STARMODE='nfsroot' also for FCoE (FATE#306855). +- Show NIC device names for unconfigured NICs (FATE#311335). +- Fixed configuring multiple interfaces with the same VLAN (FATE#311380, + FATE#309240, bnc#572747, bnc#588588) +- Make the hostname resolvable to our static address coming from + Linuxrc (bnc#664929). +- 2.21.0 + +------------------------------------------------------------------- +Fri Jul 22 17:49:46 CEST 2011 - jreidinger(a)suse.cz + +- Do not enable WIRELESS_POWER by default, some APs are broken + (FATE#309255). + +------------------------------------------------------------------- +Fri Jul 22 15:48:16 CEST 2011 - locilka(a)suse.cz + +- Obsoleted X-KDE-SubstituteUID replaced with xdg-su in Exec in + desktop files (bnc#540627) + +------------------------------------------------------------------- +Thu Jul 21 13:44:24 CEST 2011 - locilka(a)suse.cz + +- Fixed Firewall and SSH proposal to be still able to adjust SSH + independently on the firewall status (bnc#537980). +- 2.20.13 + +------------------------------------------------------------------- +Fri Jul 1 13:42:16 CEST 2011 - mvidner(a)suse.cz + +- Proofread texts for translation (by A.Turrini, bnc#703190). + +------------------------------------------------------------------- +Mon May 30 16:40:55 CEST 2011 - mvidner(a)suse.cz + +- WebYaST: also update /etc/hosts, for hostname -f (bnc#694283#c8) +- 2.20.12 + +------------------------------------------------------------------- @@ -4,0 +48,17 @@ + +------------------------------------------------------------------- +Wed Apr 13 16:17:19 CEST 2011 - mvidner(a)suse.cz + +- AutoYaST: networking/start_immediately was ignored (bnc#655571, bnc#675844) +- 2.20.11 + +------------------------------------------------------------------- +Tue Feb 15 15:19:47 CET 2011 - mvidner(a)suse.cz + +- DSL: linux-atm-lib.rpm was renamed to libatm1.rpm (bnc#668586) + +------------------------------------------------------------------- +Mon Jan 17 14:10:10 UTC 2011 - mvidner(a)novell.com + +- fixed progress messages being out of sync when writing LAN config + (reported by bmwiedemann) calling whatdependson for head-i586 Old: ---- noswitch.patch yast2-network-2.20.10.tar.bz2 New: ---- yast2-network-2.21.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.slZlSb/_old 2011-07-29 16:52:59.000000000 +0200 +++ /var/tmp/diff_new_pack.slZlSb/_new 2011-07-29 16:52:59.000000000 +0200 @@ -19,17 +19,16 @@ Name: yast2-network -Version: 2.20.10 -Release: 6 +Version: 2.21.0 +Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-network-2.20.10.tar.bz2 -Patch0: noswitch.patch +Source0: yast2-network-2.21.0.tar.bz2 Prefix: /usr Group: System/YaST -License: GPLv2+ +License: GPL v2 or later # should be required by devtools BuildRequires: perl-XML-Writer pkgconfig rpm BuildRequires: update-desktop-files @@ -37,9 +36,10 @@ BuildRequires: yast2-country BuildRequires: yast2-installation >= 2.15.27 -# NetworkStorage: adapt functions needed for iBFT (bnc#551380) -BuildRequires: yast2 >= 2.19.3 -Requires: yast2 >= 2.19.3 +# NetworkInterfaces::GetTypeFromIfcfg (bnc#572747) +BuildRequires: yast2 >= 2.21.6 +Requires: yast2 >= 2.21.6 + #netconfig (FaTE #303618) Requires: sysconfig >= 0.71.2 #GetLanguageCountry @@ -63,7 +63,7 @@ Summary: YaST2 - Network Configuration %package devel-doc -License: GPLv2+ + Group: System/YaST Summary: YaST2 - Developer documentation for yast2-network @@ -74,8 +74,7 @@ This package contains autogenerated documentation for yast2-network %prep -%setup -n yast2-network-2.20.10 -%patch0 -p1 +%setup -n yast2-network-2.21.0 %build %{prefix}/bin/y2tool y2autoconf @@ -145,5 +144,4 @@ %doc %{prefix}/share/doc/packages/yast2-network %exclude %{prefix}/share/doc/packages/yast2-network/COPYING %exclude %{prefix}/share/doc/packages/yast2-network/README - %changelog ++++++ yast2-network-2.20.10.tar.bz2 -> yast2-network-2.21.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/MAINTAINER new/yast2-network-2.21.0/MAINTAINER --- old/yast2-network-2.20.10/MAINTAINER 2006-11-06 14:35:04.000000000 +0100 +++ new/yast2-network-2.21.0/MAINTAINER 2011-03-22 16:22:24.000000000 +0100 @@ -1 +1 @@ -Michal Zugec <mzugec(a)suse.cz> +Martin Vidner <mvidner(a)suse.cz> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/VERSION new/yast2-network-2.21.0/VERSION --- old/yast2-network-2.20.10/VERSION 2011-01-03 16:00:07.000000000 +0100 +++ new/yast2-network-2.21.0/VERSION 2011-07-22 17:52:42.000000000 +0200 @@ -1 +1 @@ -2.20.10 +2.21.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/clients/firewall_stage1_finish.ycp new/yast2-network-2.21.0/src/clients/firewall_stage1_finish.ycp --- old/yast2-network-2.20.10/src/clients/firewall_stage1_finish.ycp 2009-10-05 13:17:47.000000000 +0200 +++ new/yast2-network-2.21.0/src/clients/firewall_stage1_finish.ycp 2011-07-22 15:01:24.000000000 +0200 @@ -28,20 +28,21 @@ y2debug("func=%1", func); y2debug("param=%1", param); +//we have those from the proposal +boolean fw_enabled = SuSEFirewall4Network::Enabled1stStage(); +boolean ssh_enabled = SuSEFirewall4Network::EnabledSsh1stStage(); + if (func == "Info") { return (any)$[ "steps" : 1, // progress step title "title" : _("Writing Firewall Configuration..."), - "when" : SuSEFirewallProposal::GetChangedByUser() ? [ `installation, `autoinst ] : [], + "when" : (SuSEFirewallProposal::GetChangedByUser() || ssh_enabled) ? [ `installation, `autoinst ] : [], ]; } else if (func == "Write") { - //we have those from the proposal - boolean fw_enabled = SuSEFirewall4Network::Enabled1stStage(); - boolean ssh_enabled = SuSEFirewall4Network::EnabledSsh1stStage(); y2milestone("After installation, firewall will be %1", fw_enabled ? sformat("enabled, ssh port will be %1", ssh_enabled ? "open" : "closed") : "disabled"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/clients/firewall_stage1_proposal.ycp new/yast2-network-2.21.0/src/clients/firewall_stage1_proposal.ycp --- old/yast2-network-2.20.10/src/clients/firewall_stage1_proposal.ycp 2010-01-20 17:24:12.000000000 +0100 +++ new/yast2-network-2.21.0/src/clients/firewall_stage1_proposal.ycp 2011-07-22 15:01:24.000000000 +0200 @@ -127,8 +127,6 @@ SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); } - SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); - SuSEFirewallProposal::SetProposalInitialized(true); } @@ -147,27 +145,23 @@ _("Firewall will be disabled (<a href=\"firewall--enable_firewall_in_proposal\">enable</a>)") ) + "</li>\n"; - if (SuSEFirewall4Network::Enabled1stStage()) - { - output = output + "<li>" + (SuSEFirewall4Network::EnabledSsh1stStage() ? - _("SSH service will be enabled, SSH port will be open (<a href=\"firewall--disable_ssh_in_proposal\">disable and close</a>)") - : - _("SSH service will be disabled, SSH port will be blocked (<a href=\"firewall--enable_ssh_in_proposal\">enable and open</a>)") - ) + "</li>\n"; + output = output + "<li>" + (SuSEFirewall4Network::EnabledSsh1stStage() ? + _("SSH service will be enabled, SSH port will be open (<a href=\"firewall--disable_ssh_in_proposal\">disable and close</a>)") + : + _("SSH service will be disabled, SSH port will be blocked (<a href=\"firewall--enable_ssh_in_proposal\">enable and open</a>)") + ) + "</li>\n"; - } output = output + "</ul>\n"; ret = $[ - "preformatted_proposal" : output, - "warning_level" : `warning, - //"warning" : proposal["warning"]:nil, - "links" : [ - "firewall--enable_firewall_in_proposal", "firewall--disable_firewall_in_proposal", - "firewall--enable_ssh_in_proposal", "firewall--disable_ssh_in_proposal", - ] - ]; - + "preformatted_proposal" : output, + "warning_level" : `warning, + //"warning" : proposal["warning"]:nil, + "links" : [ + "firewall--enable_firewall_in_proposal", "firewall--disable_firewall_in_proposal", + "firewall--enable_ssh_in_proposal", "firewall--disable_ssh_in_proposal", + ] + ]; } else if ( func == "AskUser" ) { any chosen_link = param["chosen_id"]:nil; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/clients/network.ycp new/yast2-network-2.21.0/src/clients/network.ycp --- old/yast2-network-2.20.10/src/clients/network.ycp 2006-11-06 14:34:53.000000000 +0100 +++ new/yast2-network-2.21.0/src/clients/network.ycp 2011-07-01 13:42:31.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Main network client * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: network.ycp 33494 2006-10-18 12:17:01Z kmachalkova $ + * $Id: network.ycp 64700 2011-07-01 11:42:29Z mvidner $ * * Main file for the network configuration. * Uses all other files. @@ -129,10 +129,10 @@ map cmdline_description = $[ "id" : "network", - // translators: command line help for HTTP server module + // translators: command line help for network module "help" : _("Configuration of network. -This is only executer of network sub-modules. -You can run this network modules: +This is only a delegator to network sub-modules. +You can run these network modules: lan ")+ _("Network Card") +(" isdn ")+ _("ISDN Card") +(" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/clients/save_network.ycp new/yast2-network-2.21.0/src/clients/save_network.ycp --- old/yast2-network-2.20.10/src/clients/save_network.ycp 2010-12-20 15:31:58.000000000 +0100 +++ new/yast2-network-2.21.0/src/clients/save_network.ycp 2011-07-22 17:31:40.000000000 +0200 @@ -223,132 +223,122 @@ list<map> hardware=ReadHardware("netcard"); y2milestone("hardware %1", hardware); +string StdoutOf(string command) { + map out = (map) SCR::Execute (.target.bash_output, command); + return out["stdout"]:""; +} - -void CreateIfcfg(){ - string network_configuration=""; +void CreateIfcfg() { + string ifcfg=""; if (network_disk==1 && contains(NetworkStorage::getiBFTDevices(), InstallInf["netdevice"]:"")){ - network_configuration = sformat("%1STARTMODE='nfsroot'\nBOOTPROTO='ibft'\n", network_configuration); - } else { - - // set BOOTPROTO=[ static | dhcp ] - if (InstallInf["bootproto"]:"dhcp"=="static") - { - // add broadcast interface #suse49131 - network_configuration=sformat("BOOTPROTO='static'\nIPADDR='%1/%2'\nBROADCAST='%3'\n", - InstallInf["ipaddr"]:"", Netmask::ToBits(InstallInf["netmask"]:""), InstallInf["bcast"]:""); - if(size(InstallInf["ipaddr6"]:"")>0){ - network_configuration=sformat("%1\n%2", network_configuration, - sformat("LABEL_ipv6='ipv6'\nIPADDR_ipv6='%1'\n", InstallInf["ipaddr6"]:"") - ); - } - } - else - { - //DHCP (also for IPv6) setup - if (InstallInf["bootproto"]:""=="dhcp") network_configuration="BOOTPROTO='dhcp4'\n"; - else if (InstallInf["bootproto"]:""=="dhcp6") network_configuration="BOOTPROTO='dhcp6'\n"; - else if (InstallInf["bootproto"]:""=="dhcp,dhcp6") network_configuration="BOOTPROTO='dhcp'\n"; - - // set DHCP_SET_HOSTNAME=yes #suse30528 - y2milestone("set DHCLIENT_SET_HOSTNAME=yes on installed system"); - SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); - } - - switch(network_disk) - { - case 0: - network_configuration = sformat("%1STARTMODE='onboot'\n", network_configuration); - break; - case 1: - if (!contains(NetworkStorage::getiBFTDevices(), InstallInf["netdevice"]:"")){ - network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); - } - break; - case 3: // FCoE case - create VLAN configuration - map<string,any> cmd = (map<string,any>) SCR::Execute(.target.bash_output, - "ls -la /sys/block/*|grep target|grep eth|cut -d'>' -f2|cut -d'/' -f5|uniq"); - y2internal("cmd %1", cmd); - if (cmd["exit"]:-1==0){ - string ifcfg = splitstring(cmd["stdout"]:"", "\n")[0]:""; - y2internal("ifcfg: %1", ifcfg); - string config=sformat("BOOTPROTO=\"static\"\nSTARTMODE=\"nfsroot\" -ETHERDEVICE=\"%1\"\nUSERCONTROL=\"no\"\n", splitstring(ifcfg, ".")[0]:""); - y2internal("config: %1", config); - string config_file=sformat("/etc/sysconfig/network/ifcfg-%1", ifcfg); - y2internal("filename: %1", config_file); - SCR::Write(.target.string, config_file, config); - } else y2error("Command failed."); - case 2: - network_configuration = sformat("%1STARTMODE='nfsroot'\n", network_configuration); - break; - } - - } - - - // wireless devices (bnc#223570) - if ( size(InstallInf["WESSID"]:"")>0 ) - { - network_configuration = sformat("%1WIRELESS_ESSID='%2'\n", network_configuration, InstallInf["WESSID"]:""); -// network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, InstallInf["WAuth"]:""); - switch(InstallInf["WAuth"]:""){ - case "" : // "" means wpa-psk - case "psk" : - network_configuration = sformat("%1WIRELESS_WPA_PSK='%2'\n", network_configuration, InstallInf["WKey"]:""); - network_configuration = sformat("%1WIRELESS_AUTH_MODE='psk'\n", network_configuration); - break; - case "open" : - network_configuration = sformat("%1WIRELESS_AUTH_MODE='no-encryption'\n", network_configuration); - break; - case "wep_open" : - case "wep_restricted" : - string type=""; - if (InstallInf["WkeyType"]:""=="password") type="h:"; - else if (InstallInf["WkeyType"]:""=="ascii") type="s:"; - network_configuration = sformat("%1WIRELESS_AUTH_MODE='%2'\n", network_configuration, (InstallInf["WAuth"]:""=="wep-open") ? "open" : "sharedkey"); - network_configuration = sformat("%1WIRELESS_DEFAULT_KEY='0'\n", network_configuration); - network_configuration = sformat("%1WIRELESS_KEY_0='%2%3'\n", network_configuration, type, InstallInf["WKey"]:""); - network_configuration = sformat("%1WIRELESS_KEY_LENGTH='%2'\n", network_configuration, InstallInf["WKeyLen"]:""); - if (size(InstallInf["WKeyType"]:"")>0 && size(InstallInf["WKey"]:"")>0) - network_configuration = sformat("%1WIRELESS_KEY_0='%2:%3'\n", network_configuration, - substring(InstallInf["WKeyType"]:"", 0, 1), InstallInf["WKey"]:""); - break; - } - } - - - // if available, write MTU - if (size(InstallInf["mtu"]:"")>0) - network_configuration = sformat("%1MTU='%2'\n", network_configuration, InstallInf["mtu"]:""); + ifcfg = sformat("%1STARTMODE='nfsroot'\nBOOTPROTO='ibft'\n", ifcfg); + } + else { + // set BOOTPROTO=[ static | dhcp ] + if (InstallInf["bootproto"]:"dhcp"=="static") { + // add broadcast interface #suse49131 + ifcfg=sformat("BOOTPROTO='static'\nIPADDR='%1/%2'\nBROADCAST='%3'\n", + InstallInf["ipaddr"]:"", Netmask::ToBits(InstallInf["netmask"]:""), InstallInf["bcast"]:""); + if(size(InstallInf["ipaddr6"]:"")>0){ + ifcfg=sformat("%1\n%2", ifcfg, + sformat("LABEL_ipv6='ipv6'\nIPADDR_ipv6='%1'\n", InstallInf["ipaddr6"]:"") + ); + } + } + else { + //DHCP (also for IPv6) setup + if (InstallInf["bootproto"]:""=="dhcp") ifcfg="BOOTPROTO='dhcp4'\n"; + else if (InstallInf["bootproto"]:""=="dhcp6") ifcfg="BOOTPROTO='dhcp6'\n"; + else if (InstallInf["bootproto"]:""=="dhcp,dhcp6") ifcfg="BOOTPROTO='dhcp'\n"; + + // set DHCP_SET_HOSTNAME=yes #suse30528 + y2milestone("set DHCLIENT_SET_HOSTNAME=yes on installed system"); + SCR::Execute(.target.bash_output, "sed -i s/\"DHCLIENT_SET_HOSTNAME=.*\"/'DHCLIENT_SET_HOSTNAME=\"yes\"'/g /etc/sysconfig/network/dhcp"); + } + + if (network_disk == 0) { + ifcfg = sformat("%1STARTMODE='onboot'\n", ifcfg); + } + else if (network_disk > 0) { + ifcfg = sformat("%1STARTMODE='nfsroot'\n", ifcfg); + } + } - // for queth devices (s390) - // bnc#578689 - YaST2 should not write the MAC address into ifcfg file - if ((Arch::s390()) && (size(InstallInf["hwaddr"]:"")>0)) - network_configuration = sformat("%1LLADDR='%2'\n", network_configuration, InstallInf["hwaddr"]:""); + // wireless devices (bnc#223570) + if ( size(InstallInf["WESSID"]:"")>0 ) { + ifcfg = sformat("%1WIRELESS_ESSID='%2'\n", ifcfg, InstallInf["WESSID"]:""); + + switch(InstallInf["WAuth"]:"") { + case "" : // "" means wpa-psk + case "psk" : + ifcfg = sformat("%1WIRELESS_WPA_PSK='%2'\n", ifcfg, InstallInf["WKey"]:""); + ifcfg = sformat("%1WIRELESS_AUTH_MODE='psk'\n", ifcfg); + break; + case "open" : + ifcfg = sformat("%1WIRELESS_AUTH_MODE='no-encryption'\n", ifcfg); + break; + case "wep_open" : + case "wep_restricted" : + string type=""; + if (InstallInf["WkeyType"]:""=="password") type="h:"; + else if (InstallInf["WkeyType"]:""=="ascii") type="s:"; + ifcfg = sformat("%1WIRELESS_AUTH_MODE='%2'\n", ifcfg, (InstallInf["WAuth"]:""=="wep-open") ? "open" : "sharedkey"); + ifcfg = sformat("%1WIRELESS_DEFAULT_KEY='0'\n", ifcfg); + ifcfg = sformat("%1WIRELESS_KEY_0='%2%3'\n", ifcfg, type, InstallInf["WKey"]:""); + ifcfg = sformat("%1WIRELESS_KEY_LENGTH='%2'\n", ifcfg, InstallInf["WKeyLen"]:""); + if (size(InstallInf["WKeyType"]:"")>0 && size(InstallInf["WKey"]:"")>0) { + ifcfg = sformat("%1WIRELESS_KEY_0='%2:%3'\n", ifcfg, + substring(InstallInf["WKeyType"]:"", 0, 1), InstallInf["WKey"]:""); + } + break; + } + } + // if available, write MTU + if (size(InstallInf["mtu"]:"")>0) { + ifcfg = sformat("%1MTU='%2'\n", ifcfg, InstallInf["mtu"]:""); + } + // for queth devices (s390) + // bnc#578689 - YaST2 should not write the MAC address into ifcfg file + if ((Arch::s390()) && (size(InstallInf["hwaddr"]:"")>0)) { + ifcfg = sformat("%1LLADDR='%2'\n", ifcfg, InstallInf["hwaddr"]:""); + } // point to point interface - if (size(InstallInf["remote_ip"]:"")>0) - network_configuration = sformat("%1REMOTE_IPADDR='%2'\n", network_configuration, InstallInf["remote_ip"]:""); + if (size(InstallInf["remote_ip"]:"")>0) { + ifcfg = sformat("%1REMOTE_IPADDR='%2'\n", ifcfg, InstallInf["remote_ip"]:""); + } - string ifcfg = sformat("ifcfg-%1", netdevice); + string new_netdevice = netdevice; + if (! LanUdevAuto::AllowUdevModify()) { + string cmd = sformat("biosdevname --policy=all_names -i %1", netdevice); + string out = String::FirstChunk(StdoutOf(cmd), "\n"); + if (out != "") { + y2milestone ("biosdevname renames %1 to %2", netdevice, out); + new_netdevice = out; + } + } + + string ifcfg_name = sformat("ifcfg-%1", new_netdevice); - string hw_name = BuildDescription(NetworkInterfaces::device_type(netdevice), NetworkInterfaces::device_num(ifcfg), $["dev_name":netdevice], hardware); + string hw_name = BuildDescription(NetworkInterfaces::device_type(netdevice), + NetworkInterfaces::device_num(ifcfg_name), + $["dev_name":netdevice], + hardware); // protect special characters, #305343 - if (size(hw_name)>0) - network_configuration = sformat("%1NAME='%2'\n", network_configuration, String::Quote (hw_name)); + if (size(hw_name)>0) { + ifcfg = sformat("%1NAME='%2'\n", ifcfg, String::Quote (hw_name)); + } - y2milestone("Network Configuration:\n%1\nifcfg file: %2", network_configuration, ifcfg); + y2milestone("Network Configuration:\n%1\nifcfg file: %2", ifcfg, ifcfg_name); // write only if file doesn't exists - string dev_file=sformat("/etc/sysconfig/network/%1", ifcfg); - // string dev_file=sformat("/tmp/%1", ifcfg); + string dev_file=sformat("/etc/sysconfig/network/%1", ifcfg_name); - SCR::Write(.target.string, dev_file, network_configuration); - y2milestone("ifcfg file: %1", dev_file); + SCR::Write(.target.string, dev_file, ifcfg); + y2milestone("ifcfg file: %1", dev_file); } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/installation/inst_hostname.ycp new/yast2-network-2.21.0/src/installation/inst_hostname.ycp --- old/yast2-network-2.20.10/src/installation/inst_hostname.ycp 2010-03-16 13:41:08.000000000 +0100 +++ new/yast2-network-2.21.0/src/installation/inst_hostname.ycp 2011-07-22 17:19:32.000000000 +0200 @@ -14,6 +14,7 @@ import "Arch"; import "DNS"; import "GetInstArgs"; +import "Host"; import "NetworkConfig"; import "String"; import "Wizard"; @@ -57,6 +58,10 @@ if (ret == `next) { + Host::Read(); + Host::ResolveHostnameToStaticIPs(); + Host::Write(); + // do not let Lan override us, #152218 DNS::proposal_valid = true; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/lan/YaPI/NETWORK.pm new/yast2-network-2.21.0/src/lan/YaPI/NETWORK.pm --- old/yast2-network-2.20.10/src/lan/YaPI/NETWORK.pm 2010-12-20 15:31:59.000000000 +0100 +++ new/yast2-network-2.21.0/src/lan/YaPI/NETWORK.pm 2011-05-30 16:33:26.000000000 +0200 @@ -4,11 +4,11 @@ use YaST::YCP qw(:LOGGING); use YaPI; use Data::Dumper; -use Switch; # ------------------- imported modules YaST::YCP::Import ("LanItems"); YaST::YCP::Import ("Hostname"); +YaST::YCP::Import ("Host"); YaST::YCP::Import ("DNS"); YaST::YCP::Import ("Routing"); # ------------------------------------- @@ -19,43 +19,53 @@ # TODO: parameter map<string, boolean> what_I_Need BEGIN{$TYPEINFO{Read} = ["function", - [ "map", "string", "any"]]; + [ "map", "string", "any"]]; } sub Read { - my $self = shift; + my $self = shift; -# Hostname->Read(); - DNS->Read(); - Routing->Read(); - LanItems->Read(); - - my %interfaces = (); - foreach my $devnum (keys %{LanItems->Items}){ - LanItems->current($devnum); - if (LanItems->IsItemConfigured()){ - my %configuration = (); - LanItems->SetItem(); - if (LanItems->isCurrentDHCP()){ - %configuration = ( 'bootproto' => LanItems->bootproto ); - } elsif (LanItems->bootproto eq "static"){ - %configuration = ( 'bootproto' => 'static' ); - $configuration{'ipaddr'} = LanItems->ipaddr . "/" . LanItems->prefix; - } - $interfaces{LanItems->interfacename}=\%configuration; - } elsif (LanItems->getCurrentItem()->{'hwinfo'}->{'type'} eq "eth") { - my $device = LanItems->getCurrentItem()->{"hwinfo"}->{"dev_name"}; - $interfaces{$device}= {}; + DNS->Read(); + Routing->Read(); + LanItems->Read(); + + my %interfaces = (); + foreach my $devnum (keys %{LanItems->Items}){ + LanItems->current($devnum); + if (LanItems->IsItemConfigured()){ + my %configuration = (); + LanItems->SetItem(); + if (LanItems->isCurrentDHCP()){ + %configuration = ( 'bootproto' => LanItems->bootproto ); + } elsif (LanItems->bootproto eq "static"){ + %configuration = ( 'bootproto' => 'static' ); + $configuration{'ipaddr'} = LanItems->ipaddr . "/" . LanItems->prefix; + } + $interfaces{LanItems->interfacename}=\%configuration; + } elsif (LanItems->getCurrentItem()->{'hwinfo'}->{'type'} eq "eth") { + my $device = LanItems->getCurrentItem()->{"hwinfo"}->{"dev_name"}; + $interfaces{$device}= {}; } - } + } - #FIXME: validate for nil values (dns espacially) - my %ret = ('interfaces'=>\%interfaces, - 'routes'=>{'default'=>{'via'=>Routing->GetGateway()}}, - 'dns'=>{'nameservers'=>\@{DNS->nameservers}, 'searches'=>\@{DNS->searchlist}}, - 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain, 'dhcp_hostname'=>DNS->dhcp_hostname} -# 'hostname'=>{'name'=>Hostname->CurrentHostname, 'domain'=>Hostname->CurrentDomain} - ); - return \%ret; + #FIXME: validate for nil values (dns espacially) + my %ret = ( + 'interfaces' => \%interfaces, + 'routes' => { + 'default' => { + 'via' => Routing->GetGateway() + } + }, + 'dns' => { + 'nameservers' => \@{DNS->nameservers}, + 'searches' => \@{DNS->searchlist} + }, + 'hostname' => { + 'name' => Hostname->CurrentHostname, + 'domain' => Hostname->CurrentDomain, + 'dhcp_hostname' => DNS->dhcp_hostname + } + ); + return \%ret; } sub writeRoute { @@ -66,121 +76,124 @@ my $dest=""; my @route = (); if (defined ($args->{'route'}->{'default'}->{'via'})){ - $gw = $args->{'route'}->{'default'}->{'via'}; - if ($gw ne ""){ - YaST::YCP::Import ("IP"); - unless (IP->Check4($gw)) { - $ret{'exit'} = -1; - $ret{'error'} = IP->Valid4(); - return \%ret; - }; - $dest = "default"; - @route = ( {"destination" => $dest, + $gw = $args->{'route'}->{'default'}->{'via'}; + if ($gw ne ""){ + YaST::YCP::Import ("IP"); + unless (IP->Check4($gw)) { + $ret{'exit'} = -1; + $ret{'error'} = IP->Valid4(); + return \%ret; + }; + $dest = "default"; + @route = ( {"destination" => $dest, "gateway" => $gw, "netmask" => "-", "device" => "-" - }); - } + }); + } } Routing->Read(); y2milestone("YaPI->Write before change Routes:", Dumper(Routing->Routes)); Routing->Routes( \@route ); y2milestone("YaPI->Write after change Routes:", Dumper(Routing->Routes)); Routing->Write(); - return \%ret; + return \%ret; } sub writeHostname { - my $args = shift; - my $ret = {'exit'=>0, 'error'=>''}; - y2milestone("hostname", Dumper(\$args->{'hostname'})); - DNS->Read(); - DNS->hostname($args->{'hostname'}->{'name'}); - DNS->domain($args->{'hostname'}->{'domain'}); - DNS->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined $args->{'hostname'}->{'dhcp_hostname'}); - DNS->modified(1); - DNS->Write(); - return $ret; + my $args = shift; + my $ret = {'exit'=>0, 'error'=>''}; + y2milestone("hostname", Dumper(\$args->{'hostname'})); + DNS->Read(); + DNS->hostname($args->{'hostname'}->{'name'}); + DNS->domain($args->{'hostname'}->{'domain'}); + DNS->dhcp_hostname($args->{'hostname'}->{'dhcp_hostname'}) if (defined $args->{'hostname'}->{'dhcp_hostname'}); + DNS->modified(1); + DNS->Write(); + Host->Read(); + Host->EnsureHostnameResolvable(); + Host->Write(); + return $ret; } sub writeDNS { - my $args = shift; - my $ret = {'exit'=>0, 'error'=>''}; - y2milestone("dns", Dumper(\$args->{'dns'})); - DNS->Read(); - DNS->nameservers($args->{'dns'}->{'nameservers'}); - DNS->searchlist($args->{'dns'}->{'searches'}); - DNS->modified(1); - DNS->Write(); - return $ret; + my $args = shift; + my $ret = {'exit'=>0, 'error'=>''}; + y2milestone("dns", Dumper(\$args->{'dns'})); + DNS->Read(); + DNS->nameservers($args->{'dns'}->{'nameservers'}); + DNS->searchlist($args->{'dns'}->{'searches'}); + DNS->modified(1); + DNS->Write(); + return $ret; } sub writeInterfaces { - my $args = shift; - my $ret = {'exit'=>0, 'error'=>''}; - y2milestone("interface", Dumper(\$args->{'interface'})); - foreach my $dev (keys %{$args->{'interface'}}){ - YaST::YCP::Import ("NetworkInterfaces"); - NetworkInterfaces->Read(); - NetworkInterfaces->Add() unless NetworkInterfaces->Edit($dev); - NetworkInterfaces->Name($dev); - my $ip = $args->{'interface'}->{$dev}->{'ipaddr'}; - my $prefix="32"; - YaST::YCP::Import ("Netmask"); - my @ip_row = split(/\//, $ip); - $prefix = $ip_row[$#ip_row]; - if (Netmask->Check4($prefix) && $prefix =~ /\./){ - y2milestone("Valid netmask: ", $prefix, " will change to prefixlen"); - $prefix = Netmask->ToBits($prefix); - } - $ip = $ip_row[0]."/".$prefix; - my %config=("STARTMODE" => "auto", - "BOOTPROTO" => $args->{'interface'}->{$dev}->{'bootproto'}, - "IPADDR" => $ip - ); - NetworkInterfaces->Current(\%config); - NetworkInterfaces->Commit(); - NetworkInterfaces->Write(""); - YaST::YCP::Import ("Service"); - Service->Restart("network"); - } - return $ret; + my $args = shift; + my $ret = {'exit'=>0, 'error'=>''}; + y2milestone("interface", Dumper(\$args->{'interface'})); + foreach my $dev (keys %{$args->{'interface'}}){ + YaST::YCP::Import ("NetworkInterfaces"); + NetworkInterfaces->Read(); + NetworkInterfaces->Add() unless NetworkInterfaces->Edit($dev); + NetworkInterfaces->Name($dev); + my $ip = $args->{'interface'}->{$dev}->{'ipaddr'}; + my $prefix="32"; + YaST::YCP::Import ("Netmask"); + my @ip_row = split(/\//, $ip); + $prefix = $ip_row[$#ip_row]; + if (Netmask->Check4($prefix) && $prefix =~ /\./){ + y2milestone("Valid netmask: ", $prefix, " will change to prefixlen"); + $prefix = Netmask->ToBits($prefix); + } + $ip = $ip_row[0]."/".$prefix; + my %config=("STARTMODE" => "auto", + "BOOTPROTO" => $args->{'interface'}->{$dev}->{'bootproto'}, + "IPADDR" => $ip + ); + NetworkInterfaces->Current(\%config); + NetworkInterfaces->Commit(); + NetworkInterfaces->Write(""); + YaST::YCP::Import ("Service"); + Service->Restart("network"); + } + return $ret; } BEGIN{$TYPEINFO{Write} = ["function", - ["map","string","any"],["map","string","any"]]; + ["map","string","any"],["map","string","any"]]; } sub Write { - my $self = shift; - my $args = shift; - y2milestone("YaPI->Write with settings:", Dumper(\$args)); - - # SAVE DEFAULT ROUTE - if (exists($args->{'route'})){ - my $route_ret = writeRoute($args); - return $route_ret if ($route_ret->{'exit'} != 0); - } - # SAVE HOSTNAME - if (exists($args->{'hostname'})){ - my $hn_ret = writeHostname($args); - return $hn_ret if ($hn_ret->{'exit'} != 0); - } - # SAVE DNS Settings - if (exists($args->{'dns'})){ - my $dns_ret = writeDNS($args); - return $dns_ret if ($dns_ret->{'exit'} != 0); - } - # SAVE interfaces Settings - if (exists($args->{'interface'})){ - my $ifc_ret = writeInterfaces($args); - return $ifc_ret if ($ifc_ret->{'exit'} != 0); - } - - # return value for exit is type integer, but it'll be converted into string (in yast-perl-bindings) - # that means in rest-api it'll be {'exit'=>'0', 'error'=>''} - return {'exit'=>0, 'error'=>''}; + my $self = shift; + my $args = shift; + y2milestone("YaPI->Write with settings:", Dumper(\$args)); + + # SAVE DEFAULT ROUTE + if (exists($args->{'route'})){ + my $route_ret = writeRoute($args); + return $route_ret if ($route_ret->{'exit'} != 0); + } + # SAVE HOSTNAME + if (exists($args->{'hostname'})){ + my $hn_ret = writeHostname($args); + return $hn_ret if ($hn_ret->{'exit'} != 0); + } + # SAVE DNS Settings + if (exists($args->{'dns'})){ + my $dns_ret = writeDNS($args); + return $dns_ret if ($dns_ret->{'exit'} != 0); + } + # SAVE interfaces Settings + if (exists($args->{'interface'})){ + my $ifc_ret = writeInterfaces($args); + return $ifc_ret if ($ifc_ret->{'exit'} != 0); + } + + # return value for exit is type integer, but it'll be converted into string (in yast-perl-bindings) + # that means in rest-api it'll be {'exit'=>'0', 'error'=>''} + return {'exit'=>0, 'error'=>''}; } 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/lan/address.ycp new/yast2-network-2.21.0/src/lan/address.ycp --- old/yast2-network-2.20.10/src/lan/address.ycp 2011-01-03 16:00:07.000000000 +0100 +++ new/yast2-network-2.21.0/src/lan/address.ycp 2011-07-22 17:34:41.000000000 +0200 @@ -125,9 +125,6 @@ */ void InitVLANSlave(string key) { - settings["ETHERDEVICE"] = NetworkInterfaces::Current["ETHERDEVICE"]:""; - settings["VLAN_ID"] = tointeger(NetworkInterfaces::Current["VLAN_ID"]:"0"); - list items = []; // unconfigured devices foreach(integer i, map a, (map<integer, map>)LanItems::Items,{ @@ -150,16 +147,10 @@ symbol HandleVLANSlave(string key, map event){ - if (event["EventReason"]:""=="ValueChanged"){ - string configname = sformat("%1.%2", UI::QueryWidget(`id(`vlan_eth), `Value), UI::QueryWidget(`id(`vlan_id), `Value)); - NetworkInterfaces::Name = configname; - LanItems::Items[LanItems::current, "ifcfg"]= configname; - UI::ChangeWidget(`id("IFCFGID"), `Value, configname); - } - return nil; + // formerly tried to edit ifcfg name. bad idea, surrounding code not ready + return nil; } - /** * Default function to store the value of ETHERDEVICE devices box. * @param key id of the widget @@ -945,6 +936,11 @@ // TODO: dynamic for dummy. or add dummy from outside? boolean no_dhcp = is_ptp || settings["IFCFGTYPE"]:"" == "dummy" || LanItems::alias != ""; + if (LanItems::type == "vlan") { + settings["ETHERDEVICE"] = LanItems::vlan_etherdevice; + settings["VLAN_ID"] = tointeger(LanItems::vlan_id); + } + if (contains(["tun", "tap"], LanItems::type)) { settings = $[ @@ -1233,7 +1229,10 @@ // address tab if(LanItems::operation == `add) { LanItems::device = NetworkInterfaces::device_num(ifcfgname); - LanItems::type = NetworkInterfaces::device_type(ifcfgname); + LanItems::type = NetworkInterfaces::GetTypeFromIfcfg(settings); + if (LanItems::type == nil) { + LanItems::type = NetworkInterfaces::device_type(ifcfgname); + } } LanItems::bootproto = settings["BOOTPROTO"]:""; @@ -1277,9 +1276,7 @@ if (LanItems::type == "vlan"){ LanItems::vlan_etherdevice = settings["ETHERDEVICE"]:""; -y2internal("%1, %2", LanItems::vlan_id, (integer)settings["VLAN_ID"]:0); LanItems::vlan_id = tostring((integer)settings["VLAN_ID"]:0); -y2internal("%1", LanItems::vlan_id); } else if (LanItems::type == "br"){ LanItems::bridge_ports = settings["BRIDGE_PORTS"]:""; } else if (contains(["tun", "tap"], LanItems::type)){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/lan/bridge.ycp new/yast2-network-2.21.0/src/lan/bridge.ycp --- old/yast2-network-2.20.10/src/lan/bridge.ycp 2010-12-20 15:31:59.000000000 +0100 +++ new/yast2-network-2.21.0/src/lan/bridge.ycp 2011-07-01 13:21:38.000000000 +0200 @@ -79,7 +79,7 @@ if ((string)configurations[NetworkInterfaces::GetType(device), device, "IPADDR"]:"" != "0.0.0.0" && (string)configurations[NetworkInterfaces::GetType(device), device, "BOOTPROTO"]:"" != "none") { if(!confirmed) { valid = Popup::ContinueCancel(_("At least one selected device is already configured. -Adapt the configuration for bridge (IP addess 0.0.0.0/32)? +Adapt the configuration for bridge (IP address 0.0.0.0/32)? ")); confirmed=true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/lan/hardware.ycp new/yast2-network-2.21.0/src/lan/hardware.ycp --- old/yast2-network-2.20.10/src/lan/hardware.ycp 2011-01-03 16:00:07.000000000 +0100 +++ new/yast2-network-2.21.0/src/lan/hardware.ycp 2011-07-22 17:34:59.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Hardware dialogs * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: hardware.ycp 63021 2010-12-22 23:32:50Z mzugec $ + * $Id: hardware.ycp 64700 2011-07-01 11:42:29Z mvidner $ */ { @@ -38,7 +38,7 @@ ") + _("Show visible port identification allows you to physically identify now configured NIC. -Set appropriate time, click Blink and LED diods on you NIC will start blinking for selected time. +Set appropriate time, click Blink and LED diodes on you NIC will start blinking for selected time. ")+ /* Manual network card setup help 2/4 */ @@ -531,10 +531,9 @@ LanItems::startmode="auto"; } if (LanItems::type=="vlan"){ - string vlanid=(string) UI::QueryWidget(`id(`num), `Value); - NetworkInterfaces::Current["VLAN_ID"] = vlanid; + LanItems::vlan_id = (string) UI::QueryWidget(`id(`num), `Value); } - } +} string driver = (string) UI::QueryWidget(`modul, `Value); LanItems::setDriver(driver); @@ -786,7 +785,7 @@ if (control==nil) control=""; LanItems::qeth_chanids = String::CutBlanks( sformat("%1 %2 %3", read, write, control) ); if (!LanItems::createS390Device()){ - Popup::Error(_("An error occured while creating device.\nSee YaST log for details.")); + Popup::Error(_("An error occurred while creating device.\nSee YaST log for details.")); ret=nil; continue; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/lan/help.ycp new/yast2-network-2.21.0/src/lan/help.ycp --- old/yast2-network-2.20.10/src/lan/help.ycp 2010-12-20 15:31:59.000000000 +0100 +++ new/yast2-network-2.21.0/src/lan/help.ycp 2011-07-01 13:36:13.000000000 +0200 @@ -175,7 +175,7 @@ /* Address dialog help 6/8 */ "netmask": _("For Static Address Setup 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> or just lenght of prefix <tt>/24</tt>).Optionally, you can enter +the network mask (usually <tt>255.255.255.0</tt> or just length of prefix <tt>/24</tt>).Optionally, you can enter a fully qualified hostname for this IP address. The hostname will be written to <tt>/etc/hosts</tt>. ") + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/modules/DSL.ycp new/yast2-network-2.21.0/src/modules/DSL.ycp --- old/yast2-network-2.20.10/src/modules/DSL.ycp 2009-04-03 14:42:29.000000000 +0200 +++ new/yast2-network-2.21.0/src/modules/DSL.ycp 2011-02-15 15:20:10.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: DSL data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: DSL.ycp 56143 2009-03-16 13:50:56Z mzugec $ + * $Id: DSL.ycp 63424 2011-02-15 14:20:09Z mvidner $ * * Representation of the configuration of DSL. * Input and output routines. @@ -568,7 +568,7 @@ global list<string> Packages() { if(size(NetworkInterfaces::List("dsl")) < 1) return []; - return ["smpppd", "ppp", "pptp", "linux-atm-lib"]; + return ["smpppd", "ppp", "pptp", "libatm1"]; } /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/modules/Host.ycp new/yast2-network-2.21.0/src/modules/Host.ycp --- old/yast2-network-2.20.10/src/modules/Host.ycp 2010-12-20 15:31:59.000000000 +0100 +++ new/yast2-network-2.21.0/src/modules/Host.ycp 2011-07-22 17:24:01.000000000 +0200 @@ -303,6 +303,27 @@ return summary; } +list<string> StaticIPs() { + NetworkInterfaces::Read (); + list<string> devs = NetworkInterfaces::Locate ("BOOTPROTO", "static"); + devs = filter(string dev, devs, { return dev != "lo"; }); + list<string> ips = maplist(string dev, devs, { + return NetworkInterfaces::GetValue(dev, "IPADDR"); + }); + y2milestone("ifcfgs: %1 IPs: %2", devs, ips); + return ips; +} + +// if we have a static address, +// make sure /etc/hosts resolves it to our, bnc#664929 +global void ResolveHostnameToStaticIPs() { + list<string> static_ips = StaticIPs(); + if (size(static_ips) > 0) {// excluding lo + string fqhostname = Hostname::MergeFQ( DNS::hostname, DNS::domain); + Update(fqhostname, fqhostname, static_ips); + } +} + /** * Function which returns if the settings were modified * @return boolean settings were modified diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/modules/Lan.ycp new/yast2-network-2.21.0/src/modules/Lan.ycp --- old/yast2-network-2.20.10/src/modules/Lan.ycp 2010-12-20 15:31:58.000000000 +0100 +++ new/yast2-network-2.21.0/src/modules/Lan.ycp 2011-07-22 17:31:40.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Network card data * Authors: Michal Svec <msvec(a)suse.cz> * - * $Id: Lan.ycp 63004 2010-12-17 09:59:53Z mzugec $ + * $Id: Lan.ycp 64081 2011-05-20 11:45:06Z mvidner $ * * Representation of the configuration of network cards. * Input and output routines. @@ -431,8 +431,9 @@ if(Abort()) return false; /* Progress step 3 - multiple devices may be present, really plural*/ ProgressNextStage(_("Writing device configuration...")); - if (!Mode::autoinst()) + if (!Mode::autoinst() && LanUdevAuto::AllowUdevModify()) { LanItems::WriteUdevDriverRules(); + } NetworkInterfaces::Write("netcard"); // WriteDevices(); sleep(sl); @@ -448,6 +449,7 @@ ProgressNextStage(_("Writing routing configuration...")); boolean orig = Progress::set (false); Routing::Write(); + Progress::set (orig); sleep(sl); if(Abort()) return false; @@ -455,6 +457,7 @@ ProgressNextStage(_("Writing hostname and DNS configuration...")); // write resolv.conf after change from dhcp to static (#327074) // reload/restart network before this to put correct resolv.conf from dhcp-backup + orig = Progress::set (false); DNS::Write(); Host::EnsureHostnameResolvable(); Host::Write(); @@ -488,7 +491,7 @@ if (Mode::installation() && NetworkService::IsManaged()) y2internal("Export sysconfig settings into NetworkManager %1", SCR::Execute(.target.bash_output, "/usr/lib/NetworkManager/nm-opensuse-sysconfig-merge --connections")); y2internal("virt_net_proposal %1", virt_net_proposal); - if (Stage::cont() && virt_net_proposal && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) { + if (Stage::cont() && virt_net_proposal == true && (Linuxrc::usessh() || Linuxrc::vnc() || Linuxrc::display_ip())) { UI::OpenDialog(`opt(`decorated), `HBox( `HSpacing(1), `HCenter(`HSquash(`VBox( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/modules/LanItems.ycp new/yast2-network-2.21.0/src/modules/LanItems.ycp --- old/yast2-network-2.20.10/src/modules/LanItems.ycp 2011-01-03 16:00:06.000000000 +0100 +++ new/yast2-network-2.21.0/src/modules/LanItems.ycp 2011-07-22 18:02:16.000000000 +0200 @@ -473,119 +473,139 @@ list<string> overview=[]; list<string> links=[]; map startmode_descrs = $[ - // summary description of STARTMODE=auto - "auto": _("Started automatically at boot"), - // summary description of STARTMODE=auto - "onboot": _("Started automatically at boot"), - // summary description of STARTMODE=hotplug - "hotplug": _("Started automatically at boot"), - // summary description of STARTMODE=ifplugd - "ifplugd": _("Started automatically on cable connection"), - // summary description of STARTMODE=managed - "managed": _("Managed by NetworkManager"), - // summary description of STARTMODE=off - "off" : _("Will not be started at all") - ]; - - - foreach(integer key, (list<integer>)Map::Keys(Items), { - string rich = ""; - string ip = _("Not configured"); - string descr = Items[key, "hwinfo", "name"]:""; - type = Items[key, "hwinfo", "type"]:""; - descr = CheckEmptyName (type, descr); - list <string> bullets = []; - - if (hasAnyValue(Items[key, "ifcfg"]:"") ){ - NetworkInterfaces::Select(Items[key, "ifcfg"]:""); - if (!hasAnyValue(type)) type = NetworkInterfaces::GetType(Items[key, "ifcfg"]:""); - descr = BuildDescription(type, NetworkInterfaces::GetType(Items[key, "ifcfg"]:""), NetworkInterfaces::Current, [Items[key, "hwinfo"]:$[]]); - string dev = NetworkInterfaces::Name; //NetworkInterfaces::device_name(type, NetworkInterfaces::Name); - ip = DeviceProtocol(NetworkInterfaces::Current); - string status = DeviceStatus(type, NetworkInterfaces::device_num(NetworkInterfaces::Name), NetworkInterfaces::Current); - - - string startmode_descr = startmode_descrs[NetworkInterfaces::Current["STARTMODE"]:""]:_("Started manually"); - - bullets = [ - sformat(_("Device Name: %1"), dev), - startmode_descr, - ]; - if (NetworkInterfaces::Current["STARTMODE"]:"" != "managed") - { - if (ip != "NONE") - { - string prefixlen = NetworkInterfaces::Current["PREFIXLEN"]:""; - if (size(ip)>0){ - string descr = sformat("%1 %2", _("IP address assigned using"), ip); - if (!issubstring(ip, "DHCP")) descr=(size(prefixlen)>0) ? + // summary description of STARTMODE=auto + "auto": _("Started automatically at boot"), + // summary description of STARTMODE=auto + "onboot": _("Started automatically at boot"), + // summary description of STARTMODE=hotplug + "hotplug": _("Started automatically at boot"), + // summary description of STARTMODE=ifplugd + "ifplugd": _("Started automatically on cable connection"), + // summary description of STARTMODE=managed + "managed": _("Managed by NetworkManager"), + // summary description of STARTMODE=off + "off" : _("Will not be started at all") + ]; + + foreach(integer key, (list<integer>)Map::Keys(Items), { + string rich = ""; + string ip = _("Not configured"); + string descr = Items[key, "hwinfo", "name"]:""; + type = Items[key, "hwinfo", "type"]:""; + descr = CheckEmptyName (type, descr); + list <string> bullets = []; + + if (hasAnyValue(Items[key, "ifcfg"]:"") ){ + NetworkInterfaces::Select(Items[key, "ifcfg"]:""); + if (!hasAnyValue(type)) type = NetworkInterfaces::GetType(Items[key, "ifcfg"]:""); + descr = BuildDescription(type, NetworkInterfaces::GetType(Items[key, "ifcfg"]:""), NetworkInterfaces::Current, [Items[key, "hwinfo"]:$[]]); + string dev = NetworkInterfaces::Name; //NetworkInterfaces::device_name(type, NetworkInterfaces::Name); + ip = DeviceProtocol(NetworkInterfaces::Current); + string status = DeviceStatus(type, NetworkInterfaces::device_num(NetworkInterfaces::Name), NetworkInterfaces::Current); + + string startmode_descr = startmode_descrs[NetworkInterfaces::Current["STARTMODE"]:""]:_("Started manually"); + + bullets = [ + sformat(_("Device Name: %1"), dev), + startmode_descr, + ]; + + if (NetworkInterfaces::Current["STARTMODE"]:"" != "managed") { + if (ip != "NONE") { + string prefixlen = NetworkInterfaces::Current["PREFIXLEN"]:""; + if (size(ip)>0) { + string descr = sformat("%1 %2", _("IP address assigned using"), ip); + if (!issubstring(ip, "DHCP")) + descr=(size(prefixlen)>0) ? sformat(_("IP address: %1/%2"), ip, prefixlen) : sformat(_("IP address: %1, subnet mask %2") - , ip, NetworkInterfaces::Current["NETMASK"]:""); - bullets = bullets + [ descr ]; - } - } - // build aliases overview - if (size(NetworkInterfaces::Current["_aliases"]:$[])>0 && !NetworkService::IsManaged()){ - foreach(string key, map<string, any> desc, (map<string ,map<string, any> >) NetworkInterfaces::Current["_aliases"]:$[], { - string parameters = sformat("%1/%2", desc["IPADDR"]:"", desc["PREFIXLEN"]:""); - bullets = add(bullets, sformat("%1 (%2)", desc["LABEL"]:"", parameters) ); - }); - } - } - - if (type == "wlan" && - !(NetworkInterfaces::Current["WIRELESS_AUTH_MODE"]:"" != "open") && - !hasAnyValue(NetworkInterfaces::Current["WIRELESS_KEY_0"]:"")) - { - // avoid colons - dev = mergestring (splitstring (dev, ":"), "/"); - string href = "lan--wifi-encryption-" + dev; - // interface summary: WiFi without encryption - string warning = HTML::Colorize (_("Warning: no encryption is used."), "red"); - status = status + " " + warning + " " + - // Hyperlink: Change the configuration of an interface - Hyperlink (href, _("Change.")); - links = add (links, href); - } - - overview = add(overview, Summary::Device(descr, status)); - } 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 mac_dev = HTML::Bold ("MAC : ") + Items[key, "hwinfo", "mac"]:"" + " "; - string bus_id = HTML::Bold ("BusID : ") + Items[key, "hwinfo", "busid"]:"" + " "; - if (hasAnyValue(Items[key, "hwinfo", "mac"]:"")) rich = " " + conn + " " + mac_dev; - if (hasAnyValue(Items[key, "hwinfo", "busid"]:"")) rich = rich + bus_id; - rich = HTML::Bold ( descr ) + rich; - - if (!hasAnyValue(Items[key, "hwinfo", "dev_name"]:"") && size(Items[key, "hwinfo"]:$[])>0 && !Arch::s390()) - rich = rich + _("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."); - else if (hasAnyValue(Items[key, "ifcfg"]:"") ) rich = rich + HTML::List (bullets); - else { - rich = rich + _("The device is not configured. Press Edit + , ip, NetworkInterfaces::Current["NETMASK"]:""); + bullets = bullets + [ descr ]; + } + } + // build aliases overview + if (size(NetworkInterfaces::Current["_aliases"]:$[])>0 && !NetworkService::IsManaged()){ + foreach(string key, map<string, any> desc, (map<string ,map<string, any> >) NetworkInterfaces::Current["_aliases"]:$[], { + string parameters = sformat("%1/%2", desc["IPADDR"]:"", desc["PREFIXLEN"]:""); + bullets = add(bullets, sformat("%1 (%2)", desc["LABEL"]:"", parameters) ); + }); + } + } + + if (type == "wlan" && + !(NetworkInterfaces::Current["WIRELESS_AUTH_MODE"]:"" != "open") && + !hasAnyValue(NetworkInterfaces::Current["WIRELESS_KEY_0"]:"")) { + // avoid colons + dev = mergestring (splitstring (dev, ":"), "/"); + string href = "lan--wifi-encryption-" + dev; + // interface summary: WiFi without encryption + string warning = HTML::Colorize (_("Warning: no encryption is used."), "red"); + status = status + " " + warning + " " + + // Hyperlink: Change the configuration of an interface + Hyperlink (href, _("Change.")); + links = add (links, href); + } + + overview = add(overview, Summary::Device(descr, status)); + } + 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 mac_dev = HTML::Bold ("MAC : ") + Items[key, "hwinfo", "mac"]:"" + " "; + string bus_id = HTML::Bold ("BusID : ") + Items[key, "hwinfo", "busid"]:"" + " "; + + if (hasAnyValue(Items[key, "hwinfo", "mac"]:"")) { + rich = rich + " " + conn + " "; + rich = rich + mac_dev; + } + if (hasAnyValue(Items[key, "hwinfo", "busid"]:"")) { + rich = rich + bus_id; + } + // display it only if we need it, don't duplicate "dev" above + if (hasAnyValue(Items[key, "hwinfo", "dev_name"]:"") && + ! hasAnyValue(Items[key, "ifcfg"]:"")) { + string dev_name = sformat(_("Device Name: %1"), Items[key, "hwinfo", "dev_name"]:"" ); + string dev_name_r = HTML::Bold(dev_name) + " "; + rich = rich + dev_name_r; + } + + rich = HTML::Bold ( descr ) + rich; + + if (!hasAnyValue(Items[key, "hwinfo", "dev_name"]:"") && size(Items[key, "hwinfo"]:$[])>0 && !Arch::s390()) { + rich = rich + _("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."); + } + else if (hasAnyValue(Items[key, "ifcfg"]:"") ) { + rich = rich + HTML::List (bullets); + } + else { + rich = rich + _("The device is not configured. Press Edit to configure. "); - integer curr=current; - current=key; - if(needFirmwareCurrentItem()){ - string fw = GetFirmwareForCurrentItem(); - rich = rich+ sformat("%1 : %2", - _("Needed firmware"), (fw!="") ? fw : _("unknown")); - } - current=curr; - } - - Items[key, "table_descr"] = $[ - "rich_descr" : rich, - "table_descr": [descr, ip] - ]; - }); - return [ Summary::DevicesList(overview), links ]; + integer curr = current; + current = key; + if (needFirmwareCurrentItem()) { + string fw = GetFirmwareForCurrentItem(); + rich = rich+ sformat("%1 : %2", + _("Needed firmware"), + (fw!="") ? fw : _("unknown")); + } + current=curr; + } + + Items[key, "table_descr"] = $[ + "rich_descr" : rich, + "table_descr": [descr, ip] + ]; + }); + return [ Summary::DevicesList(overview), links ]; } @@ -833,7 +853,8 @@ usercontrol = GetDeviceVar (devmap, defaults, "USERCONTROL") == "yes"; description = GetDeviceVar (devmap, defaults, "NAME"); bond_option = GetDeviceVar(devmap, defaults, "BONDING_MODULE_OPTS"); - vlan_id = GetDeviceVar(devmap, defaults, "VLAN_ID"); + vlan_etherdevice = GetDeviceVar(devmap, defaults, "ETHERDEVICE"); + vlan_id = GetDeviceVar(devmap, defaults, "VLAN_ID"); // FIXME, remember that it can be implied from the name. probably bond_slaves=[]; foreach(any key, any value, devmap, @@ -927,7 +948,7 @@ "WIRELESS_FREQUENCY": "", "WIRELESS_BITRATE": "auto", "WIRELESS_AP": "", - "WIRELESS_POWER": "yes", + "WIRELESS_POWER": "", "PORTNAME": "", // aliases = devmap["_aliases"]:$[]; // ? "WIRELESS_EAP_MODE": "", @@ -1063,11 +1084,6 @@ newdev["BOOTPROTO"] = bootproto; } newdev["NAME"] = description; - // L3: bnc#585458 -// if (!issubstring(Items[current, "ifcfg"]:"", type)) newdev["INTERFACETYPE"]=type; - // exception for VLAN - // because of ethX.Y -// if (deletechars(Items[current, "ifcfg"]:"", "0123456789")!=type && type!="vlan") newdev["INTERFACETYPE"]=type; if(hotplug == "pcmcia") newdev["DHCLIENT_SET_DOWN_LINK"] = "yes"; @@ -1161,6 +1177,14 @@ "TUNNEL_SET_GROUP" : tunnel_set_group ]; } + + // L3: bnc#585458 + // FIXME: INTERFACETYPE confuses sysconfig, bnc#458412 + // Only test when newdev has enough info for GetTypeFromIfcfg to work. + if (NetworkInterfaces::GetTypeFromIfcfg(newdev) != type) { + newdev["INTERFACETYPE"]=type; + } + NetworkInterfaces::Name = Items[current, "ifcfg"]:""; NetworkInterfaces::Current = newdev; y2internal("%1", newdev); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/modules/LanUdevAuto.ycp new/yast2-network-2.21.0/src/modules/LanUdevAuto.ycp --- old/yast2-network-2.20.10/src/modules/LanUdevAuto.ycp 2010-12-20 15:31:58.000000000 +0100 +++ new/yast2-network-2.21.0/src/modules/LanUdevAuto.ycp 2011-07-22 17:31:40.000000000 +0200 @@ -12,6 +12,7 @@ { module "LanUdevAuto"; import "LanItems"; + import "Map"; include "network/routines.ycp"; textdomain "network"; @@ -20,6 +21,42 @@ list<map> s390_devices=[]; list <map> hardware=nil; +/** + * @return parameter from /etc/install.inf or nil + * @param name parameter name, case sensitive + */ +string InstallInfParameter(string name) { + path p = add(.etc.install_inf, name); + return (string) SCR::Read(p); +} + +/** + * @return parameter from the kernel(boot) command line or nil + * @param name parameter name, case sensitive + */ +string KernelCmdlineParameter(string name) { + string cmdline = InstallInfParameter("Cmdline"); + map cmdmap = Map::FromString(cmdline); // handles nil too + return (string) cmdmap[name]:nil; +} + +/** + * @return installation parameter or nil + * @param name parameter name, case sensitive + */ +string InstallationParameter(string name) { + string value = InstallInfParameter(name); + if (value == nil) { + value = KernelCmdlineParameter(name); + } + return value; +} + +// FATE#311332 +global boolean AllowUdevModify() { + return InstallationParameter("biosdevname") != "1"; +} + global string getDeviceName(string oldname){ string newname=oldname; if (hardware==nil) hardware=ReadHardware("netcard"); @@ -117,8 +154,10 @@ }); if (size(rules)>0){ y2milestone("Writing AY udev rules for network (will replace original rules from 1st stage)"); - SCR::Write(.udev_persistent.rules_comment, comment); - SCR::Write(.udev_persistent.rules, rules); + if (AllowUdevModify()){ + SCR::Write(.udev_persistent.rules_comment, comment); + SCR::Write(.udev_persistent.rules, rules); + } } else y2milestone("No udev rules defined by AY, nothing to write (keep original file)"); if (Arch::s390()){ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/remote/dialogs.ycp new/yast2-network-2.21.0/src/remote/dialogs.ycp --- old/yast2-network-2.20.10/src/remote/dialogs.ycp 2009-03-02 15:58:05.000000000 +0100 +++ new/yast2-network-2.21.0/src/remote/dialogs.ycp 2011-04-13 16:29:35.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Dialog for Remote Administration * Authors: Arvin Schnell <arvin(a)suse.de> * - * $Id: dialogs.ycp 54992 2009-01-26 11:43:30Z mzugec $ + * $Id: dialogs.ycp 63773 2011-04-13 14:29:35Z mvidner $ */ { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-2.20.10/src/services/dns.ycp new/yast2-network-2.21.0/src/services/dns.ycp --- old/yast2-network-2.20.10/src/services/dns.ycp 2010-03-16 13:41:08.000000000 +0100 +++ new/yast2-network-2.21.0/src/services/dns.ycp 2011-07-01 13:42:31.000000000 +0200 @@ -5,7 +5,7 @@ * Authors: Michal Svec <msvec(a)suse.cz> * Martin Vidner <mvidner(a)suse.cz> * - * $Id: dns.ycp 60556 2010-01-27 14:21:30Z kmachalkova $ + * $Id: dns.ycp 64700 2011-07-01 11:42:29Z mvidner $ */ { @@ -209,7 +209,7 @@ if (!dhn || value != "") { if (value=="local"){ - if (!Popup::YesNo(_("It's not recomended to use .local as domainname due to Multicast DNS. Use it on your own risk?"))) return false; + if (!Popup::YesNo(_("It's not recommended to use .local as domainname due to Multicast DNS. Use it at your own risk?"))) return false; } return Hostname::CheckDomain (value); } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit os-prober for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package os-prober for openSUSE:Factory checked in at Fri Jul 29 16:52:24 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/os-prober/os-prober.changes 2011-07-12 15:22:12.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Tue Jul 12 13:08:58 UTC 2011 - aj(a)suse.de + +- Create new package. + calling whatdependson for head-i586 New: ---- os-prober-SUSE.patch os-prober-newnsdirfix.patch os-prober.changes os-prober.spec os-prober_1.47.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ os-prober.spec ++++++ # # spec file for package os-prober # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: os-prober Version: 1.47 Release: 1 Summary: Probes disks on the system for installed operating systems License: GPL Url: http://kitenet.net/~joey/code/os-prober/ Group: System/Boot Source0: http://ftp.de.debian.org/debian/pool/main/o/os-prober/%{name}_%{version}.ta… # move newns binary outside of os-prober subdirectory, so that debuginfo # can be automatically generated for it Patch0: os-prober-newnsdirfix.patch # PATCH-FIX-OPENSUSE: Fix spelling of SUSE aj(a)suse.de Patch1: os-prober-SUSE.patch Requires: /bin/grep Requires: /bin/sed Requires: /sbin/modprobe Requires: coreutils Requires: dmraid Requires: lvm2 Requires: udev Requires: util-linux %description This package detects other OSes available on a system and outputs the results in a generic machine-readable format. Support for new OSes and Linux distributions can be added easily. %prep %setup -q -n %{name} %patch0 -p1 %patch1 -p1 %build make %{?_smp_mflags} CFLAGS="%{optflags}" %install install -m 0755 -d %{buildroot}%{_bindir} install -m 0755 -d %{buildroot}%{_localstatedir}/lib/%{name} install -m 0755 -p os-prober linux-boot-prober %{buildroot}%{_bindir} install -m 0755 -Dp newns %{buildroot}%{_libexecdir}/newns install -m 0644 -Dp common.sh %{buildroot}%{_datadir}/%{name}/common.sh %ifarch m68k ARCH=m68k %endif %ifarch ppc ppc64 ARCH=powerpc %endif %ifarch sparc sparc64 ARCH=sparc %endif %ifarch %{ix86} x86_64 ARCH=x86 %endif for probes in os-probes os-probes/mounted os-probes/init \ linux-boot-probes linux-boot-probes/mounted; do install -m 755 -d %{buildroot}%{_libexecdir}/$probes cp -a $probes/common/* %{buildroot}%{_libexecdir}/$probes if [ -e "$probes/$ARCH" ]; then cp -a $probes/$ARCH/* %{buildroot}%{_libexecdir}/$probes fi done if [ "$ARCH" = x86 ]; then install -m 755 -p os-probes/mounted/powerpc/20macosx \ %{buildroot}%{_libexecdir}/os-probes/mounted fi %files %defattr(-,root,root,-) %doc README TODO debian/copyright debian/changelog %{_bindir}/* %{_libexecdir}/linux-boot-probes %{_libexecdir}/newns %{_libexecdir}/os-probes %{_datadir}/%{name} %{_localstatedir}/lib/%{name} %changelog ++++++ os-prober-SUSE.patch ++++++ Index: os-prober/os-probes/mounted/common/90linux-distro =================================================================== --- os-prober.orig/os-probes/mounted/common/90linux-distro +++ os-prober/os-probes/mounted/common/90linux-distro @@ -80,7 +80,7 @@ if ls "$dir"/lib*/ld*.so* >/dev/null 2>/ short="RedHat" long="$(cat "$dir/etc/redhat-release")" elif [ -e "$dir/etc/SuSE-release" ]; then - short="SuSE" + short="SUSE" long="$(head -n 1 "$dir/etc/SuSE-release")" elif [ -e "$dir/etc/gentoo-release" ]; then short="Gentoo" ++++++ os-prober-newnsdirfix.patch ++++++ diff -up os-prober-1.46/common.sh.newnsmove os-prober-1.46/common.sh --- os-prober-1.46/common.sh.newnsmove 2011-04-10 05:30:57.000000000 +0430 +++ os-prober-1.46/common.sh 2011-05-04 04:08:09.603020037 +0430 @@ -1,5 +1,5 @@ newns () { - [ "$OS_PROBER_NEWNS" ] || exec /usr/lib/os-prober/newns "$0" "$@" + [ "$OS_PROBER_NEWNS" ] || exec /usr/lib/newns "$0" "$@" } cleanup_tmpdir=false ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit makeself for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package makeself for openSUSE:Factory checked in at Fri Jul 29 16:50:58 CEST 2011. -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/makeself/makeself.changes 2011-07-11 23:23:09.000000000 +0200 @@ -0,0 +1,16 @@ +------------------------------------------------------------------- +Mon Jul 11 21:21:20 UTC 2011 - malcolmlewis(a)opensuse.org + +- Update spec file License field from GPLv2+ to GPL-2.0+ to + conform with spdx.org identifier. +- Fix error in rpmlitrc file. + +------------------------------------------------------------------- +Mon Jul 11 20:51:30 UTC 2011 - mrdocs(a)opensuse.org +- spec file tweaks. +- convert changelog to .changes file. + +------------------------------------------------------------------- +Tue Mar 23 2010 Malcolm J Lewis <coyoteuser(a)gmail.com> - 2.1.5 +- initial OBS build. + calling whatdependson for head-i586 New: ---- makeself-2.1.5-rpmlintrc makeself-2.1.5.tar.bz2 makeself.changes makeself.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ makeself.spec ++++++ # # spec file for package makeself # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2011 Malcolm J Lewis <malcolmlewis(a)opensuse.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: makeself Version: 2.1.5 Release: 1 License: GPL-2.0+ Summary: Make self-extractable archives on Unix Url: http://www.megastep.org/makeself/ Group: Productivity/Archiving/Compression Source0: %{name}-%{version}.tar.bz2 Source1: %{name}-%{version}-rpmlintrc BuildArch: noarch %if 0%{?suse_version} < 1120 || 0%{?sles_version} <= 11 BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif %description Small shell script that generates a self-extractable tar.gz archive from a directory. The resulting file appears as a shell script (many of those have a .run suffix), and can be launched as is. The archive will then uncompress itself to a temporary directory and an optional arbitrary command will be executed (for example an installation script). This is pretty similar to archives generated with WinZip Self-Extractor in the Windows world. Makeself archives also include checksums for integrity self-validation (CRC and/or MD5 checksums). %prep %setup -q %build %install install -D -m0755 makeself.sh %{buildroot}%{_bindir}/makeself.sh install -D -m0755 makeself-header.sh %{buildroot}%{_bindir}/makeself-header.sh %if 0%{?suse_version} < 1120 || 0%{?sles_version} <= 11 %clean rm -rf '%{buildroot}' %endif %files %defattr(-,root,root,-) %doc README TODO %{_bindir}/makeself-header.sh %{_bindir}/makeself.sh %changelog ++++++ makeself-2.1.5-rpmlintrc ++++++ addFilter("script-without-shebang .*/usr/bin/makeself-header.sh") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa-plugins for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package alsa-plugins for openSUSE:Factory checked in at Fri Jul 29 16:49:23 CEST 2011. -------- --- alsa-plugins/alsa-plugins.changes 2011-01-31 17:26:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/alsa-plugins/alsa-plugins.changes 2011-07-27 09:41:13.000000000 +0200 @@ -1,0 +2,19 @@ +Wed Jul 27 09:38:06 CEST 2011 - tiwai(a)suse.de + +- Add PA_CONTEXT_NOAUTOSPAWN flag when fallback is set for pulse + plugins + +------------------------------------------------------------------- +Tue Jul 26 15:44:06 CEST 2011 - tiwai(a)suse.de + +- Add fallback option to pulse plugin +- Enable the fallback to the system-default in asound-pulse.conf + +------------------------------------------------------------------- +Tue Apr 26 16:43:32 CEST 2011 - tiwai(a)suse.de + +- Upstream fixes: + * Fix build of a52 plugin (not used in this package, though) + * Fix bogus snd_pcm_avail() zero return in pulse plugin + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0001-a52-Fix-a52-codec-with-recent-libavcodec-updates.patch 0002-Pulse-Fix-snd_pcm_avail-returning-0-in-some-cases.patch 0003-pulse-Add-fallback-option.patch 0004-pulse-Set-PA_CONTEXT_NOAUTOSPAWN-when-fallback-is-av.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa-plugins.spec ++++++ --- /var/tmp/diff_new_pack.1ubGE4/_old 2011-07-29 16:48:34.000000000 +0200 +++ /var/tmp/diff_new_pack.1ubGE4/_new 2011-07-29 16:48:34.000000000 +0200 @@ -38,7 +38,7 @@ Url: http://www.alsa-project.org/ Summary: Extra Plug-Ins for the ALSA Library Version: 1.0.24 -Release: 1 +Release: 9 License: LGPLv2.1+ Group: System/Libraries AutoReqProv: on @@ -49,6 +49,10 @@ Source1: asound-pulse.conf Source2: alsa-pulse.conf Source3: baselibs.conf +Patch1: 0001-a52-Fix-a52-codec-with-recent-libavcodec-updates.patch +Patch2: 0002-Pulse-Fix-snd_pcm_avail-returning-0-in-some-cases.patch +Patch3: 0003-pulse-Add-fallback-option.patch +Patch4: 0004-pulse-Set-PA_CONTEXT_NOAUTOSPAWN-when-fallback-is-av.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -163,6 +167,10 @@ %prep %setup -q -n %{name}-%{package_version} +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 %build export AUTOMAKE_JOBS=%{?jobs:%jobs} ++++++ 0001-a52-Fix-a52-codec-with-recent-libavcodec-updates.patch ++++++ >From 40c129a160f37fe9488b2828d6299f99c269703e Mon Sep 17 00:00:00 2001 From: Joerg Reuter <jreuter(a)suse.de> Date: Wed, 6 Apr 2011 16:36:11 +0200 Subject: [PATCH 1/2] a52 - Fix a52 codec with recent libavcodec updates The recent libavcodec is changed to accept only float input, but the old ac3 encoder is still somehow working with a different name. This patch makes it working again. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- a52/pcm_a52.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c index ed491b3..76f21cd 100644 --- a/a52/pcm_a52.c +++ b/a52/pcm_a52.c @@ -436,6 +436,7 @@ static int a52_prepare(snd_pcm_ioplug_t *io) rec->avctx->bit_rate = rec->bitrate * 1000; rec->avctx->sample_rate = io->rate; rec->avctx->channels = io->channels; + rec->avctx->sample_fmt = AV_SAMPLE_FMT_S16; #if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3) switch (io->channels) { case 2: @@ -699,8 +700,13 @@ SND_PCM_PLUGIN_DEFINE_FUNC(a52) avcodec_init(); avcodec_register_all(); - rec->codec = avcodec_find_encoder(CODEC_ID_AC3); - if (! rec->codec) { + + rec->codec = avcodec_find_encoder_by_name("ac3_fixed"); + if (rec->codec == NULL) + rec->codec = avcodec_find_encoder_by_name("ac3"); + if (rec->codec == NULL) + rec->codec = avcodec_find_encoder(CODEC_ID_AC3); + if (rec->codec == NULL) { SNDERR("Cannot find codec engine"); err = -EINVAL; goto error; -- 1.7.4.2 ++++++ 0002-Pulse-Fix-snd_pcm_avail-returning-0-in-some-cases.patch ++++++ >From e1661e3daa22cfed67c4b74099bcd97b433af24b Mon Sep 17 00:00:00 2001 From: David Henningsson <david.henningsson(a)canonical.com> Date: Thu, 21 Apr 2011 15:10:19 +0200 Subject: [PATCH 2/2] Pulse: Fix snd_pcm_avail returning 0 in some cases Due to a round-off error, snd_pcm_avail could in some cases return 0 even though more data could be written to the stream. Reported-by: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Signed-off-by: David Henningsson <david.henningsson(a)canonical.com> Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- pulse/pcm_pulse.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c index 2df0a80..9105d4d 100644 --- a/pulse/pcm_pulse.c +++ b/pulse/pcm_pulse.c @@ -92,8 +92,8 @@ static int update_ptr(snd_pcm_pulse_t *pcm) size -= pcm->offset; /* Prevent accidental overrun of the fake ringbuffer */ - if (size >= pcm->buffer_attr.tlength) - size = pcm->buffer_attr.tlength-1; + if (size > pcm->buffer_attr.tlength - pcm->frame_size) + size = pcm->buffer_attr.tlength - pcm->frame_size; if (size > pcm->last_size) { pcm->ptr += size - pcm->last_size; -- 1.7.4.2 ++++++ 0003-pulse-Add-fallback-option.patch ++++++ >From 5f5cde50d9de7b63aa6f1a7a86c31eeb2a4e9950 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai(a)suse.de> Date: Tue, 26 Jul 2011 14:26:26 +0200 Subject: [PATCH] pulse: Add fallback option Added "fallback" option to give the PCM / controller name as a fallback when connecting to PA server fails. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- doc/README-pulse | 19 +++++++++++++++++++ pulse/ctl_pulse.c | 17 ++++++++++++++++- pulse/pcm_pulse.c | 17 ++++++++++++++++- pulse/pulse.c | 7 ++++--- pulse/pulse.h | 2 +- 5 files changed, 56 insertions(+), 6 deletions(-) diff --git a/doc/README-pulse b/doc/README-pulse index d5431b4..5b119f9 100644 --- a/doc/README-pulse +++ b/doc/README-pulse @@ -39,3 +39,22 @@ you need to do this with PCM:s then specify two PCM:s with different "device". If you do not specify any source and/or sink, then the server's defaults will be used. + +When "fallback" option is set, the plugin will try to open the given PCM +(or control) automatically when connecting to PA server fails. Typically, +it should point to "sysdefault", which was introduced recently in alsa-lib, +so that the system-default setup is used even when you overwrite "default" +PCM and control definitions. + + pcm.pulse { + type pulse + fallback "sysdefault" + } + + ctl.pulse { + type pulse + fallback "sysdefault" + } + + pcm.!default "pulse" + ctl.!default "pulse" diff --git a/pulse/ctl_pulse.c b/pulse/ctl_pulse.c index 85863ed..8b5ff9e 100644 --- a/pulse/ctl_pulse.c +++ b/pulse/ctl_pulse.c @@ -647,6 +647,7 @@ SND_CTL_PLUGIN_DEFINE_FUNC(pulse) const char *device = NULL; const char *source = NULL; const char *sink = NULL; + const char *fallback_name = NULL; int err; snd_ctl_pulse_t *ctl; pa_operation *o; @@ -687,10 +688,20 @@ SND_CTL_PLUGIN_DEFINE_FUNC(pulse) } continue; } + if (strcmp(id, "fallback") == 0) { + if (snd_config_get_string(n, &fallback_name) < 0) { + SNDERR("Invalid value for %s", id); + return -EINVAL; + } + continue; + } SNDERR("Unknown field %s", id); return -EINVAL; } + if (fallback_name && name && !strcmp(name, fallback_name)) + fallback_name = NULL; /* no fallback for the same name */ + ctl = calloc(1, sizeof(*ctl)); if (!ctl) return -ENOMEM; @@ -701,7 +712,7 @@ SND_CTL_PLUGIN_DEFINE_FUNC(pulse) goto error; } - err = pulse_connect(ctl->p, server); + err = pulse_connect(ctl->p, server, !fallback_name); if (err < 0) goto error; @@ -794,6 +805,10 @@ error: free(ctl->sink); free(ctl); + if (fallback_name) + return snd_ctl_open_fallback(handlep, root, + fallback_name, name, mode); + return err; } diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c index 9105d4d..15b29e0 100644 --- a/pulse/pcm_pulse.c +++ b/pulse/pcm_pulse.c @@ -982,6 +982,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pulse) snd_config_iterator_t i, next; const char *server = NULL; const char *device = NULL; + const char *fallback_name = NULL; int handle_underrun = 0; int err; snd_pcm_pulse_t *pcm; @@ -1016,10 +1017,20 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pulse) handle_underrun = err; continue; } + if (strcmp(id, "fallback") == 0) { + if (snd_config_get_string(n, &fallback_name) < 0) { + SNDERR("Invalid value for %s", id); + return -EINVAL; + } + continue; + } SNDERR("Unknown field %s", id); return -EINVAL; } + if (fallback_name && name && !strcmp(name, fallback_name)) + fallback_name = NULL; /* no fallback for the same name */ + pcm = calloc(1, sizeof(*pcm)); if (!pcm) return -ENOMEM; @@ -1041,7 +1052,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pulse) pcm->handle_underrun = handle_underrun; - err = pulse_connect(pcm->p, server); + err = pulse_connect(pcm->p, server, !fallback_name); if (err < 0) goto error; @@ -1074,6 +1085,10 @@ error: free(pcm->device); free(pcm); + if (fallback_name) + return snd_pcm_open_fallback(pcmp, root, fallback_name, name, + stream, mode); + return err; } diff --git a/pulse/pulse.c b/pulse/pulse.c index f26363a..6d9613d 100644 --- a/pulse/pulse.c +++ b/pulse/pulse.c @@ -188,7 +188,7 @@ void pulse_free(snd_pulse_t * p) free(p); } -int pulse_connect(snd_pulse_t * p, const char *server) +int pulse_connect(snd_pulse_t * p, const char *server, int show_error) { int err; pa_context_state_t state; @@ -225,8 +225,9 @@ int pulse_connect(snd_pulse_t * p, const char *server) return 0; error: - SNDERR("PulseAudio: Unable to connect: %s\n", - pa_strerror(pa_context_errno(p->context))); + if (show_error) + SNDERR("PulseAudio: Unable to connect: %s\n", + pa_strerror(pa_context_errno(p->context))); pa_threaded_mainloop_unlock(p->mainloop); diff --git a/pulse/pulse.h b/pulse/pulse.h index e98124f..9f32a7f 100644 --- a/pulse/pulse.h +++ b/pulse/pulse.h @@ -42,7 +42,7 @@ int pulse_wait_operation(snd_pulse_t * p, pa_operation * o); snd_pulse_t *pulse_new(void); void pulse_free(snd_pulse_t * p); -int pulse_connect(snd_pulse_t * p, const char *server); +int pulse_connect(snd_pulse_t * p, const char *server, int show_error); void pulse_poll_activate(snd_pulse_t * p); void pulse_poll_deactivate(snd_pulse_t * p); -- 1.7.6 ++++++ 0004-pulse-Set-PA_CONTEXT_NOAUTOSPAWN-when-fallback-is-av.patch ++++++ >From 440e79153ffd3b38ba5494f92c7ba7767cd590b3 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai(a)suse.de> Date: Wed, 27 Jul 2011 09:32:12 +0200 Subject: [PATCH] pulse: Set PA_CONTEXT_NOAUTOSPAWN when fallback is available Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- pulse/ctl_pulse.c | 2 +- pulse/pcm_pulse.c | 2 +- pulse/pulse.c | 12 +++++++++--- pulse/pulse.h | 2 +- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pulse/ctl_pulse.c b/pulse/ctl_pulse.c index 8b5ff9e..242b77d 100644 --- a/pulse/ctl_pulse.c +++ b/pulse/ctl_pulse.c @@ -712,7 +712,7 @@ SND_CTL_PLUGIN_DEFINE_FUNC(pulse) goto error; } - err = pulse_connect(ctl->p, server, !fallback_name); + err = pulse_connect(ctl->p, server, fallback_name != NULL); if (err < 0) goto error; diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c index 15b29e0..d6c6792 100644 --- a/pulse/pcm_pulse.c +++ b/pulse/pcm_pulse.c @@ -1052,7 +1052,7 @@ SND_PCM_PLUGIN_DEFINE_FUNC(pulse) pcm->handle_underrun = handle_underrun; - err = pulse_connect(pcm->p, server, !fallback_name); + err = pulse_connect(pcm->p, server, fallback_name != NULL); if (err < 0) goto error; diff --git a/pulse/pulse.c b/pulse/pulse.c index 6d9613d..c34671b 100644 --- a/pulse/pulse.c +++ b/pulse/pulse.c @@ -188,13 +188,19 @@ void pulse_free(snd_pulse_t * p) free(p); } -int pulse_connect(snd_pulse_t * p, const char *server, int show_error) +int pulse_connect(snd_pulse_t * p, const char *server, int can_fallback) { int err; + pa_context_flags_t flags; pa_context_state_t state; assert(p); + if (can_fallback) + flags = PA_CONTEXT_NOAUTOSPAWN; + else + flags = 0; + if (!p->context || !p->mainloop) return -EBADFD; @@ -204,7 +210,7 @@ int pulse_connect(snd_pulse_t * p, const char *server, int show_error) pa_threaded_mainloop_lock(p->mainloop); - err = pa_context_connect(p->context, server, 0, NULL); + err = pa_context_connect(p->context, server, flags, NULL); if (err < 0) goto error; @@ -225,7 +231,7 @@ int pulse_connect(snd_pulse_t * p, const char *server, int show_error) return 0; error: - if (show_error) + if (!can_fallback) SNDERR("PulseAudio: Unable to connect: %s\n", pa_strerror(pa_context_errno(p->context))); diff --git a/pulse/pulse.h b/pulse/pulse.h index 9f32a7f..9b337bc 100644 --- a/pulse/pulse.h +++ b/pulse/pulse.h @@ -42,7 +42,7 @@ int pulse_wait_operation(snd_pulse_t * p, pa_operation * o); snd_pulse_t *pulse_new(void); void pulse_free(snd_pulse_t * p); -int pulse_connect(snd_pulse_t * p, const char *server, int show_error); +int pulse_connect(snd_pulse_t * p, const char *server, int can_fallback); void pulse_poll_activate(snd_pulse_t * p); void pulse_poll_deactivate(snd_pulse_t * p); -- 1.7.6 ++++++ asound-pulse.conf ++++++ --- /var/tmp/diff_new_pack.1ubGE4/_old 2011-07-29 16:48:34.000000000 +0200 +++ /var/tmp/diff_new_pack.1ubGE4/_new 2011-07-29 16:48:34.000000000 +0200 @@ -4,21 +4,15 @@ pcm.pulse { type pulse + fallback "sysdefault" } ctl.pulse { type pulse + fallback "sysdefault" } # Let's make it the default! -pcm.!default { - type plug - slave.pcm { - type pulse - } -} - -ctl.!default { - type pulse -} +pcm.!default "pulse" +ctl.!default "pulse" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit alsa for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package alsa for openSUSE:Factory checked in at Fri Jul 29 16:48:16 CEST 2011. -------- --- alsa/alsa.changes 2011-07-11 10:58:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/alsa/alsa.changes 2011-07-27 15:27:02.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Jul 27 15:25:23 CEST 2011 - tiwai(a)suse.de + +- Fix enumeration of default PCM in addition to sysdefault + +------------------------------------------------------------------- +Tue Jul 26 15:42:37 CEST 2011 - tiwai(a)suse.de + +- Add fallback PCM/control support (for pulse plugin) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0024-Define-sysdefault-PCM-and-control.patch 0025-Add-snd_-ctl-pcm-_open_fallback-functions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alsa.spec ++++++ --- /var/tmp/diff_new_pack.gud76A/_old 2011-07-29 16:48:01.000000000 +0200 +++ /var/tmp/diff_new_pack.gud76A/_new 2011-07-29 16:48:01.000000000 +0200 @@ -34,7 +34,7 @@ # Summary: Advanced Linux Sound Architecture Version: 1.0.24.1 -Release: 14 +Release: 16 Source: ftp://ftp.alsa-project.org/pub/lib/alsa-lib-%{package_version}.tar.bz2 Source2: baselibs.conf Source8: 40-alsa.rules @@ -74,6 +74,8 @@ Patch21: 0021-ctlparse-Respect-softfloat-configure-option.patch Patch22: 0022-UCM-Fix-typo-in-error-message.patch Patch23: 0023-UCM-Fix-deadlock-following-failed-get-_verb.patch +Patch24: 0024-Define-sysdefault-PCM-and-control.patch +Patch25: 0025-Add-snd_-ctl-pcm-_open_fallback-functions.patch Patch99: alsa-lib-doxygen-avoid-crash-for-11.3.diff Url: http://www.alsa-project.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -172,6 +174,8 @@ %patch21 -p1 %patch22 -p1 %patch23 -p1 +%patch24 -p1 +%patch25 -p1 %if %suse_version == 1130 %patch99 -p1 %endif ++++++ 0024-Define-sysdefault-PCM-and-control.patch ++++++ >From e6f990e5c9be5cac6f36924d20a75d0f69d27297 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai(a)suse.de> Date: Tue, 26 Jul 2011 13:05:53 +0200 Subject: [PATCH 1/2] Define "sysdefault" PCM and control When "default" PCM and control definitions are overwritten by others like PulseAudio setup, the original system-default defition is lost. This is a problem when PA is temporarily (or intentionally) disabled and user wants to use the default dmix. This patch adds a new standard definition for the system-default, "sysdefault". This can be used for fallbacks. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- src/conf/alsa.conf | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf index 1889f01..a33c24e 100644 --- a/src/conf/alsa.conf +++ b/src/conf/alsa.conf @@ -119,6 +119,7 @@ defaults.timer.subdevice 0 pcm.cards cards.pcm pcm.default cards.pcm.default +pcm.sysdefault cards.pcm.default pcm.front cards.pcm.front pcm.rear cards.pcm.rear pcm.center_lfe cards.pcm.center_lfe @@ -321,7 +322,7 @@ pcm.null { # Control interface # -ctl.default { +ctl.sysdefault { type hw card { @func getenv @@ -335,6 +336,7 @@ ctl.default { } } } +ctl.default ctl.sysdefault ctl.hw { @args [ CARD ] -- 1.7.6 ++++++ 0025-Add-snd_-ctl-pcm-_open_fallback-functions.patch ++++++ >From acb423d937111d682706169bcdcb58c70fdfa84d Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai(a)suse.de> Date: Tue, 26 Jul 2011 13:10:24 +0200 Subject: [PATCH 2/2] Add snd_{ctl|pcm}_open_fallback() functions This patch adds new API functions, snd_ctl_open_fallback() and snd_pcm_open_fallback(). These are just like snd_*_open_lconf() but used to open a fallback PCM/control. The difference is that it replaces the name string with the given original name, so that hctl and other upper-layers will recognize it as an alias. Signed-off-by: Takashi Iwai <tiwai(a)suse.de> --- include/control.h | 1 + include/pcm.h | 3 +++ src/control/control.c | 22 ++++++++++++++++++++++ src/pcm/pcm.c | 24 ++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 0 deletions(-) diff --git a/include/control.h b/include/control.h index e8f38bb..f265e34 100644 --- a/include/control.h +++ b/include/control.h @@ -224,6 +224,7 @@ char *snd_device_name_get_hint(const void *hint, const char *id); int snd_ctl_open(snd_ctl_t **ctl, const char *name, int mode); int snd_ctl_open_lconf(snd_ctl_t **ctl, const char *name, int mode, snd_config_t *lconf); +int snd_ctl_open_fallback(snd_ctl_t **ctl, snd_config_t *root, const char *name, const char *orig_name, int mode); int snd_ctl_close(snd_ctl_t *ctl); int snd_ctl_nonblock(snd_ctl_t *ctl, int nonblock); int snd_async_add_ctl_handler(snd_async_handler_t **handler, snd_ctl_t *ctl, diff --git a/include/pcm.h b/include/pcm.h index 7243ffb..be355a9 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -410,6 +410,9 @@ int snd_pcm_open(snd_pcm_t **pcm, const char *name, int snd_pcm_open_lconf(snd_pcm_t **pcm, const char *name, snd_pcm_stream_t stream, int mode, snd_config_t *lconf); +int snd_pcm_open_fallback(snd_pcm_t **pcm, snd_config_t *root, + const char *name, const char *orig_name, + snd_pcm_stream_t stream, int mode); int snd_pcm_close(snd_pcm_t *pcm); const char *snd_pcm_name(snd_pcm_t *pcm); diff --git a/src/control/control.c b/src/control/control.c index 19e9389..cd17c6f 100644 --- a/src/control/control.c +++ b/src/control/control.c @@ -919,6 +919,28 @@ int snd_ctl_open_lconf(snd_ctl_t **ctlp, const char *name, return snd_ctl_open_noupdate(ctlp, lconf, name, mode); } +/** + * \brief Opens a fallback CTL + * \param ctlp Returned CTL handle + * \param root Configuration root + * \param name ASCII identifier of the CTL handle used as fallback + * \param orig_name The original ASCII name + * \param mode Open mode (see #SND_CTL_NONBLOCK, #SND_CTL_ASYNC) + * \return 0 on success otherwise a negative error code + */ +int snd_ctl_open_fallback(snd_ctl_t **ctlp, snd_config_t *root, + const char *name, const char *orig_name, int mode) +{ + int err; + assert(ctlp && name && root); + err = snd_ctl_open_noupdate(ctlp, root, name, mode); + if (err >= 0) { + free((*ctlp)->name); + (*ctlp)->name = orig_name ? strdup(orig_name) : NULL; + } + return err; +} + #ifndef DOC_HIDDEN #define TYPE(v) [SND_CTL_ELEM_TYPE_##v] = #v #define IFACE(v) [SND_CTL_ELEM_IFACE_##v] = #v diff --git a/src/pcm/pcm.c b/src/pcm/pcm.c index 02dea0d..12f8cd0 100644 --- a/src/pcm/pcm.c +++ b/src/pcm/pcm.c @@ -2259,6 +2259,30 @@ int snd_pcm_open_lconf(snd_pcm_t **pcmp, const char *name, return snd_pcm_open_noupdate(pcmp, lconf, name, stream, mode, 0); } +/** + * \brief Opens a fallback PCM + * \param pcmp Returned PCM handle + * \param root Configuration root + * \param name ASCII identifier of the PCM handle + * \param orig_name The original ASCII name + * \param stream Wanted stream + * \param mode Open mode (see #SND_PCM_NONBLOCK, #SND_PCM_ASYNC) + * \return 0 on success otherwise a negative error code + */ +int snd_pcm_open_fallback(snd_pcm_t **pcmp, snd_config_t *root, + const char *name, const char *orig_name, + snd_pcm_stream_t stream, int mode) +{ + int err; + assert(pcmp && name && root); + err = snd_pcm_open_noupdate(pcmp, root, name, stream, mode, 0); + if (err >= 0) { + free((*pcmp)->name); + (*pcmp)->name = orig_name ? strdup(orig_name) : NULL; + } + return err; +} + #ifndef DOC_HIDDEN int snd_pcm_new(snd_pcm_t **pcmp, snd_pcm_type_t type, const char *name, snd_pcm_stream_t stream, int mode) -- 1.7.6 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-trans for openSUSE:Factory
by root＠hilbert.suse.de 29 Jul '11

29 Jul '11

Hello community, here is the log from the commit of package yast2-trans for openSUSE:Factory checked in at Fri Jul 29 16:47:32 CEST 2011. -------- --- yast2-trans/yast2-trans.changes 2011-07-15 13:56:01.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-trans/yast2-trans.changes 2011-07-29 14:42:30.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jul 29 14:42:14 CEST 2011 - ke(a)suse.de + +- Updated languages: ca es fi fr hu it ja lt nn ru. + +------------------------------------------------------------------------ calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans.spec ++++++ --- /var/tmp/diff_new_pack.k6HTfN/_old 2011-07-29 16:46:39.000000000 +0200 +++ /var/tmp/diff_new_pack.k6HTfN/_new 2011-07-29 16:46:39.000000000 +0200 @@ -20,7 +20,7 @@ Name: yast2-trans Version: 2.21.0 -Release: 42 +Release: 44 License: GPLv2+ Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-trans-ca-2.21.0.tar.bz2 ++++++ ++++ 19594 lines of diff (skipped) ++++++ yast2-trans-es-2.21.0.tar.bz2 ++++++ ++++++ yast2-trans-fi-2.21.0.tar.bz2 ++++++ ++++ 20455 lines of diff (skipped) ++++++ yast2-trans-fr-2.21.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fr-2.21.0/po/autoinst.fr.po new/yast2-trans-fr-2.21.0/po/autoinst.fr.po --- old/yast2-trans-fr-2.21.0/po/autoinst.fr.po 2011-06-27 16:02:28.000000000 +0200 +++ new/yast2-trans-fr-2.21.0/po/autoinst.fr.po 2011-07-29 14:22:17.000000000 +0200 @@ -16,8 +16,8 @@ "Project-Id-Version: autoinst\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 15:55+0200\n" -"PO-Revision-Date: 2010-06-04 17:22+0100\n" -"Last-Translator: Guillaume GARDET <guillaume.gardet(a)opensuse.org>\n" +"PO-Revision-Date: 2011-07-28 09:37+0100\n" +"Last-Translator: Guillaume GARDET <guillaume.gardet(a)free.fr>\n" "Language-Team: French <opensuse-fr(a)opensuse.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -25,6 +25,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: KBabel 1.11.4\n" +"X-Poedit-Language: French\n" #. progress step title #: src/clients/autoinst_scripts1_finish.ycp:44 @@ -1907,16 +1908,6 @@ #. help 5/6 #: src/dialogs/script_dialogs.ycp:106 -#, fuzzy -#| msgid "" -#| "\n" -#| "<H3>Init Scripts</H3>\n" -#| "These scripts are executed during the initial boot process and after\n" -#| "YaST has finished configuring the system. The final scripts are executed \n" -#| "using a special rc script that is executed only once. \n" -#| "The final scripts are executed toward the end of the boot\n" -#| "process and after network has been intialized.\n" -#| "\n" msgid "" "\n" "<H3>Init Scripts</H3>\n" @@ -1930,10 +1921,10 @@ "\n" "<H3>Scripts init</H3>\n" "Ces scripts sont exécutés lors du processus d'amorçage initial et après\n" -"que YaST ait fini de configurer le système. Les scripts finaux sont exécutés en\n" -"utilisant un script rc spécial qui n'est exécuté qu'une fois. \n" -"Le scripts finaux sont exécuté vers la fin du processus d'amorçage et après\n" -"que le réseau ait été initialisé.\n" +"que YaST ait fini de configurer le système. Les scripts finaux sont exécutés\n" +"en utilisant un script rc spécial qui n'est exécuté qu'une fois. \n" +"Le scripts finaux sont exécuté vers la fin du processus d'amorçage\n" +"et après que le réseau ait été initialisé.\n" "\n" #. help 6/6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fr-2.21.0/po/base.fr.po new/yast2-trans-fr-2.21.0/po/base.fr.po --- old/yast2-trans-fr-2.21.0/po/base.fr.po 2011-06-27 16:02:13.000000000 +0200 +++ new/yast2-trans-fr-2.21.0/po/base.fr.po 2011-07-29 14:21:59.000000000 +0200 @@ -9,20 +9,22 @@ # Patricia Vaz <patricia.vaz(a)suse.com>, 2004. # Patricia Vaz <patricia(a)suse.de>, 2005. # Guillaume GARDET <guillaume.gardet(a)free.fr>, 2008, 2010. +# Guillaume GARDET <guillaume.gardet(a)opensuse.org>, 2011. msgid "" msgstr "" "Project-Id-Version: base\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 15:49+0200\n" -"PO-Revision-Date: 2010-04-27 13:25+0100\n" -"Last-Translator: Guillaume GARDET <guillaume.gadret(a)opensuse.org>\n" +"PO-Revision-Date: 2011-07-28 09:34+0200\n" +"Last-Translator: Guillaume GARDET <guillaume.gardet(a)opensuse.org>\n" "Language-Team: French <opensuse-fr(a)opensuse.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 0.2\n" +"X-Generator: Lokalize 1.0\n" +"X-Poedit-Language: French\n" # TLABEL country_2002_08_07_0216__2 #: data/country.ycp:11 data/country_long.ycp:12 @@ -4285,12 +4287,16 @@ msgstr "Nom d'&utilisateur" #: library/packages/src/PackageLock.ycp:38 +#, fuzzy msgid "" "PackageKit is still running (probably busy).\n" "Ask PackageKit to quit again?" msgstr "" +"PackageKit est encore en cours d'exécution (probablement occupé).\n" +"Demander à nouveau à PackageKit de quitter?" #: library/packages/src/PackageLock.ycp:41 +#, fuzzy msgid "" "PackageKit is blocking software management.\n" "This happens when the updater applet or another software management\n" @@ -4298,6 +4304,11 @@ "\n" "Ask PackageKit to quit?" msgstr "" +"PackageKit bloque la gestion logicielle.\n" +"Cela arrive lorsque l'applet de mise à jour ou un autre programme de gestion\n" +"est en cours d'exécution.\n" +"\n" +"Demander à PackageKit de quitter?" #. TRANSLATORS: a popup headline #: library/packages/src/PackageLock.ycp:88 @@ -6256,29 +6267,3 @@ #: remote/remoteinstall.ycp:29 msgid "Select the Serial &Interface to Use:" msgstr "Sélectionner l'&interface série à utiliser :" - -# TLABEL sw_single_2002_01_04_0147__0 -#~ msgid "Package %1 was not found on the medium." -#~ msgstr "Paquet %1 non trouvé sur ce support." - -#~ msgid "Package %1 could not be downloaded (input/output error)." -#~ msgstr "Le paquet %1 n'a pas pu être téléchargé (erreur d'entrée/sortie)." - -#~ msgid "Failed to download delta RPM" -#~ msgstr "Échec de téléchargement du paquet delta RPM" - -#~ msgid "Failed to apply delta RPM" -#~ msgstr "Échec d'application du delta RPM" - -#~ msgid "Failed to download patch RPM" -#~ msgstr "Échec de téléchargement des RPM correctifs" - -#~ msgid "" -#~ "Download failed:\n" -#~ " %1" -#~ msgstr "" -#~ "Échec du téléchargement :\n" -#~ " %1" - -#~ msgid "Accessing the Softwaree Management Failed" -#~ msgstr "Echec de l'accès à la gestion des logiciels" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fr-2.21.0/po/dns-server.fr.po new/yast2-trans-fr-2.21.0/po/dns-server.fr.po --- old/yast2-trans-fr-2.21.0/po/dns-server.fr.po 2011-06-27 16:02:12.000000000 +0200 +++ new/yast2-trans-fr-2.21.0/po/dns-server.fr.po 2011-07-29 14:22:02.000000000 +0200 @@ -15,20 +15,22 @@ # Patricia Vaz <Patricia.Vaz(a)suse.de>, 2003,2004. # Patricia Vaz <patricia.vaz(a)suse.com>, 2004. # Fabien Crespel <fabien(a)crespel.net>, 2008. +# Guillaume GARDET <guillaume.gardet(a)opensuse.org>, 2011. msgid "" msgstr "" "Project-Id-Version: dns-server\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 15:54+0200\n" -"PO-Revision-Date: 2009-07-01 08:49+0100\n" -"Last-Translator: Guillaume GARDET <guillaume.gardet(a)free.fr>\n" -"Language-Team: French Team <opensuse-fr(a)opensuse.org>\n" +"PO-Revision-Date: 2011-07-28 09:44+0200\n" +"Last-Translator: Guillaume GARDET <guillaume.gardet(a)opensuse.org>\n" +"Language-Team: French <opensuse-fr(a)opensuse.org>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.0\n" +"X-Poedit-Language: French\n" # TLABEL mail_2002_03_14_2340__61 #. DNS server read dialog caption @@ -259,10 +261,8 @@ #. BNC #679960 #: src/DnsServer.pm:1802 -#, fuzzy -#| msgid "LDAP initialization failed." msgid "Unknown LDAP initialization error." -msgstr "Échec de l'initialisation LDAP." +msgstr "Erreur dl'initialisation LDAP inconnue." # TLABEL printer_2002_08_07_0216__263 #. TRANSLATORS: Popup error message, %1 is an LDAP object whose creation failed @@ -1008,10 +1008,9 @@ # TLABEL profile-manager_2002_08_07_0216__12 #. An error message, %1 is replaced with a variable IP #: src/dialog-main.ycp:479 -#, fuzzy, ycp-format -#| msgid "Cannot find out owner of product %1" +#, ycp-format msgid "Cannot find local equivalent for IP %1" -msgstr "Impossible de trouver le propriétaire du produit %1" +msgstr "Impossible de trouver l'équivalent local pour l'IP %1" #. TRANSLATORS: A warning message, %1 is replaced with the input IP, %2 with the output IP #: src/dialog-main.ycp:482 @@ -1021,6 +1020,9 @@ "IP address %1 is currently used by this server, so it has\n" "been changed to its local equivalent %2." msgstr "" +"Transmettre les requêtes DNS à soit même créera une boucle infinie.\n" +"L'adresse IP %1 est actuellement utilisée par ce serveur, donc elle a\n" +"été remplacée par son équivalent local %2." # TLABEL lan_2002_01_04_0147__56 #: src/dialog-main.ycp:504 @@ -1683,6 +1685,8 @@ "Invalid TXT record key. It should consist of printable US-ASCII characters excluding '='\n" "and must be at least one character long." msgstr "" +"Clé d'enregistrement TXT invalide. Elle devrait comprendre des caractères US-ASCII imprimables, sans '='\n" +"et doit comprendre au moins 1 caractère." #. TRANSLATORS: Error message, %1 is replaced with the maximal length #. %2 with the current length of a new TXT record. @@ -2447,19 +2451,14 @@ #. Expert Mode Configuration - Zones #5 #: src/helps.ycp:306 -#, fuzzy -#| msgid "" -#| "To modify settings for a zone, such as zone transport and name and\n" -#| "mail servers, select it, and click Edit Zone.\n" -#| "To remove a configured zone, select it and click Delete Zone.\n" msgid "" "To modify settings for a zone, such as zone transport and name and\n" "mail servers, select it, and click Edit.\n" "To remove a configured zone, select it and click Delete.\n" msgstr "" "Pour modifier les paramètres d'une zone, tels que son transport, son nom et ses serveurs\n" -"de messagerie, sélectionnez-la et cliquez sur Modifier la zone.\n" -"Pour supprimer une zone configurée, sélectionnez-la et cliquez sur Supprimer la zone.\n" +"de mail, sélectionnez-la et cliquez sur Modifier.\n" +"Pour supprimer une zone configurée, sélectionnez-la et cliquez sur Effacer.\n" #. Zone Editor - Help for tab - Basics 1/3 #: src/helps.ycp:315 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fr-2.21.0/po/gtk.fr.po new/yast2-trans-fr-2.21.0/po/gtk.fr.po --- old/yast2-trans-fr-2.21.0/po/gtk.fr.po 2011-06-27 16:03:19.000000000 +0200 +++ new/yast2-trans-fr-2.21.0/po/gtk.fr.po 2011-07-29 14:23:05.000000000 +0200 @@ -15,15 +15,16 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 16:03+0200\n" -"PO-Revision-Date: 2011-02-14 14:01+0100\n" -"Last-Translator: Guillaume GARDET\n" -"Language-Team: French <kde-i18n-doc(a)kde.org>\n" +"PO-Revision-Date: 2011-07-28 09:55+0200\n" +"Last-Translator: Guillaume GARDET <guillaume.gardet(a)opensuse.org>\n" +"Language-Team: French <opensuse-fr(a)opensuse.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.0\n" +"X-Poedit-Language: French\n" # TLABEL backup_2002_03_14_2340__147 #. translator: byte shorthand @@ -65,10 +66,8 @@ # TLABEL lan_2002_01_04_0147__130 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/YGTreeView.cc:116 #: src/YGTreeView.cc:116 -#, fuzzy -#| msgid "Several selected" msgid "Total selected:" -msgstr "Plusieurs sélectionnés" +msgstr "Total sélectionnés:" # TLABEL nfs_2002_08_07_0216__0 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/YGTreeView.cc:355 @@ -481,10 +480,8 @@ #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/pkg-selector-help.cc:55 #: src/pkg/pkg-selector-help.cc:55 -#, fuzzy -#| msgid "<h3>Search</h3>Enter free text into the search-field to match their names and descriptions. (a search for 'office' will bring up the 'OpenOffice' packages as well as 'AbiWord' which carries the word 'office' in its description). You can search for multiple keywords by separating the with a white space (e.g. 'spread sheet' would return 'OpenOffice-calc').You may use the search combined with a filter, like searching for a package in a given repository. Other search attributes are provided, such as to search for a given file." msgid "<h3>Search</h3>Enter free text into the search-field to match their names and descriptions. (a search for 'office' will bring up the 'LibreOffice' packages as well as 'AbiWord' which carries the word 'office' in its description). You can search for multiple keywords by separating the with a white space (e.g. 'spread sheet' would return 'libreoffice-calc').You may use the search combined with a filter, like searching for a package in a given repository. Other search attributes are provided, such as to search for a given file." -msgstr "<h3>Recherche </h3>Entrez un texte dans le champ de recherche en fonction de leurs noms et descriptions. (une recherche sur 'office' vous donnera le paquet 'OpenOffice' ainsi que 'AbiWord' qui comporte le mot 'office' dans sa description). Vous pouvez lancer une recherche sur plusieurs mots clés en les séparant avec des espaces (par exemple en entrant 'feuille de calcul' vous trouverez 'OpenOffice-calc'). Vous pouvez utiliser la recherche combinée avec un filtre comme la recherche d'un paquet dans un dépôt donné. D'autres attributs de recherche sont fournis, comme la recherche sur un fichier donné." +msgstr "<h3>Recherche</h3>Entrez un texte dans le champ de recherche en fonction de leurs noms et descriptions. (une recherche sur 'office' vous donnera les paquets 'LibreOffice' ainsi que 'AbiWord' qui comporte le mot 'office' dans sa description). Vous pouvez lancer une recherche sur plusieurs mots clés en les séparant avec des espaces (par exemple en entrant 'spread sheet' ou 'feuille de calcul' vous trouverez 'libreoffice-calc'). Vous pouvez utiliser la recherche combinée avec un filtre comme la recherche d'un paquet dans un dépôt donné. D'autres attributs de recherche sont fournis, comme la recherche sur un fichier donné." #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/pkg-selector-help.cc:63 #: src/pkg/pkg-selector-help.cc:63 @@ -542,7 +539,7 @@ #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgdetailview.cc:195 #: src/pkg/ygtkpkgdetailview.cc:195 msgid "as" -msgstr "" +msgstr "comme" # TLABEL cups_2002_03_14_2340__28 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgdetailview.cc:321 @@ -894,10 +891,9 @@ # TLABEL backup_2002_03_14_2340__57 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkghistorydialog.cc:623 #: src/pkg/ygtkpkghistorydialog.cc:623 -#, fuzzy, c-format -#| msgid "History (%s)" +#, c-format msgid "Show History (%s)" -msgstr "Historique (%s)" +msgstr "Afficher l'historique (%s)" # TLABEL restore_2002_08_07_0216__41 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkghistorydialog.cc:625 @@ -914,17 +910,13 @@ #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkglistview.cc:478 #: src/pkg/ygtkpkglistview.cc:478 -#, fuzzy -#| msgid "Upgrade" msgid "&Upgrade" -msgstr "Mettre à jour" +msgstr "&Mettre à niveau" #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkglistview.cc:481 #: src/pkg/ygtkpkglistview.cc:481 -#, fuzzy -#| msgid "Re-install" msgid "&Re-install" -msgstr "Ré-installer" +msgstr "&Ré-installer" # TLABEL partitioning_2002_01_04_0147__406 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkglistview.cc:484 @@ -935,24 +927,18 @@ #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkglistview.cc:487 #: src/pkg/ygtkpkglistview.cc:487 -#, fuzzy -#| msgid "Undo" msgid "&Undo" -msgstr "Annuler" +msgstr "&Annuler" #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkglistview.cc:494 #: src/pkg/ygtkpkglistview.cc:494 -#, fuzzy -#| msgid "_Unlock" msgid "&Unlock" -msgstr "_Déverrouiller" +msgstr "&Déverrouiller" #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkglistview.cc:497 #: src/pkg/ygtkpkglistview.cc:497 -#, fuzzy -#| msgid "Lock" msgid "&Lock" -msgstr "Verrouillage" +msgstr "&Verrouiller" #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkglistview.cc:691 #: src/pkg/ygtkpkglistview.cc:691 @@ -994,8 +980,6 @@ # TLABEL packages_2002_01_04_0147__129 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkglistview.cc:1029 #: src/pkg/ygtkpkglistview.cc:1029 -#, fuzzy -#| msgid "Installed Packages" msgid "Installed packages" msgstr "Paquets installés" @@ -1060,7 +1044,7 @@ #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgmenubar.cc:693 #: src/pkg/ygtkpkgmenubar.cc:693 msgid "F&ile" -msgstr "" +msgstr "F&ichier" # TLABEL autoinst_2002_08_07_0216__279 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgmenubar.cc:695 @@ -1164,26 +1148,20 @@ # TLABEL profile-manager_2002_08_07_0216__53 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgmenubar.cc:736 #: src/pkg/ygtkpkgmenubar.cc:736 -#, fuzzy -#| msgid "Show _Changes" msgid "Show &Changes" -msgstr "_Afficher les modifications" +msgstr "Afficher les &modifications" # TLABEL backup_2002_03_14_2340__57 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgmenubar.cc:739 #: src/pkg/ygtkpkgmenubar.cc:739 -#, fuzzy -#| msgid "Show _History" msgid "Show &History" -msgstr "Afficher l'_historique" +msgstr "Afficher l'&historique" # TLABEL packages_2002_03_14_2340__36 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgmenubar.cc:742 #: src/pkg/ygtkpkgmenubar.cc:742 -#, fuzzy -#| msgid "Show Unneeded Dependencies" msgid "Show &Unneeded Dependencies" -msgstr "Afficher les Dépendances non necessaires" +msgstr "Afficher les dépendances &non nécessaires" # TLABEL printer_2002_08_07_0216__68 #. Translators: keep "-_devel" untranslated @@ -1196,34 +1174,26 @@ #. Translators: keep "-debug-_info" untranslated #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgmenubar.cc:751 #: src/pkg/ygtkpkgmenubar.cc:751 -#, fuzzy -#| msgid "Install All Matching -debug-_sinfo Packages" msgid "Install All Matching -debug-&sinfo Packages" -msgstr "Installer tous les paquets -debug-_sinfo correspondants" +msgstr "Installer tous les paquets -debug-&sinfo correspondants" # TLABEL printer_2002_08_07_0216__68 #. Translators: keep "-debug-_source" untranslated #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgmenubar.cc:754 #: src/pkg/ygtkpkgmenubar.cc:754 -#, fuzzy -#| msgid "Install All Matching -debug-source Packages" msgid "Install All Matching -debug-&source Packages" -msgstr "Installer tous les paquets -debug-source correspondants" +msgstr "Installer tous les paquets -debug-&source correspondants" #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgmenubar.cc:757 #: src/pkg/ygtkpkgmenubar.cc:757 -#, fuzzy -#| msgid "Generate Dependencies Resolver Testcase" msgid "Generate Dependencies Resolver &Testcase" -msgstr "Générer un cas de test du résolveur de dépendances" +msgstr "Générer un cas de &test du résolveur de dépendances" # TLABEL packages_2002_01_04_0147__30 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgmenubar.cc:759 #: src/pkg/ygtkpkgmenubar.cc:759 -#, fuzzy -#| msgid "Reset _Ignored Dependencies Conflicts" msgid "Reset &Ignored Dependencies Conflicts" -msgstr "Rétablir les conflits de dépendances _ignorés" +msgstr "Rétablir les conflits de dépendances &ignorés" #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgpatternview.cc:296 #: src/pkg/ygtkpkgpatternview.cc:296 @@ -1285,10 +1255,8 @@ #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgsearchentry.cc:97 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/ygtkwizard.c:157 #: src/pkg/ygtkpkgsearchentry.cc:97 src/ygtkwizard.c:157 -#, fuzzy -#| msgid "_Find:" msgid "&Find:" -msgstr "_Rechercher :" +msgstr "&Trouver:" #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgsearchentry.cc:102 #: src/pkg/ygtkpkgsearchentry.cc:102 @@ -1435,10 +1403,8 @@ #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgvestigialdialog.cc:195 #: src/pkg/ygtkpkgvestigialdialog.cc:195 -#, fuzzy -#| msgid "This is not a comprehensive listing of dependencies no longer in use. It is possible we missed some." msgid "This is a listing of dependencies no longer used. It is neither accurate, nor comprehensive. Use with care." -msgstr "Il ne s'agit pas d'une liste complète de dépendances qui ne sont plus utilisées. Il est possible que certaines aient été manquées." +msgstr "Il s'agit d'une liste de dépendances qui ne sont plus utilisées. Elle n'est ni exacte, ni exhaustive. À utiliser avec précaution." #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/pkg/ygtkpkgvestigialdialog.cc:205 #: src/pkg/ygtkpkgvestigialdialog.cc:205 @@ -1650,10 +1616,8 @@ # TLABEL autoinst_2002_08_07_0216__263 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/ygtktreeview.c:214 #: src/ygtktreeview.c:214 -#, fuzzy -#| msgid "_Show column" msgid "&Show column" -msgstr "_Afficher la colonne" +msgstr "&Afficher la colonne" #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/ygtkwizard.c:107 #: build/_CPack_Packages/Linux-Source/TBZ2/yast2-gtk-2.21.96/src/ygtkwizard.c:597 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fr-2.21.0/po/printer.fr.po new/yast2-trans-fr-2.21.0/po/printer.fr.po --- old/yast2-trans-fr-2.21.0/po/printer.fr.po 2011-06-27 16:02:56.000000000 +0200 +++ new/yast2-trans-fr-2.21.0/po/printer.fr.po 2011-07-29 14:22:03.000000000 +0200 @@ -8,20 +8,22 @@ # Patricia Vaz <Patricia.Vaz(a)suse.de>, 2003, 2004, 2005. # Guillaume GARDET <guillaume.gardet(a)free.fr>, 2008. # Fabien Crespel <fabien(a)crespel.net>, 2008, 2009, 2010, 2011. +# Guillaume GARDET <guillaume.gardet(a)opensuse.org>, 2011. msgid "" msgstr "" "Project-Id-Version: printer\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 15:59+0200\n" -"PO-Revision-Date: 2011-01-22 15:32+0100\n" -"Last-Translator: \n" +"PO-Revision-Date: 2011-07-28 11:20+0200\n" +"Last-Translator: Guillaume GARDET <guillaume.gardet(a)opensuse.org>\n" "Language-Team: French <opensuse-fr(a)opensuse.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.0\n" +"X-Poedit-Language: French\n" #: src/Printer.ycp:92 msgid "" @@ -722,27 +724,21 @@ #. CheckBox to trigger an automatic configuration of local connected printers #. by calling the YaST printer module autoconfig functionality right now. #: src/autoconfig.ycp:50 -#, fuzzy -#| msgid "Enable &Automatic Configuration of New Printers" msgid "&Do an automatic configuration of local connected printers now" -msgstr "Activer la configuration &automatique des nouvelles imprimantes" +msgstr "&Effectuer maintenant une configuration automatique des imprimantes locales connectés" #. Header for a dialog section where the user can #. specify if USB printers are configured automatically: #: src/autoconfig.ycp:62 -#, fuzzy -#| msgid "Specify add-on product configuration that should be deleted." msgid "Specify if automatic USB printer configuration should happen when plug in" -msgstr "Spécifiez la configuration du produit complémentaire qui doit être éffacée." +msgstr "Spécifiez si la configuration automatique des imprimantes USB doit être effectuée lors de la connexion." #. CheckBox for automatic configuration of USB printers #. by installing or removing the RPM package udev-configure-printer. #. Do not change or translate "udev-configure-printer", it is a RPM package name. #: src/autoconfig.ycp:75 -#, fuzzy -#| msgid "udev-configure-printer is used for automatic configuration" msgid "&Use the package udev-configure-printer for automatic USB printer configuration" -msgstr "udev-configure-printer est utilisé pour la configuration automatique" +msgstr "&Utiliser le paquet udev-configure-printer pour la configuration automatique d'imprimantes USB" # TLABEL runlevel_2002_08_07_0216__21 #. PopupYesNoHeadline headline @@ -776,33 +772,25 @@ # TLABEL packages_2002_01_04_0147__106 #. Popup::Error message when the RPM package udev-configure-printer could not be installed: #: src/autoconfig.ycp:169 -#, fuzzy -#| msgid "Failed to install required package." msgid "Failed to install udev-configure-printer." -msgstr "Échec de l'installation du paquetage requis." +msgstr "Échec de l'installation de udev-configure-printer." # TLABEL users_2002_08_07_0216__47 #. Popup::Error message when the RPM package udev-configure-printer could not be removed: #: src/autoconfig.ycp:184 -#, fuzzy -#| msgid "Failed to remove some devices." msgid "Failed to remove udev-configure-printer." -msgstr "Échec lors du retrait de certains périphériques." +msgstr "Échec de la suppression de udev-configure-printer." # TLABEL sound_2002_01_04_0147__68 #: src/autoconfig.ycp:213 -#, fuzzy -#| msgid "The sound configuration was saved." msgid "The automated printer configuration was in vain." -msgstr "La configuration du son a été enregistrée." +msgstr "La configuration automatique de l'imprimante a été vaine." # TLABEL printer_2002_08_07_0216__200 #. Popup::AnyMessage header: #: src/autoconfig.ycp:216 -#, fuzzy -#| msgid "AutoYaST Printer Configurations" msgid "Automated printer configuration results" -msgstr "Configurations d'imprimantes pour AutoYaST" +msgstr "Résultats de la configuration automatique des 'imprimantes" # TLABEL sound_2002_01_04_0147__117 #: src/basicadd.ycp:48 src/basicmodify.ycp:48 @@ -1363,42 +1351,32 @@ # TLABEL packages_2002_03_14_2340__85 #. TRANSLATORS: Text entry for remote server name #: src/connectionwizard.ycp:1349 -#, fuzzy -#| msgid "Server (NetBIOS Host Name)" msgid "&Server (NetBIOS Host Name)" -msgstr "Serveur (nom d'hôte NetBIOS)" +msgstr "&Serveur (nom d'hôte NetBIOS)" # TLABEL lan_2002_01_04_0147__340 #. TRANSLATORS: Text entry for printer name #: src/connectionwizard.ycp:1366 -#, fuzzy -#| msgid "Printer (Share Name)" msgid "&Printer (Share Name)" -msgstr "Imprimante (nom de partage)" +msgstr "Im&primante (nom de partage)" # TLABEL nfs_2002_01_04_0147__36 #. TRANSLATORS: Text entry for samba domain #: src/connectionwizard.ycp:1376 -#, fuzzy -#| msgid "Workgroup (Domain Name)" msgid "&Workgroup (Domain Name)" -msgstr "Groupe de travail (nom de domaine)" +msgstr "&Workgroup (nom de domaine)" # TLABEL autoinst_2002_08_07_0216__146 #. TRANSLATORS: Frame label for authentication #: src/connectionwizard.ycp:1384 -#, fuzzy -#| msgid "&Authentication Mode" msgid "Authentication (if needed)" -msgstr "Mode d'&authentification" +msgstr "Authentification (si besoin)" # TLABEL nis_server_2002_01_04_0147__80 #. A Label for authentication via fixed username and password: #: src/connectionwizard.ycp:1389 -#, fuzzy -#| msgid "Use prev&iously entered password" msgid "Use fixed username and password" -msgstr "Ut&iliser le mot de passe entré précédemment" +msgstr "Utiliser un nom d'utilisateur et un mot de passe fixés" # TLABEL lan_inetd_2002_01_04_0147__24 #. TRANSLATORS: Text entry for username (authentication) @@ -1415,10 +1393,8 @@ # TLABEL packages_2002_01_04_0147__11 #. A CheckBox to support Active Directory (R): #: src/connectionwizard.ycp:1420 -#, fuzzy -#| msgid "Active Directory Server" msgid "Support for &Active Directory (R)" -msgstr "Activer le serveur de répertoires" +msgstr "Support pour &Active Directory (R)" # TLABEL printconf_2002_03_14_2340__19 #. TRANSLATORS: InputField for a print queue name: @@ -1584,7 +1560,7 @@ #. TRANSLATORS: Tree widget item #: src/connectionwizard.ycp:1980 msgid "Windows (R) or Samba (SMB/CIFS)" -msgstr "" +msgstr "Windows (R) ou Samba (SMB/CIFS)" # TLABEL firewall_2002_03_14_2340__51 #. TRANSLATORS: Tree widget item @@ -1839,10 +1815,9 @@ #. where %1 will be replaced by the SMB share name #. and %2 will be replaced by the host name: #: src/connectionwizard.ycp:2714 -#, fuzzy, ycp-format -#| msgid "Access test failed for share '%1' on host '%2'." +#, ycp-format msgid "The generic test reports failures for share '%1' on host '%2'." -msgstr "Echec du test d'accès au partage '%1' sur l'hôte '%2'." +msgstr "Le test générique a échoué pour le partage '%1' sur l'hôte '%2'." #. Message of a Popup::ErrorDetails #. where %1 will be replaced by the SMB share name @@ -1860,17 +1835,15 @@ # TLABEL nfs_2002_01_04_0147__0 #. Install samba-krb-printing when it is not installed: #: src/connectionwizard.ycp:2887 -#, fuzzy -#| msgid "To access a SMB printer share, the RPM package samba-client must be installed." msgid "To support Active Directory (R), the RPM package samba-krb-printing must be installed." -msgstr "Pour accéder à un partage d'imprimante SMB, le paquet RPM samba-client doit être installé." +msgstr "Pour supporter Active Directory (R), le paquet RPM samba-krb-printing doit être installé." #. Currently there is support for Active Directory (R). #. Show a user notification before it gets disabled: #. Popup::Warning message before Active Directory (R) support gets disabled: #: src/connectionwizard.ycp:2914 msgid "Active Directory (R) support will be disabled for all SMB print queues." -msgstr "" +msgstr "Le support d'Active Directory (R) sera désactivé pour toutes les files d'impressions SMB." # TLABEL printer_2002_08_07_0216__200 #: src/dialogs.ycp:84 src/dialogs.ycp:85 src/dialogs.ycp:86 @@ -3271,13 +3244,13 @@ "" msgstr "" "\n" -"<big>URI de périphérique pour imprimer vers une machine serveur d'impression</big> \n" +"<big>URI de périphérique pour imprimer via une machine serveur d'impression</big> \n" "Contrairement à un simple serveur d'impression (appareil spécialisé), une machine\n" "serveur d'impression est un véritable ordinateur offrant un service d'impression. \n" "L'accès s'effectue via différents protocoles réseau.\n" "Demandez à votre administrateur réseau ce que chaque\n" "machine serveur d'impression fournit dans votre réseau : \n" -"Microsoft Windows/SAMBA (SMB/CIFS) \n" +" Windows (R) ou SAMBA (SMB/CIFS) \n" "Pour accéder à une imprimante partagée SMB, le paquet RPM samba-client doit être installé.\n" "Ce paquet fournit le moteur CUPS 'smb', qui est un lien vers\n" "le programme <tt>/usr/bin/smbspool</tt> chargé d'envoyer les données\n" @@ -3287,13 +3260,43 @@ "De plus, un nom d'utilisateur et un mot de passe peuvent être requis pour en obtenir l'accès.\n" "Gardez à l'esprit que les espaces et caractères spéciaux dans ces valeurs\n" "doivent être encodés avec des pourcents (voir plus haut).\n" -"L'URI de périphérique correspondant est : \n" -"smb://username:password@workgroup/server/printer \n" +"Par défaut, CUPS exécute les backends (ici smbspool) en tant qu'utilisateur 'lp'.\n" +"Lors de l'impression dans un environnement Active Directory (R) (AD)\n" +"l'utilisateur 'lp' n'est pas autorisé à imprimer, ainsi, la methode traditionnelle\n" +"d'impression via smbspool en tant qu'utilisateur 'lp'\n" +"ne fonctionnera pas. \n" +"Pour imprimer dans un environnement AD, le paquet RPM\n" +"samba-krb-printing doit être installé.\n" +"Dans ce cas, le lien du backend CUPS 'smb' est\n" +"modifié en <tt>/usr/bin/get_printing_ticket</tt>\n" +"qui est un wrapper pour exécuter smbspool en tant qu'utilisateur original\n" +"qui a soumis la tâche d'impression.\n" +"Lorsque le protocole Kerberos est utilisé pour l'authentification\n" +"dans un environnement AD, un utilisateur obtient un ticket granting ticket (TGT)\n" +"via le gestionnaire d'affichage lors de la connexion au bureau Gnome ou KDE.\n" +"Lorsque smbspool est exécuté en tant qu'utilisateur original\n" +"qui a soumis la tâche d'impression, il peut accéder au TGT de cet utilisateur\n" +"et l'utiliser pour passer les données d'impression au partage d'imprimante SMB\n" +"même dans un environnement AD avec une authentification Kerberos.\n" +"Dans ce cas, ni un nom d'utilisateur fixé ni un mot de passe fixé\n" +"ne doivent être spécifiés pour l'authentification.\n" +"Une condition est que get_printing_ticket s'exécute sur le même hôte\n" +"que celui où est connecté l'utilisateur qui a soumis la tâche d'impression.\n" +"Cela signifie qu'il doit être configuré sur la station de travail\n" +"pour l'utilisateur donné qui soumettra de telles tâches d'impression\n" +"et la station de travail de l'utilisateur doit envoyer ses données d'impression\n" +"directement au partage d'imprimante SMB dans l'environnement AD.\n" +"En particulier, cela ne fonctionne pas sur une machine serveur CUPS séparée\n" +"où les utilisateurs qui soumettent des tâches d'impression ne sont pas connectés. \n" +"Pour la méthode traditionnelle, l'URI de périphérique correspondant est : \n" +"smb://utilisateur:mot_de_passe@groupe_de_travail/serveur/imprimante \n" "Par exemple 'John Doe' avec le mot de passe '@home!' pourrait utiliser\n" "l'URI de périphérique suivant pour accéder à un partage 'Fun Printer 1000+': \n" "smb://John%20Doe:%40home%21@MYGROUP/homeserver/Fun%20Printer%201000%2B \n" "Pour plus d'informations, consultez <tt>man smbspool</tt> et \n" "http://fr.opensuse.org/SDB:Imprimer_via_un_partage_SMB_(Samba)_ou_Windows \n" +"'Windows' et 'Active Directory' sont des marques déposées\n" +"de Microsoft Corporation aux États-Unis et/ou dans d'autres pays. \n" "Serveur UNIX traditionnel (LPR) \n" "Un Line Printer Daemon (LPD) fonctionne sur un serveur UNIX traditionnel\n" "et fournit une ou plusieurs files d'attente LPD.\n" @@ -3301,7 +3304,7 @@ "L'URI de périphérique correspondant est : \n" "lpd://adresse-ip/file-attente \n" "Serveur CUPS \n" -"Habituellement, vous ne devriez pas configurer une file d'attente locale pour accéder\n" +"Généralement, vous ne devriez pas configurer une file d'attente locale pour accéder\n" "à une file d'attente distante sur un serveur CUPS. Effectuez la configuration\n" "dans la boîte de dialogue Impression via le réseau à la place.\n" "Ne continuez ici que si vous savez de manière certaine que vous devez configurer\n" @@ -3309,7 +3312,7 @@ "IPP est le protocole natif pour CUPS fonctionnant sur un serveur.\n" "Le port officiel IANA pour IPP est 631.\n" "L'URI de périphérique correspondant est : \n" -"ipp://adresse-ip:631/printers/file-attente \n" +"ipp://adresse-ip:631/imprimantes/file-attente \n" "Serveur d'impression Novell Netware (IPX) \n" "Pour accéder aux files d'attente sur un serveur d'impression Novell Netware,\n" "le paquet RPM ncpfs doit être installé.\n" @@ -3572,16 +3575,6 @@ #. SharingDialog help 2/4: #: src/helps.ycp:786 -#, fuzzy -#| msgid "" -#| "\n" -#| "First of all CUPS client systems must be allowed to access the CUPS server.\n" -#| "Then specify whether or not printers should be published to the clients.\n" -#| "It is not required to publish printers in any case.\n" -#| "If you have only one single CUPS server, there is no need to use CUPS Browsing.\n" -#| "Instead it is simpler to specify the CUPS server on the client systems\n" -#| "(via 'Printing Via Network') so that the clients access the server directly.\n" -#| "" msgid "" "\n" "First of all CUPS client systems must be allowed to access the CUPS server.\n" @@ -3596,11 +3589,14 @@ "" msgstr "" "\n" -"Tout d'abord les clients CUPS doivent être autorisés à accéder au serveur CUPS.\n" +"Tout d'abord les systèmes clients CUPS doivent être autorisés à accéder au serveur CUPS.\n" "Spécifiez ensuite si les imprimantes doivent ou non être publiées vers les clients.\n" +"Généralement, sur un réseau local, la configuration de la navigation CUPS est\n" +"d'autoriser l'accès distant à tous les hôtes du réseau local et de \n" +"publier les imprimantes vers tous ces hôtes. \n" "Il n'est pas nécessaire de publier les imprimantes dans tous les cas.\n" "Si vous n'avez qu'un seul serveur CUPS, il n'est pas nécessaire d'utiliser le mode\n" -"de navigation de CUPS. Il est plus simple de spécifier le serveur CUPS sur les clients\n" +"de navigation de CUPS. Il est plus simple de spécifier le serveur CUPS sur les systèmes clients\n" "(via 'Imprimer via le réseau') de sorte que les clients accèdent au serveur directement.\n" "" @@ -4358,25 +4354,19 @@ # TLABEL network_2002_03_14_2340__331 #. Explanation details of a Popup::ErrorDetails. #: src/printer_proposal.ycp:269 -#, fuzzy -#| msgid "Finishing printer configuration..." msgid "This may result broken printer configurations." -msgstr "Fin de la configuration de l'imprimante ..." +msgstr "" #. The automated printer setup found an already existing configuration: #: src/printer_proposal.ycp:298 -#, fuzzy -#| msgid "Edit existing configuration" msgid "Found existing configuration" -msgstr "Editer les configurations existantes" +msgstr "Configurations existantes trouvée" # TLABEL autoinst_2002_08_07_0216__228 #. The automated printer setup created a new configuration: #: src/printer_proposal.ycp:302 -#, fuzzy -#| msgid "Read configurations" msgid "Created configuration" -msgstr "Lire les configurations" +msgstr "Configuration créée" # TLABEL runlevel_2002_03_14_2340__5 #: src/printer_proposal.ycp:313 @@ -4646,19 +4636,15 @@ #. A CheckBox label to publish local print queues by default within the local network: #: src/sharing.ycp:108 -#, fuzzy -#| msgid "&Publish printers by default within the local network" msgid "&Publish printers within the local network" -msgstr "&Publier les imprimantes par défaut dans le réseau local" +msgstr "&Publier les imprimantes sur le réseau local" # TLABEL hwinfo_2002_01_04_0147__40 #. A caption for a table to allow remote access to local print queues #. via network interfaces specified in the table below: #: src/sharing.ycp:118 -#, fuzzy -#| msgid "Network interface" msgid "Via network interfaces" -msgstr "Interface réseau" +msgstr "Via les interfaces réseau" # TLABEL lan_2002_01_04_0147__340 #. A table column header where the column lists network interfaces: @@ -4670,10 +4656,8 @@ #. local print queues are published by default #. via the network interface in the other table column: #: src/sharing.ycp:135 -#, fuzzy -#| msgid "Publish printers by default via this interface" msgid "Publish printers via this interface" -msgstr "Publier les imprimantes par défaut via cette interface" +msgstr "Publier les imprimantes via cette interface" # TLABEL base_2002_08_07_0216__18 #. A PushButton label to add a network interface to the table which shows @@ -4699,18 +4683,14 @@ #. A caption to allow remote access to local print queues #. for hosts and/or networks specified in two TextEntries below: #: src/sharing.ycp:167 -#, fuzzy -#| msgid "Optional Specific IP Addresses or &Network/Netmask" msgid "For Specific IP Addresses or Networks" -msgstr "Adresses IP ou &réseau/masque de sous-réseau spécifiques optionnels" +msgstr "Pour des réseaux ou des adresses IP spécifiques" #. TextEntry to allow remote access to local print queues #. for hosts and/or networks: #: src/sharing.ycp:178 -#, fuzzy -#| msgid "Allow remote access from those IP addresses or &network/netmask (separated by space)" msgid "Allow access from those IP addresses or &network/netmask (separated by space)" -msgstr "Autoriser l'accès distant à partir de ces adresses IP ou &réseaux/masques de sous-réseau (séparés par un espace)" +msgstr "Autoriser l'accès à partir de ces adresses IP ou &réseaux/masques de sous-réseau (séparés par un espace)" #. TextEntry to publish local print queues #. to IP addresses and/or network broadcast addresses: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fr-2.21.0/po/registration.fr.po new/yast2-trans-fr-2.21.0/po/registration.fr.po --- old/yast2-trans-fr-2.21.0/po/registration.fr.po 2011-06-27 16:02:49.000000000 +0200 +++ new/yast2-trans-fr-2.21.0/po/registration.fr.po 2011-07-29 14:22:37.000000000 +0200 @@ -8,20 +8,22 @@ # Karine Nguyen <karine(a)suse.de>, 2001. # Guillaume GARDET <guillaume.gardet(a)free.fr>, 2008. # Fabien Crespel <fabien(a)crespel.net>, 2008. +# Guillaume GARDET <guillaume.gardet(a)opensuse.org>, 2011. msgid "" msgstr "" "Project-Id-Version: registration\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 15:53+0200\n" -"PO-Revision-Date: 2010-05-04 19:07+0100\n" -"Last-Translator: Guillaume GARDET <guillaume.gardet(a)free.fr>\n" -"Language-Team: French Team <opensuse-fr(a)opensuse.org>\n" +"PO-Revision-Date: 2011-07-28 09:56+0200\n" +"Last-Translator: Guillaume GARDET <guillaume.gardet(a)opensuse.org>\n" +"Language-Team: French <opensuse-fr(a)opensuse.org>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.0\n" +"X-Poedit-Language: French\n" # TLABEL online_update_2002_03_14_2340__8 #: src/clients/inst_suse_register.ycp:48 @@ -894,8 +896,6 @@ #. translators: this is a heading for an error message - so no punctuation #: src/modules/Register.ycp:490 -#, fuzzy -#| msgid "Could find SMT certificate file in local path" msgid "Could not find SMT certificate file in local path" msgstr "Impossible de trouver le fichier certificat SMT dans le chemin local" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fr-2.21.0/po/runlevel.fr.po new/yast2-trans-fr-2.21.0/po/runlevel.fr.po --- old/yast2-trans-fr-2.21.0/po/runlevel.fr.po 2011-06-27 16:03:50.000000000 +0200 +++ new/yast2-trans-fr-2.21.0/po/runlevel.fr.po 2011-07-29 14:23:33.000000000 +0200 @@ -5,19 +5,21 @@ # Patricia Vaz <Patricia.Vaz(a)suse.de>, 2003,2004. # Patricia Vaz <patricia(a)suse.de>, 2005. # Guillaume GARDET <guillaume.gardet(a)free.fr>, 2008. +# Guillaume GARDET <guillaume.gardet(a)opensuse.org>, 2011. msgid "" msgstr "" "Project-Id-Version: runlevel\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 15:54+0200\n" -"PO-Revision-Date: 2010-05-04 19:23+0100\n" -"Last-Translator: Guillaume GARDET <guillaume.gardet(a)free.fr>\n" -"Language-Team: French Team <opensuse-fr(a)opensuse.org>\n" +"PO-Revision-Date: 2011-07-28 09:58+0200\n" +"Last-Translator: Guillaume GARDET <guillaume.gardet(a)opensuse.org>\n" +"Language-Team: French <opensuse-fr(a)opensuse.org>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Lokalize 1.0\n" # TLABEL runlevel_2002_01_04_0147__0 #. progress caption @@ -374,10 +376,9 @@ msgstr "Le service %1 sera activé et les ports du pare-feu seront ouverts <a href=\"%2\">(désactiver)</a>" #: src/services_proposal.ycp:186 -#, fuzzy, ycp-format -#| msgid "Service %1 will be disabled and ports in firewall will be open <a href=\"%2\">(enable)</a>" +#, ycp-format msgid "Service %1 will be disabled and ports in firewall will be closed <a href=\"%2\">(enable)</a>" -msgstr "Le service %1 sera désactivé et les ports du pare-feu seront ouverts <a href=\"%2\">(activer)</a>" +msgstr "Le service %1 sera désactivé et les ports du pare-feu seront fermés <a href=\"%2\">(activer)</a>" #: src/services_proposal.ycp:194 #, ycp-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fr-2.21.0/po/samba-client.fr.po new/yast2-trans-fr-2.21.0/po/samba-client.fr.po --- old/yast2-trans-fr-2.21.0/po/samba-client.fr.po 2011-07-08 11:34:47.000000000 +0200 +++ new/yast2-trans-fr-2.21.0/po/samba-client.fr.po 2011-07-29 14:23:28.000000000 +0200 @@ -8,20 +8,22 @@ # Karine Nguyen <karine(a)suse.de>, 2001. # Patricia Vaz <Patricia.Vaz(a)suse.de>, 2003,2004. # Guillaume GARDET <guillaume.gardet(a)free.fr>, 2008, 2011. +# Guillaume GARDET <guillaume.gardet(a)opensuse.org>, 2011. msgid "" msgstr "" "Project-Id-Version: samba-client\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-30 09:50+0200\n" -"PO-Revision-Date: 2011-07-04 22:41+0100\n" -"Last-Translator: Guillaume GARDET <guillaume.gardet(a)free.fr>\n" -"Language-Team: French <kde-i18n-doc(a)kde.org>\n" +"PO-Revision-Date: 2011-07-28 10:02+0200\n" +"Last-Translator: Guillaume GARDET <guillaume.gardet(a)opensuse.org>\n" +"Language-Team: French <opensuse-fr(a)opensuse.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.0\n" +"X-Poedit-Language: French\n" # TLABEL network_2002_03_14_2340__310 #. Samba-client read dialog caption @@ -883,10 +885,8 @@ #. help text for PAM Mount table #: src/routines.ycp:425 -#, fuzzy -#| msgid "In the table Mount Server Directories, you can specify server directories (such as home directory) which should be localy mounted when the user is logged in. If mounting should be user-specific, specify User Name for selected rule. Otherwise, the directory is mounted for each user. For more information, see pam_mount.conf manual page." msgid "In the table Mount Server Directories, you can specify server directories (such as home directory) which should be locally mounted when the user is logged in. If mounting should be user-specific, specify User Name for selected rule. Otherwise, the directory is mounted for each user. For more information, see pam_mount.conf manual page." -msgstr "Dans la table Monter les dossiers serveur, vous pouvez spécifier des dossiers serveurs (comme le dossier home) qui devrait être monté localement lorsque l'utilisateur est logué. Si le montage devrait être spécifique à l'utilisateur, spécifiez le Nom d'utilisateur pour la règle sélectionnée. Sinon, le dossier est monté pour chaque utilisateur. Pour plus d'informations, reportez vous au manuel sur pam_mount.conf ." +msgstr "Dans la table Monter les dossiers serveur, vous pouvez spécifier des dossiers serveurs (comme le dossier home) qui devrait être monté localement lorsque l'utilisateur est connecté. Si le montage devrait être spécifique à l'utilisateur, spécifiez le Nom d'utilisateur pour la règle sélectionnée. Sinon, le dossier est monté pour chaque utilisateur. Pour plus d'informations, reportez vous au manuel de pam_mount.conf ." #. help text for PAM Mount table: example #: src/routines.ycp:428 @@ -895,7 +895,6 @@ #. help text for kerberos method option #: src/routines.ycp:434 -#, fuzzy msgid "The value of Kerberos Method sets how kerberos tickets are verified. When Single Sing-on for SSH is used, the default Kerberos Method set by YaST is <tt>secrets and keytab</tt>. See smb.conf manual page for details." msgstr "La valeur de Methode Kerberos paramètre la façon dont les tickets kerberos sont vérifiés. Lorsque Authentification unique (SSO) pour SSH est utilisé, la methode Kerberos par défaut paramétré par YaST est <tt>secrets and keytab</tt>. Reportez-vous à la page de manuel smb.conf pour plus de détails." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fr-2.21.0/po/status.txt new/yast2-trans-fr-2.21.0/po/status.txt --- old/yast2-trans-fr-2.21.0/po/status.txt 2011-07-08 11:34:57.000000000 +0200 +++ new/yast2-trans-fr-2.21.0/po/status.txt 2011-07-29 14:23:38.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 0 -Fuzzy : 323 -Untranslated : 89 +Fuzzy : 274 +Untranslated : 82 -------------------- - All strings : 412 + All strings : 356 0 % are translated ++++++ yast2-trans-hu-2.21.0.tar.bz2 ++++++ ++++++ yast2-trans-it-2.21.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-it-2.21.0/po/squid.it.po new/yast2-trans-it-2.21.0/po/squid.it.po --- old/yast2-trans-it-2.21.0/po/squid.it.po 2011-06-27 16:14:14.000000000 +0200 +++ new/yast2-trans-it-2.21.0/po/squid.it.po 2011-07-29 14:28:05.000000000 +0200 @@ -17,7 +17,7 @@ "Project-Id-Version: squid\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 16:00+0200\n" -"PO-Revision-Date: 2011-06-02 15:09+0100\n" +"PO-Revision-Date: 2011-07-25 20:30+0100\n" "Last-Translator: Andrea Turrini <andrea.turrini(a)gmail.com>\n" "Language-Team: Italiano <opensuse-translation(a)opensuse.org>\n" "Language: \n" @@ -373,7 +373,7 @@ #: src/SquidACL.ycp:210 msgid "A regular expression that matches the clients browser type based on the user agent header." -msgstr "Un'espressione regolare che combacia con il tipo del browser dei client basandosi sull'intestazione dell'agente dell'utente." +msgstr "Un'espressione regolare che combacia con il tipo del browser dei client basandosi sull'intestazione dello user agent." # #-#-#-#-# squid.it.po (squid) #-#-#-#-# # TLABEL modules/printconf/printconf_ask_device.ycp:134 ++++++ yast2-trans-ja-2.21.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ja-2.21.0/po/yast2-apparmor.ja.po new/yast2-trans-ja-2.21.0/po/yast2-apparmor.ja.po --- old/yast2-trans-ja-2.21.0/po/yast2-apparmor.ja.po 2011-06-27 16:18:03.000000000 +0200 +++ new/yast2-trans-ja-2.21.0/po/yast2-apparmor.ja.po 2011-07-29 14:21:08.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: yast2-apparmor\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 15:55+0200\n" -"PO-Revision-Date: 2011-06-24 10:39+0900\n" +"PO-Revision-Date: 2011-07-27 16:06+0900\n" "Last-Translator: Yasuhiko Kamata <belphegor(a)belbel.or.jp>\n" "Language-Team: Japanese <opensuse-ja(a)opensuse.org>\n" "Language: ja\n" @@ -24,12 +24,12 @@ #: src/agents/ag_genprof.pm:68 msgid "SubDomain does not appear to be started. Please enable SubDomain and try again." -msgstr "サブドメインが開始されていません。サブドメインを有効化して再度行なってください。" +msgstr "SubDomain が開始されていません。 SubDomain を有効化して再度行なってください。" #: src/agents/ag_genprof.pm:75 #, perl-format msgid "Can't find subdomain profiles in %s." -msgstr "%s 内にサブドメインプロファイルが見つかりませんでした。" +msgstr "%s 内に SubDomain プロファイルが見つかりませんでした。" #: src/agents/ag_genprof.pm:87 msgid "" @@ -158,7 +158,7 @@ #: src/agents/ag_genprof.pm:243 msgid "Reloaded SubDomain profiles in enforce mode." -msgstr "サブドメインプロファイルを強制モードで読み込みなおしました。" +msgstr "SubDomain プロファイルを強制モードで読み込みなおしました。" #: src/agents/ag_genprof.pm:244 #, perl-format @@ -282,7 +282,7 @@ #: src/agents/ag_reports_parse.pm:144 msgid "ag_reports_parse: No archived reports found." -msgstr "ag_reports_parse: 保存されたログが見つかりません。" +msgstr "ag_reports_parse: 保存されたレポートが見つかりません。" #: src/agents/ag_reports_parse.pm:149 #, perl-format @@ -568,7 +568,7 @@ #: src/include/subdomain/apparmor_ycp_utils.ycp:45 msgid "&Profile ix" -msgstr "プロファイル (&P)" +msgstr "プロファイル継承 (&P)" #: src/include/subdomain/apparmor_ycp_utils.ycp:46 msgid "&Profile ix Clean Exec" @@ -609,7 +609,7 @@ #: src/include/subdomain/apparmor_ycp_utils.ycp:59 msgid "Glob w/E&xt" -msgstr "グロブと外部 (&X)" +msgstr "拡張子付きグロブ (&X)" #: src/include/subdomain/apparmor_ycp_utils.ycp:60 msgid "&Add Requested Hat" @@ -1301,7 +1301,7 @@ "概要の通知: 概要の通知を選択すると、\n" "記録された AppArmor のセキュリティイベントと、それぞれの発生回数を \n" "最後に発生した時刻とともに一覧表示します。 \n" -" 例: <tt>サブドメイン: 機能 'setgid' に対してアクセスを許可\n" +" 例: <tt>SubDomain: 機能 'setgid' に対してアクセスを許可\n" "(httpd2-prefork(6347) プロファイル /usr/sbin/httpd2-prefork \n" "アクティブ /usr/sbin/httpd2-prefork) 2 回, 最終 2004 年 10 月 9 日日曜日 16:05:54</tt>\n" "" @@ -1403,8 +1403,8 @@ "<li>Select Include unknown security events if \n" "you would like to include events that are not rated with a severity number.</li>" msgstr "" -"<li>重大度の番号が割り当てないイベントも通知する場合は、 \n" -"［不明なセキュリティイベントを含みます］を選択します。</li>" +"<li>重大度が割り当てないイベントも通知するには、 \n" +"不明なセキュリティイベントを含む を選択します。</li>" #: src/include/subdomain/helps.ycp:82 msgid "AppArmor Profiling Wizard " @@ -1574,7 +1574,7 @@ #: src/include/subdomain/helps.ycp:152 msgid "Discrete Profile execute mode " -msgstr "AutoYastプロファイルのセットアップ " +msgstr "独立プロファイル実行モード " #: src/include/subdomain/helps.ycp:153 msgid "" @@ -1628,23 +1628,23 @@ #: src/include/subdomain/helps.ycp:178 msgid "<li>* can substitute for any number of characters, except '/'<li>" -msgstr "<li>* '/'を除き、任意の数の文字に代えることができる<li>" +msgstr "<li>* '/'を除き、任意の長さの文字に取って代わることができる<li>" #: src/include/subdomain/helps.ycp:179 msgid "<li>** can substitute for any number of characters, including '/'</li>" -msgstr "<li>** '/'を含め、任意の数の文字に代えることができる</li>" +msgstr "<li>** '/'を含め、任意の長さの文字に取って代わることができる</li>" #: src/include/subdomain/helps.ycp:180 msgid "<li>? can substitute for any single character except '/'</li>" -msgstr "<li>? '/'を除いた任意の1文字に代えることができる</li>" +msgstr "<li>? '/'を除いた任意の 1 文字に取って代わることができる</li>" #: src/include/subdomain/helps.ycp:181 msgid "<li>[abc] will substitute for the single character a, b, or c</li>" -msgstr "<li>[abc] a、b または c の1文字の代わりになる</li>" +msgstr "<li>[abc] a, b, c のうち、いずれか 1 文字の代わりになる</li>" #: src/include/subdomain/helps.ycp:182 msgid "<li>[a-c] will substitute for the single character a, b, or c</li>" -msgstr "<li>[a-c] a、b または c の1文字の代わりになる</li>" +msgstr "<li>[a-c] a, b, c のうち、いずれか 1 文字の代わりになる</li>" #: src/include/subdomain/helps.ycp:183 msgid "<li>{ab,cd} will expand to one rule to match ab, one rule to match cd</li>" @@ -1652,7 +1652,7 @@ #: src/include/subdomain/helps.ycp:186 msgid "Clean Exec - for sanitized execution" -msgstr "クリーン実行 - 無害化された実行のために" +msgstr "クリーン実行 - 無害化された実行" #: src/include/subdomain/helps.ycp:188 msgid "" @@ -2081,9 +2081,9 @@ "one specific process or running program (this number is valid only \n" "during the lifetime of that process). " msgstr "" -"PID番号: プロセスID番号は一つの特定プロセスまたは実行中の \n" -"プログラムを一意に識別する番号です(この番号はそのプロセスの \n" -"生存期間中のみ有効です)。 " +"PID番号: プロセスID番号は、特定のプロセス (実行中のプログラム)\n" +"を識別するための番号です (この番号はプロセスが終了するまでの間に\n" +"限って有効となる値です) 。 " #: src/include/subdomain/report_helptext.ycp:29 msgid "" @@ -2146,8 +2146,8 @@ "The Report Configuration dialog enables you to filter the archived \n" "report selected in the previous screen. To filter by Date Range:" msgstr "" -"［環境設定のレポート］ダイアログにより、前の画面で選択された \n" -"アーカイブレポートをフィルタできます。 日付範囲によりフィルタする:" +"レポート設定ダイアログでは、以前の画面で選択した保存済みレポートに\n" +"対して、フィルタを設定することができます。 日付範囲でフィルタ するには:" #: src/include/subdomain/report_helptext.ycp:55 msgid "" @@ -2857,7 +2857,7 @@ #: src/include/subdomain/reporting_dialogues.ycp:868 msgid "View &All" -msgstr "すべて表示（&A" +msgstr "すべて表示 (&A)" #: src/include/subdomain/reporting_dialogues.ycp:1075 msgid "Events DB Not Initialized." @@ -3110,7 +3110,7 @@ #: src/include/subdomain/reporting_dialogues.ycp:2478 msgid "Cannot delete a stock report." -msgstr "保存されているレポートを削除できません。" +msgstr "ストックレポートは削除できません。" #: src/include/subdomain/reporting_utils.ycp:78 #, ycp-format ++++++ yast2-trans-lt-2.21.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-2.21.0/po/control.lt.po new/yast2-trans-lt-2.21.0/po/control.lt.po --- old/yast2-trans-lt-2.21.0/po/control.lt.po 2011-06-27 16:25:54.000000000 +0200 +++ new/yast2-trans-lt-2.21.0/po/control.lt.po 2011-07-29 14:26:37.000000000 +0200 @@ -5,21 +5,21 @@ # Jonas Gocentas <jonasgocentas(a)florida.usa.com>, 2001. # Linas Spraunius <linas(a)operis.org>, 2004. # Andrius Štikonas <stikonas(a)gmail.com>, 2006. -# Mindaugas Baranauskas <embar(a)users.berlios.de>, 2009, 2010. +# Mindaugas Baranauskas <embar(a)users.berlios.de>, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: control\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 15:57+0200\n" -"PO-Revision-Date: 2010-07-30 16:33+0300\n" +"PO-Revision-Date: 2011-07-02 14:15+0300\n" "Last-Translator: Mindaugas Baranauskas <embar(a)users.berlios.de>\n" -"Language-Team: Lithuanian <>\n" +"Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%10==1 ? 0 : n%10==1 && n%100!=11 ? 1 : n%10>=2 && (n%100<10 || n%100>=20) ? 2 : 3);\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.2\n" #: control/add-on-template_installation.glade:7 msgid "Add-On Product Installation" @@ -153,7 +153,7 @@ #: control/control.openSUSE.glade:809 control/control.openSUSE.glade:911 #: control/control.openSUSE.glade:1034 control/control.openSUSE.glade:1079 msgid "Welcome" -msgstr "Sveikiname" +msgstr "Pasisveikinimas" #: control/control.SLED.glade:594 control/control.SLES.glade:728 #: control/control.glade:343 control/control.openSUSE.glade:650 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-2.21.0/po/fcoe-client.lt.po new/yast2-trans-lt-2.21.0/po/fcoe-client.lt.po --- old/yast2-trans-lt-2.21.0/po/fcoe-client.lt.po 2011-07-08 11:53:57.000000000 +0200 +++ new/yast2-trans-lt-2.21.0/po/fcoe-client.lt.po 2011-07-29 14:26:45.000000000 +0200 @@ -2,16 +2,16 @@ # Copyright (C) 2005 SUSE Linux Products GmbH. # Copyright (C) 2002 SuSE Linux AG. # Copyright (C) 2000, 2001 SuSE GmbH. +# # Jonas Gocentas <jonasgocentas(a)florida.usa.com>, 2001. # Linas Spraunius <lsprauni(a)radio.lt>, 2000. -# Mindaugas Baranauskas <embar(a)users.berlios.de>, 2009, 2010. -# +# Mindaugas Baranauskas <embar(a)users.berlios.de>, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-30 14:26+0200\n" -"PO-Revision-Date: 2001-10-18 09:54+0200\n" +"PO-Revision-Date: 2011-07-02 14:02+0300\n" "Last-Translator: Mindaugas Baranauskas <embar(a)users.berlios.de>\n" "Language-Team: Lithuanian <opensuse-translation(a)opensuse.org>\n" "Language: lt\n" @@ -19,12 +19,12 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%10==1 ? 0 : n%10==1 && n%100!=11 ? 1 : n%10>=2 && (n%100<10 || n%100>=20) ? 2 : 3);\n" +"X-Generator: Lokalize 1.2\n" #: src/FcoeClient.ycp:254 -#, fuzzy, ycp-format -#| msgid "To clone the current system, the %1 package must be installed." +#, ycp-format msgid "To continue the FCoE configuration, the %1 package must be installed." -msgstr "Norint dubliuoti esamą sistemą, turi būti įdiegtas paketas %1." +msgstr "Norint tęsti FCoE konfigūravimą, turi būti įdiegtas paketas %1." #: src/FcoeClient.ycp:255 msgid "Install it now?" @@ -32,10 +32,8 @@ #. FcoeClient read dialog caption #: src/FcoeClient.ycp:727 -#, fuzzy -#| msgid "Initializing inetd Configuration" msgid "Initializing fcoe-client Configuration" -msgstr "Paleidžiamas inetd konfigūravimas" +msgstr "Ruošiamas fcoe-client konfigūravimas" #. Progress stage 1/3 #: src/FcoeClient.ycp:738 @@ -44,38 +42,28 @@ #. Progress stage 2/3 #: src/FcoeClient.ycp:740 -#, fuzzy -#| msgid "Network services" msgid "Check services" -msgstr "Tinklo paslaugos" +msgstr "Tikrinti paslaugas" #. Progress stage 3/3 #: src/FcoeClient.ycp:742 -#, fuzzy -#| msgid "Detecting network cards..." msgid "Detect network cards" -msgstr "Ieškoma tinklo plokščių..." +msgstr "Aptikti tinklo plokštes" #. Progress stage 4/4 #: src/FcoeClient.ycp:744 -#, fuzzy -#| msgid "Read device configuration" msgid "Read /etc/fcoe/config" -msgstr "Skaityti įrenginio konfigūraciją" +msgstr "Skaityti /etc/fcoe/config" #. Progress step 1/3 #: src/FcoeClient.ycp:747 -#, fuzzy -#| msgid "Checking for installed RPM packages..." msgid "Checking for installed packages..." -msgstr "Tikrinami įdiegti RPM paketai..." +msgstr "Tikrinami įdiegti paketai..." #. Progress step 2/3 #: src/FcoeClient.ycp:749 -#, fuzzy -#| msgid "Checking for network devices..." msgid "Checking for services..." -msgstr "Ieškoma tinklo įrenginių..." +msgstr "Tikrinamos paslaugos..." #. Progress step 3/3 #: src/FcoeClient.ycp:751 @@ -84,10 +72,8 @@ #. Progress step 4/4 #: src/FcoeClient.ycp:753 -#, fuzzy -#| msgid "Reading the config file..." msgid "Reading /etc/fcoe/config" -msgstr "Skaitoma konfigūracijos rinkmena..." +msgstr "Skaitoma /etc/fcoe/config rinkmena..." #. Progress finished #: src/FcoeClient.ycp:755 src/FcoeClient.ycp:847 @@ -96,10 +82,8 @@ #. Error message #: src/FcoeClient.ycp:783 -#, fuzzy -#| msgid "Starting the LDAP service failed." msgid "Starting of services failed." -msgstr "Nepavyko paleisti LDAP paslaugos." +msgstr "Nepavyko paleisti paslaugų." #. Error message #: src/FcoeClient.ycp:793 @@ -108,17 +92,13 @@ #. Error message #: src/FcoeClient.ycp:803 -#, fuzzy -#| msgid "Cannot read the configuration." msgid "Cannot read /etc/fcoe/config." -msgstr "Nepavyksta nuskaityti konfigūracijos." +msgstr "Nepavyksta skaityti /etc/fcoe/config." #. FcoeClient read dialog caption #: src/FcoeClient.ycp:823 -#, fuzzy -#| msgid "Saving inetd Configuration" msgid "Saving fcoe-client Configuration" -msgstr "Išsaugoma inetd konfigūracija" +msgstr "Įrašoma fcoe-client konfigūracija" #. Progress stage 1/2 #: src/FcoeClient.ycp:834 @@ -127,17 +107,13 @@ #. Progress stage 2/3 #: src/FcoeClient.ycp:836 -#, fuzzy -#| msgid "Restart services" msgid "Restart FCoE service" -msgstr "Iš naujo paleisti paslaugas" +msgstr "Iš naujo paleisti FCoE paslaugą" #. Progress stage 3/3 #: src/FcoeClient.ycp:838 -#, fuzzy -#| msgid "Adjust the DNS service" msgid "Adjust start of services" -msgstr "Derinti DNS paslaugą" +msgstr "Derinti paslaugų paleidimą" #. Progress step 1/2 #: src/FcoeClient.ycp:841 @@ -146,44 +122,38 @@ #. Progress step 2/3 #: src/FcoeClient.ycp:843 -#, fuzzy -#| msgid "Restarting service..." msgid "Restarting FCoE service..." -msgstr "Perkraunama paslauga..." +msgstr "Iš naujo paleidžiama FCoE paslauga..." #. Progress sstep 3/3 #: src/FcoeClient.ycp:845 -#, fuzzy -#| msgid "Adjusting the DNS service..." msgid "Adjusting start of services..." -msgstr "Derinamos DNS paslaugos..." +msgstr "Derinamas paslaugų paleidimas..." #. Error message #: src/FcoeClient.ycp:864 -#, fuzzy -#| msgid "Cannot write settings to /etc/samba/smb.conf." msgid "Cannot write settings to /etc/fcoe/config." -msgstr "Nepavyksta įrašyti nuostatų į /etc/samba/smb.conf." +msgstr "Nepavyksta įrašyti nuostatų į /etc/fcoe/config." #: src/FcoeClient.ycp:868 msgid "" "Cannot write settings for FCoE interfaces.\n" "For details see /var/log/YaST2/y2log" msgstr "" +"Nepavyksta įrašyti FCoE sąsajų nuostatų.\n" +"Daugiau informacijos rasite /var/log/YaST2/y2log" #. Error message #: src/FcoeClient.ycp:877 -#, fuzzy -#| msgid "Deleting the request failed." msgid "/etc/init.d/fcoe restart failed." -msgstr "Užklausos ištrinti nepavyko." +msgstr "Nepavyko paleisti iš naujo /etc/init.d/fcoe." #. Configuration summary text for autoyast #: src/FcoeClient.ycp:941 #, fuzzy -#| msgid "<big>Global Configuration of DRBD</big>" +#| msgid "<big>General configuration of FCoE</big>" msgid "General FCoE configuration" -msgstr "<big>DRBD globali konfigūracija</big>" +msgstr "<big>Bendra FCoE konfigūracija</big>" #: src/FcoeClient.ycp:945 #, fuzzy @@ -200,20 +170,19 @@ #: src/FcoeClient.ycp:956 #, fuzzy -#| msgid "Starting the LDAP service failed." +#| msgid "Starting of services failed." msgid "Starting of services" -msgstr "Nepavyko paleisti LDAP paslaugos." +msgstr "Nepavyko paleisti paslaugų." #: src/complex.ycp:236 -#, fuzzy, ycp-format -#| msgid "Configuration of printer" +#, ycp-format msgid "Configuration of Interface %1" -msgstr "Spausdintuvo konfigūracija" +msgstr "%1 sąsajos konfigūracija" #. headline of a popup: creating and starting Fibre Channel over Ethernet #: src/complex.ycp:280 msgid "Creating and starting FCoE on detected VLAN device" -msgstr "" +msgstr "Aptiktame VLAN įrenginyje kuriamas ir paleidžiamas FCoE" #. question to the user: really create and start FCoE #: src/complex.ycp:282 @@ -223,18 +192,20 @@ "interface for discovered FCoE VLAN interface\n" "on %1 and start the FCoE initiator?" msgstr "" +"Tikrai sukurti FCoE tinklo sąsają\n" +"aptiktoms FCoE VLAN sąsajoms\n" +"%1 ir paleisti FCoE iniciatorių?" #. text of an error popup #: src/complex.ycp:297 -#, fuzzy, ycp-format -#| msgid "Cannot create zone %1." +#, ycp-format msgid "Cannot create and start FCoE on %1" -msgstr "Nepavyksta sukurti zonos %1." +msgstr "Nepavyksta sukurti ir paleisti FCoE %1." #. headline of a popup: starting Fibre Channel over Ethernet #: src/complex.ycp:310 msgid "Starting FCoE on detected VLAN device" -msgstr "" +msgstr "Aptiktame virtualiojo vietinio tinklo įrenginyje paleidžiamas FCoE" #. question to the user: really start FCoE #: src/complex.ycp:312 @@ -243,38 +214,31 @@ "Do you really want to start FCoE initiator\n" "on discovered FCoE VLAN interface on %1?" msgstr "" +"Tikrai paleisti FCoE iniciatorių\n" +"„%1“ aptiktoje FCoE VLAN sąsajoje?" #. text of an error popup: command failed on the network interface #: src/complex.ycp:350 -#, fuzzy, ycp-format -#| msgid "Command %1 failed" +#, ycp-format msgid "Command \"%1\" on %2 failed." -msgstr "Komanda %1 nepavyko" +msgstr "%1 komanda nepavyko įvykdyti %2 tinklo sąsajoje." #: src/dialogs.ycp:73 src/dialogs.ycp:123 -#, fuzzy -#| msgid "Enable" msgid "FCoE Enable" -msgstr "Įgalinti" +msgstr "FCoE įgalintas" #: src/dialogs.ycp:78 src/dialogs.ycp:123 -#, fuzzy -#| msgid "Requires" msgid "DCB Required" -msgstr "Reikalauja" +msgstr "Reikalingas DCB" #. frame #: src/dialogs.ycp:102 -#, fuzzy -#| msgid "Service Start" msgid "FCoE Service Start" -msgstr "Paleisti paslaugą" +msgstr "FCoE paslaugos paleidimas" #: src/dialogs.ycp:106 -#, fuzzy -#| msgid "Service Start" msgid "Lldpad Service Start" -msgstr "Paleisti paslaugą" +msgstr "Lldpad paslaugos paleidimas" #: src/dialogs.ycp:122 msgid "Device Name" @@ -285,33 +249,25 @@ msgstr "Modelis" #: src/dialogs.ycp:122 -#, fuzzy -#| msgid "Interface" msgid "FCoE VLAN Interface" -msgstr "Sąsaja" +msgstr "FCoE VLAN sąsaja" #: src/dialogs.ycp:123 msgid "DCB capable" -msgstr "" +msgstr "DCB veiksnus" #: src/dialogs.ycp:126 -#, fuzzy -#| msgid "Change &Status" msgid "Change &Settings" -msgstr "Pakeisti &būseną" +msgstr "Keisti &nuostatas" #: src/dialogs.ycp:127 -#, fuzzy -#| msgid "&Name of Interface" msgid "Create FCoE &VLAN Interface" -msgstr "&Sąsajos pavadinimas" +msgstr "Kurti FCoE &VLAN sąsają" #. Frame label - configuration settings of FCoE #: src/dialogs.ycp:143 -#, fuzzy -#| msgid "Ad&ministration Settings" msgid "Configuration Settings" -msgstr "&Administratoriaus nuostatos" +msgstr "Konfigūracijos nuostatos" #. ComboBox label #: src/dialogs.ycp:146 @@ -320,47 +276,35 @@ #: src/dialogs.ycp:151 msgid "&Use syslog" -msgstr "" +msgstr "&Naudoti sistemos žurnalą" #. Command line help text for the Xfcoe-client module #: src/fcoe-client.ycp:54 -#, fuzzy -#| msgid "Configuration of NFS client" msgid "Configuration of fcoe-client" -msgstr "NIS kliento konfigūracija" +msgstr "fcoe-client konfigūravimas" #. progress step title #: src/fcoe-client_finish.ycp:43 -#, fuzzy -#| msgid "Saving console configuration..." msgid "Saving fcoe configuration..." -msgstr "Išsaugoma konsolės konfigūracija..." +msgstr "Įrašoma fcoe-client konfigūracija..." #. Rich text title for FcoeClient in proposals #: src/fcoe-client_proposal.ycp:84 -#, fuzzy -#| msgid "Clients" msgid "FcoeClient" -msgstr "Klientai" +msgstr "Fcoe klientas" #. Menu title for FcoeClient in proposals #: src/fcoe-client_proposal.ycp:86 -#, fuzzy -#| msgid "NFS Client" msgid "&FcoeClient" -msgstr "NFS klientas" +msgstr "&Fcoe klientas" #. Read dialog help 1/2 #: src/helps.ycp:39 -#, fuzzy -#| msgid "" -#| "<big>Initializing xinetd Configuration</big> \n" -#| "Please wait... \n" msgid "" "<big>Initializing fcoe-client Configuration</big> \n" "Please wait... \n" msgstr "" -"<big>Paleidžiamas xinetd konfigūravimas</big> \n" +"<big>Ruošiamas fcoe-client konfigūravimas</big> \n" "Palaukite... \n" #. Read dialog help 2/2 @@ -374,15 +318,11 @@ #. Write dialog help 1/2 #: src/helps.ycp:49 -#, fuzzy -#| msgid "" -#| "<big>Saving xinetd Configuration</big> \n" -#| "Please wait... \n" msgid "" "<big>Saving fcoe-client Configuration</big> \n" "Please wait... \n" msgstr "" -"<big>Išsaugoma xinetd konfigūracija</big> \n" +"<big>Įrašomos fcoe-client nuostatos</big> \n" "Palaukite... \n" #. Write dialog help 2/2 @@ -400,49 +340,36 @@ #. Summary dialog help 1/3 #: src/helps.ycp:61 -#, fuzzy -#| msgid "" -#| "<big>Squid Configuration</big> \n" -#| "Configure squid here. \n" msgid "" "<big>FcoeClient Configuration</big> \n" "Configure fcoe-client here. \n" msgstr "" -"<big>Squid konfigūravimas</big> \n" -"Čia konfigūruokite squid. \n" +"<big>Fcoe kliento konfigūravimas</big> \n" +"Čia konfigūruokite fcoe-client. \n" #. Summary dialog help 2/3 #: src/helps.ycp:66 -#, fuzzy -#| msgid "" -#| "<big>Adding a Provider:</big> \n" -#| "Choose a provider from the list of available providers\n" -#| "then press Edit.\n" msgid "" "<big>Adding a fcoe-client:</big> \n" "Choose an fcoe-client from the list of detected fcoe-clients.\n" "If your fcoe-client was not detected, use Other (not detected).\n" "Then press Configure.\n" msgstr "" -"<big>Tiekėjo pridėjimas:</big> \n" -"Iš galimų tiekėjų sąrašo pasirinkite tiekėją ir spauskite\n" -"Keisti.\n" +"<big>Fcoe kliento pridėjimas:</big> \n" +"Pasirinkite fcoe klientą iš aptiktų fcoe klientų sąrašo\n" +"Jei fcoe klientas nebuvo aptiktas, naudokite Kitas (neaptiktas).\n" +"Tuomet paspauskite Konfigūruoti.\n" #. Summary dialog help 3/3 #: src/helps.ycp:73 -#, fuzzy -#| msgid "" -#| "<big>Editing or Deleting:</big> \n" -#| "If you press Edit, an additional dialog in which\n" -#| "to change the configuration opens.\n" msgid "" "<big>Editing or Deleting:</big> \n" "If you press Edit, an additional dialog in which to change\n" "the configuration opens.\n" msgstr "" -"<big>Keitimas arba trynimas:</big> \n" -"Jei paspausite Keisti, atsivers papildomas dialogas,\n" -"kur galėsite pakeisti konfigūraciją.\n" +"<big>Keitimas arba šalinimas:</big> \n" +"Jei paspausite Keisti, atsivers papildomas dialogo langas, kuriame galėsite keisti\n" +"konfigūraciją.\n" #. Services dialog help 1/2 #: src/helps.ycp:79 @@ -451,6 +378,9 @@ "There is the possibility to enable/disable the start of the services\n" "fcoe and lldpad at boot time. \n" msgstr "" +"<big>Paslaugų paleidimas</big> \n" +"Yra galimybė įgalinti/uždrausti fcoe ir lldpad\n" +"paslaugų paleidimą operacinės sistemos paleidimo metu. \n" #. Services dialog help 2/2 #: src/helps.ycp:85 @@ -458,17 +388,13 @@ "Check the appropriate button, e.g. if you want to start FCoE automatically at\n" "boot time click on 'When booting' in 'FcoE' frame." msgstr "" +"Rinkitės atitinkamą mygtuką, pvz., jei norite operacinės sistemos paleidimo metu\n" +"automatiškai paleisti FCoE, „FCoE“ rėmelyje spauskite „Operacinės sistemos paleidimo metu“." #. Interfaces dialog help 1/4 #: src/helps.ycp:89 -#, fuzzy -#| msgid "" -#| "<big>Network Server Configuration</big> \n" -#| "" msgid "<big>Network interface overview</big> " -msgstr "" -"<big>Tinklo serverio konfigūracija</big> \n" -"" +msgstr "<big>Tinklo sąsajos apžvalga</big> " #. Interfaces dialog help 2/4 #: src/helps.ycp:92 @@ -486,30 +412,18 @@ #. Interfaces dialog help 3/4 #: src/helps.ycp:101 -#, fuzzy -#| msgid "" -#| "\n" -#| "To change the configuration of a card, select the card.\n" -#| "Then press Edit.\n" -#| "\n" msgid "To change the configuration of an existing FCoE VLAN interface press button Change Settings." -msgstr "" -"\n" -"Norėdami keisti garso plokštės konfigūraciją, pirma ją pasirinkite.\n" -"Po to spauskite Keisti.\n" -"\n" +msgstr "Norėdami pakeisti esamos FCoE virtualiojo vietinio tinklo sąsajos konfigūraciją, spauskite Keisti nuostatas." #. Configuration dialog help 1/3 #: src/helps.ycp:104 -#, fuzzy -#| msgid "<big>Global Configuration of DRBD</big>" msgid "<big>General configuration of FCoE</big>" -msgstr "<big>DRBD globali konfigūracija</big>" +msgstr "<big>Bendra FCoE konfigūracija</big>" #. Configuration dialog help 2/3 #: src/helps.ycp:107 msgid "Here you can configure the general settings for the FCoE system service. The settings are written to '/etc/fcoe/config'." -msgstr "" +msgstr "Čia galite konfigūruoti bendras the FCoE paslaugos nuostatas. Nuostatos įrašomos į /etc/fcoe/config." #. Configuration dialog help 3/3 #: src/helps.ycp:110 @@ -522,7 +436,7 @@ #. edit dialog help 1/3 #: src/helps.ycp:115 msgid "Edit settings in /etc/fcoe/ethx" -msgstr "" +msgstr "Keisti nuostatas /etc/fcoe/ethx rinkmenoje" #. Edit dialog help 2/3 #: src/helps.ycp:118 @@ -543,17 +457,13 @@ #. Header of tab in tab widget #: src/wizards.ycp:86 src/wizards.ycp:111 -#, fuzzy -#| msgid "Interfaces" msgid "&Interfaces" -msgstr "Sąsajos" +msgstr "&Sąsajos" #. Header of tab in tab widget #: src/wizards.ycp:92 src/wizards.ycp:117 -#, fuzzy -#| msgid "Configuration" msgid "&Configuration" -msgstr "Konfigūracija" +msgstr "&Konfigūracija" #. Header of tab in tab widget #: src/wizards.ycp:105 @@ -562,23 +472,17 @@ #. Initialization dialog caption #: src/wizards.ycp:147 -#, fuzzy -#| msgid "Fibre Channel information" msgid "Fibre Channel over Ethernet Configuration" -msgstr "Skaidulinio kanalo informacija" +msgstr "Skaidulinio kanalo per eternetą konfigūravimas" #: src/wizards.ycp:165 -#, fuzzy -#| msgid "Change Installation Settings" msgid "Change FCoE Settings" -msgstr "Keisti diegimo nuostatas" +msgstr "Keisti FCoE nuostatas" #. Initialization dialog caption #: src/wizards.ycp:269 -#, fuzzy -#| msgid "NFS Client Configuration" msgid "FcoeClient Configuration" -msgstr "NFS kliento konfigūravimas" +msgstr "Fcoe kliento konfigūravimas" #. Initialization dialog contents #: src/wizards.ycp:271 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-2.21.0/po/http-server.lt.po new/yast2-trans-lt-2.21.0/po/http-server.lt.po --- old/yast2-trans-lt-2.21.0/po/http-server.lt.po 2011-06-27 16:26:09.000000000 +0200 +++ new/yast2-trans-lt-2.21.0/po/http-server.lt.po 2011-07-29 14:26:52.000000000 +0200 @@ -5,13 +5,13 @@ # Jonas Gocentas <jonasgocentas(a)florida.usa.com>, 2001. # Linas Spraunius <linas(a)operis.org>, 2004. # Andrius Štikonas <stikonas(a)gmail.com>, 2006. -# Mindaugas Baranauskas <embar(a)users.berlios.de>, 2009, 2010. +# Mindaugas Baranauskas <embar(a)users.berlios.de>, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: http-server.lt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 15:57+0200\n" -"PO-Revision-Date: 2010-12-28 19:29+0200\n" +"PO-Revision-Date: 2011-06-27 11:57+0300\n" "Last-Translator: Mindaugas Baranauskas <embar(a)users.berlios.de>\n" "Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: lt\n" @@ -19,7 +19,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%10==1 ? 0 : n%10==1 && n%100!=11 ? 1 : n%10>=2 && (n%100<10 || n%100>=20) ? 2 : 3);\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.2\n" #. HttpServer read dialog caption #: src/HttpServer.ycp:106 @@ -112,7 +112,7 @@ #. translators: progress stage 1/3 #: src/HttpServer.ycp:315 msgid "Write the Apache2 settings" -msgstr "Įrašyti Apache2 nustatymus" +msgstr "Įrašyti Apache2 nuostatas" #. translators: progress stage 2/3 #: src/HttpServer.ycp:318 @@ -127,7 +127,7 @@ #. translators: progress step 1/3 #: src/HttpServer.ycp:323 msgid "Writing the settings..." -msgstr "Įrašomi nustatymai..." +msgstr "Įrašomos nuostatos..." #. translators: progress step 2/3 #: src/HttpServer.ycp:326 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-2.21.0/po/ntp-client.lt.po new/yast2-trans-lt-2.21.0/po/ntp-client.lt.po --- old/yast2-trans-lt-2.21.0/po/ntp-client.lt.po 2011-06-27 16:26:07.000000000 +0200 +++ new/yast2-trans-lt-2.21.0/po/ntp-client.lt.po 2011-07-29 14:26:49.000000000 +0200 @@ -6,13 +6,13 @@ # Jonas Gocentas <linuxjonas(a)unitedlinux.lt>, 2003. # Linas Spraunius <linas(a)operis.org>, 2003, 2004. # Andrius Štikonas <stikonas(a)gmail.com>, 2006. -# Mindaugas Baranauskas <embar(a)users.berlios.de>, 2009, 2010. +# Mindaugas Baranauskas <embar(a)users.berlios.de>, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: ntp-client\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 15:58+0200\n" -"PO-Revision-Date: 2010-11-13 19:06+0200\n" +"PO-Revision-Date: 2011-07-02 14:13+0300\n" "Last-Translator: Mindaugas Baranauskas <embar(a)users.berlios.de>\n" "Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: lt\n" @@ -20,7 +20,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%10==1 ? 0 : n%10==1 && n%100!=11 ? 1 : n%10>=2 && (n%100<10 || n%100>=20) ? 2 : 3);\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.2\n" #. NtpClient read dialog caption #: src/NtpClient.ycp:474 @@ -72,7 +72,7 @@ #. progress step #: src/NtpClient.ycp:723 msgid "Writing the settings..." -msgstr "Įrašomos nustatos..." +msgstr "Įrašomos nuostatos..." #. progress step #: src/NtpClient.ycp:725 @@ -568,26 +568,24 @@ #. dialog caption #: src/dialogs.ycp:444 msgid "Local Reference Clock" -msgstr "" +msgstr "Vietinis pamatinis generatorius" #. dialog caption #. table cell, NTP relationship type #: src/dialogs.ycp:473 src/widgets.ycp:503 -#, fuzzy msgid "Outgoing Broadcast" -msgstr "Priimama transliacija" +msgstr "Siunčiama transliacija" #. dialog caption #. table cell, NTP relationship type #: src/dialogs.ycp:498 src/widgets.ycp:505 -#, fuzzy msgid "Incoming Broadcast" -msgstr "Priimama transliacija" +msgstr "Gaunama transliacija" #. text entry #: src/dialogs.ycp:520 msgid "&Reference ID" -msgstr "" +msgstr "&Rodyklės ID" #. int field #: src/dialogs.ycp:523 @@ -1364,15 +1362,13 @@ #. radio button, NTP relationship type #: src/widgets.ycp:1483 -#, fuzzy msgid "&Outgoing Broadcast" -msgstr "Priimama transliacija" +msgstr "&Siunčiama transliacija" #. radio button, NTP relationship type #: src/widgets.ycp:1485 -#, fuzzy msgid "&Incoming Broadcast" -msgstr "Priimama transliacija" +msgstr "&Gaunama transliacija" #. frame #: src/widgets.ycp:1488 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-2.21.0/po/online-migration.lt.po new/yast2-trans-lt-2.21.0/po/online-migration.lt.po --- old/yast2-trans-lt-2.21.0/po/online-migration.lt.po 2011-06-27 16:26:17.000000000 +0200 +++ new/yast2-trans-lt-2.21.0/po/online-migration.lt.po 2011-07-29 14:27:00.000000000 +0200 @@ -6,21 +6,21 @@ # # Jonas Gocentas <jonasgocentas(a)florida.usa.com>, 2001. # Linas Spraunius <lsprauni(a)radio.lt>, 2000. -# Mindaugas Baranauskas <embar(a)users.berlios.de>, 2009, 2010. +# Mindaugas Baranauskas <embar(a)users.berlios.de>, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: online-migration.lt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 15:54+0200\n" -"PO-Revision-Date: 2010-07-29 18:40+0300\n" +"PO-Revision-Date: 2011-07-02 14:14+0300\n" "Last-Translator: Mindaugas Baranauskas <embar(a)users.berlios.de>\n" -"Language-Team: Lithuanian <>\n" +"Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: lt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%10==1 ? 0 : n%10==1 && n%100!=11 ? 1 : n%10>=2 && (n%100<10 || n%100>=20) ? 2 : 3);\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.2\n" #: src/config/online_migration-SLE.glade:131 #: src/config/online_migration-openSUSE.glade:110 @@ -40,14 +40,12 @@ #: src/config/online_migration-SLE.glade:169 #: src/config/online_migration-openSUSE.glade:148 msgid "Welcome" -msgstr "Sveikiname" +msgstr "Pasisveikinimas" #: src/config/online_migration-SLE.glade:176 #: src/config/online_migration-openSUSE.glade:155 -#, fuzzy -#| msgid "Registration Code" msgid "Registration Check" -msgstr "Registracijos kodas" +msgstr "Registracijos patikrinimas" #: src/config/online_migration-SLE.glade:183 #: src/config/online_migration-openSUSE.glade:162 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-2.21.0/po/packager.lt.po new/yast2-trans-lt-2.21.0/po/packager.lt.po --- old/yast2-trans-lt-2.21.0/po/packager.lt.po 2011-06-27 16:25:51.000000000 +0200 +++ new/yast2-trans-lt-2.21.0/po/packager.lt.po 2011-07-29 14:26:35.000000000 +0200 @@ -11,7 +11,7 @@ "Project-Id-Version: packager.lt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 15:50+0200\n" -"PO-Revision-Date: 2011-05-26 20:46+0300\n" +"PO-Revision-Date: 2011-07-10 15:03+0300\n" "Last-Translator: Mindaugas Baranauskas <embar(a)users.berlios.de>\n" "Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: lt\n" @@ -1729,10 +1729,8 @@ msgstr "Nepavyko įdiegti kai kurių paketų" #: src/modules/PackageInstallation.ycp:188 -#, fuzzy -#| msgid "Installation failed." msgid "Installation aborted by user." -msgstr "Diegimas nepavyko." +msgstr "Diegimą nutraukė naudotojas." #. the string is follwed by a media number, e.g. "Medium 1" #: src/modules/PackageSlideShow.ycp:30 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-2.21.0/po/samba-client.lt.po new/yast2-trans-lt-2.21.0/po/samba-client.lt.po --- old/yast2-trans-lt-2.21.0/po/samba-client.lt.po 2011-07-08 11:54:17.000000000 +0200 +++ new/yast2-trans-lt-2.21.0/po/samba-client.lt.po 2011-07-29 14:27:04.000000000 +0200 @@ -11,7 +11,7 @@ "Project-Id-Version: samba-client\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-30 09:50+0200\n" -"PO-Revision-Date: 2011-05-26 20:43+0300\n" +"PO-Revision-Date: 2011-07-28 13:08+0300\n" "Last-Translator: Mindaugas Baranauskas <embar(a)users.berlios.de>\n" "Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: lt\n" @@ -364,7 +364,7 @@ #. text entry label #: src/dialogs.ycp:406 msgid "Active Directory Server" -msgstr "„Aktyvaus katalogo“ serveris" +msgstr "„Active Directory“ serveris" #. button label (run YaST client for NTP) #: src/dialogs.ycp:412 @@ -545,7 +545,7 @@ "A Linux client can be a member of a workgroup, NT domain, or Active Directory domain.\n" "Here, specify the name of the membership.\n" msgstr "" -"Linux klientas gali gali būti darbo grupės, NT srities arba „Aktyvaus katalogo“ srities nariu.\n" +"Linux klientas gali gali būti darbo grupės, NT srities arba „Active Directory“ srities nariu.\n" "Čia galite nurodyti narystės vardą.\n" #. Samba role dialog help 2/3 @@ -569,7 +569,7 @@ #. translators: Samba membership dialog help 1/2 (installation) #: src/helps.ycp:61 msgid "Specify the name of the NT or Active Directory domain.\n" -msgstr "Nurodykite NT arba „Aktyvaus katalogo“ srities vardą.\n" +msgstr "Nurodykite NT arba „Active Directory“ srities vardą.\n" #. translators: Samba membership dialog help 2/2 (installation) #: src/helps.ycp:64 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-2.21.0/po/snapper.lt.po new/yast2-trans-lt-2.21.0/po/snapper.lt.po --- old/yast2-trans-lt-2.21.0/po/snapper.lt.po 2011-07-08 11:54:18.000000000 +0200 +++ new/yast2-trans-lt-2.21.0/po/snapper.lt.po 2011-07-29 14:27:05.000000000 +0200 @@ -11,7 +11,7 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 16:00+0200\n" -"PO-Revision-Date: 2011-06-25 21:07+0300\n" +"PO-Revision-Date: 2011-07-10 15:02+0300\n" "Last-Translator: Mindaugas Baranauskas <embar(a)users.berlios.de>\n" "Language-Team: Lithuanian <opensuse-translation(a)opensuse.org>\n" "Language: lt\n" @@ -23,10 +23,9 @@ #. popup error #: src/Snapper.ycp:79 -#, fuzzy, ycp-format -#| msgid "Package '%s' was not found." +#, ycp-format msgid "Snapshot '%1' was not found." -msgstr "Paketas „%s“ nerastas." +msgstr "Momentinė kopija „%1“ nerasta." #: src/Snapper.ycp:196 msgid "Reason not known." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-2.21.0/po/sshd.lt.po new/yast2-trans-lt-2.21.0/po/sshd.lt.po --- old/yast2-trans-lt-2.21.0/po/sshd.lt.po 2011-06-27 16:25:48.000000000 +0200 +++ new/yast2-trans-lt-2.21.0/po/sshd.lt.po 2011-07-29 14:26:32.000000000 +0200 @@ -7,21 +7,21 @@ # Jonas Gocentas <jonasgocentas(a)florida.usa.com>, 2001. # Linas Spraunius <lsprauni(a)radio.lt>, 2000. # Andrius Štikonas <stikonas(a)gmail.com>, 2007. -# Mindaugas Baranauskas <embar(a)users.berlios.de>, 2009, 2010. +# Mindaugas Baranauskas <embar(a)users.berlios.de>, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: sshd\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 16:00+0200\n" -"PO-Revision-Date: 2010-07-29 22:19+0300\n" +"PO-Revision-Date: 2011-07-10 15:02+0300\n" "Last-Translator: Mindaugas Baranauskas <embar(a)users.berlios.de>\n" -"Language-Team: lietuvių\n" +"Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%10==1 ? 0 : n%10==1 && n%100!=11 ? 1 : n%10>=2 && (n%100<10 || n%100>=20) ? 2 : 3);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.2\n" #. SSHD read dialog caption #: src/Sshd.ycp:219 @@ -55,10 +55,8 @@ #. Progress step 2 #: src/Sshd.ycp:236 -#, fuzzy -#| msgid "Reading the current SSHD state..." msgid "Reading the current SSHD state" -msgstr "Skaitoma dabartinė SSHD būsena..." +msgstr "Skaitoma dabartinė SSHD būsena" #. Progress step 3 #: src/Sshd.ycp:238 @@ -67,8 +65,6 @@ #. Progress step 4 #: src/Sshd.ycp:240 -#, fuzzy -#| msgid "Reading the service status..." msgid "Reading service status..." msgstr "Skaitoma paslaugos būsena.." @@ -94,10 +90,8 @@ #. Progress stage 3 #: src/Sshd.ycp:335 -#, fuzzy -#| msgid "Adjust the SSHD service" msgid "Adjust SSHD service" -msgstr "Derinti DNS paslaugą" +msgstr "Derinti SSHD paslaugą" #. Progress step 1 #: src/Sshd.ycp:338 @@ -111,10 +105,8 @@ #. Progress step 3 #: src/Sshd.ycp:342 -#, fuzzy -#| msgid "Adjusting the SSHD service..." msgid "Adjusting SSHD service..." -msgstr "Derinamos DNS paslaugos..." +msgstr "Derinama SSHD paslauga..." #. Error message #: src/Sshd.ycp:351 @@ -406,66 +398,48 @@ #. label - service status, informative text #: src/wizards.ycp:67 -#, fuzzy -#| msgid "DNS server is running" msgid "SSH server is running" -msgstr "DNS serveris veikia" +msgstr "SSH serveris veikia" #. label - service status, informative text #: src/wizards.ycp:69 -#, fuzzy -#| msgid "DNS server is not running" msgid "SSH server is not running" -msgstr "DNS serveris neveikia" +msgstr "SSH serveris neveikia" #. push button (SSH service handling) #: src/wizards.ycp:71 -#, fuzzy -#| msgid "&Start DNS Server Now" msgid "&Start SSH Server Now" -msgstr "&Paleisti DNS serverį" +msgstr "&Paleisti SSH serverį tuoj pat" #. push button (SSH service handling) #: src/wizards.ycp:73 -#, fuzzy -#| msgid "S&top DNS Server Now" msgid "S&top SSH Server Now" -msgstr "&Stabdyti DNS serverį" +msgstr "&Stabdyti SSH serverį tuoj pat" #. push button (SSH service handling) #: src/wizards.ycp:76 -#, fuzzy -#| msgid "Save Settings and Reload DNS Server &Now" msgid "Save Settings and Reload SSH Server &Now" -msgstr "&Išsaugoti nustatymus ir perkrauti DNS serverį" +msgstr "Į&rašyti nuostatas ir tuoj pat iš naujo paleisti SSH serverį" #. part of help text, used to describe pusbuttons (matching SSH service handling but without "&") #: src/wizards.ycp:79 -#, fuzzy -#| msgid "Start DNS Server Now" msgid "Start SSH Server Now" -msgstr "Paleisti DNS serverį" +msgstr "Paleisti SSH serverį tuoj pat" #. part of help text, used to describe pusbuttons (matching SSH service handling but without "&") #: src/wizards.ycp:81 -#, fuzzy -#| msgid "Stop DNS Server Now" msgid "Stop SSH Server Now" -msgstr "Sustabdyti DNS serverį" +msgstr "Stabdyti SSH serverį tuoj pat" #. part of help text, used to describe pusbuttons (matching SSH service handling but without "&") #: src/wizards.ycp:83 -#, fuzzy -#| msgid "Save Settings and Reload DNS Server Now" msgid "Save Settings and Reload SSH Server Now" -msgstr "Išsaugoti nustatymus ir perkrauti DNS serverį" +msgstr "Į&rašyti nuostatas ir tuoj pat iš naujo paleisti SSH serverį" #. radio button (starting SSH service - option 1) #: src/wizards.ycp:89 -#, fuzzy -#| msgid "Now and When Booting" msgid "Now and When &Booting" -msgstr "Dabar ir kraunantis sistemai" +msgstr "Dabar ir operacinės sistemos paleidimo metu" #. radio button (starting SSH service - option 2) #: src/wizards.ycp:91 @@ -483,10 +457,8 @@ msgstr "Rankiniu būdu" #: src/wizards.ycp:103 -#, fuzzy -#| msgid "Start-Up" msgid "&Start-Up" -msgstr "Paleidimas" +msgstr "&Paleidimas" #: src/wizards.ycp:108 msgid "&General" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-2.21.0/po/status.txt new/yast2-trans-lt-2.21.0/po/status.txt --- old/yast2-trans-lt-2.21.0/po/status.txt 2011-07-08 11:54:21.000000000 +0200 +++ new/yast2-trans-lt-2.21.0/po/status.txt 2011-07-29 14:27:08.000000000 +0200 @@ -1,6 +1,6 @@ Translated : 0 -Fuzzy : 718 -Untranslated : 1461 +Fuzzy : 635 +Untranslated : 1432 -------------------- - All strings : 2179 + All strings : 2067 0 % are translated diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-2.21.0/po/wagon.lt.po new/yast2-trans-lt-2.21.0/po/wagon.lt.po --- old/yast2-trans-lt-2.21.0/po/wagon.lt.po 2011-07-08 11:54:01.000000000 +0200 +++ new/yast2-trans-lt-2.21.0/po/wagon.lt.po 2011-07-29 14:26:48.000000000 +0200 @@ -12,7 +12,7 @@ "Project-Id-Version: wagon\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 15:54+0200\n" -"PO-Revision-Date: 2011-06-27 15:15+0300\n" +"PO-Revision-Date: 2011-07-10 15:37+0300\n" "Last-Translator: Mindaugas Baranauskas <embar(a)users.berlios.de>\n" "Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: lt\n" @@ -32,7 +32,7 @@ #: src/clients/wagon.ycp:179 src/clients/wagon.ycp:221 msgid "Reverting Migration" -msgstr "Atšaukiami perėjimo pakeitimai" +msgstr "Atšaukiami migravimo pakeitimai" #: src/clients/wagon.ycp:180 msgid "" @@ -40,7 +40,7 @@ "install the previously installed ones and contact Novell Customer Center\n" "to get update repositories." msgstr "" -"Perėjimo įrankis pašalina laikinus perėjimo produktus,\n" +"Migravimo įrankis pašalina laikinus migravimo produktus,\n" "įdiegia anksčiau įdiegtuosius ir kreipiasi į Novell Klientų Centrą,\n" "kad parsisiųstų atnaujinimo saugyklas." @@ -49,18 +49,18 @@ "Several tasks can be done by the migration tool. If you skip this step,\n" "you will have to do them manually." msgstr "" -"Perėjimo įrankis leidžia atlikti keletą užduočių. Praleidę šį žingsnį,\n" +"Migravimo įrankis leidžia atlikti keletą užduočių. Praleidę šį žingsnį,\n" "jį turėsite atlikti rankiniu būdu." #. popup dialog caption #: src/clients/wagon.ycp:198 msgid "Migration Has to Be Reverted" -msgstr "Perėjimo pakeitimai buvo atšaukti" +msgstr "Migravimo pakeitimai buvo atšaukti" #. popup dialog qustion #: src/clients/wagon.ycp:200 msgid "Are you sure you want to skip reverting the migration?" -msgstr "Tikrai norite praleisti perėjimo darbų atšaukimą?" +msgstr "Tikrai norite praleisti migravimo darbų atšaukimą?" #. button #: src/clients/wagon.ycp:202 @@ -74,7 +74,7 @@ #: src/clients/wagon.ycp:222 msgid "Removing temporary migration products..." -msgstr "Šalinami laikini perėjimo produktai..." +msgstr "Šalinami laikini migravimo produktai..." #: src/clients/wagon.ycp:233 #, ycp-format @@ -103,7 +103,7 @@ #: src/clients/wagon_congratulate.ycp:32 msgid "Migration Completed" -msgstr "Perėjimas užbaigtas" +msgstr "Migravimas užbaigtas" #: src/clients/wagon_congratulate.ycp:39 msgid "" @@ -116,9 +116,9 @@ "Your SUSE Linux Team" msgstr "" "Sveikiname! \n" -"Jūs ką tik baigėte perėjimą internetu.\n" -"Dabar visa sistema naujovinta. Perkraukite\n" -"kaip galima greičiau.\n" +"Jūs ką tik baigėte migravimą internetu.\n" +"Dabar visa sistema naujovinta. Kaip galima greičiau\n" +"iš naujo paleiskite sistemą.\n" "Apsilankykite mūsų svetainėje http://www.novell.com/linux/.\n" "Geros dienos! \n" "Jūsų SUSE Linux komanda" @@ -128,29 +128,21 @@ "Finish will close the migration\n" "and you should restart the system as soon as possible." msgstr "" -"Mygtuku Baigti užbaigsite perėjimą.\n" -"Po to kaip galima greičiau perkraukite savo sistemą." +"Mygtuku Baigti užbaigsite migravimą.\n" +"Po to kaip galima greičiau iš naujo paleiskite sistemą." #: src/clients/wagon_congratulate.ycp:84 msgid "Finishing the migration..." -msgstr "Užbaigiamas perėjimas..." +msgstr "Užbaigiamas migravimas..." #. heading text #: src/clients/wagon_dup_repositories.ycp:54 -#, fuzzy -#| msgid "Edit Repositories" msgid "Migration Repositories" -msgstr "Keisti saugyklas" +msgstr "Saugyklų keitimas" #: src/clients/wagon_dup_repositories.ycp:57 -#, fuzzy -#| msgid "" -#| "These packages could not be found in the software repositories:\n" -#| "%1" msgid "The packages will be switched to versions in the selected repositories." -msgstr "" -"Šie paketai nerasti programinės įrangos saugyklose:\n" -"%1" +msgstr "Bus naudojami pasirinktose saugyklose esantys paketai." #: src/clients/wagon_dup_repositories.ycp:58 msgid "Selected" @@ -169,22 +161,20 @@ msgstr "Pasirinkti" #: src/clients/wagon_dup_repositories.ycp:61 -#, fuzzy -#| msgid "&Deselect All" msgid "Deselect" -msgstr "&Nežymėti nieko" +msgstr "Nesirinkti" #. help text #: src/clients/wagon_dup_repositories.ycp:66 #: src/clients/wagon_registration_check.ycp:189 msgid "YaST checks whether the installed products are the installed products are registered." -msgstr "" +msgstr "YaST tikrina, ar įdiegtas produktas yra užregistruotas." #: src/clients/wagon_dup_repositories.ycp:67 #: src/clients/wagon_registration_check.ycp:168 #: src/clients/wagon_registration_check.ycp:190 msgid "Migrating unregistered or partly registered system might result in broken system." -msgstr "" +msgstr "Neregistruotos arba dalinai registruotos sistemos migravimas gali sugadinti sistemą." #: src/clients/wagon_migration_products.ycp:65 #, ycp-format @@ -212,7 +202,7 @@ "Migration path is erroneous." msgstr "" "Negalima naujovinti produkto %1 (%2).\n" -"Perėjimo kelias yra netinkamas." +"Migravimo kelias yra netinkamas." #: src/clients/wagon_migration_products.ycp:109 msgid "Unknown" @@ -241,36 +231,32 @@ "Jis negali uždraustas." #: src/clients/wagon_registration_check.ycp:80 -#, fuzzy -#| msgid "Installation Summary" msgid "Registration Summary" -msgstr "Diegimo santrauka" +msgstr "Registracijos santrauka" #: src/clients/wagon_registration_check.ycp:84 msgid "The system is not registered" -msgstr "" +msgstr "Sistema neužregistruota" #: src/clients/wagon_registration_check.ycp:92 -#, fuzzy, ycp-format -#| msgid "Product %1 will keep installed" +#, ycp-format msgid "Product %1 has a valid registration" -msgstr "Įdiegtas produktas %1 bus išlaikytas" +msgstr "%1 produktas turi galiojančią registraciją" #: src/clients/wagon_registration_check.ycp:99 #, ycp-format msgid "Product %1 does not need a subscription" -msgstr "" +msgstr "%1 produktui nereikia registruotis" #: src/clients/wagon_registration_check.ycp:107 #, ycp-format msgid "Registration status of product %1 is unknown" -msgstr "" +msgstr "%1 produkto registracijos būsena nežinoma" #: src/clients/wagon_registration_check.ycp:115 -#, fuzzy, ycp-format -#| msgid "Product %1 will keep installed" +#, ycp-format msgid "Product %1 is not registered, registration failed" -msgstr "Įdiegtas produktas %1 bus išlaikytas" +msgstr "%1 produktas neregistruotas, užregistruoti nepavyko" #: src/clients/wagon_registration_check.ycp:124 #, ycp-format @@ -280,7 +266,7 @@ #: src/clients/wagon_registration_check.ycp:133 #, ycp-format msgid "Registration for product %1 has expired, the registration is not valid anymore" -msgstr "" +msgstr "%1 produkto registracija nebegalioja" #: src/clients/wagon_registration_check.ycp:142 #, ycp-format @@ -290,31 +276,24 @@ #: src/clients/wagon_registration_check.ycp:157 #, ycp-format msgid "The registration status is %1 days old. The summary above might not be correct, run registration to update the status." -msgstr "" +msgstr "Registracijos būsena nustatyta prieš %1 d., tad aukščiau esanti santrauka gali būti klaidinga. Norėdami atnaujinti būseną, pradėkite registravimą." #: src/clients/wagon_registration_check.ycp:166 -#, fuzzy -#| msgid "Warning:" -#| msgid_plural "Warnings:" msgid "Warning:" msgstr "Įspėjimas:" #: src/clients/wagon_registration_check.ycp:167 msgid "It is strongly recommended to register the unregistered or expired products before starting migration." -msgstr "" +msgstr "Jei produktas neregistruotas ar jo registracija nebegalioja, prieš migravimą patariama produktą užregistruoti." #. heading text #: src/clients/wagon_registration_check.ycp:181 -#, fuzzy -#| msgid "Registration Code" msgid "Registration Check" -msgstr "Registracijos kodas" +msgstr "Registracijos patikrinimas" #: src/clients/wagon_registration_check.ycp:185 -#, fuzzy -#| msgid "Registration" msgid "Run Registration..." -msgstr "Registracija" +msgstr "Pradėti registravimą..." #: src/clients/wagon_registration_handler.ycp:35 msgid "Novell Customer Center Configuration" @@ -393,7 +372,7 @@ "to handle the installation repositories during migration or use Custom &URL\n" "if you want to set them manually." msgstr "" -"Čia galite pasirinkti, ar perėjimo metu diegimo saugyklų tvarkymui\n" +"Čia galite pasirinkti, ar migravimo metu diegimo saugyklų tvarkymui\n" "naudoti Klientų centrą, ar naudoti Savitą &URL\n" "jo nurodymui rankiniu būdu." @@ -482,8 +461,8 @@ "Error switching migration method.\n" "Unknown migration method: %1" msgstr "" -"Keičiant perėjimo būdą įvyko klaida.\n" -"Nežinomas parėjimo būdas: %1" +"Keičiant migravimo būdą įvyko klaida.\n" +"Nežinomas migravimo būdas: %1" #. TRANSLATORS: error message #: src/modules/Wagon.ycp:177 @@ -512,12 +491,12 @@ #: src/modules/Wagon.ycp:461 #, ycp-format msgid "There is not enough free space to migrate the system using download in advance mode. Partition %1 needs at least %2MB more free disk space. (The needed size is estimated, it is recommended to add slightly more free space.) Add more disk space or disable download in advance mode." -msgstr "" +msgstr "Migravimui iš anksto parsiunčiant reikiamas rinkmenas nepakanka laisvos atminties. %1 skaidinyje reikia bent %2MB daugiau laisvos vietos diske. (Nurodytas tikėtinas reikalingas dydis, patariama rasti daugiau laisvos vietos.) Raskite daugiau laisvos vietos arba uždrauskite išankstinį parsiuntimą." #: src/modules/Wagon.ycp:471 #, ycp-format msgid "There might not be enough free space for download in advance mode migration. The estimated free space after migration is %2MB, it is recommended to increase the free space in case the estimation is inaccurate to avoid installation errors." -msgstr "" +msgstr "Migravimui iš anksto parsiunčiant reikiamas rinkmenas gali nepakakti laisvos atminties. Tikėtina, kad po migravimo liks %2MB laisvos vietos diske. Prieš migruojant patariama padidinti laisvos vietos kiekį tam, kad išvengtumėte diegimo klaidų, jei tikėtinas skaičius nebūtų tikslus." #. 'Product Long Name (product-libzypp-name)' #: src/modules/Wagon.ycp:504 @@ -567,7 +546,7 @@ #: src/modules/Wagon.ycp:623 msgid "Download all packages before upgrade: " -msgstr "" +msgstr "Prieš naujovinant parsiųsti visus paketus: " #: src/modules/Wagon.ycp:624 msgid "Enabled" @@ -591,7 +570,7 @@ msgstr "" "<li>Bus pašalinta produktų: %1.\n" "Eikite į paketų pasirinkimo skyrių ir išspręskite nesklandumus rankiniu būdu. \n" -"Beje, dabar galite saugiai nutraukti perėjimą.</li>" +"Beje, dabar galite saugiai nutraukti migravimą.</li>" #: src/modules/Wagon.ycp:643 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-lt-2.21.0/po/yast2-apparmor.lt.po new/yast2-trans-lt-2.21.0/po/yast2-apparmor.lt.po --- old/yast2-trans-lt-2.21.0/po/yast2-apparmor.lt.po 2011-06-27 16:26:22.000000000 +0200 +++ new/yast2-trans-lt-2.21.0/po/yast2-apparmor.lt.po 2011-07-29 14:27:04.000000000 +0200 @@ -1,26 +1,26 @@ # translation of yast2-apparmor.lt.po to lietuvių -# Jonas Gocentas <jonasgocentas(a)florida.usa.com>, 2001. -# Linas Spraunius <lsprauni(a)radio.lt>, 2000. -# Andrius Štikonas <stikonas(a)gmail.com>, 2006. -# Mindaugas Baranauskas <embar(a)users.berlios.de>, 2009, 2010. # Lithuanian message file for YaST2 (@memory@). # Copyright (C) 2005 SUSE Linux Products GmbH. # Copyright (C) 2002 SuSE Linux AG. # Copyright (C) 2000, 2001 SuSE GmbH. +# Jonas Gocentas <jonasgocentas(a)florida.usa.com>, 2001. +# Linas Spraunius <lsprauni(a)radio.lt>, 2000. +# Andrius Štikonas <stikonas(a)gmail.com>, 2006. +# Mindaugas Baranauskas <embar(a)users.berlios.de>, 2009, 2010, 2011. msgid "" msgstr "" "Project-Id-Version: yast2-apparmor.lt\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2011-06-23 15:55+0200\n" -"PO-Revision-Date: 2010-07-31 13:39+0300\n" +"PO-Revision-Date: 2011-07-02 14:11+0300\n" "Last-Translator: Mindaugas Baranauskas <embar(a)users.berlios.de>\n" -"Language-Team: lietuvių\n" +"Language-Team: Lithuanian <komp_lt(a)konferencijos.lt>\n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%10==1 ? 0 : n%10==1 && n%100!=11 ? 1 : n%10>=2 && (n%100<10 || n%100>=20) ? 2 : 3);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.2\n" #: src/agents/ag_genprof.pm:68 msgid "SubDomain does not appear to be started. Please enable SubDomain and try again." @@ -588,9 +588,8 @@ msgstr "K&eisti" #: src/include/subdomain/apparmor_ycp_utils.ycp:58 -#, fuzzy msgid "&Glob" -msgstr "Globalus" +msgstr "&Globalus" #: src/include/subdomain/apparmor_ycp_utils.ycp:59 msgid "Glob w/E&xt" @@ -1293,9 +1292,8 @@ msgstr "" #: src/include/subdomain/helps.ycp:99 -#, fuzzy msgid "Access Modes " -msgstr "Prieiga prie serverio" +msgstr "Prieigos veiksenos" #: src/include/subdomain/helps.ycp:100 msgid "File permission access modes consists of combinations of the following six modes:" @@ -1303,11 +1301,11 @@ #: src/include/subdomain/helps.ycp:103 msgid "<li>r - read</li>" -msgstr "" +msgstr "<li>r - skaityti</li>" #: src/include/subdomain/helps.ycp:104 msgid "<li>w - write</li>" -msgstr "" +msgstr "<li>w - rašyti</li>" #: src/include/subdomain/helps.ycp:105 msgid "<li>m - mmap PROT_EXEC</li>" @@ -1327,7 +1325,7 @@ #: src/include/subdomain/helps.ycp:109 msgid "<li>l - link</li>" -msgstr "" +msgstr "<li>l - nuoroda</li>" #: src/include/subdomain/helps.ycp:111 msgid "Details for Access Modes" @@ -1335,7 +1333,7 @@ #: src/include/subdomain/helps.ycp:114 msgid "Read mode " -msgstr "" +msgstr "Skaitymo veiksena " #: src/include/subdomain/helps.ycp:115 msgid "" @@ -1349,7 +1347,7 @@ #: src/include/subdomain/helps.ycp:123 msgid "Write mode " -msgstr "" +msgstr "Rašymo veiksena " #: src/include/subdomain/helps.ycp:124 msgid "" @@ -1530,9 +1528,8 @@ msgstr "Visi" #: src/include/subdomain/profile_dialogs.ycp:166 -#, fuzzy msgid "Network Family" -msgstr "Tinklo plokštė" +msgstr "Tinklo šeima" #: src/include/subdomain/profile_dialogs.ycp:173 #, fuzzy @@ -1574,9 +1571,8 @@ msgstr "Papildyti" #: src/include/subdomain/profile_dialogs.ycp:262 -#, fuzzy msgid "Lock" -msgstr "CapsLock!" +msgstr "Užrakinti" #: src/include/subdomain/profile_dialogs.ycp:263 msgid "MMap PROT_EXEC" @@ -2068,15 +2064,14 @@ #: src/include/subdomain/reporting_dialogues.ycp:410 #: src/include/subdomain/reporting_dialogues.ycp:542 msgid "Filter By Date Range" -msgstr "" +msgstr "Filtruoti pagal laikotarpį" #: src/include/subdomain/reporting_archived_dialogs.ycp:73 #: src/include/subdomain/reporting_dialogues.ycp:318 #: src/include/subdomain/reporting_dialogues.ycp:411 #: src/include/subdomain/reporting_dialogues.ycp:543 -#, fuzzy msgid " Select Date Range " -msgstr "Pasirinkite skenerio tipą" +msgstr " Pasirinkite laiko tarpą " #: src/include/subdomain/reporting_archived_dialogs.ycp:75 #: src/include/subdomain/reporting_dialogues.ycp:320 @@ -2200,7 +2195,6 @@ msgstr "Detalės" #: src/include/subdomain/reporting_archived_dialogs.ycp:109 -#, fuzzy msgid "Access Type: R" msgstr "Prieigos tipas: R" @@ -2765,9 +2759,8 @@ msgstr "" #: src/include/subdomain/reporting_dialogues.ycp:2118 -#, fuzzy msgid "R" -msgstr "ARBA" +msgstr "" #: src/include/subdomain/reporting_dialogues.ycp:2280 msgid "Error: " @@ -2822,9 +2815,8 @@ msgstr "Veiksena" #: src/include/subdomain/reporting_utils.ycp:117 -#, fuzzy msgid "Event Type" -msgstr "Eksportavimo tipas" +msgstr "Įvykio tipas" #: src/include/subdomain/reporting_utils.ycp:118 msgid "Operation" ++++++ yast2-trans-nn-2.21.0.tar.bz2 ++++++ ++++++ yast2-trans-ru-2.21.0.tar.bz2 ++++++ ++++ 19454 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0