March 2010 - openSUSE Commits - openSUSE Mailing Lists

commit libjpeg7 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package libjpeg7 for openSUSE:Factory checked in at Mon Mar 1 17:58:50 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ /mounts/work_src_done/STABLE/libjpeg7/libjpeg7.changes 2010-03-01 15:58:55.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Mar 1 14:58:30 UTC 2010 - coolo(a)novell.com + +- split out jpegv7 to support update path + calling whatdependson for head-i586 New: ---- baselibs.conf jpeg-7.0.0-int32.patch jpeg-7.0.0-jconfig.patch jpeg-7.0.0-tiff-ojpeg.patch jpegsrc.v7.tar.bz2 libjpeg7.changes libjpeg7.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libjpeg7.spec ++++++ # # spec file for package libjpeg7 (Version 7.0.0) # # Copyright (c) 2010 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/ # # norootforbuild Name: libjpeg7 License: BSD3c(or similar) Group: Productivity/Graphics/Convertors AutoReqProv: on %define major_version 7 Version: 7.0.0 Release: 2 Summary: Independent JPEG Group's JPEG Software Url: http://www.ijg.org/ Source0: jpegsrc.v%{major_version}.tar.bz2 Source1: baselibs.conf Patch0: jpeg-%{version}-jconfig.patch Patch1: jpeg-%{version}-tiff-ojpeg.patch Patch2: jpeg-%{version}-int32.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Software to implement JPEG image compression and decompression. JPEG (pronounced "jay-peg") is a standardized compression method for full-color and grayscale images. JPEG is intended for compressing "real-world" scenes (most of the time these are pictures that have been scanned-in with a scanner or taken with a digital camera). Cartoons and other nonrealistic images are not its strong suit. It should be noted that JPEG output is not necessarily the same as its input. If this is a factor for you, do not use it. With typical real-world scenes, JPEG can achieve high compression rates without noticeable differences. If you can accept pictures of lower quality, JPEG can achieve amazingly high compression rates. There are some library functions available for reading and writing JPEG files. The 'cjpeg' and 'djpeg' applications use the library to make conversions between JPEG and other popular graphic file formats possible. The JPEG library is meant to be used within other applications. Cjpeg compresses the input file, or standard input if no filename is given, and produces a JPEG/JFIF file as standard output. Currently supported input file formats include: PPM (PBMPLUS color format), PGM (PBMPLUS Grayscale format), BMP, GIF, Targa, and RLE (Utah Raster Toolkit Format) (RLE is only supported if the RLE library is available). Djpeg decompresses a JPEG file into one of the above mentioned formats. Authors: -------- Tom Lane <jpeg-info(a)uunet.uu.net> Philip Gladstone <pjsg(a)ix.netcom.com> Luis Ortiz <jpeg-info(a)uunet.uu.net> Jim Boucher <jpeg-info(a)uunet.uu.net> Lee Crocker <jpeg-info(a)uunet.uu.net> George Phillips <phillips(a)cs.ubc.ca> Davide Rossi <jpeg-info(a)uunet.uu.net> Ge' Weijers <jpeg-info(a)uunet.uu.net> %prep %setup -q -n jpeg-%{major_version} %patch0 %patch1 %patch2 -p1 %build %configure --disable-static --enable-shared --with-pic %{__make} %{?jobs:-j%jobs} libdir=%{_libdir} %check make test libdir=%{_libdir} %install %makeinstall libdir=%{_libdir} rm -f $RPM_BUILD_ROOT/%{_libdir}/libjpeg.la $RPM_BUILD_ROOT/%{_libdir}/libjpeg.so rm -rf $RPM_BUILD_ROOT/%{_includedir} rm -rf $RPM_BUILD_ROOT/%{_mandir} $RPM_BUILD_ROOT/%{_bindir} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %{_libdir}/libjpeg.so.%{version} %{_libdir}/libjpeg.so.%{major_version} %changelog ++++++ baselibs.conf ++++++ libjpeg7 ++++++ jpeg-7.0.0-int32.patch ++++++ Index: jpeg-7/jmorecfg.h =================================================================== --- jpeg-7.orig/jmorecfg.h +++ jpeg-7/jmorecfg.h @@ -161,7 +161,7 @@ typedef short INT16; #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */ #ifndef _BASETSD_H_ /* Microsoft defines it in basetsd.h */ #ifndef QGLOBAL_H /* Qt defines it in qglobal.h */ -typedef long INT32; +typedef int INT32; #endif #endif #endif ++++++ jpeg-7.0.0-jconfig.patch ++++++ Index: jconfig.cfg =================================================================== --- jconfig.cfg.orig +++ jconfig.cfg @@ -1,12 +1,18 @@ /* jconfig.cfg --- source file edited by configure script */ /* see jconfig.txt for explanations */ +/* Define this if you get warnings about undefined structures. */ +#undef INCOMPLETE_TYPES_BROKEN + #undef HAVE_PROTOTYPES #undef HAVE_UNSIGNED_CHAR #undef HAVE_UNSIGNED_SHORT #undef void #undef const #undef CHAR_IS_UNSIGNED + +#ifdef JPEG_INTERNALS + #undef HAVE_STDDEF_H #undef HAVE_STDLIB_H #undef HAVE_LOCALE_H @@ -14,10 +20,6 @@ #undef NEED_SYS_TYPES_H #undef NEED_FAR_POINTERS #undef NEED_SHORT_EXTERNAL_NAMES -/* Define this if you get warnings about undefined structures. */ -#undef INCOMPLETE_TYPES_BROKEN - -#ifdef JPEG_INTERNALS #undef RIGHT_SHIFT_IS_UNSIGNED #undef INLINE ++++++ jpeg-7.0.0-tiff-ojpeg.patch ++++++ Index: jdhuff.c =================================================================== --- jdhuff.c.orig +++ jdhuff.c @@ -1307,3 +1307,35 @@ jinit_huff_decoder (j_decompress_ptr cin } } } +/* + * BEWARE OF KLUDGE: This subroutine is a hack for decoding illegal JPEG-in- + * TIFF encapsulations produced by Microsoft's Wang Imaging + * for Windows application with the public-domain TIFF Library. Based upon an + * examination of selected output files, this program apparently divides a JPEG + * bit-stream into consecutive horizontal TIFF "strips", such that the JPEG + * encoder's/decoder's DC coefficients for each image component are reset before + * each "strip". Moreover, a "strip" is not necessarily encoded in a multiple + * of 8 bits, so one must sometimes discard 1-7 bits at the end of each "strip" + * for alignment to the next input-Byte storage boundary. IJG JPEG Library + * decoder state is not normally exposed to client applications, so this sub- + * routine provides the TIFF Library with a "hook" to make these corrections. + * It should be called after "jpeg_start_decompress()" and before + * "jpeg_finish_decompress()", just before decoding each "strip" using + * "jpeg_read_raw_data()" or "jpeg_read_scanlines()". + * + * This kludge is not sanctioned or supported by the Independent JPEG Group, and + * future changes to the IJG JPEG Library might invalidate it. Do not send bug + * reports about this code to IJG developers. Instead, contact the author for + * advice: Scott B. Marovich <marovich(a)hpl.hp.com>, Hewlett-Packard Labs, 6/01. + */ +GLOBAL(void) +jpeg_reset_huff_decode (register j_decompress_ptr cinfo,register float *refbw) +{ register huff_entropy_ptr entropy = (huff_entropy_ptr)cinfo->entropy; + register int ci = 0; + + /* Re-initialize DC predictions */ + do entropy->saved.last_dc_val[ci] = -refbw[ci << 1]; + while (++ci < cinfo->comps_in_scan); + /* Discard encoded input bits, up to the next Byte boundary */ + entropy->bitstate.bits_left &= ~7; +} ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 mono-core for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package mono-core for openSUSE:Factory checked in at Mon Mar 1 17:58:15 CET 2010. -------- --- mono-core/mono-core.changes 2010-01-26 23:31:17.000000000 +0100 +++ /mounts/work_src_done/STABLE/mono-core/mono-core.changes 2010-03-01 17:15:44.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 1 17:12:06 CET 2010 - ro(a)suse.de + +- try to prevent crash on exit in gmcs + call mono_alloc_special_static_data_free before closing + assemblies + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- mono-cleanup_crash.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mono-core.spec ++++++ --- /var/tmp/diff_new_pack.VteIN1/_old 2010-03-01 17:58:00.000000000 +0100 +++ /var/tmp/diff_new_pack.VteIN1/_new 2010-03-01 17:58:00.000000000 +0100 @@ -25,10 +25,11 @@ Summary: A .NET Runtime Environment Url: http://go-mono.org/ Version: 2.6.1 -Release: 1 +Release: 2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mono-%{version}.tar.bz2 Patch0: xen-aot.patch +Patch1: mono-cleanup_crash.patch ExclusiveArch: %ix86 x86_64 ppc ppc64 hppa armv4l sparc s390 ia64 s390x BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: mono = %{version}-%{release} @@ -1230,6 +1231,7 @@ %prep %setup -q -n mono-%{version} %patch0 +%patch1 %build # These are only needed if there are patches to the runtime ++++++ mono-cleanup_crash.patch ++++++ --- mono/metadata/domain.c +++ mono/metadata/domain.c @@ -1907,6 +1907,12 @@ domain->type_init_exception_hash = NULL; } + /* must do this early as it accesses fields and types */ + if (domain->special_static_fields) { + mono_alloc_special_static_data_free (domain->special_static_fields); + g_hash_table_destroy (domain->special_static_fields); + domain->special_static_fields = NULL; + } for (tmp = domain->domain_assemblies; tmp; tmp = tmp->next) { MonoAssembly *ass = tmp->data; mono_trace (G_LOG_LEVEL_INFO, MONO_TRACE_ASSEMBLY, "Unloading domain %s %p, assembly %s %p, refcount=%d\n", domain->friendly_name, domain, ass->aname.name, ass, ass->ref_count); @@ -1929,12 +1935,6 @@ domain->null_reference_ex = NULL; domain->stack_overflow_ex = NULL; domain->entry_assembly = NULL; - /* must do this early as it accesses fields and types */ - if (domain->special_static_fields) { - mono_alloc_special_static_data_free (domain->special_static_fields); - g_hash_table_destroy (domain->special_static_fields); - domain->special_static_fields = NULL; - } g_free (domain->friendly_name); domain->friendly_name = NULL; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 autoconf261 for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package autoconf261 for openSUSE:Factory checked in at Mon Mar 1 17:27:03 CET 2010. -------- New Changes file: --- /dev/null 2009-09-30 08:50:26.000000000 +0200 +++ autoconf261/autoconf261.changes 2010-03-01 16:31:51.000000000 +0100 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Mar 1 15:26:16 UTC 2010 - coolo(a)novell.com + +- clone of old autoconf 2.61 package + calling whatdependson for head-i586 New: ---- ac-func-mktime.diff ac-proc-sed.diff autoconf-2.61.tar.bz2 autoconf261.changes autoconf261.spec autoreconf-ltdl.diff tests.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoconf261.spec ++++++ # # spec file for package autoconf261 (Version 2.61) # # Copyright (c) 2010 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: autoconf261 BuildRequires: help2man License: GPLv2+ Group: Development/Tools/Building Url: http://www.gnu.org/software/autoconf AutoReqProv: on Requires: m4 >= %(rpm -q --qf=%%{VERSION} m4) PreReq: %{install_info_prereq} Version: 2.61 Release: 1 Summary: A GNU Tool for Automatically Configuring Source Code Source: autoconf-%{version}.tar.bz2 Patch: autoreconf-ltdl.diff Patch1: ac-proc-sed.diff Patch2: ac-func-mktime.diff Patch3: tests.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GNU Autoconf is a tool for configuring source code and makefiles. Using autoconf, programmers can create portable and configurable packages, because the person building the package is allowed to specify various configuration options. You should install autoconf if you are developing software and would like to create shell scripts to configure your source code packages. Note that the autoconf package is not required for the end user who may be configuring software with an autoconf-generated script; autoconf is only required for the generation of the scripts, not their use. %prep %setup -q -n autoconf-%{version} %patch %patch1 %patch2 -p1 %patch3 -p1 %build %{suse_update_config -f config} ./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} --program-suffix=-2.61 --datadir=%_prefix/share/autoconf-2.61 make %install make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_prefix}/share/emacs/site-lisp/*.el* # do not confuse info rm -rf $RPM_BUILD_ROOT%{_infodir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS README TODO %{_prefix}/bin/* %{_prefix}/share/autoconf-2.61 %doc %{_mandir}/man1/*.gz %changelog ++++++ ac-func-mktime.diff ++++++ 2006-12-22 Paul Eggert <eggert(a)cs.ucla.edu> * lib/autoconf/functions.m4 (AC_FUNC_MKTIME): Include <limits.h>, and use its INT_MAX to rewrite the j loop so that it does not overflow 'int'. Problem reported by Ralf Wildenhues in <http://lists.gnu.org/archive/html/bug-gnulib/2006-12/msg00084.html>. Play it safe by shifting left by 1 rather than multiplying by 2, as GCC is less likely to optimize this away when the value is signed (when it assumes overflow leads to undefined behavior). Also, don't assume time_t uses two's complement. diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 index 185376e..a34c9f0 100644 --- a/lib/autoconf/functions.m4 +++ b/lib/autoconf/functions.m4 @@ -984,6 +984,7 @@ AC_CACHE_CHECK([for working mktime], ac_cv_func_working_mktime, # endif #endif +#include <limits.h> #include <stdlib.h> #ifdef HAVE_UNISTD_H @@ -1132,12 +1133,15 @@ main () isn't worth using anyway. */ alarm (60); - for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2) - continue; - time_t_max--; - if ((time_t) -1 < 0) - for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2) - continue; + for (;;) + { + t = (time_t_max << 1) + 1; + if (t <= time_t_max) + break; + time_t_max = t; + } + time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max; + delta = time_t_max / 997; /* a suitable prime number */ for (i = 0; i < N_STRINGS; i++) { @@ -1152,10 +1156,12 @@ main () && mktime_test ((time_t) (60 * 60 * 24)))) return 1; - for (j = 1; 0 < j; j *= 2) + for (j = 1; ; j <<= 1) if (! bigtime_test (j)) return 1; - if (! bigtime_test (j - 1)) + else if (INT_MAX / 2 < j) + break; + if (! bigtime_test (INT_MAX)) return 1; } return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ()); ++++++ ac-proc-sed.diff ++++++ 2007-01-11 Ralf Wildenhues <Ralf.Wildenhues(a)gmx.de> * lib/autoconf/programs.m4 (AC_PROG_SED): When closing a pipe early on the reader side, drop stderr of the input to avoid `broken pipe' error output; this may happen even with shell builtin `echo' of some bash versions. Reports by Ian Macdonald <iamacdo(a)telkomsa.net> and Sam Sexton <Sam.Sexton(a)reuters.com>. Index: lib/autoconf/programs.m4 =================================================================== RCS file: /sources/autoconf/autoconf/lib/autoconf/programs.m4,v retrieving revision 1.63 retrieving revision 1.64 diff -u -a -p -u -p -a -r1.63 -r1.64 --- lib/autoconf/programs.m4 17 Nov 2006 21:04:54 -0000 1.63 +++ lib/autoconf/programs.m4 11 Jan 2007 21:17:37 -0000 1.64 @@ -859,7 +859,7 @@ AC_DEFUN([AC_PROG_SED], for ac_i in 1 2 3 4 5 6 7; do ac_script="$ac_script$as_nl$ac_script" done - echo "$ac_script" | sed 99q >conftest.sed + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed $as_unset ac_script || ac_script= _AC_PATH_PROG_FEATURE_CHECK(SED, [sed gsed], [_AC_FEATURE_CHECK_LENGTH([ac_path_SED], [ac_cv_path_SED], ++++++ autoreconf-ltdl.diff ++++++ --- bin/autoreconf.in +++ bin/autoreconf.in @@ -456,6 +456,8 @@ 'AC_CONFIG_AUX_DIR:AC_CONFIG_AUX_DIR:\$1', 'AC_CONFIG_HEADERS', 'AC_CONFIG_SUBDIRS:AC_CONFIG_SUBDIRS:\$1', + 'AC_LIBLTDL_CONVENIENCE:AC_LIBLTDL_CONVENIENCE:\$1', + 'AC_LIBLTDL_INSTALLABLE:AC_LIBLTDL_INSTALLABLE:\$1', 'AC_INIT', 'AC_PROG_LIBTOOL', 'LT_INIT', @@ -471,6 +473,7 @@ $uses_gettext_via_traces = 1 if /AM_GNU_GETTEXT/; $uses_libtool = 1 if /(AC_PROG_LIBTOOL|LT_INIT)/; $uses_libltdl = 1 if /LT_CONFIG_LTDL_DIR/; + $uses_libltdl = 1 if /AC_LIBLTDL_(CONVENIENCE|INSTALLABLE)/; $uses_autoheader = 1 if /AC_CONFIG_HEADERS/; $uses_automake = 1 if /AM_INIT_AUTOMAKE/; push @subdir, split (' ', $1) if /AC_CONFIG_SUBDIRS:(.*)/ && $recursive; ++++++ tests.diff ++++++ 2007-12-12 Eric Blake <ebb9(a)byu.net> Fix spurious testsuite failure with M4 1.4.11. * tests/local.at (AT_CHECK_M4): Cater to new m4 error message. Index: autoconf-2.61/tests/local.at =================================================================== --- autoconf-2.61.orig/tests/local.at 2006-09-11 18:42:57.000000000 +0200 +++ autoconf-2.61/tests/local.at 2010-03-01 16:00:21.000000000 +0100 @@ -64,11 +64,16 @@ m4_define([AT_CHECK_PERL_SYNTAX], # AT_CHECK_M4(COMMAND, [EXIT-STATUS = 0], STDOUT, STDERR) # ------------------------------------------------------- # If stderr is specified, normalize the observed stderr. -# This (using GNU M4 1.4.6 or later) +# This (using GNU M4 1.4.6) # # /usr/local/bin/m4:script.4s:1: cannot open `foo': No such file or directory # autom4te: /usr/local/bin/m4 failed with exit status: 1 # +# or this (GNU M4 1.4.11) +# +# /usr/local/bin/m4:script.4s:1: include: cannot open `foo': No such file or directory +# autom4te: /usr/local/bin/m4 failed with exit status: 1 +# # or this (GNU M4 1.4 installed as gm4) # # script.4s:1: /usr/local/bin/gm4: Cannot open foo: No such file or directory @@ -87,6 +92,7 @@ m4_define([AT_CHECK_PERL_SYNTAX], # # and # m4:(file):(line): Cannot open foo: +# or m4:(file):(line): include: cannot open `foo': # to m4:(file):(line): cannot open `foo': # # and @@ -102,7 +108,8 @@ m4_define([AT_CHECK_M4], m4_ifval([$4], [AT_CHECK([[sed 's/^[^:]*m4: *$[^:]*:$ *$[0-9][0-9]*: $/m4:\1\2/ s/^$[^:]*:$ *$[0-9][0-9]*:$[^:]*m4: /m4:\1\2 / - s/^$m4:[^:]*:[0-9][0-9]*: $C$annot open $$[^`:]*$:/\1c\2`\3'\'':/ + s/: C$annot open $$[^`:]*$:/: c\1`\2'\'':/ + s/: include:$ cannot open$/:\1/ s/^autom4te: [^ ]*m4 /autom4te: m4 / s/^autom4te: [^ ]*m4\.exe /autom4te: m4 / s/ (E[A-Z]*)$// ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 nasm for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package nasm for openSUSE:Factory checked in at Mon Mar 1 15:57:44 CET 2010. -------- --- nasm/nasm.changes 2009-12-18 13:36:55.000000000 +0100 +++ /mounts/work_src_done/STABLE/nasm/nasm.changes 2010-03-01 15:32:26.000000000 +0100 @@ -1,0 +2,24 @@ +Mon Mar 1 15:29:01 CET 2010 - ro(a)suse.de + +- update to 2.07 + * NASM is now under the 2-clause BSD license. See legal. + * Fix the section type for the .strtab section in the elf64 + output format. + * Fix the handling of COMMON directives in the obj output format. + * New ith and srec output formats; these are variants of the + bin output format which output Intel hex and Motorola S-records, + respectively. See ithfmt and srecfmt. + * rdf2ihx replaced with an enhanced rdf2bin, which can output + binary, COM, Intel hex or Motorola S-records. + * The Windows installer now puts the NASM directory first in the + PATH of the "NASM Shell". + * Revert the early expansion behavior of %+ to pre-2.06 behavior: + %+ is only expanded late. + * Yet another Mach-O alignment fix. + * Don't delete the list file on errors. Also, include error and + warning information in the list file. + * Support for 64-bit Mach-O output, see machofmt. + * Fix assert failure on certain operations that involve strings with + high-bit bytes. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- nasm-2.06rc2.tar.bz2 New: ---- nasm-2.07.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nasm.spec ++++++ --- /var/tmp/diff_new_pack.mdxfgY/_old 2010-03-01 15:57:35.000000000 +0100 +++ /var/tmp/diff_new_pack.mdxfgY/_new 2010-03-01 15:57:35.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package nasm (Version 2.06rc2) +# spec file for package nasm (Version 2.07) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,11 +21,11 @@ Name: nasm BuildRequires: ghostscript_any Url: http://nasm.sourceforge.net/ -License: LGPLv2.1+ +License: BSD 2-clause Group: Development/Languages/Other AutoReqProv: on -Version: 2.06rc2 -Release: 2 +Version: 2.07 +Release: 1 Summary: Netwide Assembler (An x86 Assembler) Source: nasm-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -120,7 +120,7 @@ install -d -m 755 $RPM_BUILD_ROOT/%{_infodir} make INSTALLROOT=$RPM_BUILD_ROOT install_everything docdir=%{_docdir}/nasm make INSTALLROOT=$RPM_BUILD_ROOT install_doc docdir=%{_docdir}/nasm -install -m 644 AUTHORS CHANGES ChangeLog COPYING INSTALL TODO README \ +install -m 644 AUTHORS CHANGES ChangeLog LICENSE INSTALL TODO README \ $RPM_BUILD_ROOT/%{_docdir}/nasm install -m 644 rdoff/README rdoff/doc/* \ $RPM_BUILD_ROOT/%{_docdir}/nasm/rdoff ++++++ nasm-2.06rc2.tar.bz2 -> nasm-2.07.tar.bz2 ++++++ ++++ 86248 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

commit icecream for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package icecream for openSUSE:Factory checked in at Mon Mar 1 15:56:50 CET 2010. -------- --- icecream/icecream.changes 2009-04-30 14:50:19.000000000 +0200 +++ /mounts/work_src_done/STABLE/icecream/icecream.changes 2010-03-01 15:22:36.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Feb 1 09:36:00 UTC 2010 - coolo(a)novell.com + +- Update to 0.9.5 + - fix: close the file descriptor (novell bug bnc#525799) + - log PID even if no prefix is specified + - allow get_msg() to fetch data from the kernel even if timeout is 0. + - clean up event loop of gcc invocation + - Install an "icerun" symlink that will serialize commands through + icecream's local daemon + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- icecc-0.9.4.tar.bz2 New: ---- icecc-0.9.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icecream.spec ++++++ --- /var/tmp/diff_new_pack.E5LU8j/_old 2010-03-01 15:56:23.000000000 +0100 +++ /var/tmp/diff_new_pack.E5LU8j/_new 2010-03-01 15:56:23.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package icecream (Version 0.9.4) +# spec file for package icecream (Version 0.9.5) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -21,7 +21,7 @@ Name: icecream BuildRequires: gcc-c++ -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Group: Development/Tools/Building Summary: For Distributed Compile in the Network Requires: /bin/tar /usr/bin/bzip2 @@ -31,7 +31,7 @@ %endif PreReq: /usr/sbin/useradd /usr/sbin/groupadd Requires: gcc-c++ -Version: 0.9.4 +Version: 0.9.5 Release: 1 Source0: ftp://ftp.suse.com/pub/projects/icecream/icecc-%{version}.tar.bz2 Source1: %name-manpages.tar.bz2 @@ -40,18 +40,8 @@ %description icecream is the next generation distcc. - - -Authors: --------- - Stephan Kulow <coolo(a)suse.de> - Michael Matz <matz(a)suse.de> - Cornelius Schumacher <cschum(a)suse.de> - Lubos Lunak <llunak(a)suse.cz> - Frerich Raabe <raabe(a)kde.org> - %package -n libicecream-devel -License: GPL v2 or later; LGPL v2.1 or later +License: GPLv2+ ; LGPLv2.1+ Summary: For Distributed Compile in the Network Group: Development/Tools/Building Summary: For Distributed Compile in the Network @@ -60,16 +50,6 @@ %description -n libicecream-devel icecream is the next generation distcc. - - -Authors: --------- - Stephan Kulow <coolo(a)suse.de> - Michael Matz <matz(a)suse.de> - Cornelius Schumacher <cschum(a)suse.de> - Lubos Lunak <llunak(a)suse.cz> - Frerich Raabe <raabe(a)kde.org> - %prep %setup -q -a 1 -n icecc-%{version} @@ -129,6 +109,7 @@ %config /etc/logrotate.d/icecream %config /etc/init.d/icecream %_bindir/icecc +%_bindir/icerun %_sbindir/scheduler %_libdir/icecc %_sbindir/iceccd ++++++ icecc-0.9.4.tar.bz2 -> icecc-0.9.5.tar.bz2 ++++++ ++++ 5678 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/icecc-0.9.4/NEWS new/icecc-0.9.5/NEWS --- old/icecc-0.9.4/NEWS 2009-04-30 14:42:54.000000000 +0200 +++ new/icecc-0.9.5/NEWS 2010-02-01 10:22:12.000000000 +0100 @@ -1,3 +1,11 @@ +0.9.5 (1083362) +- fix: close the file descriptor (novell bug 525799) +- log PID even if no prefix is specified +- allow get_msg() to fetch data from the kernel even if timeout is 0. +- clean up event loop of gcc invocation +- Install an "icerun" symlink that will serialize commands through + icecream's local daemon + 0.9.4 (961598): - fix compilation warnings - don't leak file descriptor to create-env 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/icecc-0.9.4/client/Makefile.am new/icecc-0.9.5/client/Makefile.am --- old/icecc-0.9.4/client/Makefile.am 2008-05-12 19:52:37.000000000 +0200 +++ new/icecc-0.9.5/client/Makefile.am 2010-02-01 10:10:50.000000000 +0100 @@ -7,16 +7,10 @@ noinst_HEADERS = client.h md5.h util.h EXTRA_DIST = icecc-create-env -CLEANFILES = icecc++ - -all-local: icecc++ - -icecc++: - -rm -f icecc++ - $(LN_S) icecc icecc++ install-exec-local: $(mkinstalldirs) $(DESTDIR)$(bindir) + (cd $(DESTDIR)$(bindir) && $(LN_S) icecc icerun) for link in g++ gcc c++ cc; do \ rm -f $(DESTDIR)$(bindir)/$$link ;\ $(LN_S) icecc $(DESTDIR)$(bindir)/$$link ;\ 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/icecc-0.9.4/client/arg.cpp new/icecc-0.9.5/client/arg.cpp --- old/icecc-0.9.4/client/arg.cpp 2009-04-30 14:35:23.000000000 +0200 +++ new/icecc-0.9.5/client/arg.cpp 2010-02-01 10:10:50.000000000 +0100 @@ -82,6 +82,7 @@ job.setLanguage (CompileJob::Lang_C); else { job.setLanguage( CompileJob::Lang_Custom ); + job.setCompilerName( name ); // keep path return true; } @@ -89,7 +90,7 @@ } bool analyse_argv( const char * const *argv, - CompileJob &job ) + CompileJob &job, bool icerun ) { ArgumentsList args; string ofile; @@ -105,11 +106,17 @@ bool always_local = analyze_program(had_cc ? job.compilerName().c_str() : argv[0], job); bool seen_c = false; bool seen_s = false; + if( icerun ) { + always_local = true; + job.setLanguage( CompileJob::Lang_Custom ); + } for (int i = had_cc ? 2 : 1; argv[i]; i++) { const char *a = argv[i]; - if (a[0] == '-') { + if (icerun) { + args.append(a, Arg_Local); + } else if (a[0] == '-') { if (!strcmp(a, "-E") || !strncmp(a, "-fdump", 6) || !strcmp(a, "-combine")) { always_local = true; args.append(a, Arg_Local); 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/icecc-0.9.4/client/client.h new/icecc-0.9.5/client/client.h --- old/icecc-0.9.4/client/client.h 2006-09-02 22:28:28.000000000 +0200 +++ new/icecc-0.9.5/client/client.h 2010-02-01 10:10:50.000000000 +0100 @@ -40,7 +40,7 @@ extern std::string get_absfilename( const std::string &_file ); /* In arg.cpp. */ -extern bool analyse_argv (const char * const *argv, CompileJob &job); +extern bool analyse_argv (const char * const *argv, CompileJob &job, bool icerun); /* In cpp.cpp. */ extern pid_t call_cpp (CompileJob &job, int fdwrite, int fdread = -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/icecc-0.9.4/client/local.cpp new/icecc-0.9.5/client/local.cpp --- old/icecc-0.9.4/client/local.cpp 2009-04-30 11:48:35.000000000 +0200 +++ new/icecc-0.9.5/client/local.cpp 2010-02-01 10:10:23.000000000 +0100 @@ -244,7 +244,7 @@ } if (r == 0) break; - if ( r < 0 && errno != EINTR && errno != EAGAIN ) + if ( r < 0 && errno != EINTR) break; } colorify_output(s_ccout); 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/icecc-0.9.4/client/main.cpp new/icecc-0.9.5/client/main.cpp --- old/icecc-0.9.4/client/main.cpp 2009-04-30 11:48:35.000000000 +0200 +++ new/icecc-0.9.5/client/main.cpp 2010-02-01 10:10:50.000000000 +0100 @@ -91,6 +91,23 @@ "\n"); } +static void icerun_show_usage(void) +{ + printf( +"Usage:\n" +" icerun [compile options] -o OBJECT -c SOURCE\n" +" icerun --help\n" +"\n" +"Options:\n" +" --help explain usage and exit\n" +" --version show version and exit\n" +"Environment Variables:\n" +" ICECC if set to \"no\", just exec the real gcc\n" +" ICECC_DEBUG [info | warnings | debug]\n" +" sets verboseness of icecream client.\n" +" ICECC_LOGFILE if set, additional debug information is logged to the specified file\n" +"\n"); +} volatile bool local = false; @@ -189,6 +206,7 @@ setup_debug(debug_level, logfile, "ICECC"); CompileJob job; + bool icerun = false; string compiler_name = argv[0]; dcc_client_catch_signals(); @@ -209,6 +227,28 @@ if ( arg.size() > 0 && arg.at(0) == '/' ) job.setCompilerName(arg); } + } else if ( find_basename( compiler_name ) == "icerun") { + icerun = true; + if ( argc > 1 ) { + string arg = argv[1]; + if ( arg == "--help" ) { + icerun_show_usage(); + return 0; + } + if ( arg == "--version" ) { + printf( "ICERUN " VERSION "\n" ); + return 0; + } + if ( arg.size() > 0 ) + job.setCompilerName(arg); + } + } else { + char buf[ PATH_MAX ]; + buf[ PATH_MAX - 1 ] = '\0'; + // check if it's a symlink to icerun + if( readlink( compiler_name.c_str(), buf, PATH_MAX - 1 ) >= 0 && find_basename( buf ) == "icerun" ) { + icerun = true; + } } int sg_level = dcc_recursion_safeguard(); @@ -222,7 +262,7 @@ * see the EPIPE. */ dcc_ignore_sigpipe(1); - local |= analyse_argv( argv, job ); + local |= analyse_argv( argv, job, icerun ); /* if ICECC is set to no, then run job locally */ char* icecc = getenv("ICECC"); 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/icecc-0.9.4/client/remote.cpp new/icecc-0.9.5/client/remote.cpp --- old/icecc-0.9.4/client/remote.cpp 2009-04-30 11:48:35.000000000 +0200 +++ new/icecc-0.9.5/client/remote.cpp 2009-07-29 13:43:38.000000000 +0200 @@ -520,6 +520,7 @@ break; md5_append(&state, buffer, size ); } + fclose(f); md5_byte_t digest[16]; md5_finish(&state, digest); 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/icecc-0.9.4/config.h.in new/icecc-0.9.5/config.h.in --- old/icecc-0.9.4/config.h.in 2009-04-30 14:44:10.000000000 +0200 +++ new/icecc-0.9.5/config.h.in 2010-02-01 10:14:16.000000000 +0100 @@ -155,6 +155,9 @@ /* Define to 1 if you have the <netinet/in.h> header file. */ #undef HAVE_NETINET_IN_H +/* Define to 1 if you have the <netinet/tcp.h> header file. */ +#undef HAVE_NETINET_TCP_H + /* Define to 1 if you have the <netinet/tcp_var.h> header file. */ #undef HAVE_NETINET_TCP_VAR_H @@ -227,6 +230,9 @@ /* Define to 1 if you have the <sys/signal.h> header file. */ #undef HAVE_SYS_SIGNAL_H +/* Define to 1 if you have the <sys/socketvar.h> header file. */ +#undef HAVE_SYS_SOCKETVAR_H + /* Define to 1 if you have the <sys/socket.h> header file. */ #undef HAVE_SYS_SOCKET_H 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/icecc-0.9.4/configure.in new/icecc-0.9.5/configure.in --- old/icecc-0.9.4/configure.in 2009-04-30 14:43:07.000000000 +0200 +++ new/icecc-0.9.5/configure.in 2010-02-01 10:13:15.000000000 +0100 @@ -4,7 +4,7 @@ AC_INIT(client/main.cpp) -AM_INIT_AUTOMAKE(icecc, "0.9.4") +AM_INIT_AUTOMAKE(icecc, "0.9.5") AM_CONFIG_HEADER(config.h) AC_CANONICAL_HOST @@ -34,7 +34,7 @@ # Some of these are needed by popt (or other libraries included in the future). AC_CHECK_HEADERS([unistd.h stdint.h signal.h sys/types.h sys/signal.h ifaddrs.h kinfo.h sys/param.h devstat.h]) -AC_CHECK_HEADERS([ctype.h sys/resource.h sys/socket.h sys/stat.h sys/select.h sys/vfs.h]) +AC_CHECK_HEADERS([ctype.h sys/resource.h sys/socket.h sys/socketvar.h sys/stat.h sys/select.h sys/vfs.h]) AC_CHECK_HEADERS([mach/host_info.h]) AC_CHECK_HEADERS([netinet/in.h], [], [], [#if HAVE_SYS_TYPES_H @@ -61,7 +61,23 @@ AC_ARG_VAR(TAR, [Specifies tar path]) AC_PATH_PROG(TAR, [tar]) AC_DEFINE_UNQUOTED([TAR], ["$TAR"], [Define path to tar]) -AC_CHECK_HEADERS([float.h mcheck.h alloca.h sys/mman.h netinet/tcp_var.h]) +AC_CHECK_HEADERS([float.h mcheck.h alloca.h sys/mman.h netinet/tcp.h]) +AC_CHECK_HEADERS([netinet/tcp_var.h], [], [], +[#if HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif +#if HAVE_SYS_SOCKETVAR_H +# include <sys/socketvar.h> +#endif +#if HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif +#if HAVE_NETINET_TCP_H +# include <netinet/tcp.h> +#endif +]) + + AC_CHECK_HEADERS([sys/user.h]) ###################################################################### 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/icecc-0.9.4/daemon/main.cpp new/icecc-0.9.5/daemon/main.cpp --- old/icecc-0.9.4/daemon/main.cpp 2009-04-30 14:39:28.000000000 +0200 +++ new/icecc-0.9.5/daemon/main.cpp 2010-02-01 10:20:21.000000000 +0100 @@ -1159,7 +1159,7 @@ off_t off = 0; while ( len ) { ssize_t bytes = write( client->pipe_to_child, fcmsg->buffer + off, len ); - if ( bytes < 0 && ( errno == EINTR || errno == EAGAIN ) ) + if ( bytes < 0 && errno == EINTR ) continue; if ( bytes == -1 ) { @@ -1463,6 +1463,8 @@ close_scheduler(); } } + // never really reached + return 0; } int main( int argc, char ** argv ) 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/icecc-0.9.4/daemon/serve.cpp new/icecc-0.9.5/daemon/serve.cpp --- old/icecc-0.9.4/daemon/serve.cpp 2009-04-30 11:48:35.000000000 +0200 +++ new/icecc-0.9.5/daemon/serve.cpp 2010-02-01 10:10:23.000000000 +0100 @@ -214,7 +214,7 @@ ssize_t bytes = read(obj_fd, buffer, sizeof(buffer)); if ( bytes < 0 ) { - if ( errno == EINTR || errno == EAGAIN ) + if ( errno == EINTR ) continue; throw myexception( EXIT_DISTCC_FAILED ); } 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/icecc-0.9.4/daemon/workit.cpp new/icecc-0.9.5/daemon/workit.cpp --- old/icecc-0.9.4/daemon/workit.cpp 2009-04-30 11:48:35.000000000 +0200 +++ new/icecc-0.9.5/daemon/workit.cpp 2010-02-01 10:10:23.000000000 +0100 @@ -94,11 +94,16 @@ } -volatile static bool must_reap = false; +static int death_pipe[2]; + +extern "C" { static void theSigCHLDHandler( int ) { - must_reap = true; + char foo = 0; + write(death_pipe[1], &foo, 1); +} + } static void @@ -108,21 +113,27 @@ client->send_msg( StatusTextMsg( error ) ); } +/* + * This is all happening in a forked child. + * That means that we can block and be lazy about closing fds + * (in the error cases which exit quickly). + */ + int work_it( CompileJob &j, unsigned int job_stat[], MsgChannel* client, CompileResultMsg& rmsg, const string &outfilename, - unsigned long int mem_limit, int client_fd, int job_in_fd ) + unsigned long int mem_limit, int client_fd, int /*job_in_fd*/ ) { rmsg.out.erase(rmsg.out.begin(), rmsg.out.end()); rmsg.out.erase(rmsg.out.begin(), rmsg.out.end()); std::list<string> list = j.remoteFlags(); appendList( list, j.restFlags() ); - int ret; int sock_err[2]; int sock_out[2]; int sock_in[2]; int main_sock[2]; + char buffer[4096]; if ( pipe( sock_err ) ) return EXIT_DISTCC_FAILED; @@ -130,24 +141,13 @@ return EXIT_DISTCC_FAILED; if ( pipe( main_sock ) ) return EXIT_DISTCC_FAILED; + if ( pipe( death_pipe ) ) + return EXIT_DISTCC_FAILED; - if ( fcntl( sock_out[0], F_SETFL, O_NONBLOCK ) ) - return EXIT_DISTCC_FAILED; - if ( fcntl( sock_err[0], F_SETFL, O_NONBLOCK ) ) - return EXIT_DISTCC_FAILED; - - if ( fcntl( sock_out[0], F_SETFD, FD_CLOEXEC ) ) - return EXIT_DISTCC_FAILED; - if ( fcntl( sock_err[0], F_SETFD, FD_CLOEXEC ) ) - return EXIT_DISTCC_FAILED; - if ( fcntl( sock_out[1], F_SETFD, FD_CLOEXEC ) ) - return EXIT_DISTCC_FAILED; - if ( fcntl( sock_err[1], F_SETFD, FD_CLOEXEC ) ) - return EXIT_DISTCC_FAILED; - + // We use a socket pair instead of a pipe to get a "slightly" bigger + // output buffer. This saves context switches and latencies. if (socketpair(AF_UNIX, SOCK_STREAM, 0, sock_in) < 0) return EXIT_DISTCC_FAILED; - int maxsize = 2*1024*2024; #ifdef SO_SNDBUFFORCE if (setsockopt(sock_in[1], SOL_SOCKET, SO_SNDBUFFORCE, &maxsize, sizeof(maxsize)) < 0) @@ -156,7 +156,8 @@ setsockopt(sock_in[1], SOL_SOCKET, SO_SNDBUF, &maxsize, sizeof(maxsize)); } - must_reap = false; + if ( fcntl( sock_in[1], F_SETFL, O_NONBLOCK ) ) + return EXIT_DISTCC_FAILED; /* Testing */ struct sigaction act; @@ -173,31 +174,13 @@ sigaddset( &act.sa_mask, SIGCHLD ); // Make sure we don't block this signal. gdb tends to do that :-( sigprocmask( SIG_UNBLOCK, &act.sa_mask, 0 ); - char buffer[4096]; - - int return_value = 0; flush_debug(); pid_t pid = fork(); if ( pid == -1 ) { - close( sock_err[0] ); - close( sock_err[1] ); - close( main_sock[0] ); - close( main_sock[1] ); - close( sock_out[0] ); - close( sock_out[1] ); - close( sock_in[0] ); - close( sock_in[1] ); - close( sock_err[0] ); return EXIT_OUT_OF_MEMORY; } else if ( pid == 0 ) { - close( main_sock[0] ); - close( sock_in[1] ); - close( sock_out[0] ); - dup2( sock_in[0], 0); - close (sock_in[0]); - fcntl(main_sock[1], F_SETFD, FD_CLOEXEC); setenv( "PATH", "usr/bin", 1 ); // Safety check if (getuid() == 0 || getgid() == 0) { @@ -261,11 +244,25 @@ assert(i <= argc); close_debug(); + + close( sock_out[0] ); dup2 (sock_out[1], STDOUT_FILENO ); close(sock_out[1]); + + close(sock_err[0]); dup2( sock_err[1], STDERR_FILENO ); close(sock_err[1]); + close( sock_in[1] ); + dup2( sock_in[0], STDIN_FILENO); + close (sock_in[0]); + + close( main_sock[0] ); + fcntl(main_sock[1], F_SETFD, FD_CLOEXEC); + + close( death_pipe[0] ); + close( death_pipe[1] ); + #ifdef ICECC_DEBUG for(int f = STDERR_FILENO+1; f < 4096; ++f) { long flags; @@ -279,212 +276,238 @@ char resultByte = 1; write(main_sock[1], &resultByte, 1); _exit(-1); - } else { - close( main_sock[1] ); - close( sock_in[0] ); - close( sock_out[1] ); - close( sock_err[1] ); - - struct timeval starttv; - gettimeofday(&starttv, 0 ); - - while ( !return_value ) { - Msg* msg = client->get_msg(60); - - if ( !msg || (msg->type != M_FILE_CHUNK && msg->type != M_END) ) - { - log_error() << "protocol error while reading preprocessed file\n"; - delete msg; - msg = 0; - return_value = EXIT_IO_ERROR; - client_fd = -1; - break; - } - - if ( msg->type == M_END ) - { - delete msg; - msg = 0; - break; - } - - FileChunkMsg *fcmsg = static_cast<FileChunkMsg*>( msg ); - job_stat[JobStatistics::in_uncompressed] += fcmsg->len; - job_stat[JobStatistics::in_compressed] += fcmsg->compressed; - - ssize_t len = fcmsg->len; - off_t off = 0; - while ( len ) { - ssize_t bytes = write( sock_in[1], fcmsg->buffer + off, len ); - if ( bytes < 0 && ( errno == EINTR || errno == EAGAIN ) ) - continue; - - write(job_in_fd, fcmsg->buffer + off, bytes); - - if ( bytes == -1 ) { - log_perror("write to caching socket failed. "); + } + close( sock_in[0] ); + close( sock_out[1] ); + close( sock_err[1] ); + + // idea borrowed from kprocess. + // check whether the compiler could be run at all. + close( main_sock[1] ); + for(;;) + { + char resultByte; + ssize_t n = ::read(main_sock[0], &resultByte, 1); + if (n == -1 && errno == EINTR) + continue; // Ignore - fd_set rfds; - FD_ZERO( &rfds ); - FD_SET( sock_err[0], &rfds ); + if (n == 1) + { + rmsg.status = resultByte; - struct timeval tv; - tv.tv_sec = 1; - tv.tv_usec = 0; + error_client( client, "compiler did not start" ); + return EXIT_COMPILER_MISSING; + } + break; // != EINTR + } + close( main_sock[0] ); - ret = select( sock_err[0]+1, &rfds, 0, 0, &tv ); + struct timeval starttv; + gettimeofday(&starttv, 0 ); - if ( ret > 0 && FD_ISSET(sock_err[0], &rfds) ) { - ssize_t bytes = read( sock_err[0], buffer, sizeof(buffer)-1 ); - if ( bytes > 0 ) { + int return_value = 0; + // Got EOF for preprocessed input. stdout send may be still pending. + bool input_complete = false; + // Pending data to send to stdin + FileChunkMsg *fcmsg = 0; + size_t off = 0; - while ( bytes > 0 && buffer[bytes - 1] == '\n' ) - bytes--; - buffer[bytes] = 0; + log_block parent_wait("parent, waiting"); - rmsg.err = buffer; + for(;;) + { + if ( client_fd >= 0 && !fcmsg ) { + if (Msg *msg = client->get_msg(0)) { + if (input_complete) { + rmsg.err.append( "client cancelled\n" ); + return_value = EXIT_CLIENT_KILLED; + client_fd = -1; + kill(pid, SIGTERM); + delete fcmsg; + fcmsg = 0; + delete msg; + } else { + if ( msg->type == M_END ) { + input_complete = true; + if (!fcmsg) { + close( sock_in[1] ); + sock_in[1] = -1; } + delete msg; + } else if ( msg->type == M_FILE_CHUNK ) { + fcmsg = static_cast<FileChunkMsg*>( msg ); + off = 0; + + job_stat[JobStatistics::in_uncompressed] += fcmsg->len; + job_stat[JobStatistics::in_compressed] += fcmsg->compressed; + } else { + log_error() << "protocol error while reading preprocessed file\n"; + return_value = EXIT_IO_ERROR; + client_fd = -1; + kill(pid, SIGTERM); + delete fcmsg; + fcmsg = 0; + delete msg; } - - if ( rmsg.err.size() ) - error_client( client, "compiler failed: " + rmsg.err ); - else - error_client( client, "compiler failed." ); - delete msg; - msg = 0; - return_value = EXIT_COMPILER_CRASHED; - break; } - - len -= bytes; - off += bytes; + } else if (client->at_eof()) { + log_error() << "unexpected EOF while reading preprocessed file\n"; + return_value = EXIT_IO_ERROR; + client_fd = -1; + kill(pid, SIGTERM); + delete fcmsg; + fcmsg = 0; } + } - delete msg; - msg = 0; + fd_set rfds; + FD_ZERO( &rfds ); + if (sock_out[0] >= 0) + FD_SET( sock_out[0], &rfds ); + if (sock_err[0] >= 0) + FD_SET( sock_err[0], &rfds ); + int max_fd = std::max( sock_out[0], sock_err[0] ); + + if ( client_fd >= 0 && !fcmsg ) { + FD_SET( client_fd, &rfds ); + if ( client_fd > max_fd ) + max_fd = client_fd; + // Note that we don't actually query the status of this fd - + // we poll it in every iteration. } - close( sock_in[1] ); - log_block parent_wait("parent, waiting"); - // idea borrowed from kprocess - for(;;) - { - char resultByte; - ssize_t n = ::read(main_sock[0], &resultByte, 1); - if (n == -1 && ( errno == EINTR || errno == EAGAIN ) ) - continue; // Ignore - - if (n == 1) - { - rmsg.status = resultByte; - close(main_sock[0]); - return_value = EXIT_COMPILER_MISSING; - error_client( client, "compiler did not start" ); - } - break; // != EINTR + FD_SET( death_pipe[0], &rfds ); + if ( death_pipe[0] > max_fd ) + max_fd = death_pipe[0]; + + fd_set wfds, *wfdsp = 0; + FD_ZERO( &wfds ); + if (fcmsg) { + FD_SET( sock_in[1], &wfds ); + wfdsp = &wfds; + if ( sock_in[1] > max_fd ) + max_fd = sock_in[1]; } - close( main_sock[0] ); - log_block bwrite("write block"); + struct timeval tv, *tvp = 0; + if (!input_complete) { + tv.tv_sec = 60; + tv.tv_usec = 0; + tvp = &tv; + } - for(;;) + switch( select( max_fd+1, &rfds, wfdsp, 0, tvp ) ) { - fd_set rfds; - FD_ZERO( &rfds ); - if (sock_out[0] >= 0) - FD_SET( sock_out[0], &rfds ); - if (sock_err[0] >= 0) - FD_SET( sock_err[0], &rfds ); - if ( client_fd >= 0 ) - FD_SET( client_fd, &rfds ); + case 0: + if (!input_complete) { + log_error() << "timeout while reading preprocessed file\n"; + kill(pid, SIGTERM); // Won't need it any more ... + return_value = EXIT_IO_ERROR; + client_fd = -1; + input_complete = true; + delete fcmsg; + fcmsg = 0; + continue; + } + // this should never happen + assert( false ); + return EXIT_DISTCC_FAILED; + case -1: + if (errno == EINTR) + continue; + // this should never happen + assert( false ); + return EXIT_DISTCC_FAILED; + default: + if ( fcmsg && FD_ISSET(sock_in[1], &wfds) ) { + ssize_t bytes = write( sock_in[1], fcmsg->buffer + off, fcmsg->len - off ); + if ( bytes < 0 ) { + if (errno == EINTR) + continue; + kill(pid, SIGTERM); // Most likely crashed anyway ... + return_value = EXIT_COMPILER_CRASHED; + continue; + } - int max_fd = std::max( sock_out[0], sock_err[0] ); - if ( client_fd > max_fd ) - max_fd = client_fd; + // The fd is -1 anyway + //write(job_in_fd, fcmsg->buffer + off, bytes); - ret = 0; - if (!must_reap) - ret = select( max_fd+1, &rfds, 0, 0, NULL ); - - switch( ret ) - { - default: - if ( sock_out[0] >= 0 && FD_ISSET(sock_out[0], &rfds) ) { - ssize_t bytes = read( sock_out[0], buffer, sizeof(buffer)-1 ); - if ( bytes > 0 ) { - buffer[bytes] = 0; - rmsg.out.append( buffer ); - } - else if (bytes == 0) { - close(sock_out[0]); - sock_out[0] = -1; + off += bytes; + + if (off == fcmsg->len) { + delete fcmsg; + fcmsg = 0; + if (input_complete) { + close( sock_in[1] ); + sock_in[1] = -1; } } - if ( sock_err[0] >= 0 && FD_ISSET(sock_err[0], &rfds) ) { - ssize_t bytes = read( sock_err[0], buffer, sizeof(buffer)-1 ); - if ( bytes > 0 ) { - buffer[bytes] = 0; - rmsg.err.append( buffer ); - } - else if (bytes == 0) { - close(sock_err[0]); - sock_err[0] = -1; - } + } + + if ( sock_out[0] >= 0 && FD_ISSET(sock_out[0], &rfds) ) { + ssize_t bytes = read( sock_out[0], buffer, sizeof(buffer)-1 ); + if ( bytes > 0 ) { + buffer[bytes] = 0; + rmsg.out.append( buffer ); } - if ( client_fd >= 0 && FD_ISSET( client_fd, &rfds ) ) { - rmsg.err.append( "client cancelled\n" ); - client_fd = -1; - kill(pid, SIGTERM); - return_value = EXIT_CLIENT_KILLED; + else if (bytes == 0) { + close(sock_out[0]); + sock_out[0] = -1; } - // fall through - case -1: - if ( ret < 0 && errno != EINTR ) { // this usually means the logic broke - assert( false ); - return EXIT_DISTCC_FAILED; + } + if ( sock_err[0] >= 0 && FD_ISSET(sock_err[0], &rfds) ) { + ssize_t bytes = read( sock_err[0], buffer, sizeof(buffer)-1 ); + if ( bytes > 0 ) { + buffer[bytes] = 0; + rmsg.err.append( buffer ); + } + else if (bytes == 0) { + close(sock_err[0]); + sock_err[0] = -1; } - // fall through - case 0: + } + + if ( FD_ISSET(death_pipe[0], &rfds) ) { + // Note that we have already read any remaining stdout/stderr: + // the sigpipe is delivered after everything was written, + // and the notification is multiplexed into the select above. + struct rusage ru; int status; + if (wait4(pid, &status, 0, &ru) != pid) { + // this should never happen + assert( false ); + return EXIT_DISTCC_FAILED; + } - if (wait4(pid, &status, must_reap ? WUNTRACED : WNOHANG, &ru) == pid) - { - close( sock_err[0] ); - close( sock_out[0] ); - - if ( !WIFEXITED(status) || WEXITSTATUS(status) ) { - unsigned long int mem_used = ( ru.ru_minflt + ru.ru_majflt ) * getpagesize() / 1024; - rmsg.status = EXIT_OUT_OF_MEMORY; - - if ( mem_used * 100 > 85 * mem_limit * 1024 || - rmsg.err.find( "memory exhausted" ) != string::npos ) - { - // the relation between ulimit and memory used is pretty thin ;( - return EXIT_OUT_OF_MEMORY; - } - } - - if ( WIFEXITED(status) ) { - struct timeval endtv; - gettimeofday(&endtv, 0 ); - rmsg.status = WEXITSTATUS(status); - job_stat[JobStatistics::exit_code] = WEXITSTATUS(status); - job_stat[JobStatistics::real_msec] = (endtv.tv_sec - starttv.tv_sec) * 1000 + - (long(endtv.tv_usec) - long(starttv.tv_usec)) / 1000; - job_stat[JobStatistics::user_msec] = ru.ru_utime.tv_sec * 1000 - + ru.ru_utime.tv_usec / 1000; - job_stat[JobStatistics::sys_msec] = ru.ru_stime.tv_sec * 1000 - + ru.ru_stime.tv_usec / 1000; - job_stat[JobStatistics::sys_pfaults] = ru.ru_majflt + ru.ru_nswap + ru.ru_minflt; + if ( !WIFEXITED(status) || WEXITSTATUS(status) ) { + unsigned long int mem_used = ( ru.ru_minflt + ru.ru_majflt ) * getpagesize() / 1024; + rmsg.status = EXIT_OUT_OF_MEMORY; + + if ( mem_used * 100 > 85 * mem_limit * 1024 || + rmsg.err.find( "memory exhausted" ) != string::npos ) + { + // the relation between ulimit and memory used is pretty thin ;( + return EXIT_OUT_OF_MEMORY; } + } - return return_value; + if ( WIFEXITED(status) ) { + struct timeval endtv; + gettimeofday(&endtv, 0 ); + rmsg.status = WEXITSTATUS(status); + job_stat[JobStatistics::exit_code] = WEXITSTATUS(status); + job_stat[JobStatistics::real_msec] = (endtv.tv_sec - starttv.tv_sec) * 1000 + + (long(endtv.tv_usec) - long(starttv.tv_usec)) / 1000; + job_stat[JobStatistics::user_msec] = ru.ru_utime.tv_sec * 1000 + + ru.ru_utime.tv_usec / 1000; + job_stat[JobStatistics::sys_msec] = ru.ru_stime.tv_sec * 1000 + + ru.ru_stime.tv_usec / 1000; + job_stat[JobStatistics::sys_pfaults] = ru.ru_majflt + ru.ru_nswap + ru.ru_minflt; } - break; + + return return_value; } } } - assert( false ); - return 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/icecc-0.9.4/missing new/icecc-0.9.5/missing --- old/icecc-0.9.4/missing 2008-12-03 11:04:52.000000000 +0100 +++ new/icecc-0.9.5/missing 2009-10-24 02:17:03.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/icecc-0.9.4/services/comm.cpp new/icecc-0.9.5/services/comm.cpp --- old/icecc-0.9.4/services/comm.cpp 2009-03-02 10:42:01.000000000 +0100 +++ new/icecc-0.9.5/services/comm.cpp 2010-02-01 10:19:25.000000000 +0100 @@ -320,9 +320,9 @@ if (inofs >= intogo + 4) { if ( ptrdiff_t(inbuf + intogo) % 4 ) { - char t_buf[4]; + uint32_t t_buf[1]; memcpy(t_buf, inbuf + intogo, 4); - buf = *(uint32_t *)t_buf; + buf = t_buf[0]; } else buf = *(uint32_t *)(inbuf + intogo); intogo += 4; @@ -850,11 +850,16 @@ { if (has_msg ()) return true; - if (!read_a_bit () || timeout <= 0) + if (!read_a_bit ()) { - trace() << "!read_a_bit || timeout <= 0\n"; + trace() << "!read_a_bit\n"; return false; } + if (timeout <= 0) + { + trace() << "timeout <= 0\n"; + return has_msg (); + } while (!has_msg ()) { fd_set read_set; @@ -884,8 +889,8 @@ Msg *m = 0; enum MsgType type; uint32_t t; - if (timeout > 0 && !wait_for_msg (timeout) ) { - trace() << "blocking && !waiting_for_msg()\n"; + if (!wait_for_msg (timeout) ) { + trace() << "!wait_for_msg()\n"; return 0; } /* If we've seen the EOF, and we don't have a complete message, 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/icecc-0.9.4/services/comm.h new/icecc-0.9.5/services/comm.h --- old/icecc-0.9.4/services/comm.h 2008-10-21 12:40:13.000000000 +0200 +++ new/icecc-0.9.5/services/comm.h 2010-02-01 10:10:23.000000000 +0100 @@ -154,7 +154,7 @@ void setBulkTransfer(); std::string dump() const; - // NULL <--> channel closed + // NULL <--> channel closed or timeout Msg *get_msg(int timeout = 10); // false <--> error (msg not send) bool send_msg (const Msg &, int SendFlags = SendBlocking); 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/icecc-0.9.4/services/logging.h new/icecc-0.9.5/services/logging.h --- old/icecc-0.9.4/services/logging.h 2008-05-12 19:52:37.000000000 +0200 +++ new/icecc-0.9.5/services/logging.h 2010-02-01 10:10:23.000000000 +0100 @@ -49,7 +49,8 @@ char buf[64]; strftime(buf, sizeof(buf), "%T: ", tmp); if (logfile_prefix.size()) - os << logfile_prefix << "[" << getpid() << "] "; + os << logfile_prefix; + os << "[" << getpid() << "] "; os << buf; return os; 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/icecc-0.9.4/suse/icecream.spec.in new/icecc-0.9.5/suse/icecream.spec.in --- old/icecc-0.9.4/suse/icecream.spec.in 2008-05-12 19:51:26.000000000 +0200 +++ new/icecc-0.9.5/suse/icecream.spec.in 2010-02-01 10:13:53.000000000 +0100 @@ -28,16 +28,6 @@ %description icecream is the next generation distcc. - - -Authors: --------- - Stephan Kulow <coolo(a)suse.de> - Michael Matz <matz(a)suse.de> - Cornelius Schumacher <cschum(a)suse.de> - Lubos Lunak <llunak(a)suse.cz> - Frerich Raabe <raabe(a)kde.org> - %package -n libicecream-devel Summary: libicecream-devel Group: Development/Tools/Building @@ -104,6 +94,7 @@ %config /etc/logrotate.d/icecream %config /etc/init.d/icecream %_bindir/icecc +%_bindir/icerun %_sbindir/scheduler %_libdir/icecc %_sbindir/iceccd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 bundle-lang-common for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package bundle-lang-common for openSUSE:Factory checked in at Mon Mar 1 14:00:39 CET 2010. -------- --- bundle-lang-common/bundle-lang-common.changes 2009-12-22 12:59:34.000000000 +0100 +++ /mounts/work_src_done/STABLE/bundle-lang-common/bundle-lang-common.changes 2010-03-01 13:35:02.000000000 +0100 @@ -1,0 +2,7 @@ +Mon Mar 1 12:21:45 UTC 2010 - coolo(a)novell.com + +- remove konversation-lang for the moment +- add some gnome utilities +- merge shared into common + +------------------------------------------------------------------- bundle-lang-gnome-extras.changes: same change bundle-lang-gnome.changes: same change bundle-lang-kde.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bundle-lang-common.spec ++++++ --- /var/tmp/diff_new_pack.C9UGcY/_old 2010-03-01 14:00:30.000000000 +0100 +++ /var/tmp/diff_new_pack.C9UGcY/_new 2010-03-01 14:00:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bundle-lang-common (Version 11.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -20,12 +20,12 @@ #!BuildIgnore: gimp-unstable Name: bundle-lang-common -BuildRequires: PackageKit-lang atk-lang avahi-lang bash-lang coreutils-lang cpio-lang desktop-translations gconf2-lang ggz-client-libs-lang gimp-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gstreamer-0_10-plugins-good-lang gtk2-engines-lang gtk2-lang gvfs-lang libbonobo-lang libgdu-lang libgnome-lang libgphoto2-lang libwebkit-lang mc-lang polkit-gnome-lang pulseaudio-lang tar-lang util-linux-lang +BuildRequires: PackageKit-lang atk-lang avahi-lang bash-lang coreutils-lang cpio-lang desktop-translations gconf2-lang ggz-client-libs-lang gimp-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gstreamer-0_10-plugins-good-lang gtk2-engines-lang gtk2-lang gvfs-lang libbonobo-lang libgdu-lang libgnome-lang libgphoto2-lang libwebkit-lang libwnck-lang mc-lang notification-daemon-lang polkit-gnome-lang pulseaudio-lang tar-lang util-linux-lang BuildRequires: fdupes License: MIT License (or similar) Group: System/Localization Version: 11.2 -Release: 22 +Release: 23 Summary: Translations for a Group of Programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -95,8 +95,12 @@ Provides: locale(libgphoto2:en) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:en) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:en) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:en) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:en) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:en) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -164,8 +168,12 @@ Provides: locale(libgphoto2:de) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:de) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:de) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:de) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:de) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:de) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -233,8 +241,12 @@ Provides: locale(libgphoto2:es) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:es) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:es) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:es) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:es) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:es) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -302,8 +314,12 @@ Provides: locale(libgphoto2:it) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:it) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:it) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:it) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:it) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:it) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -371,8 +387,12 @@ Provides: locale(libgphoto2:fr) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:fr) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:fr) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:fr) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:fr) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:fr) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -440,8 +460,12 @@ Provides: locale(libgphoto2:ja) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:ja) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:ja) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:ja) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:ja) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:ja) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -509,8 +533,12 @@ Provides: locale(libgphoto2:zh) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:zh) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:zh) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:zh) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:zh) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:zh) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -578,8 +606,12 @@ Provides: locale(libgphoto2:nl) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:nl) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:nl) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:nl) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:nl) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:nl) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -647,8 +679,12 @@ Provides: locale(libgphoto2:cs) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:cs) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:cs) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:cs) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:cs) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:cs) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -740,9 +776,15 @@ Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:pt) Provides: locale(libwebkit:pt_BR) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:pt) +Provides: locale(libwnck:pt_BR) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:pt) Provides: locale(mc:pt_BR) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:pt) +Provides: locale(notification-daemon:pt_BR) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:pt) Provides: locale(polkit-gnome:pt_BR) @@ -814,8 +856,12 @@ Provides: locale(libgphoto2:pl) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:pl) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:pl) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:pl) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:pl) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:pl) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -883,8 +929,12 @@ Provides: locale(libgphoto2:ca) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:ca) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:ca) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:ca) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:ca) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:ca) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -952,8 +1002,12 @@ Provides: locale(libgphoto2:ar) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:ar) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:ar) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:ar) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:ar) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:ar) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -1021,8 +1075,12 @@ Provides: locale(libgphoto2:hu) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:hu) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:hu) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:hu) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:hu) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:hu) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -1090,8 +1148,12 @@ Provides: locale(libgphoto2:ko) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:ko) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:ko) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:ko) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:ko) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:ko) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -1159,8 +1221,12 @@ Provides: locale(libgphoto2:da) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:da) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:da) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:da) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:da) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:da) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -1228,8 +1294,12 @@ Provides: locale(libgphoto2:sv) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:sv) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:sv) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:sv) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:sv) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:sv) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -1297,8 +1367,12 @@ Provides: locale(libgphoto2:ru) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:ru) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:ru) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:ru) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:ru) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:ru) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -1366,8 +1440,12 @@ Provides: locale(libgphoto2:fi) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:fi) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:fi) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:fi) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:fi) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:fi) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -1435,8 +1513,12 @@ Provides: locale(libgphoto2:nb) Provides: libwebkit-lang = %(rpm -q --queryformat '%{VERSION}' libwebkit-lang) Provides: locale(libwebkit:nb) +Provides: libwnck-lang = %(rpm -q --queryformat '%{VERSION}' libwnck-lang) +Provides: locale(libwnck:nb) Provides: mc-lang = %(rpm -q --queryformat '%{VERSION}' mc-lang) Provides: locale(mc:nb) +Provides: notification-daemon-lang = %(rpm -q --queryformat '%{VERSION}' notification-daemon-lang) +Provides: locale(notification-daemon:nb) Provides: polkit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' polkit-gnome-lang) Provides: locale(polkit-gnome:nb) Provides: pulseaudio-lang = %(rpm -q --queryformat '%{VERSION}' pulseaudio-lang) @@ -1458,7 +1540,8 @@ %install mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . -bash %SOURCE0 PackageKit-lang atk-lang avahi-lang bash-lang coreutils-lang cpio-lang desktop-translations gconf2-lang ggz-client-libs-lang gimp-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gstreamer-0_10-plugins-good-lang gtk2-engines-lang gtk2-lang gvfs-lang libbonobo-lang libgdu-lang libgnome-lang libgphoto2-lang libwebkit-lang mc-lang polkit-gnome-lang pulseaudio-lang tar-lang util-linux-lang +bash %SOURCE0 PackageKit-lang atk-lang avahi-lang bash-lang coreutils-lang cpio-lang desktop-translations gconf2-lang ggz-client-libs-lang gimp-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gstreamer-0_10-plugins-good-lang gtk2-engines-lang gtk2-lang gvfs-lang libbonobo-lang libgdu-lang libgnome-lang libgphoto2-lang libwebkit-lang libwnck-lang mc-lang notification-daemon-lang polkit-gnome-lang pulseaudio-lang tar-lang util-linux-lang + if test common = kde; then # pretty evil hack to keep the symlinks working langs=`cd $RPM_BUILD_ROOT/usr/share/doc-bundle/kde/HTML && ls -1d *` @@ -1493,13 +1576,16 @@ rm $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/pl/graphics/line_props.png cp $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/eu/graphics/line_props.png $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/pl/graphics/line_props.png fi + for file in filelist.*; do grep -v %dir $file | sed -e "s,.*lang[^ ]* ,,; s,%doc *,," | while read file; do rm -v $RPM_BUILD_ROOT$file; done rm $file done + for i in $RPM_BUILD_ROOT/*; do %fdupes $i done + for file in taken.*; do changed=1 while test "$changed" = 1; do @@ -1556,6 +1642,7 @@ %files fi -f taken.fi %files nb -f taken.nb + #LANGUAGE_FILES %changelog ++++++ bundle-lang-gnome-extras.spec ++++++ ++++ 866 lines (skipped) ++++ between bundle-lang-common/bundle-lang-gnome-extras.spec ++++ and /mounts/work_src_done/STABLE/bundle-lang-common/bundle-lang-gnome-extras.spec bundle-lang-gnome.spec: same change ++++++ bundle-lang-kde.spec ++++++ --- /var/tmp/diff_new_pack.C9UGcY/_old 2010-03-01 14:00:30.000000000 +0100 +++ /var/tmp/diff_new_pack.C9UGcY/_new 2010-03-01 14:00:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bundle-lang-kde (Version 11.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -20,12 +20,12 @@ #!BuildIgnore: gimp-unstable Name: bundle-lang-kde -BuildRequires: NetworkManager-kde4-lang amarok-lang digikam-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang konversation-lang ktorrent-lang libgpod4-lang simple-ccsm-kde-lang +BuildRequires: NetworkManager-kde4-lang amarok-lang digikam-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang ktorrent-lang libgpod4-lang simple-ccsm-kde-lang BuildRequires: fdupes License: MIT License (or similar) Group: System/Localization Version: 11.2 -Release: 22 +Release: 23 Summary: Translations for a group of KDE applications BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -70,8 +70,6 @@ Provides: locale(kdebase4-openSUSE:en) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:en) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:en) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:en) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -112,8 +110,6 @@ Provides: locale(kdebase4-openSUSE:de) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:de) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:de) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:de) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -154,8 +150,6 @@ Provides: locale(kdebase4-openSUSE:es) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:es) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:es) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:es) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -196,8 +190,6 @@ Provides: locale(kdebase4-openSUSE:it) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:it) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:it) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:it) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -238,8 +230,6 @@ Provides: locale(kdebase4-openSUSE:fr) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:fr) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:fr) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:fr) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -280,8 +270,6 @@ Provides: locale(kdebase4-openSUSE:ja) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ja) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:ja) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:ja) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -322,8 +310,6 @@ Provides: locale(kdebase4-openSUSE:zh) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:zh) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:zh) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:zh) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -364,8 +350,6 @@ Provides: locale(kdebase4-openSUSE:nl) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:nl) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:nl) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:nl) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -406,8 +390,6 @@ Provides: locale(kdebase4-openSUSE:cs) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:cs) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:cs) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:cs) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -454,9 +436,6 @@ Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:pt) Provides: locale(kipi-plugins:pt_BR) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:pt) -Provides: locale(konversation:pt_BR) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:pt) Provides: locale(ktorrent:pt_BR) @@ -500,8 +479,6 @@ Provides: locale(kdebase4-openSUSE:pl) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:pl) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:pl) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:pl) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -542,8 +519,6 @@ Provides: locale(kdebase4-openSUSE:ca) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ca) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:ca) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:ca) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -584,8 +559,6 @@ Provides: locale(kdebase4-openSUSE:ar) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ar) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:ar) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:ar) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -626,8 +599,6 @@ Provides: locale(kdebase4-openSUSE:hu) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:hu) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:hu) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:hu) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -668,8 +639,6 @@ Provides: locale(kdebase4-openSUSE:ko) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ko) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:ko) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:ko) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -710,8 +679,6 @@ Provides: locale(kdebase4-openSUSE:da) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:da) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:da) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:da) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -752,8 +719,6 @@ Provides: locale(kdebase4-openSUSE:sv) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:sv) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:sv) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:sv) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -794,8 +759,6 @@ Provides: locale(kdebase4-openSUSE:ru) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:ru) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:ru) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:ru) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -836,8 +799,6 @@ Provides: locale(kdebase4-openSUSE:fi) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:fi) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:fi) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:fi) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -878,8 +839,6 @@ Provides: locale(kdebase4-openSUSE:nb) Provides: kipi-plugins-lang = %(rpm -q --queryformat '%{VERSION}' kipi-plugins-lang) Provides: locale(kipi-plugins:nb) -Provides: konversation-lang = %(rpm -q --queryformat '%{VERSION}' konversation-lang) -Provides: locale(konversation:nb) Provides: ktorrent-lang = %(rpm -q --queryformat '%{VERSION}' ktorrent-lang) Provides: locale(ktorrent:nb) Provides: libgpod4-lang = %(rpm -q --queryformat '%{VERSION}' libgpod4-lang) @@ -911,7 +870,8 @@ %install mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . -bash %SOURCE0 NetworkManager-kde4-lang amarok-lang digikam-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang konversation-lang ktorrent-lang libgpod4-lang simple-ccsm-kde-lang +bash %SOURCE0 NetworkManager-kde4-lang amarok-lang digikam-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang ktorrent-lang libgpod4-lang simple-ccsm-kde-lang + if test kde = kde; then # pretty evil hack to keep the symlinks working langs=`cd $RPM_BUILD_ROOT/usr/share/doc-bundle/kde/HTML && ls -1d *` @@ -946,13 +906,16 @@ rm $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/pl/graphics/line_props.png cp $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/eu/graphics/line_props.png $RPM_BUILD_ROOT/usr/share/gnome/help-bundle/dia/pl/graphics/line_props.png fi + for file in filelist.*; do grep -v %dir $file | sed -e "s,.*lang[^ ]* ,,; s,%doc *,," | while read file; do rm -v $RPM_BUILD_ROOT$file; done rm $file done + for i in $RPM_BUILD_ROOT/*; do %fdupes $i done + for file in taken.*; do changed=1 while test "$changed" = 1; do @@ -1009,6 +972,7 @@ %files fi -f taken.fi %files nb -f taken.nb + #LANGUAGE_FILES %changelog ++++++ bundle-lang-other.spec ++++++ --- /var/tmp/diff_new_pack.C9UGcY/_old 2010-03-01 14:00:30.000000000 +0100 +++ /var/tmp/diff_new_pack.C9UGcY/_new 2010-03-01 14:00:30.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package bundle-lang-other (Version 11.2) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 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 @@ -22,7 +22,7 @@ License: MIT License (or similar) Group: System/GUI/KDE Version: 11.2 -Release: 22 +Release: 23 Summary: Translations for languages not covered by one of the bundle-lang-*-* packages BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ packages.txt ++++++ --- /var/tmp/diff_new_pack.C9UGcY/_old 2010-03-01 14:00:30.000000000 +0100 +++ /var/tmp/diff_new_pack.C9UGcY/_new 2010-03-01 14:00:30.000000000 +0100 @@ -2,7 +2,7 @@ PackageKit-lang common accerciser-lang gnome-extras aisleriot-lang gnome -alacarte-lang gnome-extras +alacarte-lang gnome amarok-lang kde anjuta-lang gnome-extras aqbanking-lang gnome-extras @@ -26,8 +26,8 @@ contact-lookup-applet-lang gnome-extras coreutils-lang common cpio-lang common -dasher-lang gnome-extras -deskbar-applet-lang gnome-extras +dasher-lang gnome +deskbar-applet-lang gnome desktop-translations common devhelp-lang gnome-extras dia-lang gnome-extras @@ -101,7 +101,7 @@ gnome-system-monitor-lang gnome gnome-terminal-lang gnome gnome-user-docs-lang gnome -gnome-user-share-lang gnome-extras +gnome-user-share-lang gnome gnome-utils-lang gnome gnome-vfs2-lang common gnome-web-photo-lang gnome @@ -145,7 +145,6 @@ k3b-lang kde kdebase4-openSUSE-lang kde kipi-plugins-lang kde -konversation-lang kde ktorrent-lang kde last-exit-lang gnome-extras libbonobo-lang common @@ -177,7 +176,7 @@ libpurple-lang gnome libslab-lang gnome libwebkit-lang common -libwnck-lang gnome +libwnck-lang common liferea-lang gnome lightsoff-lang gnome mahjongg-lang gnome @@ -196,7 +195,7 @@ nautilus-share-lang gnome nemiver-lang gnome-extras net6-lang gnome-extras -notification-daemon-lang gnome +notification-daemon-lang common obby-lang gnome-extras orca-lang gnome pessulus-lang gnome-extras @@ -207,8 +206,8 @@ rhythmbox-lang gnome-extras sabayon-lang gnome-extras scrollkeeper-lang gnome -seahorse-lang gnome-extras -seahorse-plugins-lang gnome-extras +seahorse-lang gnome +seahorse-plugins-lang gnome simple-ccsm-kde-lang kde sound-juicer-lang gnome-extras swell-foop-lang gnome ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package yast2-trans for openSUSE:Factory checked in at Mon Mar 1 01:53:10 CET 2010. -------- --- yast2-trans/yast2-trans.changes 2010-01-11 13:56:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-trans/yast2-trans.changes 2010-02-26 11:26:00.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 26 11:20:31 CET 2010 - ke(a)suse.de + +- Updated languages: cs de es fa fr gl hu ja ko lt pl sk tg pt_BR ast. +- New language: kn. + +------------------------------------------------------------------------ calling whatdependson for head-i586 New: ---- yast2-trans-kn-2.19.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-trans.spec ++++++ --- /var/tmp/diff_new_pack.uMNZ5z/_old 2010-03-01 01:52:52.000000000 +0100 +++ /var/tmp/diff_new_pack.uMNZ5z/_new 2010-03-01 01:52:52.000000000 +0100 @@ -20,7 +20,7 @@ Name: yast2-trans Version: 2.19.0 -Release: 1 +Release: 2 License: GPLv2+ Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -58,45 +58,46 @@ Source27: yast2-trans-jv-%version.tar.bz2 Source28: yast2-trans-ka-%version.tar.bz2 Source29: yast2-trans-km-%version.tar.bz2 -Source30: yast2-trans-ko-%version.tar.bz2 -Source31: yast2-trans-ku-%version.tar.bz2 -Source32: yast2-trans-lo-%version.tar.bz2 -Source33: yast2-trans-lt-%version.tar.bz2 -Source34: yast2-trans-mk-%version.tar.bz2 -Source35: yast2-trans-mr-%version.tar.bz2 -Source36: yast2-trans-ms-%version.tar.bz2 -Source37: yast2-trans-my-%version.tar.bz2 -Source38: yast2-trans-nb-%version.tar.bz2 -Source39: yast2-trans-nl-%version.tar.bz2 -Source40: yast2-trans-pa-%version.tar.bz2 -Source41: yast2-trans-pl-%version.tar.bz2 -Source42: yast2-trans-pt-%version.tar.bz2 -Source43: yast2-trans-ro-%version.tar.bz2 -Source44: yast2-trans-ru-%version.tar.bz2 -Source45: yast2-trans-si-%version.tar.bz2 -Source46: yast2-trans-sk-%version.tar.bz2 -Source47: yast2-trans-sl-%version.tar.bz2 -Source48: yast2-trans-sr-%version.tar.bz2 -Source49: yast2-trans-sv-%version.tar.bz2 -Source50: yast2-trans-sw-%version.tar.bz2 -Source51: yast2-trans-ta-%version.tar.bz2 -Source52: yast2-trans-tg-%version.tar.bz2 -Source53: yast2-trans-th-%version.tar.bz2 -Source54: yast2-trans-tk-%version.tar.bz2 -Source55: yast2-trans-tr-%version.tar.bz2 -Source56: yast2-trans-uk-%version.tar.bz2 -Source57: yast2-trans-vi-%version.tar.bz2 -Source58: yast2-trans-wa-%version.tar.bz2 -Source59: yast2-trans-xh-%version.tar.bz2 -Source60: yast2-trans-zu-%version.tar.bz2 -Source61: yast2-trans-en_GB-%version.tar.bz2 -Source62: yast2-trans-en_US-%version.tar.bz2 -Source63: yast2-trans-pt_BR-%version.tar.bz2 -Source64: yast2-trans-zh_CN-%version.tar.bz2 -Source65: yast2-trans-zh_TW-%version.tar.bz2 +Source30: yast2-trans-kn-%version.tar.bz2 +Source31: yast2-trans-ko-%version.tar.bz2 +Source32: yast2-trans-ku-%version.tar.bz2 +Source33: yast2-trans-lo-%version.tar.bz2 +Source34: yast2-trans-lt-%version.tar.bz2 +Source35: yast2-trans-mk-%version.tar.bz2 +Source36: yast2-trans-mr-%version.tar.bz2 +Source37: yast2-trans-ms-%version.tar.bz2 +Source38: yast2-trans-my-%version.tar.bz2 +Source39: yast2-trans-nb-%version.tar.bz2 +Source40: yast2-trans-nl-%version.tar.bz2 +Source41: yast2-trans-pa-%version.tar.bz2 +Source42: yast2-trans-pl-%version.tar.bz2 +Source43: yast2-trans-pt-%version.tar.bz2 +Source44: yast2-trans-ro-%version.tar.bz2 +Source45: yast2-trans-ru-%version.tar.bz2 +Source46: yast2-trans-si-%version.tar.bz2 +Source47: yast2-trans-sk-%version.tar.bz2 +Source48: yast2-trans-sl-%version.tar.bz2 +Source49: yast2-trans-sr-%version.tar.bz2 +Source50: yast2-trans-sv-%version.tar.bz2 +Source51: yast2-trans-sw-%version.tar.bz2 +Source52: yast2-trans-ta-%version.tar.bz2 +Source53: yast2-trans-tg-%version.tar.bz2 +Source54: yast2-trans-th-%version.tar.bz2 +Source55: yast2-trans-tk-%version.tar.bz2 +Source56: yast2-trans-tr-%version.tar.bz2 +Source57: yast2-trans-uk-%version.tar.bz2 +Source58: yast2-trans-vi-%version.tar.bz2 +Source59: yast2-trans-wa-%version.tar.bz2 +Source60: yast2-trans-xh-%version.tar.bz2 +Source61: yast2-trans-zu-%version.tar.bz2 +Source62: yast2-trans-en_GB-%version.tar.bz2 +Source63: yast2-trans-en_US-%version.tar.bz2 +Source64: yast2-trans-pt_BR-%version.tar.bz2 +Source65: yast2-trans-zh_CN-%version.tar.bz2 +Source66: yast2-trans-zh_TW-%version.tar.bz2 Source100: yast2-trans-ast-%version.tar.bz2 #@SOURCES@ -%define build_languages af am ar be bg bn bs ca cs cy da de el es et fa fi fr gl gu he hi hr hu id it ja jv ka km ko ku lo lt mk mr ms my nb nl pa pl pt ro ru si sk sl sr sv sw ta tg th tk tr uk vi wa xh zu en_GB en_US pt_BR zh_CN zh_TW ast +%define build_languages af am ar be bg bn bs ca cs cy da de el es et fa fi fr gl gu he hi hr hu id it ja jv ka km kn ko ku lo lt mk mr ms my nb nl pa pl pt ro ru si sk sl sr sv sw ta tg th tk tr uk vi wa xh zu en_GB en_US pt_BR zh_CN zh_TW ast %description This is a container package. Its only purpose is to build the @@ -421,8 +422,6 @@ %description ka YaST2 - Translations for Georgian. - - %package km License: GPLv2+ Summary: YaST2 - Khmer Translations @@ -432,7 +431,14 @@ %description km YaST2 - Translations for Khmer. +%package kn +License: GPLv2+ +Summary: YaST2 - Kannada Translations +Group: System/YaST +Provides: locale(yast2:ka) +%description kn +YaST2 - Translations for Kannada. %package ko License: GPLv2+ @@ -907,6 +913,7 @@ tar xf %{S:63} tar xf %{S:64} tar xf %{S:65} +tar xf %{S:66} tar xf %{S:100} #@tar@ @@ -1087,6 +1094,11 @@ %doc %{prefix}/share/doc/packages/yast2-trans-km %lang(km) /usr/share/YaST2/locale/km +%files kn +%defattr(-,root,root) +%doc %{prefix}/share/doc/packages/yast2-trans-kn +%lang(kn) /usr/share/YaST2/locale/kn + %files ko %defattr(-,root,root) %doc %{prefix}/share/doc/packages/yast2-trans-ko ++++++ yast2-trans-ast-2.19.0.tar.bz2 ++++++ ++++++ yast2-trans-cs-2.19.0.tar.bz2 ++++++ ++++ 1847 lines of diff (skipped) ++++++ yast2-trans-de-2.19.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-de-2.19.0/po/qt-pkg.de.po new/yast2-trans-de-2.19.0/po/qt-pkg.de.po --- old/yast2-trans-de-2.19.0/po/qt-pkg.de.po 2009-12-14 09:52:55.000000000 +0100 +++ new/yast2-trans-de-2.19.0/po/qt-pkg.de.po 2010-01-13 15:41:58.000000000 +0100 @@ -1,44 +1,37 @@ -# #-#-#-#-# qt-pkg.de.po (qt-pkg) #-#-#-#-# -# Copyright (C) 2006 SuSE Linux Products GmbH, Nuernberg -# This file is distributed under the same license as the package. -# -# #-#-#-#-# qt-pkg.de.po (qt-pkg.de) #-#-#-#-# # translation of qt-pkg.de.po to German # German messages for YaST2 (packages-qt) # Copyright (C) 2002, 2003 SuSE Linux AG, Nuernberg -# Copyright (C) 2005 SUSE Linux Products GmbH, Nuernberg +# Copyright (C) 2005, 2010 SUSE Linux Products GmbH, Nuernberg # This file is distributed under the same license as the yast2 package. # -# Karl Eichwalder <ke(a)suse.de>, 2002, 2003, 2005. +# Karl Eichwalder <ke(a)suse.de>, 2002, 2003, 2005, 2010. # Stefan Hundhammer <sh(a)suse.de>, 2002. # Antje Faber <afaber(a)suse.de>, 2003, 2004, 2005. # Michael Skiba <trans(a)michael-skiba.de>, 2007,2008, 2009. # Hermann J. Beckers <hj.beckers(a)onlinehome.de>, 2008. # Jannick Kuhr <opensource(a)kuhr.org>, 2008. # Hermann-Josef Beckers <hj.beckers(a)onlinehome.de>, 2009. +# msgid "" msgstr "" "Project-Id-Version: qt-pkg.de\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-10-07 08:04+0200\n" "PO-Revision-Date: 2009-10-08 18:02+0200\n" -"Last-Translator: Michael Skiba <trans(a)michael-skiba.de>\n" +"Last-Translator: Karl Eichwalder <ke(a)suse.de>\n" "Language-Team: German <opensuse-translation-de(a)opensuse.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"#-#-#-#-# qt-pkg.de.po (qt-pkg) #-#-#-#-#\n" -"#-#-#-#-# qt-pkg.de.po (qt-pkg.de) #-#-#-#-#\n" -"X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: src/YQPackageSelector.cc:280 msgid "&Update Problems" -msgstr "Probleme bei der Aktualisierung" +msgstr "&Probleme bei der Aktualisierung" #: src/YQPackageSelector.cc:307 msgid "&Patterns" -msgstr "Schemata" +msgstr "&Schemata" #: src/YQPackageSelector.cc:329 msgid "Package &Groups" @@ -65,7 +58,7 @@ #. DEBUG #: src/YQPackageSelector.cc:386 src/YQPkgSearchFilterView.cc:92 msgid "&Keywords" -msgstr "Schlüsselwörter" +msgstr "&Schlüsselwörter" #: src/YQPackageSelector.cc:395 msgid "&Installation Summary" @@ -863,7 +856,7 @@ #: src/YQPkgFilterTab.cc:543 msgid "&Close page" -msgstr "Schliefen" +msgstr "&Seite schließen" #. Translators: Table column heading for language ISO code like "de_DE", "en_US" #. Please keep this short to avoid stretching the column too wide! @@ -990,11 +983,11 @@ #: src/YQPkgObjList.cc:266 msgid "Protected -- Do Not Modify" -msgstr "Geschützt -- nicht verändern" +msgstr "Geschützt — nicht verändern" #: src/YQPkgObjList.cc:267 msgid "Taboo -- Never Install" -msgstr "Tabu - niemals installieren" +msgstr "Tabu — niemals installieren" #: src/YQPkgObjList.cc:394 msgid "Show solver information" @@ -1154,8 +1147,6 @@ msgid "Package Groups" msgstr "Paketgruppen" -# #-#-#-#-# qt-pkg.de.po (qt-pkg.de) #-#-#-#-# &a is taken by &Akzeptieren -# 2007-09-25 -ke- #: src/YQPkgPatchFilterView.cc:70 msgid "&Show Patch Category:" msgstr "Patch-&Kategorie anzeigen:" ++++++ yast2-trans-es-2.19.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-es-2.19.0/po/bootloader.es.po new/yast2-trans-es-2.19.0/po/bootloader.es.po --- old/yast2-trans-es-2.19.0/po/bootloader.es.po 2009-12-14 10:13:59.000000000 +0100 +++ new/yast2-trans-es-2.19.0/po/bootloader.es.po 2010-02-26 10:30:08.000000000 +0100 @@ -8,14 +8,14 @@ # Luis Martinez <lmartinez(a)sct.ictnet.es>, 2008. # Alfredo Beltramo <balfred(a)dimagin.net>, 2008. # Ricardo Varas Santana <rivarass(a)gmail.com>, 2009. -# Javier Llorente <javier(a)opensuse.org>, 2009. +# Javier Llorente <javier(a)opensuse.org>, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: bootloader\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-10-07 07:47+0200\n" -"PO-Revision-Date: 2009-10-06 10:14-0300\n" -"Last-Translator: Sergio Gabriel Teves <gabriel(a)opensuse.org>\n" +"PO-Revision-Date: 2010-02-08 17:05+0100\n" +"Last-Translator: Javier Llorente <javier(a)opensuse.org>\n" "Language-Team: Spanish <opensuse-translation-es(a)opensuse.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -63,12 +63,12 @@ #. command line help text for Bootloader module #: src/clients/bootloader.ycp:201 msgid "Boot loader configuration module" -msgstr "Módulo de configuración del gestor de arranque" +msgstr "Módulo de configuración del cargador de arranque" #. command line help text for summary action #: src/clients/bootloader.ycp:209 msgid "Configuration summary of boot loader" -msgstr "Resumen de la configuración del gestor de arranque" +msgstr "Resumen de la configuración del cargador de arranque" #. command line help text for delete action #: src/clients/bootloader.ycp:214 @@ -108,7 +108,7 @@ #. progress step title #: src/clients/bootloader_finish.ycp:52 msgid "Saving bootloader configuration..." -msgstr "Guardando la configuración del gestor de arranque..." +msgstr "Guardando la configuración del cargador de arranque..." #. TRANSLATORS: part of the reboot message #. (message ID#SSH) @@ -165,13 +165,13 @@ "The device map includes more than 8 devices and the boot device is out of range.\n" "The range is limited by BIOS to the first 8 devices." msgstr "" -"Configure una ubicación válida para el gestor de arranque antes de continuar. \n" +"Configure una ubicación válida para el cargador de arranque antes de continuar. \n" "El mapa de unidades tiene más de 8 unidades y la unidad de carga esta\n" "fuera de rango. El rango esta limitado a las 8 primeras unidades por BIOS." #: src/clients/bootloader_proposal.ycp:152 msgid "No boot loader is selected for installation. Your system might not be bootable." -msgstr "No se ha seleccionado ningún gestor de arranque para instalar. Es posible que su sistema no pueda iniciarse." +msgstr "No se ha seleccionado ningún cargador de arranque para instalar. Es posible que su sistema no pueda iniciarse." #: src/clients/bootloader_proposal.ycp:161 src/routines/global_widgets.ycp:297 msgid "The LILO is not supported now." @@ -180,18 +180,18 @@ #. error in the proposal #: src/clients/bootloader_proposal.ycp:170 msgid "Because of the partitioning, the bootloader cannot be installed properly" -msgstr "Debido a la forma de particionar elegida, no es posible instalar correctamente el gestor de arranque" +msgstr "Debido a la forma de particionar elegida, no es posible instalar correctamente el cargador de arranque" #: src/clients/bootloader_proposal.ycp:184 msgid "The selected boot path will not be activated for your installation. Your system may not be bootable." -msgstr "No se activará la ruta al gestor de arranque seleccionada en su instalación. Es posible que su sistema no pueda iniciarse." +msgstr "No se activará la ruta de arranque seleccionada en su instalación. Es posible que su sistema no pueda iniciarse." #: src/clients/bootloader_proposal.ycp:196 msgid "" "Configure a valid boot loader location before continuing. \n" "In case that no selection can be made it may be necessary to create a small primary Apple HFS partition." msgstr "" -"Configure una ubicación válida para el gestor de arranque antes de continuar. \n" +"Configure una ubicación válida para el cargador de arranque antes de continuar. \n" "En el caso de que no poder hacer ninguna selección podría ser necesario crear una pequeña partición Apple HFS primaria." #: src/clients/bootloader_proposal.ycp:217 @@ -199,18 +199,18 @@ "Configure a valid boot loader location before continuing. \n" "In case that no selection can be made it may be necessary to create a PReP Boot partition." msgstr "" -"Configure una ubicación válida para el gestor de arranque antes de continuar. \n" +"Configure una ubicación válida para el cargador de arranque antes de continuar. \n" "En el caso de que no se pueda hacer ninguna selección podría ser necesario crear una partición de arranque de tipo PReP (PowerPC Reference Platform)." #. proposal part - bootloader label #: src/clients/bootloader_proposal.ycp:326 msgid "Booting" -msgstr "Iniciando" +msgstr "Arranque" #. menubutton entry #: src/clients/bootloader_proposal.ycp:328 msgid "&Booting" -msgstr "&Iniciando" +msgstr "&Arranque" #: src/clients/inst_lilo_convert.ycp:130 msgid "Stay &LILO" @@ -260,11 +260,11 @@ #. dialog caption #: src/elilo/dialogs.ycp:109 msgid "Boot Loader Global Options" -msgstr "Opciones globales del gestor de arranque" +msgstr "Opciones globales del cargador de arranque" #: src/elilo/helps.ycp:24 src/ppc/helps.ycp:23 msgid "<big>Boot Loader Location</big> " -msgstr "<big>Ubicación del gestor de arranque</big> " +msgstr "<big>Ubicación del cargador de arranque</big> " #: src/elilo/helps.ycp:25 msgid "Boot Image Location" @@ -559,7 +559,7 @@ #: src/grub/dialogs.ycp:96 src/ppc/dialogs.ycp:102 msgid "Boot Loader Options" -msgstr "Opciones del gestor de arranque" +msgstr "Opciones del cargador de arranque" #: src/grub/helps.ycp:24 msgid "<big>Boot Menu</big> " @@ -573,9 +573,9 @@ "if the boot loader is installed in the MBR." msgstr "" "Especificar la bandera activa en la tabla de particiones para la partición de arranque\n" -"Para activar la partición que contiene el gestor de arranque. El código MBR genérico arrancará entonces\n" +"Para activar la partición que contiene el cargador de arranque. El código MBR genérico arrancará entonces\n" "la partición activa. Las BIOS más antiguas requieren que una partición esté marcada como activa aunque\n" -"el gestor de arranque esté instalado en el MBR." +"el cargador de arranque esté instalado en el MBR." #: src/grub/helps.ycp:31 src/routines/common_helps.ycp:24 msgid "" @@ -583,7 +583,7 @@ "Specifies the time the bootloader will wait until the default kernel is loaded.\n" msgstr "" "Tiempo Límite en Segundos \n" -"Especifica el tiempo que el gestor de arranque tendrá que esperar hasta que\n" +"Especifica el tiempo que el cargador de arranque tendrá que esperar hasta que\n" "se cargue el kernel predeterminado.\n" #: src/grub/helps.ycp:35 @@ -596,12 +596,12 @@ "using the Up and Down buttons.\n" msgstr "" " Pulsando Establecer como predeterminada se marca la sección\n" -" seleccionada como predeterminada. Al iniciar, el gestor de arranque\n" +" seleccionada como predeterminada. Al iniciar, el cargador de arranque\n" " proporcionará un menú de inicio y esperará a que el usuario seleccione\n" "el kernel u otro sistema operativo para arrancar. Si no se pulsa ninguna tecla\n" " antes del tiempo límite, se cargará el kernel o el sistema operativo\n" " predeterminado. Es posible cambiar el orden de las secciones en el menú\n" -"del gestor de arranque utilizando los botones Arriba y Abajo.\n" +"del cargador de arranque utilizando los botones Arriba y Abajo.\n" #: src/grub/helps.ycp:43 msgid "" @@ -644,7 +644,7 @@ msgstr "" "Iniciar desde una partición raíz es la opción recomendada si existe una partición\n" "apropiada. Seleccione Establecer indicador activo en la tabla de partición para la partición de arranque y Escribir código genérico en el MBR\n" -"en Opciones del gestor de arranque para actualizar el MBR en el caso de que sea necesario o configure su otro gestor de arranque\n" +"en Opciones del cargador de arranque para actualizar el MBR en el caso de que sea necesario o configure su otro cargador de arranque\n" "para iniciar esta sección." #: src/grub/helps.ycp:64 @@ -707,7 +707,7 @@ "Define the password that will be required to access the boot menu. YaST will only accept the password if you repeat\n" "it in Retype Password." msgstr "" -"Proteger el gestor de arranque con contraseña \n" +"Proteger el cargador de arranque con contraseña \n" "Defina la contraseña requerida para acceder al menú de arranque. YaST sólo aceptará la contraseña si la introduce de nuevo\n" "en el campo Volver a introducir Contraseña." @@ -728,7 +728,7 @@ #: src/grub/helps.ycp:107 msgid "Boot Loader Locations" -msgstr "Ubicaciones del gestor de arranque" +msgstr "Ubicaciones del cargador de arranque" #: src/grub/helps.ycp:108 msgid "Set &active Flag in Partition Table for Boot Partition" @@ -800,7 +800,7 @@ #: src/grub/options.ycp:222 msgid "Prot&ect Boot Loader with Password" -msgstr "Prot&eger el gestor de arranque con contraseña" +msgstr "Prot&eger el cargador de arranque con contraseña" # include/network/providers.ycp:505 #. text entry @@ -852,7 +852,7 @@ #: src/grub/options.ycp:594 src/grub/options.ycp:611 src/ppc/options.ycp:77 #: src/ppc/options.ycp:112 src/ppc/options.ycp:146 src/ppc/options.ycp:228 msgid "Boot Loader Location" -msgstr "Ubicación del gestor de arranque" +msgstr "Ubicación del cargador de arranque" #: src/grub/options.ycp:596 src/grub/options.ycp:613 msgid "Boot from &Master Boot Record" @@ -881,7 +881,7 @@ #. push button #: src/grub/options.ycp:650 src/routines/global_widgets.ycp:770 msgid "Boot Loader Installation &Details" -msgstr "&Detalles de la instalación del gestor de arranque" +msgstr "&Detalles de la instalación del cargador de arranque" #. yes-no popup #: src/grub/widgets.ycp:46 @@ -890,8 +890,8 @@ "The menu of the boot loader contains an entry to boot from the floppy.\n" "Replace it with an entry to boot from the hard disk?" msgstr "" -"Ha optado por instalar el gestor de arranque en un disquete.\n" -"El menú del gestor de arranque contiene una entrada para arrancar desde el disquete.\n" +"Ha optado por instalar el cargador de arranque en un disquete.\n" +"El menú del cargador de arranque contiene una entrada para arrancar desde el disquete.\n" "¿Desea sustituirla por una entrada para arrancar desde el disco duro?" #. yes-no popup @@ -901,8 +901,8 @@ "The menu of the boot loader contains an entry to boot from the hard disk.\n" "Replace it with an entry to boot from the floppy?" msgstr "" -"Ha optado por instalar el gestor de arranque en el disco duro.\n" -"El menú del gestor de arranque contiene una entrada para arrancar desde el disco duro.\n" +"Ha optado por instalar el cargador de arranque en el disco duro.\n" +"El menú del cargador de arranque contiene una entrada para arrancar desde el disco duro.\n" "¿Desea reemplazarla por una entrada para arrancar desde el disquete?" #. yes-no popup, %1 is device name (eg. /dev/hda) @@ -922,7 +922,7 @@ "del sistema.\n" "Si el sistema está configurado para arrancar de %1, es necesario\n" "modificar el orden de los discos en la configuración\n" -"del gestor de arranque.\n" +"del cargador de arranque.\n" "¿Desea modificarlo?\n" #. table cell @@ -948,7 +948,7 @@ #. table item / label #: src/grub/widgets.ycp:780 msgid "Add Saved MBR to Boot Loader Menu" -msgstr "Añadir MBR guardado al menú del gestor de arranque" +msgstr "Añadir MBR guardado al menú del cargador de arranque" #. yes-no popup #: src/grub/widgets.ycp:812 @@ -964,7 +964,7 @@ #. checkbox label #: src/grub/widgets.ycp:872 src/grub/widgets.ycp:888 msgid "Use Dedicated Boot Loader Area" -msgstr "Utilizar zona dedicada del gestor de arranque" +msgstr "Utilizar zona dedicada del cargador de arranque" #. label displayed as help #: src/grub/widgets.ycp:883 @@ -974,10 +974,10 @@ "automatic disk defragmentation. The movement could prevent the\n" "boot loader from loading." msgstr "" -"El uso de la zona dedicada del gestor de arranque evita\n" -"que los archivos del gestor de arranque se muevan durante\n" +"El uso de la zona dedicada del cargador de arranque evita\n" +"que los archivos del cargador de arranque se muevan durante\n" "la desfragmentación automática del disco. El movimiento de los\n" -"archivos podría evitar que el gestor de arranque se cargase." +"archivos podría evitar que el cargador de arranque se cargase." #. summary part, %1 is a list of device names #: src/modules/BootCommon.ycp:896 @@ -990,7 +990,7 @@ #: src/modules/BootCommon.ycp:908 src/modules/BootGRUB.ycp:735 #, ycp-format msgid "Boot Loader Type: %1" -msgstr "Tipo de gestor de arranque: %1" +msgstr "Tipo de cargador de arranque: %1" #. summary text, location is location description (eg. /dev/hda) #: src/modules/BootCommon.ycp:911 src/modules/BootPOWERLILO.ycp:972 @@ -1018,7 +1018,7 @@ "Do not install boot loader; just create \n" "configuration files" msgstr "" -"No instalar el gestor de arranque; crear sólo\n" +"No instalar el cargador de arranque; crear sólo\n" "los archivos de configuración" # info box title @@ -1026,18 +1026,18 @@ #: src/modules/BootELILO.ycp:378 src/modules/BootPOWERLILO.ycp:955 #, ycp-format msgid "Boot loader type: %1" -msgstr "Tipo de gestor de arranque: %1" +msgstr "Tipo de cargador de arranque: %1" #. summary text #: src/modules/BootELILO.ycp:385 msgid "Do Not Create EFI Boot Manager Entry" -msgstr "No crear una entrada para el gestor de arranque EFI" +msgstr "No crear una entrada para el cargador de arranque EFI" #. summary text, %1 is label of the entry of EFI boot manager #: src/modules/BootELILO.ycp:391 #, ycp-format msgid "Create EFI Boot Manager Entry %1" -msgstr "Crear una entrada %1 para el gestor de arranque EFI" +msgstr "Crear una entrada %1 para el cargador de arranque EFI" #. means: process received signal SIGSEGV #. please, use some usual translation @@ -1115,7 +1115,7 @@ #. summary text #: src/modules/BootGRUB.ycp:778 msgid "Do not install boot loader; just create configuration files" -msgstr "No instalar el gestor de arranque; crear sólo los archivos de configuración" +msgstr "No instalar el cargador de arranque; crear sólo los archivos de configuración" #. menubutton item, keep as short as possible #: src/modules/BootGRUB.ycp:906 @@ -1125,7 +1125,7 @@ #: src/modules/BootSupportCheck.ycp:81 #, ycp-format msgid "Unknown bootloader: %1" -msgstr "Gestor de arranque desconocido: %1" +msgstr "Cargador de arranque desconocido: %1" #: src/modules/BootSupportCheck.ycp:84 msgid "LILO bootloader is not supported" @@ -1152,7 +1152,7 @@ #: src/modules/BootSupportCheck.ycp:222 msgid "The boot device is on software RAID1. Select other bootloader location, e.g. Master Boot Record" -msgstr "La unidad de arranque está en el RAID1 de software. Seleccione otra ubicación para el gestor de arranque, p.ej. Master Boot Record" +msgstr "La unidad de arranque está en el RAID1 de software. Seleccione otra ubicación para el cargador de arranque, p.ej. Master Boot Record" #: src/modules/BootSupportCheck.ycp:239 msgid "The /boot directory is on an XFS filesystem. System may not boot." @@ -1160,7 +1160,7 @@ #: src/modules/BootSupportCheck.ycp:270 msgid "It was not possible to determine the exact order of disks for device map. The order of disks can be changed in \"Boot Loader Installation Details\"" -msgstr "No ha sido posible determinar el orden exacto de los discos para el mapeado de unidades.Se puede cambiar el orden de los discos en \"Detalles de la instalación del gestor de arranque\"" +msgstr "No ha sido posible determinar el orden exacto de los discos para el mapeado de unidades.Se puede cambiar el orden de los discos en \"Detalles de la instalación del cargador de arranque\"" #. error report #: src/modules/BootZIPL.ycp:105 @@ -1170,13 +1170,13 @@ #. summary #: src/modules/BootZIPL.ycp:211 msgid "Install S390 Boot Loader" -msgstr "Instalar gestor de arranque S390" +msgstr "Instalar cargador de arranque S390" # info box title #. progress stage, text in dialog (short, infinitiv) #: src/modules/Bootloader.ycp:207 msgid "Check boot loader" -msgstr "Verificar el gestor de arranque" +msgstr "Verificar cargador de arranque" #. progress stage, text in dialog (short, infinitiv) #: src/modules/Bootloader.ycp:209 @@ -1186,12 +1186,12 @@ #. progress stage, text in dialog (short, infinitiv) #: src/modules/Bootloader.ycp:211 msgid "Load boot loader settings" -msgstr "Cargar la configuración del gestor de arranque" +msgstr "Cargar la configuración del cargador de arranque" #. progress step, text in dialog (short) #: src/modules/Bootloader.ycp:215 msgid "Checking boot loader..." -msgstr "Comprobando gestor de arranque..." +msgstr "Comprobando cargador de arranque..." #. progress step, text in dialog (short) #: src/modules/Bootloader.ycp:217 @@ -1201,16 +1201,16 @@ #. progress step, text in dialog (short) #: src/modules/Bootloader.ycp:219 msgid "Loading boot loader settings..." -msgstr "Cargando la configuración del gestor de arranque..." +msgstr "Cargando la configuración del cargador de arranque..." #. dialog header #: src/modules/Bootloader.ycp:222 msgid "Initializing Boot Loader Configuration" -msgstr "Inicializando la configuración del gestor de arranque" +msgstr "Inicializando la configuración del cargador de arranque" #: src/modules/Bootloader.ycp:313 src/routines/dialogs.ycp:95 msgid "The boot partition is of type NFS. Bootloader cannot be installed." -msgstr "La partición de arranque es del tipo NFS; no se puede instalar el gestor de arranque." +msgstr "La partición de arranque es del tipo NFS; no se puede instalar el cargador de arranque." #. part of summary, %1 is a part of kernel command line #: src/modules/Bootloader.ycp:345 @@ -1226,12 +1226,12 @@ #. progress stage, text in dialog (short) #: src/modules/Bootloader.ycp:427 msgid "Save boot loader configuration files" -msgstr "Guardar archivos de configuración del gestor de arranque" +msgstr "Guardar archivos de configuración del cargador de arranque" #. progress stage, text in dialog (short) #: src/modules/Bootloader.ycp:429 msgid "Install boot loader" -msgstr "Instalar el gestor de arranque" +msgstr "Instalar cargador de arranque" #. progress step, text in dialog (short) #: src/modules/Bootloader.ycp:433 @@ -1241,17 +1241,17 @@ #. progress step, text in dialog (short) #: src/modules/Bootloader.ycp:435 msgid "Saving boot loader configuration files..." -msgstr "Guardando los archivos de configuración del gestor de arranque..." +msgstr "Guardando los archivos de configuración del cargador de arranque..." #. progress step, text in dialog (short) #: src/modules/Bootloader.ycp:437 msgid "Installing boot loader..." -msgstr "Instalando el gestor de arranque..." +msgstr "Instalando el cargador de arranque..." #. progress line #: src/modules/Bootloader.ycp:443 msgid "Saving Boot Loader Configuration" -msgstr "Guardando configuración del gestor de arranque" +msgstr "Guardando configuración del cargador de arranque" #. entry of bootloader menu - only a-z, A-Z, 0-9, _ and blank space #. are allowed, otherwise translartion won't be used @@ -1462,7 +1462,7 @@ "If this option is given, the boot partition will be converted to FAT. \n" "The intend of this option is to write the boot files to all members of a RAID1 or RAID5 system." msgstr "" -"Partición para el duplicado del gestor de arranque\n" +"Partición para el duplicado del cargador de arranque\n" "especifica otros nodos de unidades Linux donde la información de arranque está almacenada.\n" "Si esta opción es dada, la partición de arraque es convertida a FAT. \n" "El propósito de esta opción es escribir los archivos de arraque en todos los miembros de los sistemas RAID1 o RAID5." @@ -1521,14 +1521,14 @@ "Install the bootloader even if it is unsure whether your firmware is\n" "buggy so that next boot will fail. This results in an unsupported setup." msgstr "" -"Instalar el gestor de arranque incluso sobre errores\n" -"Instala el gestor de arranque incluso si no está claro si su firmware tiene\n" +"Instalar el cargador de arranque incluso sobre errores\n" +"Instala el cargador de arranque incluso si no está claro si su firmware tiene\n" "fallos de manera que el siguiente arranque falle. Esto resulta en una configuración no admitida." # info box title #: src/ppc/helps.ycp:90 msgid "PPC Boot Loader Location" -msgstr "Ubicación del gestor de arranque PPC" +msgstr "Ubicación del cargador de arranque PPC" # boot disk change dialog title #: src/ppc/helps.ycp:91 @@ -1557,7 +1557,7 @@ #: src/ppc/helps.ycp:97 msgid "Partition for Boot Loader Duplication" -msgstr "Partición para la duplicación del gestor de arranque" +msgstr "Partición para la duplicación del cargador de arranque" #: src/ppc/helps.ycp:98 msgid "Always Boot from FAT Partition" @@ -1569,7 +1569,7 @@ #: src/ppc/helps.ycp:100 msgid "Install Boot Loader Even on Errors" -msgstr "Instalar el gestor de arranque aunque se produzcan errores" +msgstr "Instalar el cargador de arranque aunque se produzcan errores" #: src/ppc/helps.ycp:101 msgid "PReP or FAT Partition" @@ -1598,7 +1598,7 @@ #: src/ppc/options.ycp:47 msgid "Partition for Boot Loader &Duplication" -msgstr "Partición para la &duplicación del gestor de arranque" +msgstr "Partición para la &duplicación del cargador de arranque" #: src/ppc/options.ycp:79 msgid "HFS Boot &Partition" @@ -1644,7 +1644,7 @@ #: src/ppc/options.ycp:266 msgid "&Install Boot Loader Even on Errors" -msgstr "&Instalar el gestor de arranque incluso en errores" +msgstr "&Instalar el cargador de arranque incluso sobre errores" # info box title #. end CHRP @@ -1666,12 +1666,12 @@ #. dialog caption #: src/routines/dialogs.ycp:114 msgid "Boot Loader Settings" -msgstr "Configuración del gestor de arranque" +msgstr "Configuración del cargador de arranque" #. message #: src/routines/dialogs.ycp:143 msgid "There are no options to set for the current boot loader." -msgstr "No hay opciones a definir para el gestor de arranque." +msgstr "No hay opciones a definir para el cargador de arranque." #. heading #: src/routines/dialogs.ycp:160 src/routines/dialogs.ycp:218 @@ -1696,7 +1696,7 @@ #: src/routines/dialogs.ycp:571 src/routines/dialogs.ycp:622 #: src/routines/dialogs.ycp:664 msgid "Boot Loader Settings: Section Management" -msgstr "Configuración del gestor de arranque: Gestión de la sección" +msgstr "Configuración del cargador de arranque: Gestión de la sección" #. heading #. radio button @@ -1798,7 +1798,7 @@ #. combo box #: src/routines/global_widgets.ycp:265 msgid "&Boot Loader" -msgstr "&Gestor de arranque" +msgstr "&Cargador de arranque" #. popup - Continue/Cancel #: src/routines/global_widgets.ycp:303 @@ -1810,7 +1810,7 @@ "Proceed?\n" msgstr "" "\n" -"Si no instala ningún gestor de arranque, el sistema\n" +"Si no instala ningún cargador de arranque, el sistema\n" "podría no iniciarse.\n" "\n" "¿Proceder?\n" @@ -1854,11 +1854,11 @@ "Select a course of action:\n" msgstr "" "\n" -"Ha seleccionado cambiar su gestor de arranque. Al convertir \n" +"Ha seleccionado cambiar su cargador de arranque. Al convertir \n" "la configuración, es posible que se pierdan algunos ajustes.\n" "\n" "Se guardará la configuración actual y podrá\n" -"restaurarla si regresa al gestor de arranque actual.\n" +"restaurarla si regresa al cargador de arranque actual.\n" "\n" "Seleccione un curso de acción:\n" @@ -1891,7 +1891,7 @@ #. popup message #: src/routines/global_widgets.ycp:464 msgid "Select the boot loader before editing sections." -msgstr "Seleccionar el gestor de arranque antes de editar las secciones." +msgstr "Seleccionar el cargador de arranque antes de editar las secciones." #. pushbutton #. menu button entry @@ -1917,7 +1917,7 @@ #. menubutton item, keep as short as possible #: src/routines/global_widgets.ycp:572 msgid "Write bootloader boot code to disk" -msgstr "Escribir el código de arranque del gestor de arranque al disco" +msgstr "Escribir el código de arranque del cargador de arranque al disco" #. message popup #: src/routines/global_widgets.ycp:608 @@ -1931,7 +1931,7 @@ #: src/routines/global_widgets.ycp:639 msgid "Writing bootloader settings failed." -msgstr "No ha sido posible escribir la configuración del gestor de arranque." +msgstr "No ha sido posible escribir la configuración del cargador de arranque." #. tab header #: src/routines/global_widgets.ycp:684 @@ -1941,12 +1941,12 @@ #. tab header #: src/routines/global_widgets.ycp:696 msgid "Boot Loader &Installation" -msgstr "&Instalación del gestor de arranque" +msgstr "&Instalación del cargador de arranque" #. push button #: src/routines/global_widgets.ycp:760 msgid "Boot &Loader Options" -msgstr "Opciones de&l gestor de arranque" +msgstr "Opciones de&l cargador de arranque" #. help text 1/1 (shown during settings reading progress) #: src/routines/helps.ycp:33 @@ -1954,8 +1954,8 @@ "<BIG>Boot Loader Configuration Tool</BIG> \n" "Change the settings of your boot loader." msgstr "" -"<BIG>Herramienta de configuración del gestor de arranque</BIG> \n" -"Permite cambiar las opciones de su gestor de arranque." +"<BIG>Herramienta de configuración del cargador de arranque</BIG> \n" +"Permite cambiar las opciones de su cargador de arranque." #. help text #: src/routines/helps.ycp:43 @@ -1963,7 +1963,7 @@ "<BIG>Saving Boot Loader Configuration</BIG> \n" "Please wait... " msgstr "" -"<BIG>Guardando la configuración del gestor de arranque</BIG> \n" +"<BIG>Guardando la configuración del cargador de arranque</BIG> \n" "Por favor, espere... " #. help text, optional part of following @@ -1985,7 +1985,7 @@ "the configuration saved on your disk. %1" msgstr "" "Desde Otro,\n" -"puede editar de forma manual los archivos de configuración del gestor de arranque, borrar la configuración \n" +"puede editar de forma manual los archivos de configuración del cargador de arranque, borrar la configuración \n" "actual y proponer una nueva configuración, iniciar desde el principio o volver a leer\n" "la configuración guardada en su disco. %1" @@ -1996,7 +1996,7 @@ "manually, click Edit Configuration Files." msgstr "" "Para editar de forma manual los archivos de configuración\n" -"del gestor de arranque, pulse sobre Editar Archivos de Configuración." +"del cargador de arranque, pulse sobre Editar Archivos de Configuración." #. help 1/4 #: src/routines/helps.ycp:82 @@ -2027,10 +2027,10 @@ "menu can be changed using the Up and Down buttons." msgstr "" " Al pulsar Definir como predeterminada, se marca la sección \n" -"seleccionada como predeterminada. Al iniciar, el gestor de arranque le proporcionará \n" +"seleccionada como predeterminada. Al iniciar, el cargador de arranque le proporcionará \n" "un menú de inicio y esperará a que el usuario seleccione un kernel u otro sistema operativo \n" "para arrancar. Si no se pulsa ninguna tecla antes del tiempo límite, se iniciará el kernel o el sistema \n" -"operativo predeterminado. Se puede cambiar el orden de las secciones en el menú del gestor de arranque\n" +"operativo predeterminado. Se puede cambiar el orden de las secciones en el menú del cargador de arranque\n" "utilizando los botones Arriba y Abajo." #. help 4/4 @@ -2039,7 +2039,7 @@ "Press Add to create a new boot loader section\n" "or Delete to delete the selected section." msgstr "" -"Pulse sobre Añadir para crear una nueva sección en el gestor de arranque\n" +"Pulse sobre Añadir para crear una nueva sección en el cargador de arranque\n" "o Eliminar para eliminar la sección seleccionada." #. help text for the custom boot manager installation, 1 of 7 @@ -2051,8 +2051,8 @@ "<big>Boot Loader Location</big> \n" "The boot manager (%1) can be installed in the following ways:" msgstr "" -"<big>Ubicación del gestor de arranque</big> \n" -"Es posible instalar el gestor de arranque (%1) de las siguientes maneras:" +"<big>Ubicación del cargador de arranque</big> \n" +"Es posible instalar el cargador de arranque (%1) de las siguientes maneras:" #. custom bootloader help text, 2 of 7 #: src/routines/helps.ycp:115 @@ -2080,10 +2080,10 @@ "\n" "- En el Sector de arranque de la partición <tt>/boot</tt> o <tt>/</tt> (raíz). \n" "Esta es la opción recomendada si existe la partición adecuada.\n" -"Defina Activar partición del gestor de arranque y\n" -"Reemplazar el MBR con código genérico en Detalles de la instalación del gestor de arranque\n" +"Defina Activar partición del cargador de arranque y\n" +"Reemplazar el MBR con código genérico en Detalles de la instalación del cargador de arranque\n" "para actualizar el MBR\n" -"en el caso de que sea necesario o configure su otro gestor de arranque\n" +"en el caso de que sea necesario o configure su otro cargador de arranque\n" "para iniciar el &producto;." #. custom bootloader help text, 4 of 7 @@ -2123,7 +2123,7 @@ msgstr "" "Por ejemplo, muchos equipos tienen límites en la BIOS que\n" "que restringen el arranque a\n" -"los cilindros del disco duro menores de 1024. Dependiendo del gestor de arranque utilizado,\n" +"los cilindros del disco duro menores de 1024. Dependiendo del cargador de arranque utilizado,\n" "es posible que pueda o que no pueda arrancar desde una partición lógica." #. custom bootloader help text, 7 of 7 @@ -2144,9 +2144,9 @@ "To adjust advanced boot loader installation options (such as the device\n" "mapping), click Boot Loader Installation Details." msgstr "" -"Detalles de la instalación del gestor de arranque \n" -"Para ajustar las opciones de la instalación del gestor de arranque avanzadas (como el mapeo de\n" -"unidades), pulse Detalles de la instalación del gestor de arranque." +"Detalles de la instalación del cargador de arranque \n" +"Para ajustar las opciones de la instalación del cargador de arranque avanzadas (como el mapeo de\n" +"unidades), pulse Detalles de la instalación del cargador de arranque." #. help text 1/1 #: src/routines/helps.ycp:177 @@ -2155,9 +2155,9 @@ "To select whether to install a boot loader and which bootloader to install,\n" "use Boot Loader." msgstr "" -"Tipo de gestor de arranque \n" -"Para seleccionar si se instala el gestor de arranque y cuál de ellos instalar,\n" -"utilice gestor de arranque." +"Tipo de cargador de arranque \n" +"Para seleccionar si se instala el cargador de arranque y cuál de ellos instalar,\n" +"utilice cargador de arranque." #. help text 1/1 #: src/routines/helps.ycp:189 @@ -2166,9 +2166,9 @@ "To adjust options of the boot loader, such as the time-out, click\n" "Boot Loader Options." msgstr "" -"Opciones del gestor de arranque \n" -"Para ajustar las opciones del gestor de arranque, como el tiempo límite, pulse\n" -"Opciones del gestor de arranque." +"Opciones del cargador de arranque \n" +"Para ajustar las opciones del cargador de arranque, como el tiempo límite, pulse\n" +"Opciones del cargador de arranque." #. help text 1/1 #: src/routines/helps.ycp:200 @@ -2178,7 +2178,7 @@ "Note: The final configuration file may have different indenting." msgstr "" "Configuración manual avanzada \n" -"Desde aquí, puede editar de forma manual la configuración del gestor de arranque.\n" +"Desde aquí, puede editar de forma manual la configuración del cargador de arranque.\n" "Nota: Es posible que el archivo de configuración resultante tenga un formato de sangría diferente." #. help text 1/1 @@ -2189,7 +2189,7 @@ "name must be unique." msgstr "" "Nombre de la sección \n" -"Utilice Nombre de la sección para especificar el nombre de la sección del gestor de arranque. El nombre\n" +"Utilice Nombre de la sección para especificar el nombre de la sección del cargador de arranque. El nombre\n" "de la sección debe ser único." #. help text 1/5 @@ -2266,33 +2266,33 @@ #. summary string #: src/routines/misc.ycp:60 msgid "Do not install any boot loader" -msgstr "No instalar ningún gestor de arranque" +msgstr "No instalar ningún cargador de arranque" #. combo box item #: src/routines/misc.ycp:62 msgid "Do Not Install Any Boot Loader" -msgstr "No instalar ningún gestor de arranque" +msgstr "No instalar ningún cargador de arranque" #. summary string #: src/routines/misc.ycp:68 msgid "Install the default boot loader" -msgstr "Instalar el gestor de arranque predeterminado" +msgstr "Instalar el cargador de arranque predeterminado" #. combo box item #: src/routines/misc.ycp:70 msgid "Install Default Boot Loader" -msgstr "Instalar el gestor de arranque predeterminado" +msgstr "Instalar el cargador de arranque predeterminado" #. summary string #: src/routines/misc.ycp:74 msgid "Boot loader" -msgstr "Gestor de arranque" +msgstr "Cargador de arranque" # info box title #. combo box item #: src/routines/misc.ycp:76 msgid "Boot Loader" -msgstr "gestor de arranque" +msgstr "Cargador de arranque" #. popup, %1 is bootloader name #. data saved to floppy disk @@ -2313,8 +2313,8 @@ "This function is not available if the boot\n" "loader is not specified." msgstr "" -"Esta función no esta disponible si no se especifica\n" -"el gestor de arranque." +"Esta función no está disponible si no se especifica\n" +"el cargador de arranque." #. yes-no popup #: src/routines/popups.ycp:48 @@ -2332,7 +2332,7 @@ "Really leave the boot loader configuration without saving?\n" "All changes will be lost.\n" msgstr "" -"¿Desde realmente salir de la configuración del gestor de arranque sin guardar?\n" +"¿Desea realmente salir de la configuración del cargador de arranque sin guardar?\n" "Se perderán todos los cambios.\n" #. yes-no popup question @@ -2362,7 +2362,7 @@ #. error popup #: src/routines/popups.ycp:100 msgid "Set the boot loader location." -msgstr "Defina la ubicación del gestor de arranque." +msgstr "Defina la ubicación del cargador de arranque." #. error popup #: src/routines/popups.ycp:108 @@ -2394,14 +2394,14 @@ "The disk settings have changed and you edited boot loader\n" "configuration files manually. Check the boot loader settings.\n" msgstr "" -"Ha cambiado la configuración del disco y la configuración del gestor de arranque\n" -"se editó de forma manual. Verifique la configuración del gestor de arranque.\n" +"Ha cambiado la configuración del disco y la configuración del cargador de arranque\n" +"se editó de forma manual. Verifique la configuración del cargador de arranque.\n" #. yes-no popup #: src/routines/popups.ycp:148 #, ycp-format msgid "%1Set default boot loader location?\n" -msgstr "¿%1Definir la ubicación predeterminada del gestor de arranque?\n" +msgstr "¿%1Definir la ubicación predeterminada del cargador de arranque?\n" #. combobox item #: src/routines/popups.ycp:162 @@ -2425,7 +2425,7 @@ "to a floppy disk. Insert a floppy disk\n" "and confirm with OK.\n" msgstr "" -"Se va a escribir el sector de inicio del gestor de arranque\n" +"Se va a escribir el sector de inicio del cargador de arranque\n" "en un disquete. Introduzca un disquete\n" "y confirme esta operación con OK.\n" @@ -2465,7 +2465,7 @@ "installation. Retry boot loader configuration?\n" msgstr "" "Se ha producido un error en la instalación del\n" -"gestor de arranque. ¿Desea volver a intentar configurar el gestor de arranque?\n" +"cargador de arranque. ¿Desea volver a intentar configurar el cargador de arranque?\n" #. message popup, gfxmenu is option name, leave as is #: src/routines/popups.ycp:266 @@ -2485,7 +2485,7 @@ #. error report #: src/routines/popups.ycp:288 src/routines/popups.ycp:321 msgid "Unable to install the boot loader." -msgstr "No es posible instalar el gestor de arranque." +msgstr "No es posible instalar el cargador de arranque." #. message popup #: src/routines/popups.ycp:312 @@ -2858,7 +2858,7 @@ #. error report #: src/routines/wizards.ycp:37 msgid "Because of the partitioning, the boot loader cannot be installed properly." -msgstr "Debido al particionado, no se puede instalar correctamente el gestor de arranque." +msgstr "Debido al particionado, no se puede instalar correctamente el cargador de arranque." #: src/zipl/helps.ycp:28 msgid "Default Boot Section/Menu" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-es-2.19.0/po/live-installer.es.po new/yast2-trans-es-2.19.0/po/live-installer.es.po --- old/yast2-trans-es-2.19.0/po/live-installer.es.po 2009-12-14 10:13:59.000000000 +0100 +++ new/yast2-trans-es-2.19.0/po/live-installer.es.po 2010-02-26 10:30:54.000000000 +0100 @@ -10,19 +10,20 @@ # Pablo Iranzo Gómez <Pablo.Iranzo(a)uv.es>, 2000. # César Sánchez Alonso <csalinux(a)gmail.com>, 2007. # Carlos E. Robinson <carlos.e.r(a)opensuse.org>, 2008. +# Javier Llorente <javier(a)opensuse.org>, 2010. msgid "" msgstr "" "Project-Id-Version: live-installer.es\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-10-07 07:56+0200\n" -"PO-Revision-Date: 2009-09-21 15:22-0300\n" -"Last-Translator: Sergio Gabriel Teves <gabriel(a)opensuse.org>\n" +"PO-Revision-Date: 2010-01-15 01:35+0100\n" +"Last-Translator: Javier Llorente <javier(a)opensuse.org>\n" "Language-Team: Spanish <opensuse-translation-es(a)opensuse.org>\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: Spanish\n" #: src/inst_live_add_base_repo.ycp:25 src/inst_live_sw_select.ycp:16 @@ -188,10 +189,10 @@ "while running other applications.\n" "Before continuing, finish all running applications." msgstr "" -"A su equipo le queda menos de %1 de memoria. Eso puede no ser\n" +"A su equipo le queda menos de %1 de memoria. Eso puede que no sea\n" "suficiente para una instalación live, especialmente al instalar\n" "mientras se ejecutan otras aplicaciones.\n" -"Antes de continuar, cierre todas las aplicaciones ene ejecución." +"Antes de continuar, cierre todas las aplicaciones en ejecución." # Cer - verificando por aqui #. continue/cancel pop-up @@ -228,23 +229,23 @@ "in the boot menu of the Live CD." msgstr "" "El equipo necesita reiniciarse sin el Live CD en la unidad para\n" -"continuar la instalación. YaST puede hacerlo ahora\n" -"o usted puede reiniciarlo más tarde en cualquier momento.\n" +"continuar la instalación. YaST puede reiniciarlo ahora\n" +"o usted puede hacerlo más tarde en cualquier momento.\n" "\n" -"Observe que si el CD no es expulsado, puede hacerlo\n" -"luego de que el sistema se apague o seleccionar\n" -"\"Hard Disk\" (Disco duro) en el menú de inicio del Live CD." +"Nota: si el CD no es expulsado, puede hacerlo\n" +"después de que el sistema se apague o seleccionando\n" +"\"Hard Disk\" (disco duro) en el menú de inicio del Live CD." # clients/ui_widgets.ycp:85 #. push button #: src/live-installer.ycp:162 msgid "Reboot &Now" -msgstr "Reiniciar %ahora" +msgstr "Reiniciar &ahora" # clients/ui_widgets.ycp:85 #: src/live-installer.ycp:162 msgid "Reboot &Later" -msgstr "Reiniciar más %tarde" +msgstr "Reiniciar más &tarde" #. error report #: src/live-installer.ycp:177 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-es-2.19.0/po/update.es.po new/yast2-trans-es-2.19.0/po/update.es.po --- old/yast2-trans-es-2.19.0/po/update.es.po 2010-01-11 11:01:41.000000000 +0100 +++ new/yast2-trans-es-2.19.0/po/update.es.po 2010-02-26 10:32:01.000000000 +0100 @@ -11,13 +11,13 @@ # César Sánchez Alonso <csalinux(a)gmail.com>, 2007. # Lluis Martinez <lmartinez(a)sct.ictnet.es>, 2008. # Luis Martinez <lmartinez(a)sct.ictnet.es>, 2008. -# Javier Llorente <javier(a)opensuse.org>, 2009. +# Javier Llorente <javier(a)opensuse.org>, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: update\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-10-07 07:49+0200\n" -"PO-Revision-Date: 2009-11-07 22:55+0100\n" +"PO-Revision-Date: 2010-02-08 12:43+0100\n" "Last-Translator: Javier Llorente <javier(a)opensuse.org>\n" "Language-Team: Spanish <opensuse-translation-es(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -301,7 +301,7 @@ #: src/clients/packages_proposal.ycp:71 #, ycp-format msgid "Packages to Remove: %1" -msgstr "Paquetes que eliminar: %1" +msgstr "Paquetes a eliminar: %1" # clients/inst_sw_update.ycp:444 #. part of summary, %1 is size of packages (in MB or GB) ++++++ yast2-trans-fa-2.19.0.tar.bz2 ++++++ ++++ 4885 lines of diff (skipped) ++++++ yast2-trans-fr-2.19.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-fr-2.19.0/po/storage.fr.po new/yast2-trans-fr-2.19.0/po/storage.fr.po --- old/yast2-trans-fr-2.19.0/po/storage.fr.po 2009-12-14 10:14:55.000000000 +0100 +++ new/yast2-trans-fr-2.19.0/po/storage.fr.po 2010-02-26 10:29:20.000000000 +0100 @@ -10,14 +10,14 @@ # Patricia Vaz <Patricia.Vaz(a)suse.de>, 2003,2004. # Patricia Vaz <patricia.vaz(a)suse.com>, 2004. # Patricia Vaz <patricia(a)suse.de>, 2005. -# Guillaume GARDET <guillaume.gardet(a)free.fr>, 2008, 2009. +# Guillaume GARDET <guillaume.gardet(a)free.fr>, 2008, 2009, 2010. # Benoit Verduyn <benoit.verduyn(a)videotron.ca>, 2008. msgid "" msgstr "" "Project-Id-Version: storage\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-10-07 07:47+0200\n" -"PO-Revision-Date: 2009-10-23 21:36+0100\n" +"PO-Revision-Date: 2010-01-12 20:53+0100\n" "Last-Translator: Guillaume GARDET <guillaume.gardet(a)free.fr>\n" "Language-Team: French <opensuse-fr(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -5693,7 +5693,7 @@ #: storage/src/modules/StorageFields.ycp:547 #, ycp-format msgid "Format: %1" -msgstr "Forma&t : %1" +msgstr "Format : %1" # TLABEL autoinst_2002_08_07_0216__365 #. row label, %1 is replace by "Yes" or "No" @@ -5816,7 +5816,7 @@ #: storage/src/modules/StorageFields.ycp:766 #, ycp-format msgid "Stripes: %1" -msgstr "&Bandes : %1" +msgstr "Bandes : %1" # TLABEL online_update_2002_01_04_0147__21 #. row label, %1 is replace by raid version e.g. "1.00" @@ -5830,7 +5830,7 @@ #: storage/src/modules/StorageFields.ycp:786 #, ycp-format msgid "RAID Type: %1" -msgstr "T&ype Raid : %1" +msgstr "Type Raid : %1" # TLABEL storage_2002_08_07_0216__50 #. row label, %1 is replace by size @@ -5865,7 +5865,7 @@ #: storage/src/modules/StorageFields.ycp:854 #, ycp-format msgid "Start Cylinder: %1" -msgstr "C&ylindre de départ : %1" +msgstr "Cylindre de départ : %1" # TLABEL partitioning_2002_01_04_0147__233 #. row label, %1 is replace by integer ++++++ yast2-trans-gl-2.19.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-gl-2.19.0/po/dns-server.gl.po new/yast2-trans-gl-2.19.0/po/dns-server.gl.po --- old/yast2-trans-gl-2.19.0/po/dns-server.gl.po 2010-01-11 11:08:00.000000000 +0100 +++ new/yast2-trans-gl-2.19.0/po/dns-server.gl.po 2010-02-26 10:32:59.000000000 +0100 @@ -14,7 +14,7 @@ "Project-Id-Version: YaST2 (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-10-07 07:51+0200\n" -"PO-Revision-Date: 2009-12-04 12:10+0100\n" +"PO-Revision-Date: 2009-12-28 20:38+0100\n" "Last-Translator: Leandro Regueiro <leandro.regueiro(a)gmail.com>\n" "Language-Team: Galician <proxecton(a)trasno.net>\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-gl-2.19.0/po/nfs_server.gl.po new/yast2-trans-gl-2.19.0/po/nfs_server.gl.po --- old/yast2-trans-gl-2.19.0/po/nfs_server.gl.po 2009-12-14 10:15:07.000000000 +0100 +++ new/yast2-trans-gl-2.19.0/po/nfs_server.gl.po 2010-02-26 10:33:09.000000000 +0100 @@ -9,13 +9,14 @@ # Manuel A. Vázquez <xixirei(a)yahoo.es>, 2008. # Leandro Regueiro <leandro.regueiro(a)gmail.com>, 2008. # Manuel A. Vazquez <xixirei(a)yahoo.es>, 2009. +# Manuel A. Vazquez <xixirei(a)yahoo.es>, 2010. msgid "" msgstr "" "Project-Id-Version: nfs_server.gl\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-10-07 07:57+0200\n" -"PO-Revision-Date: 2009-02-06 20:53+0100\n" -"Last-Translator: Manuel A. Vazquez <xixirei(a)yahoo.es>\n" +"PO-Revision-Date: 2010-02-13 11:32+0100\n" +"Last-Translator: Manuel A. Vázquez <xixirei(a)yahoo.es>\n" "Language-Team: Galician <proxecto(a)trasno.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -330,7 +331,7 @@ #. text entry label #: src/ui.ycp:188 msgid "&Host Wild Card" -msgstr "Comodín de &Máquina" +msgstr "Comodín de &máquina" #. text entry label #: src/ui.ycp:190 @@ -373,7 +374,7 @@ "If you choose Start NFS Server, clicking Next opens\n" "a configuration dialog in which to specify the directories to export." msgstr "" -"Se escolle Iniciar Servidor NFS, ó premer\n" +"Se escolle Iniciar servidor NFS, ó premer\n" "Seguinte abrirá un diálogo de configuración onde\n" "poderá indicar os directorios que desexa exportar." @@ -393,7 +394,7 @@ "If the server and client must authenticate using GSS library, please enable the Enable GSS Security \n" "checkbox. For being able to use GSS API, currently you need to have Kerberos and gssapi (nfs-utils > 1.0.7) on your system\n" msgstr "" -"Se o servidor e o cliente deben autenticarse usando a librería GSS, marque a caixa de verificación Activar Seguridade GSS.\n" +"Se o servidor e o cliente deben autenticarse usando a librería GSS, marque a caixa de verificación Activar seguridade GSS.\n" "Para que sexa posible usar a API GSS, actualmente o seu sistema debe dispoñer de Kerberos e gssapi (nfs-utils > 1.0.7).\n" #. frame label @@ -435,7 +436,7 @@ #. dialog title #: src/ui.ycp:392 msgid "NFS Server Configuration" -msgstr "Configuración do Servidor NFS" +msgstr "Configuración do servidor NFS" #. Help, part 1 of 5 #: src/ui.ycp:486 @@ -455,7 +456,7 @@ "It can be a single host, groups, wild cards, or\n" "IP networks.\n" msgstr "" -"O Comodín de Máquina permite definir as máquinas que teñen acceso ó directorio seleccionado.\n" +"O Comodín de máquina permite definir as máquinas que teñen acceso ó directorio seleccionado.\n" "Poden indicarse máquinas, grupos, comodíns ou\n" "redes IP.\n" @@ -478,7 +479,6 @@ #. but let's fix the help at least #. Watch out, the space is necessary between br and slash. #: src/ui.ycp:517 -#, fuzzy msgid "" "In case of multiple exports to a NFSv4 client,\n" "you need to bind the exported paths with no fsid=0 to the one with fsid=0.\n" @@ -487,7 +487,14 @@ "<pre>/Eve 10.0.0.1(fsid=0,crossmnt,ro,...)\n" "/Eve/husband 10.0.0.1(bind=/Adam,ro,...)</pre>\n" "" -msgstr "No caso de varias exportacións a un cliente NFSv4, é preciso asociar as rutas exportadas que non teñen fsid=0 á que ten fsid=0. Para facelo, só ten que engadir outra opción de exportación (bind=/destino/ruta), onde destino/ruta equivale a algún directorio existente dentro da árbore exportada fsid=0." +msgstr "" +"No caso de varias exportacións a un cliente NFSv4,\n" +"é preciso asociar as rutas exportadas que non usan fsid=0 á que ten fsid=0.\n" +"Para exportar as rutas do servidor, <tt>/Eva</tt> e <tt>/Adán</tt> como\n" +"<tt>/</tt> e <tt>/marido</tt>, respectivamente, use \n" +"<pre>/Eva 10.0.0.1(fsid=0,crossmnt,ro,...)\n" +"/Eve/marido 10.0.0.1(bind=/Adán,ro,...)</pre>\n" +"" #. Help, part 5 of 5 #: src/ui.ycp:527 @@ -512,7 +519,7 @@ #. table header #: src/ui.ycp:547 msgid "Host Wild Card" -msgstr "Comodín de Máquina" +msgstr "Comodín de máquina" #. table header #: src/ui.ycp:549 @@ -522,7 +529,7 @@ #. push button label #: src/ui.ycp:554 msgid "Add &Host" -msgstr "Engadir &Máquina" +msgstr "Engadir &máquina" #. push button label #: src/ui.ycp:556 @@ -537,4 +544,4 @@ #. dialog title #: src/ui.ycp:564 msgid "Directories to Export" -msgstr "Directorios para Exportar" +msgstr "Directorios para exportar" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-gl-2.19.0/po/security.gl.po new/yast2-trans-gl-2.19.0/po/security.gl.po --- old/yast2-trans-gl-2.19.0/po/security.gl.po 2010-01-11 11:08:18.000000000 +0100 +++ new/yast2-trans-gl-2.19.0/po/security.gl.po 2010-02-26 10:33:17.000000000 +0100 @@ -13,7 +13,7 @@ "Project-Id-Version: YaST2 (security)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-10-07 07:47+0200\n" -"PO-Revision-Date: 2001-01-10 14:48+0100\n" +"PO-Revision-Date: 2009-12-28 20:38+0100\n" "Last-Translator: Leandro Regueiro <leandro.regueiro(a)gmail.com>\n" "Language-Team: Galician <proxecto(a)trasno.net>\n" "MIME-Version: 1.0\n" @@ -24,12 +24,12 @@ #. Security read dialog caption #: src/Security.ycp:457 msgid "Saving Security Configuration" -msgstr "Gardando a configuración da seguridade" +msgstr "Gardando a configuración de seguridade" #. Progress stage 1/4 #: src/Security.ycp:462 msgid "Write security settings" -msgstr "Escribir a configuración da seguridade" +msgstr "Escribir a configuración de seguridade" #. Progress stage 2/4 #: src/Security.ycp:464 @@ -49,7 +49,7 @@ #. Progress step 1/5 #: src/Security.ycp:471 msgid "Writing security settings..." -msgstr "Escribindo a configuración da seguridade..." +msgstr "Escribindo a configuración de seguridade..." #. Progress step 2/5 #: src/Security.ycp:473 @@ -114,18 +114,18 @@ msgstr "Desactivado" #: src/dialogs.ycp:66 +#, fuzzy msgid "Use magic SysRq keys" -msgstr "" +msgstr "Activar o emprego de teclas numéricas." #: src/dialogs.ycp:67 #, fuzzy msgid "Use secure file permissions" -msgstr "Opcións dos permisos de ficheiros:" +msgstr "Cambia os permisos do ficheiro remoto" #: src/dialogs.ycp:68 -#, fuzzy msgid "Remote access to the display manager" -msgstr "Acceso Remoto ó Xestor de Entrada" +msgstr "Acceso remoto ao Xestor de entrada" #: src/dialogs.ycp:69 #, fuzzy @@ -146,8 +146,9 @@ msgstr "Xerar sempre unha mensaxe de syslog para os scripts de cron" #: src/dialogs.ycp:73 +#, fuzzy msgid "Run the DHCP daemon in a chroot" -msgstr "" +msgstr "Executar o daemon DHCP co usuario dhcp" #: src/dialogs.ycp:74 msgid "Run the DHCP daemon as dhcp user" @@ -171,23 +172,23 @@ msgstr "Desactivar o reinicio do servizo ao actualizar" #: src/dialogs.ycp:79 -#, fuzzy msgid "Disable service stop on removal" -msgstr "Deshabilitar servizo" +msgstr "Desactivar a detención do servizo ao eliminalo" #: src/dialogs.ycp:80 +#, fuzzy msgid "Enable TCP syncookies" -msgstr "" +msgstr "Conexión TCP/IP" #: src/dialogs.ycp:81 #, fuzzy msgid "Disable IPv4 forwarding" -msgstr "Deshabilitar IPv6" +msgstr "Deshabilitouse a reexpedición de paquetes de IPv4" #: src/dialogs.ycp:82 #, fuzzy msgid "Disable IPv6 forwarding" -msgstr "Deshabilitar IPv6" +msgstr "Activar soporte IPv6" #: src/dialogs.ycp:83 msgid "" @@ -203,11 +204,11 @@ #: src/dialogs.ycp:85 msgid "Enable extra services in runlevel 3" -msgstr "" +msgstr "Activar os servizos adicionais no nivel de execución 3" #: src/dialogs.ycp:86 msgid "Enable extra services in runlevel 5" -msgstr "" +msgstr "Activar os servizos adicionais no nivel de execución 5" #. table header #: src/dialogs.ycp:104 src/dialogs.ycp:338 @@ -236,7 +237,7 @@ #: src/dialogs.ycp:300 #, ycp-format msgid "These basic system services are not enabled in runlevel %1: %2" -msgstr "" +msgstr "Estes servizos básicos do sistema non están activados no nivel de execución %1: %2" #: src/dialogs.ycp:304 msgid "All basic services are enabled." @@ -245,15 +246,15 @@ #: src/dialogs.ycp:315 #, ycp-format msgid "These extra services are enabled in runlevel %1: %2" -msgstr "" +msgstr "Estes servizos básicos do sistema están activados no nivel de execución %1: %2" #: src/dialogs.ycp:316 msgid "Check the list of services and disable all unused services." -msgstr "" +msgstr "Revise a lista de servizos e desactive todos os servizos que non se usan." #: src/dialogs.ycp:320 msgid "Only basic system services are enabled." -msgstr "" +msgstr "Só están activados os servizos básicos do sistema." #: src/dialogs.ycp:326 msgid "Description" @@ -263,7 +264,7 @@ #. params: input tree, parent, label, id #: src/dialogs.ycp:333 src/wizards.ycp:28 msgid "Security Overview" -msgstr "Resumo da seguridade" +msgstr "Resumo de seguridade" #. push button label #: src/dialogs.ycp:351 @@ -287,7 +288,6 @@ #. Misc dialog caption #: src/dialogs.ycp:589 src/wizards.ycp:34 -#, fuzzy msgid "Miscellaneous Settings" msgstr "Opcións diversas" @@ -305,15 +305,16 @@ #: src/dialogs.ycp:687 #, fuzzy msgid "Password Age" -msgstr "Contrasinal" +msgstr "_Título da páxina" #. Popup text #: src/dialogs.ycp:746 -#, fuzzy msgid "" "The minimum number of days cannot be larger\n" "than the maximum." -msgstr "O número de días mínimo non pode ser maior que o máximo" +msgstr "" +"O número mínimo de días non pode ser maior\n" +"que o máximo." #. Popup text, %1 is number #: src/dialogs.ycp:756 @@ -327,26 +328,33 @@ #: src/dialogs.ycp:789 src/wizards.ycp:32 #, fuzzy msgid "Login Settings" -msgstr "Opcións do login" +msgstr "Axustes da conta" #. Frame label #: src/dialogs.ycp:795 +#, fuzzy msgid "Login" -msgstr "Autenticación" +msgstr "Iniciar sesión" #. Read dialog help 1/2 #: src/helps.ycp:23 +#, fuzzy msgid "" "<big>Initializing Security Configuration</big>\n" " Please wait... " msgstr "" +"<big>Lendo a configuración do cortalumes</big>\n" +" Agarde..." #. Read dialog help 2/2 #: src/helps.ycp:27 +#, fuzzy msgid "" "<big>Aborting the Initialization</big> \n" "Safely abort the configuration utility by pressing Abort now." msgstr "" +"<big>Abortando o inicio:</big> \n" +"Para abortar con seguridade a utilidade de configuración, prema agora mesmo en Abortar." #. Write dialog help 1/2 #: src/helps.ycp:32 @@ -354,9 +362,12 @@ "<big>Saving Security Configuration</big>\n" " Please wait... " msgstr "" +"<big>Gardando a configuración de seguridade</big>\n" +" Agarde... " #. Write dialog help 2/2 #: src/helps.ycp:36 +#, fuzzy msgid "" "<big>Aborting Saving</big> \n" "Abort the save procedure by pressing Abort." @@ -536,9 +547,8 @@ #. Password dialog help 5a/8 #: src/helps.ycp:125 -#, fuzzy msgid "Password Encryption Method:" -msgstr "Lonxitude dos contrasinais" +msgstr "Método de cifrado de contrasinal:" #. Password dialog help 5b/8 #: src/helps.ycp:128 @@ -827,11 +837,11 @@ #: src/helps.ycp:262 msgid "This setting applies to IPv4 only." -msgstr "" +msgstr "Esta opción só se aplica a IPv4." #: src/helps.ycp:264 msgid "This setting applies to IPv6 only." -msgstr "" +msgstr "Esta opción só se aplica a IPv6." #: src/helps.ycp:266 msgid "Magic SysRq Keys enable some control over the system even if it crashes (e.g. during kernel debugging) or if the system does not respond." @@ -847,11 +857,11 @@ #: src/helps.ycp:279 msgid "This setting applies for root user and system users." -msgstr "" +msgstr "Esta opción aplícase ao usuario root e aos usuarios do sistema." #: src/helps.ycp:289 msgid "This setting applies for regular users." -msgstr "" +msgstr "Esta opción aplícase aos usuarios normais." #: src/helps.ycp:291 src/helps.ycp:292 msgid "Basic system services must be enabled to provide system consistency and to run the security related services." @@ -865,37 +875,35 @@ #: src/levels.ycp:36 #, fuzzy msgid "Home Workstation" -msgstr "Nivel &1 (Estación de traballo familiar)" +msgstr "Estación de traballo CiscoWorks" #. level name #: src/levels.ycp:38 #, fuzzy msgid "Networked Workstation" -msgstr "Nivel &2 (Estación de traballo en rede)" +msgstr "Estación de traballo CiscoWorks" #. level name #: src/levels.ycp:40 -#, fuzzy msgid "Network Server" -msgstr "Servicios de rede" +msgstr "Servidor de rede" #. RadioButton label #: src/levels.ycp:45 #, fuzzy msgid "&Home Workstation" -msgstr "Nivel &1 (Estación de traballo familiar)" +msgstr "Estación de traballo CiscoWorks" #. RadioButton label #: src/levels.ycp:47 #, fuzzy msgid "N&etworked Workstation" -msgstr "Nivel &2 (Estación de traballo en rede)" +msgstr "Estación de traballo CiscoWorks" #. RadioButton label #: src/levels.ycp:49 -#, fuzzy msgid "Network &Server" -msgstr "Servicios de rede" +msgstr "&Servidor de rede" #. error message #: src/security.ycp:109 @@ -906,24 +914,24 @@ #: src/security.ycp:124 #, fuzzy msgid "Security configuration module" -msgstr "Configuración da seguridade local" +msgstr "Gardando a configuración da seguridade" #. command line help text for 'summary' action #: src/security.ycp:132 #, fuzzy msgid "View summary of current configuration" -msgstr "Configuración da seguridade local" +msgstr "A marca temporal da configuración actual do Fontconfig" #. command line help text for 'level' action #: src/security.ycp:137 -#, fuzzy msgid "Set the security level" -msgstr "Opcións de seguridade actuais:" +msgstr "Definir o nivel de seguridade" #. command line help text for 'set' action #: src/security.ycp:142 +#, fuzzy msgid "Set the value of the specific option" -msgstr "" +msgstr "Ningún valor definido para `%s'\n" #. command line help text for 'level home' option #: src/security.ycp:148 @@ -934,25 +942,25 @@ #: src/security.ycp:152 #, fuzzy msgid "Networked Workstation security level" -msgstr "Nivel &2 (Estación de traballo en rede)" +msgstr "Nivel de Seguridade e Verificacións" #. command line help text for 'level server' option #: src/security.ycp:156 #, fuzzy msgid "Network Server security level" -msgstr "Opcións de seguridade actuais:" +msgstr "Nivel de Seguridade e Verificacións" #. command line help text for 'set passwd' option #: src/security.ycp:160 #, fuzzy msgid "Password encryption method" -msgstr "Lonxitude dos contrasinais" +msgstr "xanela de método de entrada" #. command line help text for 'set crack' option #: src/security.ycp:166 #, fuzzy msgid "Check new passwords" -msgstr "Comprobacións dos novos contrasinais" +msgstr "Comprobar se hai novos episodios" #. command line help text for 'set permissions' option #: src/security.ycp:172 @@ -969,19 +977,19 @@ #: src/users.ycp:28 src/wizards.ycp:33 #, fuzzy msgid "User Addition" -msgstr "Limitacións dos ID de usuario" +msgstr "Aprende a sumar" #. Frame label #: src/users.ycp:35 #, fuzzy msgid "User ID Limitations" -msgstr "Limitacións dos ID de usuario" +msgstr "Definir o ID de _usuario" #. Frame label #: src/users.ycp:42 #, fuzzy msgid "Group ID Limitations" -msgstr "Limitacións dos ID de grupo" +msgstr "ID do grupo anónimo:" #. Popup text #: src/users.ycp:89 @@ -999,9 +1007,8 @@ #. ComboBox label #: src/widgets.ycp:77 -#, fuzzy msgid "&Interpretation of Ctrl + Alt + Del" -msgstr "Como interpretar Ctrl-Alt-Supr:" +msgstr "&Interpretación de Ctrl + Alt + Del" #. ComboBox value #: src/widgets.ycp:80 @@ -1022,7 +1029,7 @@ #: src/widgets.ycp:92 #, fuzzy msgid "&Current Directory in root's Path" -msgstr "Omitir o directorio actual do camiño de busca do usuario root" +msgstr "Camiño incompleto no directorio persoal" #. CheckBox label #: src/widgets.ycp:99 @@ -1032,13 +1039,15 @@ #. CheckBox label #: src/widgets.ycp:106 +#, fuzzy msgid "Allow Remote &Graphical Login" -msgstr "" +msgstr "Permitirlle o login remoto ó usuario root." #. CheckBox label #: src/widgets.ycp:113 +#, fuzzy msgid "Enable &Magic SysRq Keys" -msgstr "" +msgstr "Activar o plugin das teclas multimedia" #. IntField label #: src/widgets.ycp:120 @@ -1048,21 +1057,19 @@ #. IntField label #: src/widgets.ycp:127 src/widgets.ycp:185 -#, fuzzy msgid "Maxim&um" -msgstr "Máximo" +msgstr "Máxim&o" #. IntField label #: src/widgets.ycp:134 src/widgets.ycp:200 -#, fuzzy msgid "M&inimum" -msgstr "Mínimo" +msgstr "Mín&imo" #. ComboBox label #: src/widgets.ycp:141 #, fuzzy msgid "&Shutdown Behaviour of Login Manager:" -msgstr "Comportamento do apagado do KDM:" +msgstr "Configurar o xestor de login (KDM)" #. ComboBox value #: src/widgets.ycp:144 @@ -1096,13 +1103,13 @@ #: src/widgets.ycp:167 #, fuzzy msgid "P&assword Encryption Method" -msgstr "Lonxitude dos contrasinais" +msgstr "xanela de método de entrada" #. CheckBox label #: src/widgets.ycp:177 #, fuzzy msgid "&Check New Passwords" -msgstr "Comprobacións dos novos contrasinais" +msgstr "Comprobar se hai novos episodios" #. IntField label #: src/widgets.ycp:192 @@ -1111,20 +1118,20 @@ #. IntField label #: src/widgets.ycp:207 +#, fuzzy msgid "&Minimum Acceptable Password Length" -msgstr "" +msgstr "Tamaño mínimo da barra de desprazamento do control desprazábel" #. IntField label #: src/widgets.ycp:214 #, fuzzy msgid "&Days before Password Expires Warning" -msgstr "Días antes da caducidade do contrasinal cando se empeza a avisar:" +msgstr "Número de días entre o aviso e a expiración do contrasinal:" #. ComboBox label #: src/widgets.ycp:221 -#, fuzzy msgid "&File Permissions" -msgstr "Opcións dos permisos de ficheiros:" +msgstr "Permisos de &ficheiro" #. ComboBox value #: src/widgets.ycp:224 @@ -1145,33 +1152,30 @@ #: src/widgets.ycp:236 #, fuzzy msgid "&User Launching updatedb" -msgstr "Usuario que lanza o updatedb:" +msgstr "Erro ao lanzar a aplicación: %s" #. IntField label #: src/widgets.ycp:244 -#, fuzzy msgid "Ma&ximum" -msgstr "Máximo" +msgstr "Má&ximo" #. IntField label #: src/widgets.ycp:251 -#, fuzzy msgid "&Minimum" -msgstr "Mínimo" +msgstr "&Mínimo" #: src/wizards.ycp:29 #, fuzzy msgid "Predefined Security Configurations" -msgstr "Configuración da seguridade local" +msgstr "Importar configuracións novas" #. Dialog caption #: src/wizards.ycp:186 -#, fuzzy msgid "Security Configuration" -msgstr "Configuración da seguridade local" +msgstr "Configuración de seguridade" #. Label #: src/wizards.ycp:188 #, fuzzy msgid "Initializing..." -msgstr "Inicializando ..." +msgstr "Inicializando..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-gl-2.19.0/po/status.txt new/yast2-trans-gl-2.19.0/po/status.txt --- old/yast2-trans-gl-2.19.0/po/status.txt 2010-01-11 11:08:27.000000000 +0100 +++ new/yast2-trans-gl-2.19.0/po/status.txt 2010-02-26 10:33:26.000000000 +0100 @@ -1,6 +1,6 @@ -Translated : 13912 -Fuzzy : 2533 -Untranslated : 3687 +Translated : 13950 +Fuzzy : 2523 +Untranslated : 3659 -------------------- All strings : 20132 69 % are translated diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-gl-2.19.0/po/users.gl.po new/yast2-trans-gl-2.19.0/po/users.gl.po --- old/yast2-trans-gl-2.19.0/po/users.gl.po 2010-01-11 11:08:24.000000000 +0100 +++ new/yast2-trans-gl-2.19.0/po/users.gl.po 2010-02-26 10:33:23.000000000 +0100 @@ -7,15 +7,15 @@ # # Jesús Bravo Álvarez <jba(a)pobox.com>, 2000. # Leandro Regueiro <leandro.regueiro(a)gmail.com>, 2008. -# Manuel A. Vazquez <xixirei(a)yahoo.es>, 2009. +# Manuel A. Vazquez <xixirei(a)yahoo.es>, 2009, 2010. # Manuel A. Vázquez <xixirei(a)yahoo.es>, 2009. msgid "" msgstr "" "Project-Id-Version: YaST2 (user)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-10-07 08:04+0200\n" -"PO-Revision-Date: 2009-11-29 12:42+0100\n" -"Last-Translator: Manuel A. Vázquez <xixirei(a)yahoo.es>\n" +"PO-Revision-Date: 2010-01-31 11:22+0100\n" +"Last-Translator: Manuel A. Vazquez <xixirei(a)yahoo.es>\n" "Language-Team: Galician <proxecto(a)trasno.net>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3089,9 +3089,8 @@ msgstr "" #: src/inst_user_first.ycp:343 -#, fuzzy msgid "Expert Settings" -msgstr "Propiedades do Escritorio" +msgstr "Configuración Avanzada" #. summary label #: src/inst_user_first.ycp:417 @@ -3114,25 +3113,24 @@ #: src/inst_user_first.ycp:429 #, ycp-format msgid "The authentication method is %1 and Kerberos." -msgstr "" +msgstr "O método de autenticación é %1 e Kerberos." #. // summary label #: src/inst_user_first.ycp:431 -#, fuzzy msgid "The configuration will be available later during the installation." -msgstr "Vaise gardar agora a configuración do son." +msgstr "A configuración vai estar dispoñible máis tarde durante a instalación." #. summary label, %1 are user names (comma separated) #: src/inst_user_first.ycp:436 #, ycp-format msgid "Users %1 will be imported." -msgstr "" +msgstr "Vanse importar os usuarios %1." #. summary label, %1 is user name #: src/inst_user_first.ycp:440 #, ycp-format msgid "User %1 will be imported." -msgstr "" +msgstr "Vaise importar o usuario %1." #. pushbutton label #: src/inst_user_first.ycp:456 @@ -3147,7 +3145,7 @@ #. checkbox label #: src/inst_user_first.ycp:536 msgid "&Automatic Login" -msgstr "" +msgstr "Inicio de sesión &automático" #. dialog caption #: src/inst_user_first.ycp:553 @@ -3187,7 +3185,7 @@ #. translators: command line help text for delete action #: src/users.ycp:110 msgid "Delete an existing user (home directory is not removed)" -msgstr "" +msgstr "Eliminar un usuario xa existente (o cartafol persoal non será eliminado)" #. translators: command line help text for list local option #: src/users.ycp:116 @@ -3221,9 +3219,8 @@ #. translators: command line help text for username option #: src/users.ycp:142 -#, fuzzy msgid "Login name of the user" -msgstr "Nome de máquina da impresora:" +msgstr "Nome de usuario para o inicio de sesión" #. translators: command line help text for add option #: src/users.ycp:147 @@ -3232,9 +3229,8 @@ #. translators: command line help text for shell option #: src/users.ycp:152 -#, fuzzy msgid "Login shell of the user" -msgstr "Nome de máquina da impresora:" +msgstr "Shell de inicio de sesión do usuario" #. translators: command line help text for home option #: src/users.ycp:157 @@ -3259,18 +3255,17 @@ #. translators: command line help text for home option #: src/users.ycp:175 msgid "List of groups of which the user is a member (separated by commas)" -msgstr "" +msgstr "Lista dos grupos dos que o usuario é membro (separados por comas)" #. translators: command line help text for show option #: src/users.ycp:180 msgid "Type of the user (local, system, nis, ldap)" -msgstr "" +msgstr "Tipo de usuario locla (loccal, system, nis, ldap)" #. translators: command line help text for new_username option #: src/users.ycp:190 -#, fuzzy msgid "New login name of the user" -msgstr "Nome de máquina da impresora:" +msgstr "Novo nome de usuario para iniciar a sesión" #. translators: command line help text for new_uid option #: src/users.ycp:195 @@ -3479,7 +3474,7 @@ #: src/users_proposal.ycp:61 #, ycp-format msgid "<%1>Authentication method<%2>: %3" -msgstr "" +msgstr "<%1>Método de autenticación<%2>: %3" #. summary line: <%1>-<%2> are HTML tags, leave untouched, #. % is LDAP/NIS etc. ++++++ yast2-trans-hu-2.19.0.tar.bz2 ++++++ ++++++ yast2-trans-ja-2.19.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ja-2.19.0/po/ftp-server.ja.po new/yast2-trans-ja-2.19.0/po/ftp-server.ja.po --- old/yast2-trans-ja-2.19.0/po/ftp-server.ja.po 2009-12-14 10:16:42.000000000 +0100 +++ new/yast2-trans-ja-2.19.0/po/ftp-server.ja.po 2010-02-26 10:25:35.000000000 +0100 @@ -5,13 +5,13 @@ # Copyright (C) 2000, 2001 SuSE GmbH. # # Mike Fabian <mfabian(a)suse.de>, 2000, 2001. -# Yasuhiko Kamata <belphegor(a)belbel.or.jp>, 2007, 2008, 2009. +# Yasuhiko Kamata <belphegor(a)belbel.or.jp>, 2007, 2008, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: ftp-server\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-10-07 07:54+0200\n" -"PO-Revision-Date: 2009-03-11 20:31+0900\n" +"PO-Revision-Date: 2010-01-12 09:29+0900\n" "Last-Translator: Yasuhiko Kamata <belphegor(a)belbel.or.jp>\n" "Language-Team: Japanese <opensuse-ja(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -430,7 +430,7 @@ #: src/dialogs.ycp:1092 src/dialogs.ycp:1122 msgid "Uploading" -msgstr "アップロードしています" +msgstr "アップロード" #. TRANSLATORS: part of dialog caption #: src/dialogs.ycp:1099 src/dialogs.ycp:1132 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ja-2.19.0/po/qt-pkg.ja.po new/yast2-trans-ja-2.19.0/po/qt-pkg.ja.po --- old/yast2-trans-ja-2.19.0/po/qt-pkg.ja.po 2009-12-14 10:16:42.000000000 +0100 +++ new/yast2-trans-ja-2.19.0/po/qt-pkg.ja.po 2010-02-26 10:26:29.000000000 +0100 @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # # -# Yasuhiko Kamata <belphegor(a)belbel.or.jp>, 2007, 2008, 2009. +# Yasuhiko Kamata <belphegor(a)belbel.or.jp>, 2007, 2008, 2009, 2010. msgid "" msgstr "" "Project-Id-Version: qt-pkg\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-10-07 08:04+0200\n" -"PO-Revision-Date: 2009-10-08 17:59+0900\n" +"PO-Revision-Date: 2010-01-12 10:54+0900\n" "Last-Translator: Yasuhiko Kamata <belphegor(a)belbel.or.jp>\n" "Language-Team: Japanese <opensuse-ja(a)opensuse.org>\n" "MIME-Version: 1.0\n" @@ -545,7 +545,7 @@ #: src/YQPackageSelectorHelp.cc:180 src/YQPackageSelectorHelp.cc:292 msgid "Packages set to \"taboo\" are treated as if they did not exist on any installation media." -msgstr "\"禁止\" に設定されているパッケージはインストールメディアに存在ものと同様に扱われます。" +msgstr "\"禁止\" に設定されているパッケージは、インストールメディアに存在していないものと同様に扱われます。" #. Translators: Package status short (!) description #: src/YQPackageSelectorHelp.cc:184 src/YQPkgStatusFilterView.cc:80 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ja-2.19.0/po/repair.ja.po new/yast2-trans-ja-2.19.0/po/repair.ja.po --- old/yast2-trans-ja-2.19.0/po/repair.ja.po 2009-12-14 10:16:42.000000000 +0100 +++ new/yast2-trans-ja-2.19.0/po/repair.ja.po 2010-02-25 15:21:32.000000000 +0100 @@ -3376,7 +3376,7 @@ #. module action label #: src/osr_module_bootloader.ycp:660 msgid "Check Boot Loader Configuration" -msgstr "ブートローダの設定" +msgstr "ブートローダの設定確認" #. bootloader module helptext #: src/osr_module_bootloader.ycp:662 @@ -4621,7 +4621,7 @@ #. module action label #: src/osr_module_partition.ycp:1383 msgid "Check Partition Tables" -msgstr "パーティションテーブルを確認する" +msgstr "パーティションテーブルの確認" #. helptext #: src/osr_module_partition.ycp:1385 @@ -4681,7 +4681,7 @@ #. module action label #: src/osr_module_partition.ycp:1414 msgid "Check Swap Areas" -msgstr "スワップ領域を確認する" +msgstr "スワップ領域の確認" #. helptext #: src/osr_module_partition.ycp:1416 @@ -4783,7 +4783,7 @@ #. module action label #: src/osr_module_partition.ycp:1469 msgid "Check fstab Entries" -msgstr "fstab の項目を確認する" +msgstr "fstab の項目確認" #. helptext #: src/osr_module_partition.ycp:1471 ++++++ yast2-trans-ko-2.19.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-ko-2.19.0/po/packager.ko.po new/yast2-trans-ko-2.19.0/po/packager.ko.po --- old/yast2-trans-ko-2.19.0/po/packager.ko.po 2009-12-14 10:17:27.000000000 +0100 +++ new/yast2-trans-ko-2.19.0/po/packager.ko.po 2010-02-26 10:40:31.000000000 +0100 @@ -6,8 +6,8 @@ "Project-Id-Version: packager.ko\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-10-07 07:45+0200\n" -"PO-Revision-Date: 2009-09-22 11:21+0900\n" -"Last-Translator: YunSeok Choi <xein(a)naver.com>\n" +"PO-Revision-Date: 2010-01-20 18:12+0900\n" +"Last-Translator: Yunseok Choi <xein(a)naver.com>\n" "Language-Team: Korean <xein(a)naver.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1271,7 +1271,7 @@ #. wrong MD5 #: src/include/checkmedia/ui.ycp:106 msgid "Error -- MD5 sum does not match This medium should not be used." -msgstr "오류 -- MD5 sum이 일치하지 않습니다. 해당 매체가 사용되지 않습니다." +msgstr "오류 -- MD5 sum이 일치하지 않습니다. 해당 매체를 사용할 수 없습니다." #. the correct MD5 is unknown #: src/include/checkmedia/ui.ycp:111 ++++++ yast2-trans-lt-2.19.0.tar.bz2 ++++++ ++++ 7846 lines of diff (skipped) ++++++ yast2-trans-pl-2.19.0.tar.bz2 ++++++ ++++++ yast2-trans-pt_BR-2.19.0.tar.bz2 ++++++ ++++ 5342 lines of diff (skipped) ++++++ yast2-trans-sk-2.19.0.tar.bz2 ++++++ ++++++ yast2-trans-tg-2.19.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-tg-2.19.0/po/backup.tg.po new/yast2-trans-tg-2.19.0/po/backup.tg.po --- old/yast2-trans-tg-2.19.0/po/backup.tg.po 2009-12-14 10:22:21.000000000 +0100 +++ new/yast2-trans-tg-2.19.0/po/backup.tg.po 2010-02-26 10:32:28.000000000 +0100 @@ -20,7 +20,7 @@ #: src/Backup.ycp:43 msgid "Disk" -msgstr "" +msgstr "Диск" #: src/Backup.ycp:44 msgid "Tape" @@ -28,7 +28,7 @@ #: src/Backup.ycp:45 msgid "CD-ROM" -msgstr "" +msgstr "CD-ROM" #: src/Backup.ycp:46 msgid "Floppy disk" @@ -41,31 +41,31 @@ #: src/Backup.ycp:62 msgid "Monday" -msgstr "" +msgstr "Душанбе" #: src/Backup.ycp:63 msgid "Tuesday" -msgstr "" +msgstr "Сешанбе" #: src/Backup.ycp:64 msgid "Wednesday" -msgstr "" +msgstr "Чоршанбе" #: src/Backup.ycp:65 msgid "Thursday" -msgstr "" +msgstr "Панҷшанбе" #: src/Backup.ycp:66 msgid "Friday" -msgstr "" +msgstr "Ҷумъа" #: src/Backup.ycp:67 msgid "Saturday" -msgstr "" +msgstr "Шанбе" #: src/Backup.ycp:68 msgid "Sunday" -msgstr "" +msgstr "Якшанбе" #: src/Backup.ycp:72 msgid "1st" @@ -818,9 +818,8 @@ #. Pushbutton label #: src/ui.ycp:747 -#, fuzzy msgid "&Select..." -msgstr "Интихоб кунед" +msgstr "&Интихоб кунед..." #. text entry label #: src/ui.ycp:753 @@ -829,9 +828,8 @@ #. Pushbutton label #: src/ui.ycp:759 -#, fuzzy msgid "S&elect..." -msgstr "Интихоб кунед" +msgstr "&Интихоб кунед..." #. frame label #: src/ui.ycp:771 @@ -979,9 +977,8 @@ #. frame label #. dialog header #: src/ui.ycp:1235 src/ui.ycp:2324 -#, fuzzy msgid "File Selection" -msgstr "Интихоби мизи корӣ" +msgstr "Интихоби файл" #. check box label #: src/ui.ycp:1239 @@ -1056,9 +1053,8 @@ #. radio button label #: src/ui.ycp:1342 -#, fuzzy msgid "&Selected" -msgstr "Интихоб кунед" +msgstr "&Интихобшуда" #. table header #: src/ui.ycp:1347 @@ -1209,11 +1205,11 @@ #. table header #: src/ui.ycp:2333 msgid "Filename" -msgstr "" +msgstr "Номи файл" #: src/ui.ycp:2333 msgid "Package" -msgstr "" +msgstr "Қуттӣ" #. push button label #: src/ui.ycp:2338 @@ -1222,9 +1218,8 @@ #. push button label #: src/ui.ycp:2340 -#, fuzzy msgid "&Select All" -msgstr "Интихоб кунед" +msgstr "&Ҳамаашро интихоб кунед" #. push button label #: src/ui.ycp:2342 @@ -1245,7 +1240,7 @@ #. An informative popup label during selecting all items in the table (can consume a lot of time) #: src/ui.ycp:2429 msgid "Selecting all items..." -msgstr "" +msgstr "Интихобкунии чизҳо..." #. An informative popup label during deselecting all items in the table (can consume a lot of time) #: src/ui.ycp:2432 @@ -1604,16 +1599,16 @@ #. a header item #: src/ui.ycp:3661 msgid "Path" -msgstr "" +msgstr "Роҳча" #. push button label #: src/ui.ycp:3666 src/ui.ycp:4249 msgid "&Add..." -msgstr "" +msgstr "И&лова..." #: src/ui.ycp:3774 msgid "Name" -msgstr "" +msgstr "Ном" #: src/ui.ycp:3775 msgid "Description" @@ -1702,20 +1697,20 @@ #: src/ui.ycp:4259 msgid "Type" -msgstr "" +msgstr "Намуд" #. push button label #: src/ui.ycp:4262 msgid "A&dd" -msgstr "" +msgstr "&Илова" #: src/ui.ycp:4263 msgid "&Directory..." -msgstr "" +msgstr "&Феҳраст..." #: src/ui.ycp:4264 msgid "&File System..." -msgstr "" +msgstr "&Системаи фаилҳо..." #: src/ui.ycp:4265 msgid "&Regular Expression..." @@ -1767,7 +1762,6 @@ msgstr "" #: src/ui.ycp:4442 -#, fuzzy msgid "Yes, Use It" msgstr "&Ҳа, истифода баред" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-tg-2.19.0/po/country.tg.po new/yast2-trans-tg-2.19.0/po/country.tg.po --- old/yast2-trans-tg-2.19.0/po/country.tg.po 2009-12-14 10:22:21.000000000 +0100 +++ new/yast2-trans-tg-2.19.0/po/country.tg.po 2010-02-26 10:32:28.000000000 +0100 @@ -231,7 +231,7 @@ #. keyboard layout #: keyboard/data/keyboard_raw.ycp:626 msgid "Tajik" -msgstr "" +msgstr "Тоҷикӣ" #. help text for keyboard expert screen #: keyboard/src/dialogs.ycp:32 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-tg-2.19.0/po/firewall.tg.po new/yast2-trans-tg-2.19.0/po/firewall.tg.po --- old/yast2-trans-tg-2.19.0/po/firewall.tg.po 2009-12-14 10:22:21.000000000 +0100 +++ new/yast2-trans-tg-2.19.0/po/firewall.tg.po 2010-02-26 10:32:28.000000000 +0100 @@ -44,7 +44,7 @@ #: src/SuSEFirewallCMDLine.ycp:87 src/SuSEFirewallCMDLine.ycp:358 #: src/SuSEFirewallCMDLine.ycp:455 msgid "Zone Name" -msgstr "" +msgstr "Номи минтақа" #. TRANSLATORS: CommandLine header #: src/SuSEFirewallCMDLine.ycp:133 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-tg-2.19.0/po/iso-languages.tg.po new/yast2-trans-tg-2.19.0/po/iso-languages.tg.po --- old/yast2-trans-tg-2.19.0/po/iso-languages.tg.po 2009-12-14 10:22:21.000000000 +0100 +++ new/yast2-trans-tg-2.19.0/po/iso-languages.tg.po 2010-02-26 10:32:29.000000000 +0100 @@ -1160,7 +1160,7 @@ #. language code: kon kg #: src/ISOLanguage.cc:696 msgid "Kongo" -msgstr "" +msgstr "Конго" #. language code: kor ko #: src/ISOLanguage.cc:698 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-tg-2.19.0/po/status.txt new/yast2-trans-tg-2.19.0/po/status.txt --- old/yast2-trans-tg-2.19.0/po/status.txt 2010-01-11 11:49:52.000000000 +0100 +++ new/yast2-trans-tg-2.19.0/po/status.txt 2010-02-26 10:32:32.000000000 +0100 @@ -1,6 +1,6 @@ -Translated : 1912 -Fuzzy : 3014 -Untranslated : 15206 +Translated : 1962 +Fuzzy : 3007 +Untranslated : 15163 -------------------- All strings : 20132 -9 % are translated +10 % are translated diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-trans-tg-2.19.0/po/timezone_db.tg.po new/yast2-trans-tg-2.19.0/po/timezone_db.tg.po --- old/yast2-trans-tg-2.19.0/po/timezone_db.tg.po 2009-12-14 10:22:21.000000000 +0100 +++ new/yast2-trans-tg-2.19.0/po/timezone_db.tg.po 2010-02-26 10:32:31.000000000 +0100 @@ -16,61 +16,61 @@ #. name of time zone region #: timezone/data/timezone_raw.ycp:23 msgid "Europe" -msgstr "" +msgstr "Аврупо" #: timezone/data/timezone_raw.ycp:25 msgid "Netherlands" -msgstr "" +msgstr "Нидерлан" #. time zone #: timezone/data/timezone_raw.ycp:27 msgid "Andorra" -msgstr "" +msgstr "Андора" #: timezone/data/timezone_raw.ycp:28 msgid "Greece" -msgstr "" +msgstr "Юнон" #. time zone #: timezone/data/timezone_raw.ycp:30 msgid "Serbia" -msgstr "" +msgstr "Сербия" #: timezone/data/timezone_raw.ycp:31 msgid "Germany" -msgstr "" +msgstr "Олмон" #: timezone/data/timezone_raw.ycp:32 msgid "Slovakia" -msgstr "" +msgstr "Словакия" #: timezone/data/timezone_raw.ycp:33 msgid "Belgium" -msgstr "" +msgstr "Белгия" #: timezone/data/timezone_raw.ycp:34 msgid "Romania" -msgstr "" +msgstr "Руминия" #: timezone/data/timezone_raw.ycp:35 msgid "Hungary" -msgstr "" +msgstr "Венгрия" #: timezone/data/timezone_raw.ycp:36 msgid "Moldova" -msgstr "" +msgstr "Молдова" #: timezone/data/timezone_raw.ycp:37 msgid "Denmark" -msgstr "" +msgstr "Дания" #: timezone/data/timezone_raw.ycp:38 msgid "Ireland" -msgstr "" +msgstr "Ирландия" #: timezone/data/timezone_raw.ycp:39 msgid "Gibraltar" -msgstr "" +msgstr "Гибралтар" #. time zone #: timezone/data/timezone_raw.ycp:41 @@ -79,7 +79,7 @@ #: timezone/data/timezone_raw.ycp:42 msgid "Finland" -msgstr "" +msgstr "Финляндия" #. time zone #: timezone/data/timezone_raw.ycp:44 @@ -88,7 +88,7 @@ #: timezone/data/timezone_raw.ycp:45 msgid "Turkey" -msgstr "" +msgstr "Туркия" #: timezone/data/timezone_raw.ycp:46 msgid "Jersey" @@ -105,9 +105,8 @@ msgstr "" #: timezone/data/timezone_raw.ycp:51 -#, fuzzy msgid "Portugal" -msgstr "&Бандар" +msgstr "Португалия" #: timezone/data/timezone_raw.ycp:52 msgid "Slovenia" @@ -132,7 +131,7 @@ #: timezone/data/timezone_raw.ycp:58 msgid "Malta" -msgstr "" +msgstr "Малта" #. time zone #: timezone/data/timezone_raw.ycp:60 @@ -167,11 +166,11 @@ #: timezone/data/timezone_raw.ycp:69 msgid "Latvia" -msgstr "" +msgstr "Латвия" #: timezone/data/timezone_raw.ycp:70 msgid "Italy" -msgstr "" +msgstr "Италия" #. time zone #: timezone/data/timezone_raw.ycp:72 @@ -206,7 +205,7 @@ #: timezone/data/timezone_raw.ycp:81 msgid "Estonia" -msgstr "" +msgstr "Эстония" #: timezone/data/timezone_raw.ycp:82 msgid "Albania" @@ -1219,7 +1218,7 @@ #. time zone #: timezone/data/timezone_raw.ycp:521 msgid "Dushanbe" -msgstr "" +msgstr "Душанбе" #. TJ #. time zone ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 zypper for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at Mon Mar 1 01:52:44 CET 2010. -------- --- zypper/zypper.changes 2010-02-22 17:24:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/zypper/zypper.changes 2010-02-26 15:06:10.000000000 +0100 @@ -1,0 +2,22 @@ +Thu Feb 25 22:18:48 CET 2010 - jkupec(a)suse.cz + +- Added a few forgotten strings for translation (bnc #581332) + +------------------------------------------------------------------- +Thu Feb 25 11:57:48 CET 2010 - ma(a)suse.de + +- Fix SEGV in Summary::writeResolvableList +- 1.2.20 + +------------------------------------------------------------------- +Tue Feb 23 18:01:48 CET 2010 - jkupec(a)suse.cz + +- Avoid a newline in 'zypper --quiet list-patches' (bnc #523573) + +------------------------------------------------------------------- +Tue Feb 23 14:17:20 CET 2010 - jkupec(a)suse.cz + +- Showing packages that need additional customer contract + separately in the installation summary (bnc #581926 c#6) + +------------------------------------------------------------------- @@ -5,0 +28 @@ +- 1.2.19 calling whatdependson for head-i586 Old: ---- zypper-1.2.19.tar.bz2 New: ---- zypper-1.2.21.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.1cLZKm/_old 2010-03-01 01:52:37.000000000 +0100 +++ /var/tmp/diff_new_pack.1cLZKm/_new 2010-03-01 01:52:37.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package zypper (Version 1.2.19) +# spec file for package zypper (Version 1.2.21) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,15 +23,17 @@ BuildRequires: augeas-devel >= 0.5.0 readline-devel >= 5.1 BuildRequires: cmake >= 2.4.6 gcc-c++ >= 4.1 Requires: procps +%if 0%{?suse_version} %requires_ge libzypp Recommends: logrotate cron +PreReq: permissions +%endif License: GPLv2+ Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on -PreReq: permissions Summary: Command line software manager using libzypp -Version: 1.2.19 +Version: 1.2.21 Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc @@ -95,14 +97,14 @@ %{__install} -d -m755 %buildroot%_var/log touch %buildroot%_var/log/zypper.log +%if 0%{?suse_version} + %post -/sbin/ldconfig %run_permissions %verifyscript %verify_permissions -e %{_sbindir}/zypp-refresh-wrapper - -%postun -p /sbin/ldconfig +%endif %clean ++++++ zypper-1.2.19.tar.bz2 -> zypper-1.2.21.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/.gitignore new/zypper-1.2.21/.gitignore --- old/zypper-1.2.19/.gitignore 2010-02-22 17:23:33.000000000 +0100 +++ new/zypper-1.2.21/.gitignore 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -.* -build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/VERSION.cmake new/zypper-1.2.21/VERSION.cmake --- old/zypper-1.2.19/VERSION.cmake 2010-02-22 17:23:33.000000000 +0100 +++ new/zypper-1.2.21/VERSION.cmake 2010-02-26 15:05:20.000000000 +0100 @@ -31,7 +31,7 @@ # SET(VERSION_MAJOR "1") SET(VERSION_MINOR "2") -SET(VERSION_PATCH "19") +SET(VERSION_PATCH "21") -# LAST RELEASED: 1.2.19 +# LAST RELEASED: 1.2.20 #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/package/zypper.changes new/zypper-1.2.21/package/zypper.changes --- old/zypper-1.2.19/package/zypper.changes 2010-02-22 17:23:33.000000000 +0100 +++ new/zypper-1.2.21/package/zypper.changes 2010-02-26 15:05:20.000000000 +0100 @@ -1,8 +1,31 @@ ------------------------------------------------------------------- +Thu Feb 25 22:18:48 CET 2010 - jkupec(a)suse.cz + +- Added a few forgotten strings for translation (bnc #581332) + +------------------------------------------------------------------- +Thu Feb 25 11:57:48 CET 2010 - ma(a)suse.de + +- Fix SEGV in Summary::writeResolvableList +- 1.2.20 + +------------------------------------------------------------------- +Tue Feb 23 18:01:48 CET 2010 - jkupec(a)suse.cz + +- Avoid a newline in 'zypper --quiet list-patches' (bnc #523573) + +------------------------------------------------------------------- +Tue Feb 23 14:17:20 CET 2010 - jkupec(a)suse.cz + +- Showing packages that need additional customer contract + separately in the installation summary (bnc #581926 c#6) + +------------------------------------------------------------------- Mon Feb 22 17:22:14 CET 2010 - jkupec(a)suse.cz - Avoiding confirmation of unchanged license on upgrade (bnc #394396) +- 1.2.19 ------------------------------------------------------------------- Sun Feb 21 14:17:39 CET 2010 - jkupec(a)suse.cz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/src/Summary.cc new/zypper-1.2.21/src/Summary.cc --- old/zypper-1.2.19/src/Summary.cc 2010-02-22 17:23:33.000000000 +0100 +++ new/zypper-1.2.21/src/Summary.cc 2010-02-26 15:05:19.000000000 +0100 @@ -140,12 +140,12 @@ { ResObject::constPtr res(*resit); - // FIXME asKind not working? Package::constPtr pkg = asKind<Package>(res); if (pkg) { - // FIXME refactor with libzypp Package::vendorSupportAvailable() - if (pkg->maybeUnsupported()) + if (pkg->vendorSupport() & VendorSupportACC) + support_needacc[res->kind()].insert(ResPair(nullres, res)); + else if (pkg->maybeUnsupported()) unsupported[res->kind()].insert(ResPair(nullres, res)); } @@ -272,10 +272,13 @@ for_(resit, resolvables.begin(), resolvables.end()) dupes[resit->second->name()]++; // remove the single-versions from the map - map<string, unsigned>::iterator it = dupes.begin(); - for (; it != dupes.end(); ++it) + for (map<string, unsigned>::iterator it = dupes.begin(); it != dupes.end(); /**/) + { if (it->second == 1) - dupes.erase(it); // seems the iterator is not invalidated by this + dupes.erase(it++); // postfix! Incrementing before erase + else + ++it; + } } if ((_viewop & DETAILS) == 0) @@ -820,7 +823,7 @@ for_(it, unsupported.begin(), unsupported.end()) { string label; - // we only look vendor support in packages + // we only look at vendor support in packages if (it->first == ResKind::package) label = _PL( "The following package is not supported by its vendor:", @@ -834,6 +837,25 @@ // -------------------------------------------------------------------------- +void Summary::writeNeedACC(ostream & out) +{ + for_(it, support_needacc.begin(), support_needacc.end()) + { + string label; + // we only look at vendor support in packages + if (it->first == ResKind::package) + label = _PL( + "The following package needs additional customer contract to get support:", + "The following packages need additional customer contract to get support:", + it->second.size()); + out << endl << label << endl; + + writeResolvableList(out, it->second); + } +} + +// -------------------------------------------------------------------------- + void Summary::writeDownloadAndInstalledSizeSummary(ostream & out) { if (!_inst_pkg_total && toremove.empty()) @@ -1005,7 +1027,10 @@ writeChangedArch(out); writeChangedVendor(out); if (_viewop & SHOW_UNSUPPORTED) + { + writeNeedACC(out); writeUnsupported(out); + } out << endl; writePackageCounts(out); writeDownloadAndInstalledSizeSummary(out); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/src/Summary.h new/zypper-1.2.21/src/Summary.h --- old/zypper-1.2.19/src/Summary.h 2010-02-22 17:23:33.000000000 +0100 +++ new/zypper-1.2.21/src/Summary.h 2010-02-26 15:05:19.000000000 +0100 @@ -78,6 +78,7 @@ void writeChangedArch(std::ostream & out); void writeChangedVendor(std::ostream & out); void writeUnsupported(std::ostream & out); + void writeNeedACC(std::ostream & out); void writePackageCounts(std::ostream & out); void writeDownloadAndInstalledSizeSummary(std::ostream & out); @@ -132,8 +133,10 @@ KindToResPairSet toremove; KindToResPairSet tochangearch; KindToResPairSet tochangevendor; - /** objects from previous lists that are not supported */ + /** objects from previous lists that are marked as not supported */ KindToResPairSet unsupported; + /** objects from previous lists that need additional customer contract */ + KindToResPairSet support_needacc; /** \name For weak deps info. * @{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/src/callbacks/locks.h new/zypper-1.2.21/src/callbacks/locks.h --- old/zypper-1.2.19/src/callbacks/locks.h 2010-02-22 17:23:33.000000000 +0100 +++ new/zypper-1.2.21/src/callbacks/locks.h 2010-02-26 15:05:19.000000000 +0100 @@ -8,14 +8,13 @@ #ifndef LOCKS_ZYPPER_CALLBACKS_H #define LOCKS_ZYPPER_CALLBACKS_H -#include <iostream> +#include <iosfwd> #include "zypp/base/Logger.h" #include "zypp/ZYppCallbacks.h" #include "zypp/PoolQuery.h" #include "utils/prompt.h" -//#include "utils/misc.h" namespace zypp { @@ -24,14 +23,17 @@ virtual Action conflict( const PoolQuery& query, ConflictState state ) { if (state == SAME_RESULTS) - Zypper::instance()->out().error("The following query locks the same packages as the lock which you want remove:"); + Zypper::instance()->out().error( + _("The following query locks the same objects as the one you want to remove:")); else - Zypper::instance()->out().error(_("The following query locks some of the objects you want to unlock:")); + Zypper::instance()->out().error( + _("The following query locks some of the objects you want to unlock:")); query.serialize(std::cout); - return read_bool_answer(PROMPT_YN_REMOVE_LOCK , - "Do you want remove this lock?", true)? DELETE : IGNORE; + return read_bool_answer( + PROMPT_YN_REMOVE_LOCK, _("Do you want to remove this lock?"), true) ? + DELETE : IGNORE; } }; @@ -39,12 +41,14 @@ { virtual Action execute( const PoolQuery& query ) { - Zypper::instance()->out().error(_("The following query does not lock anything:")); + Zypper::instance()->out().error( + _("The following query does not lock anything:")); query.serialize(std::cout); - return read_bool_answer(PROMPT_YN_REMOVE_LOCK , - "Do you want remove this lock?", true)? DELETE : IGNORE; + return read_bool_answer( + PROMPT_YN_REMOVE_LOCK, _("Do you want to remove this lock?"), true) ? + DELETE : IGNORE; } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/src/update.cc new/zypper-1.2.21/src/update.cc --- old/zypper-1.2.19/src/update.cc 2010-02-22 17:23:33.000000000 +0100 +++ new/zypper-1.2.21/src/update.cc 2010-02-26 15:05:19.000000000 +0100 @@ -231,7 +231,7 @@ if (!tbl.empty()) { zypper.out().info(_("The following software management updates will be installed first:")); - cout << endl; + zypper.out().info("", Out::NORMAL, Out::TYPE_NORMAL); } pm_tbl.sort(1); // Name cout << pm_tbl; @@ -244,10 +244,10 @@ { if (affectpm) { - cout << endl; + zypper.out().info("", Out::NORMAL, Out::TYPE_NORMAL); zypper.out().info(_("The following updates are also available:")); - cout << endl; } + zypper.out().info("", Out::QUIET, Out::TYPE_NORMAL); cout << tbl; } @@ -377,6 +377,8 @@ // ---------------------------------------------------------------------------- +// FIXME rewrite this function so that first the list of updates is collected and later correctly presented (bnc #523573) + void list_updates(Zypper & zypper, const ResKindSet & kinds, bool best_effort) { if (zypper.out().type() == Out::TYPE_XML) @@ -404,8 +406,10 @@ else { if (kinds.size() > 1) + { + zypper.out().info("", Out::NORMAL, Out::TYPE_NORMAL); zypper.out().info(i18n_kind_updates(*it), Out::QUIET, Out::TYPE_NORMAL); - zypper.out().info("", Out::QUIET, Out::TYPE_NORMAL); // visual separator + } affects_pkgmgr = list_patch_updates(zypper); } localkinds.erase(it); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/zypper-1.2.19/zypper.spec.cmake new/zypper-1.2.21/zypper.spec.cmake --- old/zypper-1.2.19/zypper.spec.cmake 2010-02-22 17:23:33.000000000 +0100 +++ new/zypper-1.2.21/zypper.spec.cmake 2010-02-26 15:05:20.000000000 +0100 @@ -15,13 +15,15 @@ BuildRequires: readline-devel >= 5.1 augeas-devel >= 0.5.0 BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6 Requires: procps +%if 0%{?suse_version} %requires_ge libzypp Recommends: logrotate cron +PreReq: permissions +%endif License: GPL v2 or later Group: System/Packages BuildRoot: %{_tmppath}/%{name}-%{version}-build Autoreqprov: on -PreReq: permissions Summary: Command line software manager using libzypp Version: @VERSION@ Release: 0 @@ -87,14 +89,13 @@ %{__install} -d -m755 %buildroot%_var/log touch %buildroot%_var/log/zypper.log +%if 0%{?suse_version} %post -/sbin/ldconfig %run_permissions %verifyscript %verify_permissions -e %{_sbindir}/zypp-refresh-wrapper - -%postun -p /sbin/ldconfig +%endif %clean ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-users for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package yast2-users for openSUSE:Factory checked in at Mon Mar 1 01:52:25 CET 2010. -------- --- yast2-users/yast2-users.changes 2010-02-16 15:03:01.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-users/yast2-users.changes 2010-02-26 14:48:28.000000000 +0100 @@ -1,0 +2,6 @@ +Fri Feb 26 14:20:43 CET 2010 - jsuchome(a)suse.cz + +- password warnings merged into one big message (bnc#571777) +- 2.19.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-users.spec ++++++ --- /var/tmp/diff_new_pack.YZIklm/_old 2010-03-01 01:52:22.000000000 +0100 +++ /var/tmp/diff_new_pack.YZIklm/_new 2010-03-01 01:52:22.000000000 +0100 @@ -20,22 +20,30 @@ Name: yast2-users Version: 2.19.3 -Release: 1 +Release: 2 + BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-users-2.19.3.tar.bz2 + Prefix: /usr + Group: System/YaST License: GPLv2+ BuildRequires: cracklib-devel doxygen gcc-c++ perl-Digest-SHA1 perl-XML-Writer update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client yast2-perl-bindings yast2-security yast2-testsuite + Requires: yast2-country yast2-pam yast2-security cracklib perl-Digest-SHA1 perl-X500-DN perl-gettext Obsoletes: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user Provides: yast2-config-users y2c_users yast2-trans-users y2t_users yast2-trans-inst-user yast2-trans-users y2t_inst-user + # y2usernote, y2useritem Requires: yast2-perl-bindings >= 2.18.0 + # this forces using yast2-ldap with orrect LDAP object names (fate#303596) Requires: yast2-ldap-client >= 2.17.1 + # String::RemoveShortcut Requires: yast2 >= 2.18.0 + Summary: YaST2 - User and Group Configuration %description @@ -48,8 +56,10 @@ %{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} # V=1: verbose build in case we used AM_SILENT_RULES(yes) @@ -86,5 +96,4 @@ %{_libdir}/YaST2/plugin/libpy2ag_crack.so %{_libdir}/YaST2/plugin/libpy2ag_crack.la %doc %{prefix}/share/doc/packages/yast2-users - %changelog ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-storage for openSUSE:Factory
by root＠Hilbert.suse.de 01 Mar '10

01 Mar '10

Hello community, here is the log from the commit of package yast2-storage for openSUSE:Factory checked in at Mon Mar 1 01:52:09 CET 2010. -------- --- yast2-storage/yast2-storage.changes 2010-02-11 20:57:50.000000000 +0100 +++ /mounts/work_src_done/STABLE/yast2-storage/yast2-storage.changes 2010-02-26 15:24:36.000000000 +0100 @@ -1,0 +2,26 @@ +Fri Feb 26 15:02:54 CET 2010 - aschnell(a)suse.de + +- mark messages for translation (bnc #580855) +- 2.19.7 + +------------------------------------------------------------------- +Thu Feb 25 13:00:45 CET 2010 - aschnell(a)suse.de + +- fixed proposal workflow on S390 (bnc #583119) + +------------------------------------------------------------------- +Wed Feb 24 17:37:45 CET 2010 - aschnell(a)suse.de + +- check availability of smartctl and hdparm (bnc #580905) + +------------------------------------------------------------------- +Wed Feb 24 10:33:34 CET 2010 - aschnell(a)suse.de + +- mark messages for translation (bnc #580871 and bnc #581298) + +------------------------------------------------------------------- +Tue Feb 16 16:31:17 CET 2010 - aschnell(a)suse.de + +- don't import mount point for installation source (bnc #577560) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-storage-2.19.6.tar.bz2 New: ---- yast2-storage-2.19.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-storage.spec ++++++ --- /var/tmp/diff_new_pack.7Z9B3C/_old 2010-03-01 01:52:02.000000000 +0100 +++ /var/tmp/diff_new_pack.7Z9B3C/_new 2010-03-01 01:52:02.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-storage (Version 2.19.6) +# spec file for package yast2-storage (Version 2.19.7) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,16 +19,19 @@ Name: yast2-storage -Version: 2.19.6 +Version: 2.19.7 Release: 1 + BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-storage-2.19.6.tar.bz2 +Source0: yast2-storage-2.19.7.tar.bz2 + Prefix: /usr + Group: System/YaST License: GPLv2+ BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: libstorage-devel >= 2.19.9 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools +BuildRequires: libstorage-devel >= 2.19.10 yast2 >= 2.19.4 yast2-core-devel >= 2.18.1 yast2-devtools BuildRequires: yast2-perl-bindings yast2-testsuite >= 2.19.0 Requires: libstorage = %(echo `rpm -q --queryformat '%{VERSION}' libstorage`) Requires: yast2-perl-bindings yast2-core >= 2.18.3 yast2 >= 2.19.4 yast2-libyui >= 2.18.7 @@ -52,14 +55,16 @@ devices during installation and on an installed system. %prep -%setup -n yast2-storage-2.19.6 +%setup -n yast2-storage-2.19.7 %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} # V=1: verbose build in case we used AM_SILENT_RULES(yes) @@ -73,6 +78,7 @@ d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done + rm -f $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2StorageCallbacks.la rm -f $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2StorageCallbacks.so @@ -84,6 +90,7 @@ %files %defattr(-,root,root) + # storage %dir /usr/share/YaST2/include/partitioning /usr/share/YaST2/include/partitioning/*.ycp @@ -103,20 +110,27 @@ /usr/share/YaST2/clients/multipath-simple.ycp /usr/share/YaST2/modules/* /var/adm/fillup-templates/sysconfig.storage-yast2-storage + %dir /usr/share/YaST2/data /usr/share/YaST2/data/*.ycp + %doc %dir %{prefix}/share/doc/packages/yast2-storage %doc %{prefix}/share/doc/packages/yast2-storage/README* %doc %{prefix}/share/doc/packages/yast2-storage/COPY* + # agents-scr /usr/share/YaST2/scrconf/*.scr + # libstorage ycp callbacks %{_libdir}/YaST2/plugin/libpy2StorageCallbacks.so.* + # disk %dir %{prefix}/share/applications/YaST2 %{prefix}/share/applications/YaST2/disk.desktop + # scripts %{prefix}/lib/YaST2/bin/check.boot + # perl bindings of libstorage %{perl_vendorarch}/LibStorage.so ++++++ yast2-storage-2.19.6.tar.bz2 -> yast2-storage-2.19.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/VERSION new/yast2-storage-2.19.7/VERSION --- old/yast2-storage-2.19.6/VERSION 2010-02-10 12:18:38.000000000 +0100 +++ new/yast2-storage-2.19.7/VERSION 2010-02-26 15:14:41.000000000 +0100 @@ -1 +1 @@ -2.19.6 +2.19.7 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/configure new/yast2-storage-2.19.7/configure --- old/yast2-storage-2.19.6/configure 2010-01-26 11:57:33.000000000 +0100 +++ new/yast2-storage-2.19.7/configure 2010-02-26 15:14:53.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-storage 2.19.4. +# Generated by GNU Autoconf 2.63 for yast2-storage 2.19.7. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='yast2-storage' PACKAGE_TARNAME='yast2-storage' -PACKAGE_VERSION='2.19.4' -PACKAGE_STRING='yast2-storage 2.19.4' +PACKAGE_VERSION='2.19.7' +PACKAGE_STRING='yast2-storage 2.19.7' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1537,7 +1537,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-storage 2.19.4 to adapt to many kinds of systems. +\`configure' configures yast2-storage 2.19.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1608,7 +1608,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-storage 2.19.4:";; + short | recursive ) echo "Configuration of yast2-storage 2.19.7:";; esac cat <<\_ACEOF @@ -1720,7 +1720,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-storage configure 2.19.4 +yast2-storage configure 2.19.7 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1734,7 +1734,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-storage $as_me 2.19.4, which was +It was created by yast2-storage $as_me 2.19.7, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2714,7 +2714,7 @@ # Define the identity of the package. PACKAGE='yast2-storage' - VERSION='2.19.4' + VERSION='2.19.7' cat >>confdefs.h <<_ACEOF @@ -2836,7 +2836,7 @@ -VERSION="2.19.4" +VERSION="2.19.7" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschnell(a)suse.de>" @@ -17373,7 +17373,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-storage $as_me 2.19.4, which was +This file was extended by yast2-storage $as_me 2.19.7, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17436,7 +17436,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-storage config.status 2.19.4 +yast2-storage config.status 2.19.7 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/configure.in new/yast2-storage-2.19.7/configure.in --- old/yast2-storage-2.19.6/configure.in 2010-01-26 11:57:16.000000000 +0100 +++ new/yast2-storage-2.19.7/configure.in 2010-02-26 15:14:44.000000000 +0100 @@ -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-storage, 2.19.4, http://bugs.opensuse.org/, yast2-storage) +AC_INIT(yast2-storage, 2.19.7, http://bugs.opensuse.org/, yast2-storage) 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.4" +VERSION="2.19.7" RPMNAME="yast2-storage" MAINTAINER="Arvin Schnell <aschnell(a)suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/storage/src/include/custom_part_lib.ycp new/yast2-storage-2.19.7/storage/src/include/custom_part_lib.ycp --- old/yast2-storage-2.19.6/storage/src/include/custom_part_lib.ycp 2010-01-12 16:55:41.000000000 +0100 +++ new/yast2-storage-2.19.7/storage/src/include/custom_part_lib.ycp 2010-02-17 18:18:05.000000000 +0100 @@ -13,7 +13,7 @@ * ************************************************************* * - $Id: custom_part_lib.ycp 60337 2010-01-12 15:55:40Z fehr $ + $Id: custom_part_lib.ycp 60827 2010-02-16 15:32:38Z aschnell $ * */ @@ -996,12 +996,12 @@ * @return return ( [ targetMap, table_input ] * */ -define list AddFstabToData( map<string,map> targetMap, list<map> fstab ) - ``{ +list AddFstabToData(map<string, map> targetMap, list<map> fstab) +{ if( fstab == nil ) - return [targetMap] ; + return [ targetMap ]; - y2milestone( "AddFstabToData fstab = %1", fstab ); + y2milestone( "AddFstabToData fstab:%1", fstab ); map new_targetMap = targetMap; map table_input = $["tbl":[]]; @@ -1018,16 +1018,12 @@ ``{ string dev_fstab = fstab_entry["device"]:""; string mount_fstab = fstab_entry["mount"]:""; - boolean found = false; - if( dev_fstab == partition["device"]:"" ) - { - found = true; - } - if( found ) - { + if (dev_fstab == partition["device"]:"" && + !Storage::IsInstallationSource(partition["device"]:"")) + { new_partition["mount"] = mount_fstab; - if( size(fstab_entry["fstopt"]:"")>0 && + if( !isempty(fstab_entry["fstopt"]:"") && fstab_entry["fstopt"]:"" != "default" ) { new_partition["fstopt"] = fstab_entry["fstopt"]:""; @@ -1055,18 +1051,18 @@ new_targetMap[dev] = target; }); - y2milestone( "AddFstabToData table_input %1", table_input ); - y2milestone( "AddFstabToData tbl %1", table_input["tbl"]:[] ); + y2milestone( "AddFstabToData table_input:%1", table_input ); + y2milestone( "AddFstabToData tbl:%1", table_input["tbl"]:[] ); if( size( table_input["tbl"]:[] )>1 ) { table_input["tbl"] = sort( term a, term b, table_input["tbl"]:[], ``(a[2]:""<b[2]:"")); } - y2milestone( "AddFstabToData ret %1", [ new_targetMap, table_input ] ); + y2milestone( "AddFstabToData ret:%1", [ new_targetMap, table_input ] ); return [ new_targetMap, table_input ]; - }; +} define boolean CheckResizePossible( boolean ask, boolean lvm, integer resize, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/storage/src/include/ep-hd-lib.ycp new/yast2-storage-2.19.7/storage/src/include/ep-hd-lib.ycp --- old/yast2-storage-2.19.6/storage/src/include/ep-hd-lib.ycp 2010-02-08 12:49:53.000000000 +0100 +++ new/yast2-storage-2.19.7/storage/src/include/ep-hd-lib.ycp 2010-02-26 15:12:13.000000000 +0100 @@ -486,8 +486,8 @@ list <string> mydisks = AvailableTargetDisks(); if (isempty(mydisks)) { - Popup::Error("This disk cannot be cloned. There are no suitable -disks that could have the same partitioning layout."); + Popup::Error(_("This disk cannot be cloned. There are no suitable +disks that could have the same partitioning layout.")); return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/storage/src/include/ep-hd.ycp new/yast2-storage-2.19.7/storage/src/include/ep-hd.ycp --- old/yast2-storage-2.19.6/storage/src/include/ep-hd.ycp 2010-02-03 15:15:42.000000000 +0100 +++ new/yast2-storage-2.19.7/storage/src/include/ep-hd.ycp 2010-02-26 15:12:13.000000000 +0100 @@ -66,7 +66,7 @@ `PushButton(`id(`edit),`opt(`key_F4), _("Edit...")), // push button text `PushButton(`id(`move), `opt(`key_F7), _("Move...")), - // push button text + // push button text `PushButton(`id(`resize), `opt(`key_F6), _("Resize...")), // push button text `PushButton(`id(`delete), `opt(`key_F5), _("Delete...")) @@ -214,17 +214,21 @@ fields = (list<symbol>) merge(fields, [`heading_fc, `fc_wwpn, `fc_port_id, `fc_fcp_lun ]); } + term buttons = `HBox(); + + if ((integer) SCR::Read(.target.size, "/usr/sbin/smartctl") > 0) + // push button text (do not translate 'SMART', it is the name of the tool) + buttons = add(buttons, `PushButton(`id(`smart), _("Health Test (SMART)..."))); + + if ((integer) SCR::Read(.target.size, "/sbin/hdparm") > 0) + // push button text (do not translate 'hdparm', it is the name of the tool) + buttons = add(buttons, `PushButton(`id(`hdparm), _("Properties (hdparm)..."))); + UI::ReplaceWidget(`tab_panel, `VBox( `HStretch(), StorageFields::Overview(StorageSettings::FilterOverview(fields), target_map, device), - `HBox( - // push button text (do not translate 'SMART', it is the name of the tool) - `PushButton(`id(`smart), _("Health Test (SMART)...")), - // push button text (do not translate 'hdparm', it is the name of the tool) - `PushButton(`id(`hdparm), _("Properties (hdparm)...")), - `HStretch() - ) + add(buttons, `HStretch()) ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/storage/src/include/ep-lvm-dialogs.ycp new/yast2-storage-2.19.7/storage/src/include/ep-lvm-dialogs.ycp --- old/yast2-storage-2.19.6/storage/src/include/ep-lvm-dialogs.ycp 2009-11-24 16:01:00.000000000 +0100 +++ new/yast2-storage-2.19.7/storage/src/include/ep-lvm-dialogs.ycp 2010-02-26 15:12:13.000000000 +0100 @@ -214,7 +214,7 @@ }); // label for input field - contents = add(contents, `Left(`InputField(`id(`vgname), "Volume Group Name"))); + contents = add(contents, `Left(`InputField(`id(`vgname), _("Volume Group Name")))); contents = add(contents, `Left(`ComboBoxSelected(`id(`pesize), `opt(`editable), // label for combo box _("&Physical Extent Size"), pesizes_list, `id(pesize)))); @@ -279,7 +279,7 @@ string MiniWorkflowStepResizeVgHelptext() { // helptext - string helptext = "Change the devices that are used for the volume group."; + string helptext = _("Change the devices that are used for the volume group."); return helptext; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/storage/src/modules/Storage.ycp new/yast2-storage-2.19.7/storage/src/modules/Storage.ycp --- old/yast2-storage-2.19.6/storage/src/modules/Storage.ycp 2010-02-10 12:21:04.000000000 +0100 +++ new/yast2-storage-2.19.7/storage/src/modules/Storage.ycp 2010-02-17 18:18:05.000000000 +0100 @@ -19,7 +19,7 @@ * wurde versucht "intelligent" zu gestallten und ist im einzelen bei den * entspechenden Funktionen n�her erkl�rt. * - * $Id: Storage.ycp 60782 2010-02-10 11:21:03Z fehr $ + * $Id: Storage.ycp 60827 2010-02-16 15:32:38Z aschnell $ */ { module "Storage"; @@ -2045,6 +2045,12 @@ } + global boolean IsInstallationSource(string device) + { + return !isempty(device) && device == part_insts; + } + + /* Dev definitions dev = maindev | subdev @@ -3694,7 +3700,7 @@ Popup::Message( txt ); } } - if( size(part_insts)>0 && p["device"]:""==part_insts ) + if (IsInstallationSource(p["device"]:"")) { ret = false; y2milestone( "CanEdit part_insts:%1 p:%2", part_insts, p ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-storage-2.19.6/storage/src/proposal/partitions_proposal.ycp new/yast2-storage-2.19.7/storage/src/proposal/partitions_proposal.ycp --- old/yast2-storage-2.19.6/storage/src/proposal/partitions_proposal.ycp 2009-11-05 11:03:34.000000000 +0100 +++ new/yast2-storage-2.19.7/storage/src/proposal/partitions_proposal.ycp 2010-02-26 15:12:13.000000000 +0100 @@ -1,7 +1,7 @@ /** * Module: proposal_partitions.ycp * - * $Id: partitions_proposal.ycp 59267 2009-11-02 10:58:59Z jsrain $ + * $Id: partitions_proposal.ycp 61023 2010-02-25 12:04:23Z aschnell $ * * Author: Klaus Kaempf <kkaempf(a)suse.de> * @@ -145,12 +145,7 @@ seq["disk"] = $[ `abort : `abort, `cancel: `cancel, `next: `next ]; - if( Arch::s390() ) - { - Storage::SetPartMode("PROP_MODIFY"); - seq["ws_start"] = "disk"; - } - else if( Mode::autoinst() ) + if( Mode::autoinst() ) { Storage::SetPartMode("PROP_MODIFY"); seq["ws_start"] = "disk"; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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