Hello community,
here is the log from the commit of package yast2-control-center
checked in at Thu Nov 20 16:37:12 CET 2008.
--------
--- yast2-control-center/yast2-control-center.changes 2008-11-18 00:13:25.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-control-center/yast2-control-center.changes 2008-11-19 21:06:10.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Nov 19 13:05:31 CET 2008 - sh@suse.de
+
+- Fixed bnc #445781: Module groups not translated
+- V 2.17.3
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-control-center-2.17.2.tar.bz2
New:
----
yast2-control-center-2.17.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-control-center.spec ++++++
--- /var/tmp/diff_new_pack.Z20997/_old 2008-11-20 16:37:00.000000000 +0100
+++ /var/tmp/diff_new_pack.Z20997/_new 2008-11-20 16:37:00.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-control-center (Version 2.17.2)
+# spec file for package yast2-control-center (Version 2.17.3)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-control-center
-Version: 2.17.2
-Release: 2
+Version: 2.17.3
+Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-control-center-2.17.2.tar.bz2
+Source0: yast2-control-center-2.17.3.tar.bz2
Prefix: /usr
BuildRequires: libdrm-devel libjpeg-devel pkgconfig qt3-devel update-desktop-files yast2-devtools
Summary: YaST2 - Control Center
@@ -54,7 +54,7 @@
%prep
-%setup -n yast2-control-center-2.17.2
+%setup -n yast2-control-center-2.17.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -87,8 +87,10 @@
%defattr(-,root,root)
%{prefix}/lib/YaST2/bin/y2controlcenter
%doc %{prefix}/share/doc/packages/yast2-control-center
-
%changelog
+* Wed Nov 19 2008 sh@suse.de
+- Fixed bnc #445781: Module groups not translated
+- V 2.17.3
* Tue Nov 11 2008 ro@suse.de
- drop bogus prereq (there is no pre or postinstall script here)
* Wed Oct 29 2008 sh@suse.de
++++++ yast2-control-center-2.17.2.tar.bz2 -> yast2-control-center-2.17.3.tar.bz2 ++++++
++++ 57862 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-control-center-2.17.2/config.h.in new/yast2-control-center-2.17.3/config.h.in
--- old/yast2-control-center-2.17.2/config.h.in 2008-10-29 15:21:30.000000000 +0100
+++ new/yast2-control-center-2.17.3/config.h.in 2008-11-19 21:07:02.000000000 +0100
@@ -45,6 +45,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-control-center-2.17.2/configure.in new/yast2-control-center-2.17.3/configure.in
--- old/yast2-control-center-2.17.2/configure.in 2008-10-29 15:21:07.000000000 +0100
+++ new/yast2-control-center-2.17.3/configure.in 2008-11-19 21:06:47.000000000 +0100
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-control-center, 2.17.2, http://bugs.opensuse.org/, yast2-control-center)
+AC_INIT(yast2-control-center, 2.17.3, http://bugs.opensuse.org/, yast2-control-center)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.17.2"
+VERSION="2.17.3"
RPMNAME="yast2-control-center"
MAINTAINER="Stefan Hundhammer "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-control-center-2.17.2/src/process.cpp new/yast2-control-center-2.17.3/src/process.cpp
--- old/yast2-control-center-2.17.2/src/process.cpp 2007-11-16 12:41:26.000000000 +0100
+++ new/yast2-control-center-2.17.3/src/process.cpp 2008-11-19 21:05:49.000000000 +0100
@@ -50,7 +50,6 @@
stream=0L;
#endif
int ret=pclose(fp);
- qDebug(QString("process closed: %1").arg(ret));
fp=NULL;
delete timer;
timer=0L;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-control-center-2.17.2/src/yastmodules.cpp new/yast2-control-center-2.17.3/src/yastmodules.cpp
--- old/yast2-control-center-2.17.2/src/yastmodules.cpp 2007-11-16 12:41:26.000000000 +0100
+++ new/yast2-control-center-2.17.3/src/yastmodules.cpp 2008-11-19 21:05:49.000000000 +0100
@@ -50,6 +50,7 @@
#define DEBUG_MODE 0
#define VERBOSE_GETTEXT 0
+#define VERBOSE_GROUPS 0
#define DESKTOP_TRANSLATIONS "desktop_translations"
#define DEFAULT_GROUP_ICON "yast-default-group.png"
@@ -61,6 +62,11 @@
bindtextdomain( DESKTOP_TRANSLATIONS, DESKTOP_TRANSLATIONS_DIR );
bind_textdomain_codeset( DESKTOP_TRANSLATIONS, "utf8" );
+
+#if VERBOSE_GETTEXT
+ fprintf( stderr, "Using translations from %s.mo below %s\n",
+ DESKTOP_TRANSLATIONS, DESKTOP_TRANSLATIONS_DIR );
+#endif
}
@@ -136,7 +142,7 @@
it != desktop_files.end();
++it )
{
- readGroupDesktopFile( dir.path() + "/" + *it );
+ readGroupDesktopFile( dir.path(), *it );
}
return true;
@@ -273,9 +279,9 @@
}
-bool YModules::readGroupDesktopFile( const QString & filename )
+bool YModules::readGroupDesktopFile( const QString & path, const QString & filename )
{
- QY2Settings desktopFile( filename );
+ QY2Settings desktopFile( path + "/" + filename );
if ( desktopFile.readError() )
return false;
@@ -294,6 +300,26 @@
name = desktopFile[ QString( "Name[%1]" ).arg( lang ) ];
if ( name.isEmpty() )
+ {
+ QString msgid = QString( "Name(%1)" ).arg( filename );
+ msgid += ": ";
+ msgid += desktopFile[ "Name" ];
+ name = QString::fromUtf8( dgettext( DESKTOP_TRANSLATIONS, msgid.ascii() ) );
+
+ if ( name == msgid ) // no translation?
+ {
+#if VERBOSE_GROUPS
+ fprintf( stderr, "No translation for group name %s\n", msgid.ascii() );
+#endif
+ name = "";
+ }
+
+#if VERBOSE_GROUPS
+ fprintf( stderr, "[Groups] Reading key %s -> %s\n", msgid.ascii(), name.ascii() );
+#endif
+ }
+
+ if ( name.isEmpty() )
name = desktopFile[ "Name" ];
QString icon = desktopFile.get( "Icon", DEFAULT_GROUP_ICON );
@@ -309,7 +335,7 @@
if ( groupList.find( grp ) >= 0 )
{
// group already existing
- qWarning( "Warning: Duplicate group " + rawName + " in " + filename );
+ qWarning( "Warning: Duplicate group %s in %s", rawName.ascii(), filename.ascii() );
}
else
{
@@ -350,8 +376,8 @@
if ( groupList.find( tmpGrp ) < 0 )
{
// group did not exist
- qWarning( "Warning: new Group detected for Module " +
- module->getName() + ", misspelled in .desktop file?");
+ qWarning( "Warning: new Group detected for Module %s, misspelled in .desktop file?",
+ module->getName().ascii() );
tmpGrp->setIcon(DEFAULT_GROUP_ICON);
tmpGrp->setSortKey( "zzzzz" );
@@ -493,9 +519,9 @@
}
cmd += " &";
- qDebug( QString("Command: ") + cmd);
+ qDebug( "Command: %s", cmd.ascii() );
- system(cmd);
+ system( cmd );
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-control-center-2.17.2/src/yastmodules.h new/yast2-control-center-2.17.3/src/yastmodules.h
--- old/yast2-control-center-2.17.2/src/yastmodules.h 2007-11-16 12:41:26.000000000 +0100
+++ new/yast2-control-center-2.17.3/src/yastmodules.h 2008-11-19 21:05:49.000000000 +0100
@@ -108,7 +108,7 @@
* Read one group .desktop file and add a module group accordingly.
* Returns 'true' on success.
**/
- bool readGroupDesktopFile( const QString & filename );
+ bool readGroupDesktopFile( const QString & path, const QString & filename );
/**
* Add a module group (a category)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-control-center-2.17.2/VERSION new/yast2-control-center-2.17.3/VERSION
--- old/yast2-control-center-2.17.2/VERSION 2008-10-29 15:20:15.000000000 +0100
+++ new/yast2-control-center-2.17.3/VERSION 2008-11-19 21:05:49.000000000 +0100
@@ -1 +1 @@
-2.17.2
+2.17.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org