Hello community,
here is the log from the commit of package gnome-menus for openSUSE:Factory
checked in at Fri Oct 15 16:12:10 CEST 2010.
--------
--- GNOME/gnome-menus/gnome-menus.changes 2010-09-24 12:02:30.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-menus/gnome-menus.changes 2010-10-11 18:05:57.000000000 +0200
@@ -1,0 +2,16 @@
+Mon Oct 11 18:05:05 CEST 2010 - vuntz@opensuse.org
+
+- Update baselibs.conf to ignore gnome-menus (there is no library
+ there) and instead put python-gnome-menus in there.
+
+-------------------------------------------------------------------
+Mon Sep 27 13:51:29 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.30.4:
+ + libmenu
+ - Clear cache of desktop entries set when files are
+ added/removed
+ + Associate .gir with pkg-config file
+ + Updated translations.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
gnome-menus-2.30.3.tar.bz2
New:
----
gnome-menus-2.30.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-menus.spec ++++++
--- /var/tmp/diff_new_pack.3jXvk6/_old 2010-10-15 16:11:50.000000000 +0200
+++ /var/tmp/diff_new_pack.3jXvk6/_new 2010-10-15 16:11:50.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gnome-menus (Version 2.30.3)
+# spec file for package gnome-menus (Version 2.30.4)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,8 +18,8 @@
Name: gnome-menus
-Version: 2.30.3
-Release: 2
+Version: 2.30.4
+Release: 1
License: GFDLv1.1 ; GPLv2+ ; LGPLv2.1+
Summary: The GNOME Desktop Menu
Url: http://www.gnome.org
++++++ baselibs.conf ++++++
--- /var/tmp/diff_new_pack.3jXvk6/_old 2010-10-15 16:11:50.000000000 +0200
+++ /var/tmp/diff_new_pack.3jXvk6/_new 2010-10-15 16:11:50.000000000 +0200
@@ -1,2 +1,2 @@
-gnome-menus
libgnome-menu2
+python-gnome-menus
++++++ gnome-menus-2.30.3.tar.bz2 -> gnome-menus-2.30.4.tar.bz2 ++++++
++++ 3176 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/gnome-menus-2.30.3/ChangeLog new/gnome-menus-2.30.4/ChangeLog
--- old/gnome-menus-2.30.3/ChangeLog 2010-09-14 14:32:02.000000000 +0200
+++ new/gnome-menus-2.30.4/ChangeLog 2010-09-27 12:56:03.000000000 +0200
@@ -1,6 +1,122 @@
+commit 90a58de1f3a7381b26206be39624a3d40d8ffb07
+Author: Vincent Untz
+Date: 2010-09-27
+
+ misc: Rename --enable-deprecations to --enable-deprecation-flags
+
+ This is a better name for this configure option, since it's really
+ about
+ enabling the use of the deprecation flags, not allowing the use of
+ deprecated API.
+
+M configure.ac
+
+commit f1da5abb7c1783134cfa485b323aedb4f5bc2465
+Author: Vincent Untz
+Date: 2010-09-27
+
+ introspection: Associate .gir with pkg-config file
+
+M libmenu/Makefile.am
+
+commit fbd3e2c9f8fb8de4c975367f30b84121478da7d2
+Author: Vincent Untz
+Date: 2010-09-23
+
+ libmenu: Clear cache of desktop entries set when files are
+ added/removed
+
+ When installing or removing an application, we get a notification of
+ change. However, the menu tree still contained the same content.
+
+ We were simply not clearing the cache containing the list of desktop
+ entries when a file got added or removed, meaning that we always
+ got the
+ same list of desktop entries.
+
+ (Note that it didn't affect gnome-panel, it's unclear why)
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=630410
+
+M libmenu/entry-directories.c
+
+commit 54af0ebf8863955c0641670343ac57900092f104
+Author: Torstein Winterseth
+Date: 2010-09-22
+
+ Updated Norwegian Nynorsk translation.
+
+M po/nn.po
+
+commit b8874d1d36c9b7d448b4958af5b71f2fa3606984
+Author: Vincent Untz
+Date: 2010-09-20
+
+ build: Update all Makefile.am to more recent standards
+
+M Makefile.am
+M desktop-directories/Makefile.am
+M layout/Makefile.am
+M libmenu/Makefile.am
+M python/Makefile.am
+M simple-editor/GMenuSimpleEditor/Makefile.am
+M simple-editor/Makefile.am
+M util/Makefile.am
+
+commit 7060e3c48a391c0fa96e57879575e333c3a54e67
+Author: Vincent Untz
+Date: 2010-09-20
+
+ misc: Update instructions for commit messages
+
+ We're switching to "tag:" instead of "[tag]".
+
+M ChangeLog
+
+commit 22642577f7324349b3681bc58e32004820236066
+Author: Takayuki KUSANO
+Date: 2010-09-20
+
+ Updated Japanese translation
+
+M po/ja.po
+
+commit feeb6b4d64f2d3e5e0f284aa3e1bfd625a627b1f
+Author: Daniel Martinez
+Date: 2010-09-18
+
+ Updated Aragonese translation
+
+M po/an.po
+
+commit 6010094c40eb65965622141cb09fec3a0c8b31d3
+Author: Baurzhan Muftakhidinov
+Date: 2010-09-15
+
+ Updated Kazakh translation
+
+M po/kk.po
+
+commit fe36b5b5371404ea96a46ac6d6b4a003f54d9828
+Author: Vincent Untz
+Date: 2010-09-14
+
+ release: post-release bump to 2.30.4
+
+M configure.ac
+
+commit 721b241e2c5449003238d333d03063fdfe7b3aa1
+Author: Vincent Untz
+Date: 2010-09-14
+
+ release: 2.30.3
+
+M NEWS
+M configure.ac
+
commit 328cff2e2951e817a6e999b3a3a8b563f07cd778
Author: Vincent Untz
-Date: 2010-09-08
+Date: 2010-09-08
[misc] Update AUTHORS, HACKING, MAINTAINERS, README
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/gnome-menus-2.30.3/Makefile.am new/gnome-menus-2.30.4/Makefile.am
--- old/gnome-menus-2.30.3/Makefile.am 2010-09-08 19:09:21.000000000 +0200
+++ new/gnome-menus-2.30.4/Makefile.am 2010-09-20 17:44:39.000000000 +0200
@@ -1,28 +1,16 @@
-NULL =
+SUBDIRS = libmenu desktop-directories layout util po
if HAVE_PYTHON
-PYTHON_SUBDIRS = python simple-editor
+SUBDIRS += python simple-editor
endif
-ALL_SUBDIRS = \
- po \
- libmenu \
- layout \
- desktop-directories \
- util \
- $(NULL)
-
-SUBDIRS = $(ALL_SUBDIRS) $(PYTHON_SUBDIRS)
-DIST_SUBDIRS = $(ALL_SUBDIRS) python simple-editor
-
ACLOCAL_AMFLAGS = -I m4
+DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-python
+
EXTRA_DIST = \
HACKING \
- MAINTAINERS \
- $(NULL)
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-introspection
+ MAINTAINERS
MAINTAINERCLEANFILES = \
$(srcdir)/INSTALL \
@@ -38,6 +26,11 @@
$(srcdir)/py-compile \
`find "$(srcdir)" -type f -name Makefile.in -print` \
$(srcdir)/configure \
- $(srcdir)/m4/intltool.m4
+ $(srcdir)/m4/intltool.m4 \
+ $(srcdir)/m4/libtool.m4 \
+ $(srcdir)/m4/ltoptions.m4 \
+ $(srcdir)/m4/ltsugar.m4 \
+ $(srcdir)/m4/ltversion.m4 \
+ $(srcdir)/m4/lt~obsolete.m4
-include $(top_srcdir)/git.mk
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/gnome-menus-2.30.3/NEWS new/gnome-menus-2.30.4/NEWS
--- old/gnome-menus-2.30.3/NEWS 2010-09-14 14:38:49.000000000 +0200
+++ new/gnome-menus-2.30.4/NEWS 2010-09-27 12:57:26.000000000 +0200
@@ -1,4 +1,26 @@
==============
+Version 2.30.4
+==============
+
+ libmenu
+
+ * Clear cache of desktop entries set when files are added/removed
+ (Vincent)
+
+ Misc
+
+ * Associate .gir with pkg-config file (Vincent)
+ * Rename --enable-deprecations configure option to
+ --enable-deprecation-flags (Vincent)
+
+ Translators
+
+ * Daniel Martinez (an)
+ * Takayuki KUSANO (ja)
+ * Baurzhan Muftakhidinov (kk)
+ * Torstein Winterseth (nn)
+
+==============
Version 2.30.3
==============
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/gnome-menus-2.30.3/configure.ac new/gnome-menus-2.30.4/configure.ac
--- old/gnome-menus-2.30.3/configure.ac 2010-09-14 14:38:05.000000000 +0200
+++ new/gnome-menus-2.30.4/configure.ac 2010-09-27 12:56:11.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ(2.62)
-AC_INIT([gnome-menus], [2.30.3],
+AC_INIT([gnome-menus], [2.30.4],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus])
AC_CONFIG_SRCDIR(libmenu/gmenu-tree.h)
@@ -20,7 +20,7 @@
# change to C+1:0:0
# - If the interface is the same as the previous version, change to C:R+1:A
-LIB_MENU_LT_VERSION=6:8:4
+LIB_MENU_LT_VERSION=6:9:4
AC_SUBST(LIB_MENU_LT_VERSION)
GETTEXT_PACKAGE=gnome-menus
@@ -47,16 +47,15 @@
GNOME_COMPILE_WARNINGS(yes)
-AC_ARG_ENABLE(deprecations,
- [AC_HELP_STRING([--enable-deprecations],
- [warn about deprecated usages @<:@default=no@:>@])],,
- [enable_deprecations=no])
+AC_ARG_ENABLE(deprecation_flags,
+ [AC_HELP_STRING([--enable-deprecation-flags],
+ [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],,
+ [enable_deprecation_flags=no])
-DISABLE_DEPRECATED_CFLAGS=
-if test "x$enable_deprecations" = "xyes"; then
+if test "x$enable_deprecation_flags" = "xyes"; then
DISABLE_DEPRECATED_CFLAGS=$DISABLE_DEPRECATED
+ AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
fi
-AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
dnl --enable-debug=(yes|minimum|no)
AC_ARG_ENABLE(debug,
@@ -166,7 +165,7 @@
compiler: ${CC}
cflags: ${CFLAGS}
Maintainer mode: ${USE_MAINTAINER_MODE}
- Warn about deprecations: ${enable_deprecations}
+ Use *_DISABLE_DEPRECATED: ${enable_deprecation_flags}
Turn on debugging: ${enable_debug}
Build python bindings: ${have_python}
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/gnome-menus-2.30.3/desktop-directories/Makefile.am new/gnome-menus-2.30.4/desktop-directories/Makefile.am
--- old/gnome-menus-2.30.3/desktop-directories/Makefile.am 2010-02-09 13:21:04.000000000 +0100
+++ new/gnome-menus-2.30.4/desktop-directories/Makefile.am 2010-09-20 17:44:39.000000000 +0200
@@ -1,15 +1,13 @@
-NULL =
-
-@INTLTOOL_DIRECTORY_RULE@
directorydir = $(datadir)/desktop-directories
+
# Should be moved to gnome-control-center:
directory_in_controlcenterfiles = \
Hardware.directory.in \
InternetAndNetwork.directory.in \
LookAndFeel.directory.in \
Personal.directory.in \
- System.directory.in \
- $(NULL)
+ System.directory.in
+
directory_in_files = \
AudioVideo.directory.in \
Development.directory.in \
@@ -26,11 +24,12 @@
X-GNOME-Other.directory.in \
X-GNOME-Menu-Applications.directory.in \
X-GNOME-Menu-System.directory.in \
- $(directory_in_controlcenterfiles) \
- $(NULL)
+ $(directory_in_controlcenterfiles)
directory_DATA = $(directory_in_files:.directory.in=.directory)
+@INTLTOOL_DIRECTORY_RULE@
+
EXTRA_DIST= $(directory_in_files)
DISTCLEANFILES = $(directory_DATA)
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/gnome-menus-2.30.3/layout/Makefile.am new/gnome-menus-2.30.4/layout/Makefile.am
--- old/gnome-menus-2.30.3/layout/Makefile.am 2010-02-09 13:21:04.000000000 +0100
+++ new/gnome-menus-2.30.4/layout/Makefile.am 2010-09-20 17:44:39.000000000 +0200
@@ -1,11 +1,8 @@
-NULL =
-
menudir = $(sysconfdir)/xdg/menus
-menu_DATA = \
- applications.menu \
- settings.menu \
- $(NULL)
+menu_DATA = \
+ applications.menu \
+ settings.menu
EXTRA_DIST= $(menu_DATA)
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/gnome-menus-2.30.3/libmenu/Makefile.am new/gnome-menus-2.30.4/libmenu/Makefile.am
--- old/gnome-menus-2.30.3/libmenu/Makefile.am 2010-06-22 03:54:22.000000000 +0200
+++ new/gnome-menus-2.30.4/libmenu/Makefile.am 2010-09-27 12:01:29.000000000 +0200
@@ -1,14 +1,16 @@
-NULL =
+lib_LTLIBRARIES = libgnome-menu.la
-INCLUDES = \
- -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
+AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
+ -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
$(DISABLE_DEPRECATED_CFLAGS) \
- $(DEBUG_CFLAGS) \
- $(WARN_CFLAGS) \
- $(NULL)
+ $(DEBUG_CFLAGS)
-lib_LTLIBRARIES = libgnome-menu.la
+AM_CFLAGS = $(WARN_CFLAGS)
+
+libgnome_menu_includedir = $(includedir)/gnome-menus
+libgnome_menu_include_HEADERS = \
+ gmenu-tree.h
libgnome_menu_sources = \
canonicalize.c \
@@ -17,8 +19,7 @@
gmenu-tree.c \
menu-layout.c \
menu-monitor.c \
- menu-util.c \
- $(NULL)
+ menu-util.c
libgnome_menu_la_SOURCES = \
$(libgnome_menu_sources) \
@@ -28,59 +29,47 @@
gmenu-tree.h \
menu-layout.h \
menu-monitor.h \
- menu-util.h \
- $(NULL)
+ menu-util.h
libgnome_menu_la_LIBADD = \
- $(GLIB_LIBS) \
- $(MONITOR_LIBS) \
- $(NULL)
+ $(GLIB_LIBS)
+
libgnome_menu_la_LDFLAGS = \
-version-info $(LIB_MENU_LT_VERSION) \
-no-undefined \
- -export-symbols-regex gmenu_tree \
- $(NULL)
+ -export-symbols-regex gmenu_tree
-libgnome_menu_includedir = $(includedir)/gnome-menus
-
-libgnome_menu_include_HEADERS = \
- gmenu-tree.h \
- $(NULL)
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libgnome-menu.pc
EXTRA_DIST = \
- libgnome-menu.pc.in \
- libgnome-menu-uninstalled.pc.in \
- $(NULL)
-
-CLEANFILES = \
- $(NULL)
+ libgnome-menu.pc.in \
+ libgnome-menu-uninstalled.pc.in
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgnome-menu.pc
+CLEANFILES =
# Introspection
-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
if HAVE_INTROSPECTION
# Note: we only include the headers here so far because there's no gtk-doc at all anyway
introspection_sources = $(libgnome_menu_include_HEADERS)
-GMenu-2.0.gir: libgnome-menu.la Makefile
+GMenu-2.0.gir: libgnome-menu.la
GMenu_2_0_gir_INCLUDES = GObject-2.0
-GMenu_2_0_gir_CFLAGS = \
- -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
- $(GLIB_CFLAGS)
+GMenu_2_0_gir_CFLAGS = $(AM_CPPFLAGS)
GMenu_2_0_gir_LIBS = libgnome-menu.la
+GMenu_2_0_gir_SCANNERFLAGS = --pkg-export=libgnome-menu
GMenu_2_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
INTROSPECTION_GIRS += GMenu-2.0.gir
-girdir = $(datadir)/gir-1.0
+girdir = $(INTROSPECTION_GIRDIR)
gir_DATA = $(INTROSPECTION_GIRS)
-typelibdir = $(libdir)/girepository-1.0
+typelibdir = $(INTROSPECTION_TYPELIBDIR)
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(gir_DATA) $(typelib_DATA)
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/gnome-menus-2.30.3/libmenu/entry-directories.c new/gnome-menus-2.30.4/libmenu/entry-directories.c
--- old/gnome-menus-2.30.3/libmenu/entry-directories.c 2010-02-09 13:21:04.000000000 +0100
+++ new/gnome-menus-2.30.4/libmenu/entry-directories.c 2010-09-23 19:44:05.000000000 +0200
@@ -451,6 +451,12 @@
if (handled)
{
+ /* CHANGED events don't change the set of desktop entries */
+ if (event == MENU_MONITOR_EVENT_CREATED || event == MENU_MONITOR_EVENT_DELETED)
+ {
+ _entry_directory_list_empty_desktop_cache ();
+ }
+
cached_dir_invoke_monitors (dir);
}
}
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/gnome-menus-2.30.3/po/an.po new/gnome-menus-2.30.4/po/an.po
--- old/gnome-menus-2.30.3/po/an.po 2010-05-26 19:17:31.000000000 +0200
+++ new/gnome-menus-2.30.4/po/an.po 2010-09-20 17:44:39.000000000 +0200
@@ -8,7 +8,7 @@
"Project-Id-Version: gnome-menus.HEAD.an\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
"menus&component=general\n"
-"POT-Creation-Date: 2010-04-21 21:32+0000\n"
+"POT-Creation-Date: 2010-09-15 06:57+0000\n"
"PO-Revision-Date: 2010-04-24 02:30+0200\n"
"Last-Translator: Daniel Martinez \n"
"Language-Team: Aragonés \n"
@@ -30,7 +30,7 @@
#: ../desktop-directories/Development.directory.in.h:2
msgid "Tools for software development"
-msgstr "Ferramientas ta lo desarrollo de software"
+msgstr "Ainas ta lo desarrollo de software"
#: ../desktop-directories/Education.directory.in.h:1
msgid "Education"
@@ -66,7 +66,7 @@
#: ../desktop-directories/InternetAndNetwork.directory.in.h:2
msgid "Network-related settings"
-msgstr "Propiedaz arredol d'o rete"
+msgstr "Propiedatz arredol d'o rete"
#: ../desktop-directories/LookAndFeel.directory.in.h:1
msgid "Look and Feel"
@@ -128,7 +128,7 @@
#: ../desktop-directories/System-Tools.directory.in.h:1
msgid "System Tools"
-msgstr "Ferramientas d'o sistema"
+msgstr "Ainas d'o sistema"
#: ../desktop-directories/System-Tools.directory.in.h:2
msgid "System configuration and monitoring"
@@ -180,7 +180,7 @@
#: ../simple-editor/gmenu-simple-editor.ui.h:3
msgid "_Defaults"
-msgstr "_Por defecto"
+msgstr "_Predeterminaus"
#: ../simple-editor/gmenu-simple-editor.ui.h:4
msgid "_Menus:"
@@ -208,3 +208,4 @@
msgstr ""
"No s'ha puesto trobar lo direutorio presonal: no ye estableciu en o /etc/"
"passwd y no bi ha dengun valor en a variable d'entorno $HOME"
+
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/gnome-menus-2.30.3/po/ja.po new/gnome-menus-2.30.4/po/ja.po
--- old/gnome-menus-2.30.3/po/ja.po 2010-03-15 09:34:17.000000000 +0100
+++ new/gnome-menus-2.30.4/po/ja.po 2010-09-20 17:44:39.000000000 +0200
@@ -1,16 +1,16 @@
# ja.po for gnome-menus.
-# Copyright (C) 2004-2007 THE gnome-menus' COPYRIGHT HOLDER
+# Copyright (C) 2004-2007,2009-2010 THE gnome-menus' COPYRIGHT HOLDER
# This file is distributed under the same license as the gnome-menus package.
# Satoru SATOH , 2004.
# Takeshi AIHANA , 2005-2007.
-# Takayuki KUSANO , 2009.
+# Takayuki KUSANO , 2009-2010.
#
msgid ""
msgstr ""
"Project-Id-Version: gnome-menus master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
"menus&component=general\n"
-"POT-Creation-Date: 2009-09-08 22:08+0900\n"
+"POT-Creation-Date: 2010-09-18 18:45+0000\n"
"PO-Revision-Date: 2009-09-08 22:13+0900\n"
"Last-Translator: Takayuki KUSANO \n"
"Language-Team: Japanese \n"
@@ -94,11 +94,12 @@
msgid "Office Applications"
msgstr "オフィス・アプリケーションです"
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/Personal.directory.in.h:2
msgid "Personal"
msgstr "ユーザ向け"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/Personal.directory.in.h:3
msgid "Personal settings"
msgstr "ユーザ向けの設定を変更します"
@@ -108,7 +109,7 @@
#: ../desktop-directories/Settings-System.directory.in.h:2
msgid "Change system-wide settings (affects all users)"
-msgstr "システム規模の設定を変更します (全てのユーザに影響します)"
+msgstr "システム規模の設定を変更します (すべてのユーザに影響します)"
#: ../desktop-directories/Settings.directory.in.h:1
msgid "Personal preferences"
@@ -210,62 +211,50 @@
"ホーム・フォルダが見つかりません: \"/etc/passwd\" に記述されていないか、環境"
"変数 $HOME の値が空です。"
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "メニュー・ファイル"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENU_FILE"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "メニューの変更を監視する"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "<Exclude> のエントリを含める"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "NoDisplay=true のエントリを含める"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr ".desktop ファイルの ID が間違っています"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[ファイル名が間違っています]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
+#~ msgid "Menu file"
+#~ msgstr "メニュー・ファイル"
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== メニューが変更されました (再読込中...) ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "メニューのツリーが空です"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test GNOME's implementation of the Desktop Menu Specification"
-msgstr "- GNOME のデスクトップ・メニューの実装をテストします"
+#~ msgid "MENU_FILE"
+#~ msgstr "MENU_FILE"
+
+#~ msgid "Monitor for menu changes"
+#~ msgstr "メニューの変更を監視する"
+
+#~ msgid "Include <Exclude>d entries"
+#~ msgstr "<Exclude> のエントリを含める"
+
+#~ msgid "Include NoDisplay=true entries"
+#~ msgstr "NoDisplay=true のエントリを含める"
+
+#~ msgid "Invalid desktop file ID"
+#~ msgstr ".desktop ファイルの ID が間違っています"
+
+#~ msgid "[Invalid Filename]"
+#~ msgstr "[ファイル名が間違っています]"
+
+#~ msgid " <excluded>"
+#~ msgstr " <excluded>"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "==== Menu changed, reloading ====\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "==== メニューが変更されました (再読み込み中...) ====\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid "Menu tree is empty"
+#~ msgstr "メニューのツリーが空です"
+
+#~ msgid "- test GNOME's implementation of the Desktop Menu Specification"
+#~ msgstr "- GNOME のデスクトップ・メニューの実装をテストします"
#~ msgid "Universal access related preferences"
#~ msgstr "ユニバーサル・アクセスに関連する設定を変更します"
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/gnome-menus-2.30.3/po/kk.po new/gnome-menus-2.30.4/po/kk.po
--- old/gnome-menus-2.30.3/po/kk.po 2010-08-04 13:22:28.000000000 +0200
+++ new/gnome-menus-2.30.4/po/kk.po 2010-09-20 17:44:39.000000000 +0200
@@ -3,18 +3,21 @@
#
# Moldabekov Margulan , 2008
# Erzhan Shaniev , 2008
+# Baurzhan Muftakhidinov , 2010
msgid ""
msgstr ""
"Project-Id-Version: gnome-menus trunk\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus&component=general\n"
-"POT-Creation-Date: 2009-04-21 13:07+0000\n"
-"PO-Revision-Date: 2009-06-11 17:30+0600\n"
-"Last-Translator: Baurzhan M. \n"
-"Language-Team: Kazakh \n"
+"POT-Creation-Date: 2010-07-02 11:40+0000\n"
+"PO-Revision-Date: 2010-09-15 12:55+0600\n"
+"Last-Translator: Baurzhan Muftakhidinov \n"
+"Language-Team: Kazakh \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=1; plural=0\n"
+"X-Poedit-Language: Kazakh\n"
+"X-Poedit-Country: KAZAKHSTAN\n"
#: ../desktop-directories/AudioVideo.directory.in.h:1
msgid "Multimedia menu"
@@ -50,7 +53,7 @@
#: ../desktop-directories/Graphics.directory.in.h:2
msgid "Graphics applications"
-msgstr "Графикалық айқындауыштар"
+msgstr "Графикалық қолданбалар"
#: ../desktop-directories/Hardware.directory.in.h:1
msgid "Hardware"
@@ -70,7 +73,7 @@
#: ../desktop-directories/LookAndFeel.directory.in.h:1
msgid "Look and Feel"
-msgstr "Көркемдеу"
+msgstr "Сыртқы түрі"
#: ../desktop-directories/LookAndFeel.directory.in.h:2
msgid "Settings controlling the desktop appearance and behavior"
@@ -86,17 +89,18 @@
#: ../desktop-directories/Office.directory.in.h:1
msgid "Office"
-msgstr "Кеңсе"
+msgstr "Кеңселік"
#: ../desktop-directories/Office.directory.in.h:2
msgid "Office Applications"
msgstr "Кеңселік қолданбалар"
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/Personal.directory.in.h:2
msgid "Personal"
msgstr "Жеке"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/Personal.directory.in.h:3
msgid "Personal settings"
msgstr "Жеке баптаулар"
@@ -106,20 +110,20 @@
#: ../desktop-directories/Settings-System.directory.in.h:2
msgid "Change system-wide settings (affects all users)"
-msgstr "Жүйелік орнатуларды өзгерту (барлық пайдаланушылар үшін)"
+msgstr "Жүйелік баптауларды өзгерту (барлық пайдаланушылар үшін)"
#: ../desktop-directories/Settings.directory.in.h:1
msgid "Personal preferences"
-msgstr "Жеке қалаулар"
+msgstr "Жеке баптаулар"
#: ../desktop-directories/Settings.directory.in.h:2
msgid "Preferences"
-msgstr "Қалаулар"
+msgstr "Баптаулар"
#: ../desktop-directories/System.directory.in.h:1
#: ../desktop-directories/X-GNOME-Menu-System.directory.in.h:2
msgid "System"
-msgstr "Жүйе"
+msgstr "Жүйелік"
#: ../desktop-directories/System.directory.in.h:2
msgid "System settings"
@@ -127,7 +131,7 @@
#: ../desktop-directories/System-Tools.directory.in.h:1
msgid "System Tools"
-msgstr "Жүйелік"
+msgstr "Жүйелік саймандар"
#: ../desktop-directories/System-Tools.directory.in.h:2
msgid "System configuration and monitoring"
@@ -139,7 +143,7 @@
#: ../desktop-directories/Utility-Accessibility.directory.in.h:2
msgid "Universal Access Settings"
-msgstr "Арнайы мүмкіндіктер параметрлері"
+msgstr "Арнайы мүмкіндіктер баптаулары"
#: ../desktop-directories/Utility.directory.in.h:1
msgid "Accessories"
@@ -155,7 +159,7 @@
#: ../desktop-directories/X-GNOME-Menu-System.directory.in.h:1
msgid "Personal preferences and administration settings"
-msgstr "Жеке қалаулар және әкімшілік баптаулар"
+msgstr "Жеке мен әкімшілік баптаулар"
#: ../desktop-directories/X-GNOME-Other.directory.in.h:1
msgid "Applications that did not fit in other categories"
@@ -169,22 +173,29 @@
msgid "Menu Editor"
msgstr "Мәзір түзетушісі"
-#: ../simple-editor/gmenu-simple-editor.glade.h:1
+#: ../simple-editor/gmenu-simple-editor.ui.h:1
msgid "Edit Menus"
msgstr "Мәзірді түзету"
-#: ../simple-editor/gmenu-simple-editor.glade.h:2
+#: ../simple-editor/gmenu-simple-editor.ui.h:2
msgid "_Applications:"
msgstr "Қ_олданбалар:"
-#: ../simple-editor/gmenu-simple-editor.glade.h:3
+#: ../simple-editor/gmenu-simple-editor.ui.h:3
msgid "_Defaults"
msgstr "_Бастапқы қалпы"
-#: ../simple-editor/gmenu-simple-editor.glade.h:4
+#: ../simple-editor/gmenu-simple-editor.ui.h:4
msgid "_Menus:"
msgstr "_Мәзірлер:"
+#. Translators: %s is the version number
+#: ../simple-editor/GMenuSimpleEditor/main.py:49
+#, python-format
+#| msgid "Menu Editor"
+msgid "Simple Menu Editor %s"
+msgstr "Қарапайым мәзір түзетушісі %s"
+
#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
msgid "Name"
@@ -198,61 +209,47 @@
msgid "Cannot find home directory: not set in /etc/passwd and no value for $HOME in environment"
msgstr "Үй бумасы табылмады: /etc/passwd ішінде жоқ және $HOME айнымалысы орнатылмаған"
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Мәзір файлы"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "МӘЗІР_ФАЙЛЫ"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Мәзірде болған өзгерістерді бақылау"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Шығарылған элементтерді іске келтіру"
-
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr "NoDisplay=true элементтерін іске келтіру"
-
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Desktop-файлдың ID-і қате"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[файлдың аты дұрыс емес]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <excluded>"
+#~ msgid "Menu file"
+#~ msgstr "Мәзір файлы"
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Мәзір өзгертілді, жаңадан қосылуда ====\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169
-#: ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Мәзір ағашы бос"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test GNOME's implementation of the Desktop Menu Specification"
-msgstr "- GNOME-да қолданылған Desktop Menu-дің тексерісі"
+#~ msgid "MENU_FILE"
+#~ msgstr "МӘЗІР_ФАЙЛЫ"
+
+#~ msgid "Monitor for menu changes"
+#~ msgstr "Мәзірде болған өзгерістерді бақылау"
+
+#~ msgid "Include <Exclude>d entries"
+#~ msgstr "Шығарылған элементтерді іске келтіру"
+
+#~ msgid "Include NoDisplay=true entries"
+#~ msgstr "NoDisplay=true элементтерін іске келтіру"
+
+#~ msgid "Invalid desktop file ID"
+#~ msgstr "Desktop-файлдың ID-і қате"
+
+#~ msgid "[Invalid Filename]"
+#~ msgstr "[файлдың аты дұрыс емес]"
+
+#~ msgid " <excluded>"
+#~ msgstr " <excluded>"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "==== Menu changed, reloading ====\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "==== Мәзір өзгертілді, жаңадан қосылуда ====\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid "Menu tree is empty"
+#~ msgstr "Мәзір ағашы бос"
+#~ msgid "- test GNOME's implementation of the Desktop Menu Specification"
+#~ msgstr "- GNOME-да қолданылған Desktop Menu-дің тексерісі"
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/gnome-menus-2.30.3/po/nn.po new/gnome-menus-2.30.4/po/nn.po
--- old/gnome-menus-2.30.3/po/nn.po 2010-03-15 09:34:17.000000000 +0100
+++ new/gnome-menus-2.30.4/po/nn.po 2010-09-23 19:44:05.000000000 +0200
@@ -1,25 +1,27 @@
# translation of nn.po to Norwegian Nynorsk
# Norwegian (nynorsk) translation of gnome-menus.
# Copyright (C) Roy-Magne Mo , 2001.
-#
# Roy-Magne Mo , 2001.
# Åsmund Skjæveland , 2003, 2004.
# Kjartan Maraas , 2005.
# Eskild Hustvedt , 2008.
# Torstein Adolf Winterseth , 2010.
+# Torstein Winterseth , 2010.
msgid ""
msgstr ""
"Project-Id-Version: gnome-control-center 2.9.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-28 12:09+0100\n"
-"PO-Revision-Date: 2010-01-02 15:46+0000\n"
-"Last-Translator: Torstein Adolf Winterseth \n"
-"Language-Team: Norwegian Nynorsk \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-"
+"menus&component=general\n"
+"POT-Creation-Date: 2010-03-28 07:09+0000\n"
+"PO-Revision-Date: 2010-09-01 18:55+0200\n"
+"Last-Translator: Torstein Winterseth \n"
+"Language-Team: i18n-nn@lister.ping.uio.no\n"
+"Language: nn\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.6.1\n"
#: ../desktop-directories/AudioVideo.directory.in.h:1
msgid "Multimedia menu"
@@ -31,11 +33,11 @@
#: ../desktop-directories/Development.directory.in.h:1
msgid "Programming"
-msgstr "Programmering"
+msgstr "Utvikling"
#: ../desktop-directories/Development.directory.in.h:2
msgid "Tools for software development"
-msgstr "Verktøy for programmering"
+msgstr "Verktøy for programvareutvikling"
#: ../desktop-directories/Education.directory.in.h:1
msgid "Education"
@@ -79,7 +81,7 @@
#: ../desktop-directories/LookAndFeel.directory.in.h:2
msgid "Settings controlling the desktop appearance and behavior"
-msgstr "Innstillingar som kontrollerar skrivebordets utsjåande og oppførsel"
+msgstr "Innstillingar som kontrollerer utsjånaden og åtferda til skrivebordet"
#: ../desktop-directories/Network.directory.in.h:1
msgid "Internet"
@@ -87,7 +89,7 @@
#: ../desktop-directories/Network.directory.in.h:2
msgid "Programs for Internet access such as web and email"
-msgstr "Program for bruk på Internett til dømes nettlesar og e-post"
+msgstr "Program for bruk på Internett, som nettlesar og e-postklient"
#: ../desktop-directories/Office.directory.in.h:1
msgid "Office"
@@ -97,11 +99,12 @@
msgid "Office Applications"
msgstr "Kontorprogram"
-#: ../desktop-directories/Personal.directory.in.h:1
+#. Translators: this is Personal as in "Personal settings"
+#: ../desktop-directories/Personal.directory.in.h:2
msgid "Personal"
msgstr "Personleg"
-#: ../desktop-directories/Personal.directory.in.h:2
+#: ../desktop-directories/Personal.directory.in.h:3
msgid "Personal settings"
msgstr "Personlege innstillingar"
@@ -111,7 +114,7 @@
#: ../desktop-directories/Settings-System.directory.in.h:2
msgid "Change system-wide settings (affects all users)"
-msgstr "Gjer om instillingar for heile systemet (påverkar alle brukarar)"
+msgstr "Endra innstillingar for heile systemet (påverkar alle brukarar)"
#: ../desktop-directories/Settings.directory.in.h:1
msgid "Personal preferences"
@@ -148,11 +151,11 @@
#: ../desktop-directories/Utility.directory.in.h:1
msgid "Accessories"
-msgstr "Tilbehøyr"
+msgstr "Verktøy"
#: ../desktop-directories/Utility.directory.in.h:2
msgid "Desktop accessories"
-msgstr "Tilbehøyr for skrivebordet"
+msgstr "Verktøy for skrivebordet"
#: ../desktop-directories/X-GNOME-Menu-Applications.directory.in.h:1
msgid "Applications"
@@ -172,7 +175,7 @@
#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1
msgid "Menu Editor"
-msgstr "Menyredigerar"
+msgstr "Menyredigering"
#: ../simple-editor/gmenu-simple-editor.ui.h:1
msgid "Edit Menus"
@@ -194,7 +197,7 @@
#: ../simple-editor/GMenuSimpleEditor/main.py:49
#, python-format
msgid "Simple Menu Editor %s"
-msgstr "Menyredigerar %s"
+msgstr "Enkel menyredigering %s"
#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94
#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121
@@ -210,66 +213,54 @@
"Cannot find home directory: not set in /etc/passwd and no value for $HOME in "
"environment"
msgstr ""
-"Klarte ikkje finna heimemappe: Ikkje satt i /etc/passwd og ingen verdi for "
+"Klarte ikkje finna heimemappe: Ikkje seten i /etc/passwd og ingen verdi for "
"$HOME i miljøet"
-#: ../util/test-menu-spec.c:33
-msgid "Menu file"
-msgstr "Menyfil"
-
-#: ../util/test-menu-spec.c:33
-msgid "MENU_FILE"
-msgstr "MENY_FIL"
-
-#: ../util/test-menu-spec.c:34
-msgid "Monitor for menu changes"
-msgstr "Overvak menyen for endringar"
-
-#: ../util/test-menu-spec.c:35
-msgid "Include <Exclude>d entries"
-msgstr "Inkluder oppføringar som har blitt ekskludert med <exclude>"
+#~ msgid "Menu file"
+#~ msgstr "Menyfil"
-#: ../util/test-menu-spec.c:36
-msgid "Include NoDisplay=true entries"
-msgstr ""
-"Inkluder oppføringar som er satt til å ikkje verta vist med NoDisplay=true"
+#~ msgid "MENU_FILE"
+#~ msgstr "MENY_FIL"
-#: ../util/test-menu-spec.c:91
-msgid "Invalid desktop file ID"
-msgstr "Ugyldig ID for desktop-fil"
-
-#: ../util/test-menu-spec.c:92
-msgid "[Invalid Filename]"
-msgstr "[Ugyldig filnamn]"
-
-#: ../util/test-menu-spec.c:93
-msgid " <excluded>"
-msgstr " <ekskludert>"
+#~ msgid "Monitor for menu changes"
+#~ msgstr "Overvak menyen for endringar"
-#: ../util/test-menu-spec.c:164
-#, c-format
-msgid ""
-"\n"
-"\n"
-"\n"
-"==== Menu changed, reloading ====\n"
-"\n"
-"\n"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==== Meny endra, lastar på nytt ===\n"
-"\n"
-"\n"
-
-#: ../util/test-menu-spec.c:169 ../util/test-menu-spec.c:211
-msgid "Menu tree is empty"
-msgstr "Menytreet er tomt"
-
-#: ../util/test-menu-spec.c:189
-msgid "- test GNOME's implementation of the Desktop Menu Specification"
-msgstr "- test GNOME sin implementasjon av desktop-menyspesifikasjonen"
+#~ msgid "Include <Exclude>d entries"
+#~ msgstr "Inkluder oppføringar som har blitt ekskludert med <exclude>"
+
+#~ msgid "Include NoDisplay=true entries"
+#~ msgstr ""
+#~ "Inkluder oppføringar som er satt til å ikkje verta vist med NoDisplay=true"
+
+#~ msgid "Invalid desktop file ID"
+#~ msgstr "Ugyldig ID for desktop-fil"
+
+#~ msgid "[Invalid Filename]"
+#~ msgstr "[Ugyldig filnamn]"
+
+#~ msgid " <excluded>"
+#~ msgstr " <ekskludert>"
+
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "==== Menu changed, reloading ====\n"
+#~ "\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "==== Meny endra, lastar på nytt ===\n"
+#~ "\n"
+#~ "\n"
+
+#~ msgid "Menu tree is empty"
+#~ msgstr "Menytreet er tomt"
+
+#~ msgid "- test GNOME's implementation of the Desktop Menu Specification"
+#~ msgstr "- test GNOME sin implementasjon av desktop-menyspesifikasjonen"
#~ msgid "Universal access related preferences"
#~ msgstr "Innstillingar relatert til tilgjenge"
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/gnome-menus-2.30.3/python/Makefile.am new/gnome-menus-2.30.4/python/Makefile.am
--- old/gnome-menus-2.30.3/python/Makefile.am 2010-03-15 09:34:17.000000000 +0100
+++ new/gnome-menus-2.30.4/python/Makefile.am 2010-09-20 17:44:39.000000000 +0200
@@ -1,21 +1,20 @@
-NULL =
-
-INCLUDES = \
- -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
- -I$(srcdir)/../libmenu \
- $(WARN_CFLAGS) \
- $(NO_STRICT_ALIASING_CFLAGS) \
+AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(PYTHON_INCLUDES) \
+ -I$(srcdir)/../libmenu \
+ -DGMENU_I_KNOW_THIS_IS_UNSTABLE \
$(DISABLE_DEPRECATED_CFLAGS) \
- $(DEBUG_CFLAGS) \
- $(NULL)
+ $(DEBUG_CFLAGS)
+
+AM_CFLAGS =
+ $(WARN_CFLAGS) \
+ $(NO_STRICT_ALIASING_CFLAGS)
gmenudir = $(pyexecdir)
gmenu_LTLIBRARIES = gmenu.la
-gmenu_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initgmenu
-gmenu_la_LIBADD = $(GLIB_LIBS) $(PYTHON_LIBS) $(top_builddir)/libmenu/libgnome-menu.la
gmenu_la_SOURCES = gmenu.c
+gmenu_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initgmenu
+gmenu_la_LIBADD = $(GLIB_LIBS) $(PYTHON_LIBS) $(top_builddir)/libmenu/libgnome-menu.la
-include $(top_srcdir)/git.mk
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/gnome-menus-2.30.3/simple-editor/GMenuSimpleEditor/Makefile.am new/gnome-menus-2.30.4/simple-editor/GMenuSimpleEditor/Makefile.am
--- old/gnome-menus-2.30.3/simple-editor/GMenuSimpleEditor/Makefile.am 2010-03-15 09:34:17.000000000 +0100
+++ new/gnome-menus-2.30.4/simple-editor/GMenuSimpleEditor/Makefile.am 2010-09-20 17:44:39.000000000 +0200
@@ -1,4 +1,4 @@
-appdir = $(pyexecdir)/GMenuSimpleEditor
+appdir = $(pyexecdir)/GMenuSimpleEditor
app_PYTHON = \
__init__.py \
main.py \
@@ -8,11 +8,6 @@
nodist_app_PYTHON = config.py
-CLEANFILES = config.py
-EXTRA_DIST = config.py.in
-
-all-local: config.py
-
config.py: config.py.in
$(AM_V_GEN)sed \
-e s!\@DATADIR\@!$(datadir)! \
@@ -21,4 +16,8 @@
-e s!\@PACKAGE_VERSION\@!$(PACKAGE_VERSION)! \
< $< > $@
+EXTRA_DIST = config.py.in
+
+CLEANFILES = config.py
+
-include $(top_srcdir)/git.mk
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/gnome-menus-2.30.3/simple-editor/Makefile.am new/gnome-menus-2.30.4/simple-editor/Makefile.am
--- old/gnome-menus-2.30.3/simple-editor/Makefile.am 2010-03-15 09:34:17.000000000 +0100
+++ new/gnome-menus-2.30.4/simple-editor/Makefile.am 2010-09-20 17:44:39.000000000 +0200
@@ -6,7 +6,7 @@
$(AM_V_GEN)sed -e s!\@pyexecdir\@!@pyexecdir@! -e s!\@PYTHON\@!@PYTHON@! < $< > $@ && \
chmod a+x $@
-uidir = $(pkgdatadir)/ui
+uidir = $(pkgdatadir)/ui
ui_DATA = gmenu-simple-editor.ui
desktopdir = $(datadir)/applications
@@ -17,11 +17,11 @@
EXTRA_DIST = \
gmenu-simple-editor.in \
- gmenu-simple-editor.desktop.in \
- gmenu-simple-editor.ui
+ $(desktop_in_files) \
+ $(ui_DATA)
CLEANFILES = \
gmenu-simple-editor \
- gmenu-simple-editor.desktop
+ $(desktop_DATA)
-include $(top_srcdir)/git.mk
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/gnome-menus-2.30.3/util/Makefile.am new/gnome-menus-2.30.4/util/Makefile.am
--- old/gnome-menus-2.30.3/util/Makefile.am 2010-02-09 13:21:04.000000000 +0100
+++ new/gnome-menus-2.30.4/util/Makefile.am 2010-09-20 17:44:39.000000000 +0200
@@ -1,33 +1,27 @@
-NULL =
+noinst_PROGRAMS = gnome-menu-spec-test
-INCLUDES = \
+AM_CPPFLAGS = \
+ $(GLIB_CFLAGS) \
+ -I$(srcdir)/../libmenu \
-DGMENU_I_KNOW_THIS_IS_UNSTABLE \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
- -I$(srcdir)/../libmenu \
- $(GLIB_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
- $(DEBUG_CFLAGS) \
- $(WARN_CFLAGS) \
- $(NULL)
-
-noinst_PROGRAMS = \
- gnome-menu-spec-test \
- $(NULL)
+ $(DEBUG_CFLAGS)
+
+AM_CFLAGS = $(WARN_CFLAGS)
gnome_menu_spec_test_SOURCES = \
- test-menu-spec.c \
- $(NULL)
+ test-menu-spec.c
gnome_menu_spec_test_LDADD = \
- ../libmenu/libgnome-menu.la \
$(GLIB_LIBS) \
- $(NULL)
+ ../libmenu/libgnome-menu.la
if HAVE_PYTHON
-pyexampledir = $(pkgdatadir)/examples
+pyexampledir = $(pkgdatadir)/examples
pyexample_DATA = gnome-menus-ls.py
else
-pyexampledir =
+pyexampledir =
pyexample_DATA =
endif
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org