Hello community, here is the log from the commit of package yast2-control-center-gnome checked in at Wed May 23 01:56:29 CEST 2007. -------- --- yast2-control-center-gnome/yast2-control-center-gnome.changes 2007-04-18 02:21:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-control-center-gnome/yast2-control-center-gnome.changes 2007-05-23 01:44:20.738578000 +0200 @@ -1,0 +2,6 @@ +Wed May 23 01:41:50 CEST 2007 - sreeves@suse.de + +- Remove existing X-SuSE-translate from .directory files so + suse_update_desktop_file wont error out + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-control-center-gnome.spec ++++++ --- /var/tmp/diff_new_pack.Z30709/_old 2007-05-23 01:56:25.000000000 +0200 +++ /var/tmp/diff_new_pack.Z30709/_new 2007-05-23 01:56:25.000000000 +0200 @@ -16,7 +16,7 @@ Group: System/Management Autoreqprov: on Version: 2.13.2 -Release: 8 +Release: 25 Summary: GNOME control center Source: %{name}-%{version}.tar.gz prefix: /usr @@ -88,6 +88,9 @@ %{_datadir}/YaST2/theme/SuSELinux/hicolor %changelog +* Wed May 23 2007 - sreeves@suse.de +- Remove existing X-SuSE-translate from .directory files so + suse_update_desktop_file wont error out * Wed Apr 18 2007 - sreeves@suse.de - Fix for 245970 - install into y2bindir. * Mon Mar 19 2007 - sreeves@suse.de ++++++ yast2-control-center-gnome-2.13.2.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/ChangeLog new/yast2-control-center-gnome-2.13.2/ChangeLog --- old/yast2-control-center-gnome-2.13.2/ChangeLog 2007-03-30 00:03:59.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/ChangeLog 2007-05-23 00:34:11.000000000 +0200 @@ -1,3 +1,7 @@ +2007-05-14 Scott Reeves <sreeves@novell.com> + Fix for 259542 - not translated + Fix for 245970 - install into y2bindir. + 2007-03-19 Scott Reeves <sreeves@novell.com> * etc/YaST-gnome.menu * etc/yast-gnome-virtualization.directory: diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-apparmor.directory new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-apparmor.directory --- old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-apparmor.directory 2007-03-30 00:03:57.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-apparmor.directory 2007-05-23 00:58:37.000000000 +0200 @@ -2,7 +2,6 @@ Type=Directory Icon=apparmor/app_armor -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_apparmor Name=Novell AppArmor diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-hardware.directory new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-hardware.directory --- old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-hardware.directory 2007-03-30 00:03:57.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-hardware.directory 2007-05-23 00:59:02.000000000 +0200 @@ -2,7 +2,6 @@ Type=Directory Icon=yast-hardware -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_hardware Name=Hardware diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-misc.directory new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-misc.directory --- old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-misc.directory 2007-03-30 00:03:57.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-misc.directory 2007-05-23 00:59:24.000000000 +0200 @@ -2,7 +2,6 @@ Type=Directory Icon=yast-misc -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_misc Name=Miscellaneous Name[cs]=Různé diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-net-devices.directory new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-net-devices.directory --- old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-net-devices.directory 2007-03-30 00:03:57.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-net-devices.directory 2007-05-23 00:59:29.000000000 +0200 @@ -2,7 +2,6 @@ Type=Directory Icon=yast-network_devices -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_network_devices Name=Network Devices diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-net-services.directory new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-net-services.directory --- old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-net-services.directory 2007-03-30 00:03:57.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-net-services.directory 2007-05-23 00:59:33.000000000 +0200 @@ -2,7 +2,6 @@ Type=Directory Icon=yast-network_services -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_network_services Name=Network Services diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-security.directory new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-security.directory --- old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-security.directory 2007-03-30 00:03:57.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-security.directory 2007-05-23 00:59:36.000000000 +0200 @@ -2,7 +2,6 @@ Type=Directory Icon=yast-security -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_security Name=Security and Users diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-software.directory new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-software.directory --- old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-software.directory 2007-03-30 00:03:57.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-software.directory 2007-05-23 00:59:39.000000000 +0200 @@ -2,7 +2,6 @@ Type=Directory Icon=yast-software -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_software Name=Software diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-system.directory new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-system.directory --- old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-system.directory 2007-03-30 00:03:57.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-system.directory 2007-05-23 00:59:42.000000000 +0200 @@ -2,7 +2,6 @@ Type=Directory Icon=yast-system -X-SuSE-translate=true X-SuSE-DocTeamID=ycc_system Name=System diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-virtualization.directory new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-virtualization.directory --- old/yast2-control-center-gnome-2.13.2/etc/yast-gnome-virtualization.directory 2007-03-30 00:03:57.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/etc/yast-gnome-virtualization.directory 2007-05-23 00:59:51.000000000 +0200 @@ -16,6 +16,5 @@ Name=Virtualization -X-SuSE-translate=true diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-control-center-gnome-2.13.2/src/control-center.c new/yast2-control-center-gnome-2.13.2/src/control-center.c --- old/yast2-control-center-gnome-2.13.2/src/control-center.c 2007-04-17 19:41:41.000000000 +0200 +++ new/yast2-control-center-gnome-2.13.2/src/control-center.c 2007-05-23 00:34:10.000000000 +0200 @@ -18,6 +18,7 @@ * Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#define ENABLE_NLS 1 #include "config.h" #include <string.h> #include <gtk/gtkicontheme.h> @@ -38,6 +39,9 @@ #define CONTROL_CENTER_ACTIONS_SEPARATOR ";" #define EXIT_SHELL_ON_STATIC_ACTION "exit_shell_on_static_action" +#define GNOME_MAIN_MENU_PACKAGE "gnome-main-menu" +#define YAST_CC_PACKAGE "control-center" + static GSList * get_actions_list () { @@ -112,11 +116,11 @@ GnomeProgram *program; const gchar *widget_theming_name = "y2ccg-control-center"; -#ifdef ENABLE_NLS - bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); -#endif + bindtextdomain (GNOME_MAIN_MENU_PACKAGE, "/opt/gnome/share/locale"); + bind_textdomain_codeset (GNOME_MAIN_MENU_PACKAGE, "UTF-8"); + bindtextdomain (YAST_CC_PACKAGE, "/usr/share/YaST2/locale"); + bind_textdomain_codeset (YAST_CC_PACKAGE, "UTF-8"); + textdomain (GNOME_MAIN_MENU_PACKAGE); if (argc > 1) { @@ -155,8 +159,10 @@ handle_static_action_clicked); g_signal_connect (bonobo_app, "new-instance", G_CALLBACK (apss_new_instance_cb), app_data); + textdomain (YAST_CC_PACKAGE); create_main_window (app_data, widget_theming_name, _("YaST2 Control Center"), "gnome-control-center", 975, 600, hidden); + textdomain (GNOME_MAIN_MENU_PACKAGE); if (bonobo_app) bonobo_object_unref (bonobo_app); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠Hilbert.suse.de