diff -Nru gnome-menus-3.2.0.1/aclocal.m4 gnome-menus-3.3.5/aclocal.m4 --- gnome-menus-3.2.0.1/aclocal.m4 2011-09-28 07:12:09.000000000 +0000 +++ gnome-menus-3.3.5/aclocal.m4 2012-02-06 11:26:08.000000000 +0000 @@ -1590,6 +1590,10 @@ [CATOBJEXT=.mo DATADIRNAME=lib]) ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib diff -Nru gnome-menus-3.2.0.1/ChangeLog gnome-menus-3.3.5/ChangeLog --- gnome-menus-3.2.0.1/ChangeLog 2011-09-28 07:11:21.000000000 +0000 +++ gnome-menus-3.3.5/ChangeLog 2012-02-06 11:25:35.000000000 +0000 @@ -1,6 +1,113 @@ +commit 2adf8dc80b99459450e891161b3b7f254317d9b5 +Author: Danishka Navin +Date: 2012-02-01 + + fixed few typos in si.po file + +M po/si.po + +commit 17d5a7f7942f9045acdb8d5cbe18c967169d054e +Author: Danishka Navin +Date: 2012-02-01 + + fixed few typos in si.po file + +M po/si.po + +commit 7b895320a73ef066508d0d411c9ce1e725188a96 +Author: Kjartan Maraas +Date: 2012-01-25 + + Updated Norwegian bokmål translation + +M po/nb.po + +commit a84c7d360b4cb22a10cac76c95eff4654effd730 +Author: Andiswa Mvanyashe +Date: 2012-01-17 + + Updated translation for Xhosa (xh) + +M po/xh.po + +commit 91a67746970ca4327c03c2f048e48c666a1f3776 +Author: Vincent Untz +Date: 2011-12-20 + + build: Create xz tarballs + +M configure.ac + +commit 581bdf9920d18024413fa7afcacd83e733a26089 +Author: Jiro Matsuzawa +Date: 2011-11-11 + + Updated Japanese translation + +M po/ja.po + +commit 8d46c3a20c4718384b66180990258c0ad6c12f49 +Author: Vincent Untz +Date: 2011-10-24 + + release: post-release bump to 3.3.2 + +M configure.ac + +commit f258c9c144c569772a1ea7ea81179c98110fc58f +Author: Vincent Untz +Date: 2011-10-24 + + release: 3.3.1 + +M NEWS +M configure.ac + +commit fbabc41cb6f2c6520f9f117137fa296a7f8340f3 +Author: Florian Müllner +Date: 2011-10-21 + + libmenu: Ignore invalid desktop entries + + Both "Name" and "Exec" are mandatory keys according to the desktop + entry spec; some .desktop files missing one or the other have been + spotted in the while, so ignore them explicitly. + + https://bugzilla.gnome.org/show_bug.cgi?id=662409 + +M libmenu/desktop-entries.c + +commit 2179d84e1d7ce5a5b79f2736bf64a13e7bca1b4d +Author: Vincent Untz +Date: 2011-10-07 + + layout: Put the Other menu at the end + + It's really a special menu, which should not be handled with + alphabetical order. + +M layout/applications.menu + +commit 480edac95baba553b3cfc471817779e50a367871 +Author: Vincent Untz +Date: 2011-09-28 + + release: post-release bump to 3.2.1 + +M configure.ac + +commit 2d5915b925791d2d3bd736704a8706553455bd26 +Author: Vincent Untz +Date: 2011-09-28 + + release: 3.2.0.1 + +M NEWS +M configure.ac + commit f1c76629d33a616089a15bd034708d21e8bd9a87 Author: Vincent Untz -Date: 2011-09-27 +Date: 2011-09-27 editor: Fix to work with latest pygi diff -Nru gnome-menus-3.2.0.1/configure gnome-menus-3.3.5/configure --- gnome-menus-3.2.0.1/configure 2011-09-28 07:12:11.000000000 +0000 +++ gnome-menus-3.3.5/configure 2012-02-06 11:26:09.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for gnome-menus 3.2.0.1. +# Generated by GNU Autoconf 2.68 for gnome-menus 3.3.5. # # Report bugs to . # @@ -710,8 +710,8 @@ # Identity of this package. PACKAGE_NAME='gnome-menus' PACKAGE_TARNAME='gnome-menus' -PACKAGE_VERSION='3.2.0.1' -PACKAGE_STRING='gnome-menus 3.2.0.1' +PACKAGE_VERSION='3.3.5' +PACKAGE_STRING='gnome-menus 3.3.5' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus' PACKAGE_URL='' @@ -1514,7 +1514,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 gnome-menus 3.2.0.1 to adapt to many kinds of systems. +\`configure' configures gnome-menus 3.3.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1584,7 +1584,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-menus 3.2.0.1:";; + short | recursive ) echo "Configuration of gnome-menus 3.3.5:";; esac cat <<\_ACEOF @@ -1705,7 +1705,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-menus configure 3.2.0.1 +gnome-menus configure 3.3.5 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2074,7 +2074,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-menus $as_me 3.2.0.1, which was +It was created by gnome-menus $as_me 3.3.5, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2891,7 +2891,7 @@ # Define the identity of the package. PACKAGE='gnome-menus' - VERSION='3.2.0.1' + VERSION='3.3.5' cat >>confdefs.h <<_ACEOF @@ -2992,7 +2992,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=0:0:0 +LIB_MENU_LT_VERSION=0:1:0 GETTEXT_PACKAGE=gnome-menus-3.0 @@ -4965,6 +4965,10 @@ fi ;; + *-*-openbsd*) + CATOBJEXT=.mo + DATADIRNAME=share + ;; *) CATOBJEXT=.mo DATADIRNAME=lib @@ -7333,13 +7337,13 @@ else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:7336: $ac_compile\"" >&5) + (eval echo "\"\$as_me:7340: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:7339: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:7343: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:7342: output\"" >&5) + (eval echo "\"\$as_me:7346: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -8541,7 +8545,7 @@ ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8544 "configure"' > conftest.$ac_ext + echo '#line 8548 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9801,11 +9805,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9804: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9808: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9808: \$? = $ac_status" >&5 + echo "$as_me:9812: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10140,11 +10144,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10143: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10147: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:10147: \$? = $ac_status" >&5 + echo "$as_me:10151: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -10245,11 +10249,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10248: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10252: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10252: \$? = $ac_status" >&5 + echo "$as_me:10256: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10300,11 +10304,11 @@ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:10303: $lt_compile\"" >&5) + (eval echo "\"\$as_me:10307: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:10307: \$? = $ac_status" >&5 + echo "$as_me:10311: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12667,7 +12671,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12670 "configure" +#line 12674 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12763,7 +12767,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12766 "configure" +#line 12770 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14215,7 +14219,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-menus $as_me 3.2.0.1, which was +This file was extended by gnome-menus $as_me 3.3.5, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14281,7 +14285,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-menus config.status 3.2.0.1 +gnome-menus config.status 3.3.5 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru gnome-menus-3.2.0.1/configure.ac gnome-menus-3.3.5/configure.ac --- gnome-menus-3.2.0.1/configure.ac 2011-09-28 07:11:30.000000000 +0000 +++ gnome-menus-3.3.5/configure.ac 2012-02-06 11:25:41.000000000 +0000 @@ -1,10 +1,10 @@ AC_PREREQ(2.62) -AC_INIT([gnome-menus], [3.2.0.1], +AC_INIT([gnome-menus], [3.3.5], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-menus]) AC_CONFIG_SRCDIR(libmenu/gmenu-tree.h) -AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-bzip2]) +AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_MACRO_DIR([m4]) AM_CONFIG_HEADER(config.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=0:0:0 +LIB_MENU_LT_VERSION=0:1:0 AC_SUBST(LIB_MENU_LT_VERSION) GETTEXT_PACKAGE=gnome-menus-3.0 diff -Nru gnome-menus-3.2.0.1/debian/changelog gnome-menus-3.3.5/debian/changelog --- gnome-menus-3.2.0.1/debian/changelog 2012-02-08 11:08:19.000000000 +0000 +++ gnome-menus-3.3.5/debian/changelog 2012-02-22 08:07:48.000000000 +0000 @@ -1,3 +1,10 @@ +gnome-menus (3.3.5-0ubuntu1) precise; urgency=low + + * New upstream release. + * Unfuzz patches. + + -- Martin Pitt Wed, 22 Feb 2012 09:07:37 +0100 + gnome-menus (3.2.0.1-2ubuntu3) precise; urgency=low * debian/patches/22_directory-suffix-for-icons.patch: append "-directory" diff -Nru gnome-menus-3.2.0.1/debian/patches/05_debian_menu.patch gnome-menus-3.3.5/debian/patches/05_debian_menu.patch --- gnome-menus-3.2.0.1/debian/patches/05_debian_menu.patch 2012-02-08 11:08:19.000000000 +0000 +++ gnome-menus-3.3.5/debian/patches/05_debian_menu.patch 2012-02-22 08:07:48.000000000 +0000 @@ -1,9 +1,10 @@ -diff -urN gnome-menus-2.15.91.orig/layout/applications.menu gnome-menus-2.15.91/layout/applications.menu ---- gnome-menus-2.15.91.orig/layout/applications.menu 2006-08-13 18:46:45.000000000 +0200 -+++ gnome-menus-2.15.91/layout/applications.menu 2006-08-13 18:49:52.000000000 +0200 -@@ -150,4 +150,11 @@ - - +Index: gnome-menus-3.3.5/layout/applications.menu +=================================================================== +--- gnome-menus-3.3.5.orig/layout/applications.menu 2012-02-22 09:02:30.771202095 +0100 ++++ gnome-menus-3.3.5/layout/applications.menu 2012-02-22 09:02:31.527202131 +0100 +@@ -156,4 +156,11 @@ + + + + diff -Nru gnome-menus-3.2.0.1/debian/patches/09_app_install_entry.patch gnome-menus-3.3.5/debian/patches/09_app_install_entry.patch --- gnome-menus-3.2.0.1/debian/patches/09_app_install_entry.patch 2012-02-08 11:08:19.000000000 +0000 +++ gnome-menus-3.3.5/debian/patches/09_app_install_entry.patch 2012-02-22 08:07:48.000000000 +0000 @@ -1,10 +1,10 @@ Description: Include Software Center in menus -Index: gnome-menus-2.28.0/layout/applications.menu +Index: gnome-menus-3.3.5/layout/applications.menu =================================================================== ---- gnome-menus-2.28.0.orig/layout/applications.menu 2009-09-24 11:34:44.000000000 +0200 -+++ gnome-menus-2.28.0/layout/applications.menu 2009-09-24 11:34:44.000000000 +0200 -@@ -157,4 +157,16 @@ +--- gnome-menus-3.3.5.orig/layout/applications.menu 2012-02-22 09:02:35.403202318 +0100 ++++ gnome-menus-3.3.5/layout/applications.menu 2012-02-22 09:02:36.059202350 +0100 +@@ -191,4 +191,16 @@ Debian.directory diff -Nru gnome-menus-3.2.0.1/layout/applications.menu gnome-menus-3.3.5/layout/applications.menu --- gnome-menus-3.2.0.1/layout/applications.menu 2011-03-31 06:48:41.000000000 +0000 +++ gnome-menus-3.3.5/layout/applications.menu 2011-10-24 11:48:17.000000000 +0000 @@ -151,4 +151,10 @@ + + + Other + + + diff -Nru gnome-menus-3.2.0.1/libmenu/desktop-entries.c gnome-menus-3.3.5/libmenu/desktop-entries.c --- gnome-menus-3.2.0.1/libmenu/desktop-entries.c 2011-08-29 06:37:06.000000000 +0000 +++ gnome-menus-3.3.5/libmenu/desktop-entries.c 2011-10-24 11:48:12.000000000 +0000 @@ -256,7 +256,9 @@ const char *categories_str; entry_desktop->appinfo = g_desktop_app_info_new_from_filename (entry->path); - if (!entry_desktop->appinfo) + if (!entry_desktop->appinfo || + !g_app_info_get_name (G_APP_INFO (entry_desktop->appinfo)) || + !g_app_info_get_executable (G_APP_INFO (entry_desktop->appinfo))) { menu_verbose ("Failed to load \"%s\"\n", entry->path); return FALSE; diff -Nru gnome-menus-3.2.0.1/Makefile.in gnome-menus-3.3.5/Makefile.in --- gnome-menus-3.2.0.1/Makefile.in 2011-09-28 07:12:12.000000000 +0000 +++ gnome-menus-3.3.5/Makefile.in 2012-02-06 11:26:11.000000000 +0000 @@ -108,7 +108,7 @@ done; \ reldir="$$dir2" GZIP_ENV = --best -DIST_ARCHIVES = $(distdir).tar.bz2 +DIST_ARCHIVES = $(distdir).tar.xz distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ @@ -574,6 +574,7 @@ dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 $(am__remove_distdir) @@ -581,7 +582,6 @@ dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) - dist-xz: distdir tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz $(am__remove_distdir) @@ -600,7 +600,7 @@ $(am__remove_distdir) dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then diff -Nru gnome-menus-3.2.0.1/NEWS gnome-menus-3.3.5/NEWS --- gnome-menus-3.2.0.1/NEWS 2011-09-28 07:11:53.000000000 +0000 +++ gnome-menus-3.3.5/NEWS 2012-02-06 11:25:51.000000000 +0000 @@ -1,3 +1,26 @@ +============= +Version 3.3.5 +============= + + Translators + + * Jiro Matsuzawa (ja) + * Kjartan Maraas (nb) + * Danishka Navin (si) + * Andiswa Mvanyashe (xh) + +============= +Version 3.3.1 +============= + + libmenu + + * Ignore desktop entries with no Name or Exec key (Florian Müllner) + + Layout + + * Put the Other menu at the end (Vincent) + =============== Version 3.2.0.1 =============== diff -Nru gnome-menus-3.2.0.1/po/ja.po gnome-menus-3.3.5/po/ja.po --- gnome-menus-3.2.0.1/po/ja.po 2011-09-19 17:27:02.000000000 +0000 +++ gnome-menus-3.3.5/po/ja.po 2011-11-14 10:55:37.000000000 +0000 @@ -4,14 +4,15 @@ # Satoru SATOH , 2004. # Takeshi AIHANA , 2005-2007. # Takayuki KUSANO , 2009-2010. +# Jiro Matsuzawa , 2011 # msgid "" msgstr "" "Project-Id-Version: gnome-menus master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" "menus&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2011-08-29 06:44+0000\n" -"PO-Revision-Date: 2011-09-11 07:40+0900\n" +"POT-Creation-Date: 2011-10-24 11:58+0000\n" +"PO-Revision-Date: 2011-11-06 18:38+0900\n" "Last-Translator: Jiro Matsuzawa \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" @@ -60,7 +61,7 @@ #: ../desktop-directories/Hardware.directory.in.h:2 msgid "Settings for several hardware devices" -msgstr "使用するハードウェア・デバイスを設定します" +msgstr "使用するハードウェアデバイスを設定します" #: ../desktop-directories/Network.directory.in.h:1 msgid "Internet" @@ -68,7 +69,7 @@ #: ../desktop-directories/Network.directory.in.h:2 msgid "Programs for Internet access such as web and email" -msgstr "ウェブやメールなどインターネットにアクセスのためのプログラムです" +msgstr "ウェブやメールなどインターネットにアクセスするためのプログラムです" #: ../desktop-directories/Office.directory.in.h:1 msgid "Office" @@ -76,7 +77,7 @@ #: ../desktop-directories/Office.directory.in.h:2 msgid "Office Applications" -msgstr "オフィス・アプリケーションです" +msgstr "オフィスアプリケーションです" #. Translators: this is Personal as in "Personal settings" #: ../desktop-directories/Personal.directory.in.h:2 @@ -105,11 +106,11 @@ #: ../desktop-directories/Utility-Accessibility.directory.in.h:1 msgid "Universal Access" -msgstr "ユニバーサル・アクセス" +msgstr "ユニバーサルアクセス" #: ../desktop-directories/Utility-Accessibility.directory.in.h:2 msgid "Universal Access Settings" -msgstr "ユニバーサル・アクセスの設定を変更します" +msgstr "ユニバーサルアクセスの設定を変更します" #: ../desktop-directories/Utility.directory.in.h:1 msgid "Accessories" @@ -117,7 +118,7 @@ #: ../desktop-directories/Utility.directory.in.h:2 msgid "Desktop accessories" -msgstr "デスクトップ用のアクセサリーです" +msgstr "デスクトップ用のアクセサリです" #: ../desktop-directories/X-GNOME-Menu-Applications.directory.in.h:1 msgid "Applications" @@ -133,7 +134,7 @@ #: ../simple-editor/gmenu-simple-editor.desktop.in.h:1 msgid "Menu Editor" -msgstr "メニュー・エディター" +msgstr "メニューエディター" #: ../simple-editor/gmenu-simple-editor.ui.h:1 msgid "Edit Menus" @@ -152,10 +153,10 @@ msgstr "メニュー(_M):" #. Translators: %s is the version number -#: ../simple-editor/GMenuSimpleEditor/main.py:47 +#: ../simple-editor/GMenuSimpleEditor/main.py:44 #, python-format msgid "Simple Menu Editor %s" -msgstr "シンプル・メニュー・エディター %s" +msgstr "シンプルメニューエディター %s" #: ../simple-editor/GMenuSimpleEditor/maindialog.py:97 #: ../simple-editor/GMenuSimpleEditor/maindialog.py:124 @@ -171,8 +172,8 @@ "Cannot find home directory: not set in /etc/passwd and no value for $HOME in " "environment" msgstr "" -"ホーム・フォルダーが見つかりません: \"/etc/passwd\" に記述されていないか、環" -"境変数 $HOME の値が空です。" +"ホームフォルダーが見つかりません: \"/etc/passwd\" に記述されておらず、かつ環" +"境変数 $HOME の値が設定されていません" #~ msgid "Internet and Network" #~ msgstr "インターネットとネットワーク" diff -Nru gnome-menus-3.2.0.1/po/nb.po gnome-menus-3.3.5/po/nb.po --- gnome-menus-3.2.0.1/po/nb.po 2010-03-15 08:34:17.000000000 +0000 +++ gnome-menus-3.3.5/po/nb.po 2012-02-06 11:13:55.000000000 +0000 @@ -1,29 +1,30 @@ # Norwegian bokmål translation of gnome-menus. # Copyright (C) 2004, 2005 Red Hat, Inc. # This file is distributed under the same license as the gnome-menus package. -# Kjartan Maraas , 2004-2008. +# Kjartan Maraas , 2004-2012. # Terance Edward Sola , 2005. # msgid "" msgstr "" -"Project-Id-Version: gnome-menus 2.23.1\n" +"Project-Id-Version: gnome-menus 3.3.x\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-08-04 18:15+0200\n" -"PO-Revision-Date: 2009-08-04 18:15+0200\n" +"POT-Creation-Date: 2012-01-25 14:47+0100\n" +"PO-Revision-Date: 2012-01-25 14:47+0100\n" "Last-Translator: Kjartan Maraas \n" -"Language-Team: Norwegian Bokmal \n" +"Language-Team: Norwegian bokmål \n" +"Language: nb\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: ../desktop-directories/AudioVideo.directory.in.h:1 -msgid "Multimedia menu" -msgstr "Multimedia" - -#: ../desktop-directories/AudioVideo.directory.in.h:2 msgid "Sound & Video" msgstr "Lyd og bilde" +#: ../desktop-directories/AudioVideo.directory.in.h:2 +msgid "Multimedia menu" +msgstr "Multimedia" + #: ../desktop-directories/Development.directory.in.h:1 msgid "Programming" msgstr "Utvikling" @@ -60,22 +61,6 @@ msgid "Settings for several hardware devices" msgstr "Innstillinger for forskjellige maskinvareenheter" -#: ../desktop-directories/InternetAndNetwork.directory.in.h:1 -msgid "Internet and Network" -msgstr "Internett og nettverk" - -#: ../desktop-directories/InternetAndNetwork.directory.in.h:2 -msgid "Network-related settings" -msgstr "Nettverksrelaterte innstillinger" - -#: ../desktop-directories/LookAndFeel.directory.in.h:1 -msgid "Look and Feel" -msgstr "Utseende og oppførsel" - -#: ../desktop-directories/LookAndFeel.directory.in.h:2 -msgid "Settings controlling the desktop appearance and behavior" -msgstr "Innstillinger som kontrollerer utseende og oppførsel for skrivebordet" - #: ../desktop-directories/Network.directory.in.h:1 msgid "Internet" msgstr "Internett" @@ -92,32 +77,16 @@ msgid "Office Applications" msgstr "Kontorstøtteprogrammer" -#: ../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 "Personlig" -#: ../desktop-directories/Personal.directory.in.h:2 +#: ../desktop-directories/Personal.directory.in.h:3 msgid "Personal settings" msgstr "Personlige innstillinger" -#: ../desktop-directories/Settings-System.directory.in.h:1 -msgid "Administration" -msgstr "Administrasjon" - -#: ../desktop-directories/Settings-System.directory.in.h:2 -msgid "Change system-wide settings (affects all users)" -msgstr "Endre systeminnstillinger (påvirker alle brukere)" - -#: ../desktop-directories/Settings.directory.in.h:1 -msgid "Personal preferences" -msgstr "Personlige brukervalg" - -#: ../desktop-directories/Settings.directory.in.h:2 -msgid "Preferences" -msgstr "Brukervalg" - #: ../desktop-directories/System.directory.in.h:1 -#: ../desktop-directories/X-GNOME-Menu-System.directory.in.h:2 msgid "System" msgstr "System" @@ -153,18 +122,14 @@ msgid "Applications" msgstr "Programmer" -#: ../desktop-directories/X-GNOME-Menu-System.directory.in.h:1 -msgid "Personal preferences and administration settings" -msgstr "Personlige brukervalg og administrative innstillinger" - #: ../desktop-directories/X-GNOME-Other.directory.in.h:1 -msgid "Applications that did not fit in other categories" -msgstr "Programmer som ikke passer i andre kategorier" - -#: ../desktop-directories/X-GNOME-Other.directory.in.h:2 msgid "Other" msgstr "Annet" +#: ../desktop-directories/X-GNOME-Other.directory.in.h:2 +msgid "Applications that did not fit in other categories" +msgstr "Programmer som ikke passer i andre kategorier" + #: ../simple-editor/gmenu-simple-editor.desktop.in.h:1 msgid "Menu Editor" msgstr "Menyredigering" @@ -174,93 +139,36 @@ msgstr "Rediger menyer" #: ../simple-editor/gmenu-simple-editor.ui.h:2 -msgid "_Applications:" -msgstr "_Programmer" - -#: ../simple-editor/gmenu-simple-editor.ui.h:3 msgid "_Defaults" msgstr "_Forvalg" -#: ../simple-editor/gmenu-simple-editor.ui.h:4 +#: ../simple-editor/gmenu-simple-editor.ui.h:3 msgid "_Menus:" msgstr "_Menyer:" +#: ../simple-editor/gmenu-simple-editor.ui.h:4 +msgid "_Applications:" +msgstr "_Programmer" + #. Translators: %s is the version number -#: ../simple-editor/GMenuSimpleEditor/main.py:49 +#: ../simple-editor/GMenuSimpleEditor/main.py:44 #, python-format msgid "Simple Menu Editor %s" msgstr "Enkel menyredigering %s" -#: ../simple-editor/GMenuSimpleEditor/maindialog.py:94 -#: ../simple-editor/GMenuSimpleEditor/maindialog.py:121 +#: ../simple-editor/GMenuSimpleEditor/maindialog.py:97 +#: ../simple-editor/GMenuSimpleEditor/maindialog.py:124 msgid "Name" msgstr "Navn" -#: ../simple-editor/GMenuSimpleEditor/maindialog.py:113 +#: ../simple-editor/GMenuSimpleEditor/maindialog.py:116 msgid "Show" msgstr "Vis" -#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:42 +#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:44 msgid "" "Cannot find home directory: not set in /etc/passwd and no value for $HOME in " "environment" msgstr "" "Kan ikke finne hjemmekatalog: ikke satt i /etc/passwd og det finnes 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 "Overvåk endringer i menyen" - -#: ../util/test-menu-spec.c:35 -msgid "Include d entries" -msgstr "Ta med oppføringer i seksjoner" - -#: ../util/test-menu-spec.c:36 -msgid "Include NoDisplay=true entries" -msgstr "Ta med oppføringer som har NoDisplay=true" - -#: ../util/test-menu-spec.c:91 -msgid "Invalid desktop file ID" -msgstr "Ugyldig ID for menyoppføringsfil" - -#: ../util/test-menu-spec.c:92 -msgid "[Invalid Filename]" -msgstr "[Ugyldig filnavn]" - -#: ../util/test-menu-spec.c:93 -msgid " " -msgstr " " - -#: ../util/test-menu-spec.c:164 -#, c-format -msgid "" -"\n" -"\n" -"\n" -"==== Menu changed, reloading ====\n" -"\n" -"\n" -msgstr "" -"\n" -"\n" -"\n" -"==== Meny endret, laster 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's implementasjon av menyspesifikasjonen" diff -Nru gnome-menus-3.2.0.1/po/si.po gnome-menus-3.3.5/po/si.po --- gnome-menus-3.2.0.1/po/si.po 2010-02-09 12:21:04.000000000 +0000 +++ gnome-menus-3.3.5/po/si.po 2012-02-06 11:13:55.000000000 +0000 @@ -3,19 +3,21 @@ # This file is distributed under the same license as the PACKAGE package. # # Danishka Navin , 2007. +# Danishka Navin , 2012. msgid "" msgstr "" "Project-Id-Version: gnome-menus\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-05-29 03:37+0100\n" -"PO-Revision-Date: 2007-06-20 16:27+0530\n" -"Last-Translator: Danishka Navin \n" +"PO-Revision-Date: 2012-02-01 17:28+0530\n" +"Last-Translator: Danishka Navin \n" "Language-Team: Sinhala \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: si\n" #: ../desktop-directories/Accessibility.directory.in.h:1 #: ../desktop-directories/Settings-Accessibility.directory.in.h:1 @@ -32,7 +34,7 @@ #: ../desktop-directories/Accessories.directory.in.h:2 msgid "Desktop accessories" -msgstr "මූලික තිරය උපාංග" +msgstr "වැඩතල උපාංග" #: ../desktop-directories/Applications.directory.in.h:1 msgid "Applications" @@ -45,7 +47,7 @@ #: ../desktop-directories/Desktop.directory.in.h:2 #: ../desktop-directories/System.directory.in.h:1 msgid "System" -msgstr "පද්දති" +msgstr "පද්ධතිය" #: ../desktop-directories/Development.directory.in.h:1 msgid "Programming" @@ -57,7 +59,7 @@ #: ../desktop-directories/Education.directory.in.h:1 msgid "Education" -msgstr "අධ්‍යාපනිකපනික" +msgstr "අධ්‍යාපනික" #: ../desktop-directories/Games.directory.in.h:1 msgid "Games" @@ -186,7 +188,7 @@ #: ../simple-editor/gmenu-simple-editor.glade.h:2 msgid "_Applications:" -msgstr "යෙදුම්: (_A)" +msgstr "යෙදුම් (_A):" #: ../simple-editor/gmenu-simple-editor.glade.h:3 msgid "_Defaults" @@ -194,7 +196,7 @@ #: ../simple-editor/gmenu-simple-editor.glade.h:4 msgid "_Menus:" -msgstr "මෙනු: (_M)" +msgstr "මෙනු (_M):" #: ../simple-editor/GMenuSimpleEditor/maindialog.py:96 #: ../simple-editor/GMenuSimpleEditor/maindialog.py:123 @@ -269,3 +271,4 @@ msgid "- test GNOME's implementation of the Desktop Menu Specification" msgstr "- GNOME හි මූලික තිරයෙ මෙනුවෙ ග විශේෂ ක්‍රියාවෙහි යෙදවිම පරික්‍ෂාකරනය" + diff -Nru gnome-menus-3.2.0.1/po/xh.po gnome-menus-3.3.5/po/xh.po --- gnome-menus-3.2.0.1/po/xh.po 2010-02-09 12:21:04.000000000 +0000 +++ gnome-menus-3.3.5/po/xh.po 2012-02-06 11:13:55.000000000 +0000 @@ -3,39 +3,31 @@ # This file is distributed under the same license as the gnome-menus package. # Translation by Canonical Ltd with thanks to # Translation World CC in South Africa, 2005. -# +# Andiswa Mvanyashe , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: gnome-menus\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2005-04-01 13:09+0200\n" -"PO-Revision-Date: 2005-03-30 21:58+0200\n" -"Last-Translator: Canonical Ltd \n" -"Language-Team: Xhosa \n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-" +"menus&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2011-12-20 08:46+0000\n" +"PO-Revision-Date: 2012-01-15 00:42+0200\n" +"Last-Translator: Andiswa Mvanyashe \n" +"Language-Team: translate-discuss-xh@lists.sourceforge.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: xh\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Virtaal 0.7.0\n" +"X-Project-Style: gnome\n" -#: ../desktop-directories/Accessibility.directory.in.h:1 -#: ../desktop-directories/Settings-Accessibility.directory.in.h:1 -msgid "Accessibility" -msgstr "Ukufikeleleka" - -#: ../desktop-directories/Accessibility.directory.in.h:2 -msgid "Accessibility Settings" -msgstr "Imimiselo Yokufikeleleka" - -#: ../desktop-directories/Accessories.directory.in.h:1 -msgid "Accessories" -msgstr "Izinto ezongezelelwayo" - -#: ../desktop-directories/Accessories.directory.in.h:2 -msgid "Desktop accessories" -msgstr "Izinto ezongezelelwayo ze-Desktop" +#: ../desktop-directories/AudioVideo.directory.in.h:1 +msgid "Multimedia menu" +msgstr "Imenu yezixhobo eziphathekayo zokugcina ulwazi ngokuphinda-phindeneyo" -#: ../desktop-directories/Applications.directory.in.h:1 -msgid "Applications" -msgstr "Iinkqubo" +#: ../desktop-directories/AudioVideo.directory.in.h:2 +msgid "Sound & Video" +msgstr "Isandi neVidiyo" #: ../desktop-directories/Development.directory.in.h:1 msgid "Programming" @@ -45,15 +37,15 @@ msgid "Tools for software development" msgstr "Izixhobo zokuphuhlisa ubucukubhede bekhompyutha" -#: ../desktop-directories/Edutainment.directory.in.h:1 -msgid "Edutainment" -msgstr "Ukufunda ngokuzonwabisa" +#: ../desktop-directories/Education.directory.in.h:1 +msgid "Education" +msgstr "Imfundo" -#: ../desktop-directories/Games.directory.in.h:1 +#: ../desktop-directories/Game.directory.in.h:1 msgid "Games" msgstr "Imidlalo" -#: ../desktop-directories/Games.directory.in.h:2 +#: ../desktop-directories/Game.directory.in.h:2 msgid "Games and amusements" msgstr "Imidlalo nokuzihlekisa" @@ -65,63 +57,139 @@ msgid "Graphics applications" msgstr "Iinkqubo ngeemo zezibonakalisi-nkqubo" -#: ../desktop-directories/Internet.directory.in.h:1 +#: ../desktop-directories/Hardware.directory.in.h:1 +msgid "Hardware" +msgstr "Okungaphakathi eqokobheni lekhompyutha" + +#: ../desktop-directories/Hardware.directory.in.h:2 +msgid "Settings for several hardware devices" +msgstr "Izicwangciso ezininzi zokungaphakathi eqokobheni lekhompyutha" + +#: ../desktop-directories/Network.directory.in.h:1 msgid "Internet" msgstr "I-intanethi" -#: ../desktop-directories/Internet.directory.in.h:2 +#: ../desktop-directories/Network.directory.in.h:2 msgid "Programs for Internet access such as web and email" msgstr "Iinkqubo zokufikelela kwi-Intanethi ezinjenge-web ne-imeyile" -#: ../desktop-directories/Multimedia.directory.in.h:1 -msgid "Multimedia menu" -msgstr "Imenu Yezixhobo eziphathekayo zokugcina ulwazi ngokuphinda-phindeneyo" - -#: ../desktop-directories/Multimedia.directory.in.h:2 -msgid "Sound & Video" -msgstr "Isandi neVidiyo" - #: ../desktop-directories/Office.directory.in.h:1 msgid "Office" -msgstr "i-Ofisi" +msgstr "I-ofisi" #: ../desktop-directories/Office.directory.in.h:2 msgid "Office Applications" msgstr "Iinkqubo ze-Ofisi" -#: ../desktop-directories/Other.directory.in.h:1 +#. Translators: this is Personal as in "Personal settings" +#: ../desktop-directories/Personal.directory.in.h:2 +msgid "Personal" +msgstr "Ubunikazi" + +#: ../desktop-directories/Personal.directory.in.h:3 +msgid "Personal settings" +msgstr "Izicwangciso ezizezam" + +#: ../desktop-directories/System.directory.in.h:1 +msgid "System" +msgstr "Isixokelelwano" + +#: ../desktop-directories/System.directory.in.h:2 +msgid "System settings" +msgstr "Imimiselo yenkqubo" + +#: ../desktop-directories/System-Tools.directory.in.h:1 +msgid "System Tools" +msgstr "Izixhobo Zeenkqubo" + +#: ../desktop-directories/System-Tools.directory.in.h:2 +msgid "System configuration and monitoring" +msgstr "Umiselo-nkqubo lwendlela emisiweyo kunye nokuhlola" + +#: ../desktop-directories/Utility-Accessibility.directory.in.h:1 +msgid "Universal Access" +msgstr "Indawo yongeno yezwe lonke" + +#: ../desktop-directories/Utility-Accessibility.directory.in.h:2 +msgid "Universal Access Settings" +msgstr "Izicwangciso zonikezelo zelizwe lonke" + +#: ../desktop-directories/Utility.directory.in.h:1 +msgid "Accessories" +msgstr "Izinto ezongezelelwayo" + +#: ../desktop-directories/Utility.directory.in.h:2 +msgid "Desktop accessories" +msgstr "Izinto ezongezelelwayo ze-desktop" + +#: ../desktop-directories/X-GNOME-Menu-Applications.directory.in.h:1 +msgid "Applications" +msgstr "Iinkqubo" + +#: ../desktop-directories/X-GNOME-Other.directory.in.h:1 msgid "Applications that did not fit in other categories" msgstr "Iinkqubo ezingangeniyo kwezinye iindidi" -#: ../desktop-directories/Other.directory.in.h:2 +#: ../desktop-directories/X-GNOME-Other.directory.in.h:2 msgid "Other" msgstr "Ezinye" -#: ../desktop-directories/Settings-Accessibility.directory.in.h:2 -msgid "Accessibility related preferences" -msgstr "Uluhlu lwezinto ezikhethwayo olunxulumene nofikeleleko" - -#: ../desktop-directories/Settings.directory.in.h:1 -msgid "Personal preferences and settings" -msgstr "Uluhlu lwezinto ezikhethwayo zaloo mntu uthile kunye nemimiselo" - -#: ../desktop-directories/Settings.directory.in.h:2 -msgid "Preferences" -msgstr "Uluhlu lwezinto ezikhethwayo" - -#: ../desktop-directories/System-Settings.directory.in.h:1 -msgid "Administration" -msgstr "Ulawulo" +#: ../simple-editor/gmenu-simple-editor.desktop.in.h:1 +msgid "Menu Editor" +msgstr "Umhleli wemenyu" + +#: ../simple-editor/gmenu-simple-editor.ui.h:1 +msgid "Edit Menus" +msgstr "Hlela iimenyu" + +#: ../simple-editor/gmenu-simple-editor.ui.h:2 +msgid "_Applications:" +msgstr "_Iinkqubo:" + +#: ../simple-editor/gmenu-simple-editor.ui.h:3 +msgid "_Defaults" +msgstr "_Okwendalo" + +#: ../simple-editor/gmenu-simple-editor.ui.h:4 +msgid "_Menus:" +msgstr "Ii_menyu:" + +#. Translators: %s is the version number +#: ../simple-editor/GMenuSimpleEditor/main.py:44 +#, python-format +msgid "Simple Menu Editor %s" +msgstr "Umheli wemenyu olula %s" + +#: ../simple-editor/GMenuSimpleEditor/maindialog.py:97 +#: ../simple-editor/GMenuSimpleEditor/maindialog.py:124 +msgid "Name" +msgstr "Igama" + +#: ../simple-editor/GMenuSimpleEditor/maindialog.py:116 +msgid "Show" +msgstr "Bonisa" -#: ../desktop-directories/System-Settings.directory.in.h:2 -msgid "Change systemwide settings (affects all users)" +#: ../simple-editor/GMenuSimpleEditor/menufilewriter.py:44 +#, fuzzy +msgid "" +"Cannot find home directory: not set in /etc/passwd and no value for $HOME in " +"environment" msgstr "" -"Tshintsha imimiselo yenkqubo ngokubanzi (ichukumisa bonke abasebenzisi)" +"Asifumanekanga isikhombisi sasekhaya: not set in /etc/passwd and no value " +"for $HOME in environment" -#: ../desktop-directories/System-Tools.directory.in.h:1 -msgid "System Tools" -msgstr "Izixhobo Zeenkqubo" +#~ msgid "Accessibility" +#~ msgstr "Ukufikeleleka" -#: ../desktop-directories/System-Tools.directory.in.h:2 -msgid "System configuration and monitoring" -msgstr "Umiselo-nkqubo lwendlela emisiweyo kunye nokuhlola" +#~ msgid "Accessibility related preferences" +#~ msgstr "Uluhlu lwezinto ezikhethwayo olunxulumene nofikeleleko" + +#~ msgid "Preferences" +#~ msgstr "Uluhlu lwezinto ezikhethwayo" + +#~ msgid "Administration" +#~ msgstr "Ulawulo" + +#~ msgid "Change systemwide settings (affects all users)" +#~ msgstr "" +#~ "Tshintsha imimiselo yenkqubo ngokubanzi (ichukumisa bonke abasebenzisi)"