Hello community,
here is the log from the commit of package libgarcon for openSUSE:Factory
checked in at Mon Jun 20 10:31:12 CEST 2011.
--------
--- libgarcon/libgarcon.changes 2011-04-16 12:45:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/libgarcon/libgarcon.changes 2011-06-19 16:44:27.000000000 +0200
@@ -1,0 +2,9 @@
+Sun Jun 19 14:39:05 UTC 2011 - gber@opensuse.org
+
+- update to version 0.1.8
+ - removed the science toplevel category
+ - handle local desktop file loading directly
+ - bugfixes
+ - translation updates
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
garcon-0.1.7.tar.bz2
New:
----
garcon-0.1.8.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libgarcon.spec ++++++
--- /var/tmp/diff_new_pack.hyJXTX/_old 2011-06-20 09:47:27.000000000 +0200
+++ /var/tmp/diff_new_pack.hyJXTX/_new 2011-06-20 09:47:27.000000000 +0200
@@ -18,7 +18,7 @@
Name: libgarcon
-Version: 0.1.7
+Version: 0.1.8
Release: 1
License: GPLv2+
Summary: Library Implementing the freedesktop.org Desktop Menu Specification
++++++ garcon-0.1.7.tar.bz2 -> garcon-0.1.8.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/ChangeLog new/garcon-0.1.8/ChangeLog
--- old/garcon-0.1.7/ChangeLog 2011-04-16 12:01:43.000000000 +0200
+++ new/garcon-0.1.8/ChangeLog 2011-06-19 15:35:21.000000000 +0200
@@ -1,3 +1,181 @@
+commit 592d5c3390d9bc5cbd66eb5d96a878162c9e221c
+Author: Nick Schermer
+Date: Sun Jun 19 15:35:00 2011 +0200
+
+ Updates for release.
+
+commit 2e5a4a70844b7c5e03029af32b38e9bec83a4b3a
+Author: Nick Schermer
+Date: Sun Jun 19 15:30:18 2011 +0200
+
+ Remove the science toplevel category (bug #1038).
+
+commit c22e3fea9453a08d0513c8306f66442fac64bc36
+Author: Nick Schermer
+Date: Sun Jun 19 15:12:13 2011 +0200
+
+ Fix merging parent menu file (bug #7169).
+
+commit f8fddd91f726218935bb417fef8550b6f9c0bf00
+Author: Pjotr Anon
+Date: Fri Jun 17 12:11:08 2011 +0200
+
+ l10n: Updated Dutch (Flemish) (nl) translation to 100%
+
+ New status: 29 messages complete with 0 fuzzies and 0 untranslated.
+
+ Transmitted-via: Transifex (translations.xfce.org).
+
+commit 84065e78a3932dfe3ed9a62d21d9bfe9ced76d55
+Author: Nick Schermer
+Date: Sun Jun 5 20:48:03 2011 +0200
+
+ Handle local desktop file loading directly.
+
+ This is a tiny bit faster and uses less memory.
+
+commit 3d3e623ac9e8fa1e03f74143c8bcfb9f0dd752a0
+Author: Nick Schermer
+Date: Thu Jun 2 12:03:08 2011 +0200
+
+ Don't unref NULL file in GarconMenuDirectory.
+
+commit a3f79532450bb741a9551665a6dfdb4b7501d02a
+Author: Pjotr Anon
+Date: Thu May 26 17:23:27 2011 +0200
+
+ l10n: Updated Dutch (Flemish) (nl) translation to 100%
+
+ New status: 29 messages complete with 0 fuzzies and 0 untranslated.
+
+ Transmitted-via: Transifex (translations.xfce.org).
+
+commit dce9e68ca0cdfb6e23e8cb7ac4b707e867abe9b3
+Author: Pjotr Anon
+Date: Thu May 26 17:15:39 2011 +0200
+
+ l10n: Updated Dutch (Flemish) (nl) translation to 100%
+
+ New status: 29 messages complete with 0 fuzzies and 0 untranslated.
+
+ Transmitted-via: Transifex (translations.xfce.org).
+
+commit 4f1b0cb631adc16f8e4c044c45157961371083e2
+Author: Pjotr Anon
+Date: Wed May 25 11:01:32 2011 +0200
+
+ l10n: Updated Dutch (Flemish) (nl) translation to 100%
+
+ New status: 29 messages complete with 0 fuzzies and 0 untranslated.
+
+ Transmitted-via: Transifex (translations.xfce.org).
+
+commit dfdc6215d66e221baeedd77211db7fdf03ddd0cb
+Author: Pjotr Anon
+Date: Wed May 25 10:30:17 2011 +0200
+
+ l10n: Updated Dutch (Flemish) (nl) translation to 100%
+
+ New status: 29 messages complete with 0 fuzzies and 0 untranslated.
+
+ Transmitted-via: Transifex (translations.xfce.org).
+
+commit 34bb0620dd84ad50345c07b54111937e33e46156
+Author: Ričardas Vasiulis
+Date: Wed May 18 19:32:15 2011 +0200
+
+ l10n: Updated Lithuanian (lt) translation to 96%
+
+ New status: 28 messages complete with 1 fuzzy and 0 untranslated.
+
+ Transmitted-via: Transifex (translations.xfce.org).
+
+commit 51818aa7424e1292d7b5583bb758b69a83301736
+Author: Pjotr Anon
+Date: Mon May 9 18:04:49 2011 +0200
+
+ l10n: Updated Dutch (Flemish) (nl) translation to 100%
+
+ New status: 29 messages complete with 0 fuzzies and 0 untranslated.
+
+ Transmitted-via: Transifex (translations.xfce.org).
+
+commit db6235258c85166184a0306105d67619696cdce7
+Author: Pjotr Anon
+Date: Mon May 9 11:58:58 2011 +0200
+
+ l10n: Updated Dutch (Flemish) (nl) translation to 100%
+
+ New status: 29 messages complete with 0 fuzzies and 0 untranslated.
+
+ Transmitted-via: Transifex (translations.xfce.org).
+
+commit 9a5dee4721f717e45a16f43244f4a64ecfc026af
+Author: Christoph Wickert
+Date: Fri May 6 13:17:06 2011 +0200
+
+ l10n: Updated German (de) translation to 100%
+
+ New status: 29 messages complete with 0 fuzzies and 0 untranslated.
+
+ Transmitted-via: Transifex (translations.xfce.org).
+
+commit 15d6320490357ec0be6c27f3ca6f84201f2779ca
+Author: Chipong L
+Date: Fri Apr 29 12:02:33 2011 +0200
+
+ l10n: Updated Chinese (China) (zh_CN) translation to 100%
+
+ New status: 29 messages complete with 0 fuzzies and 0 untranslated.
+
+ Transmitted-via: Transifex (translations.xfce.org).
+
+commit 46daedb7cc6a70077122bbbca9c2c3428f17e25c
+Author: Mark Trompell
+Date: Wed Apr 27 12:47:36 2011 +0200
+
+ l10n: Updated German (de) translation to 100%
+
+ New status: 29 messages complete with 0 fuzzies and 0 untranslated.
+
+ Transmitted-via: Transifex (translations.xfce.org).
+
+commit e4d1ff0c827428dfcd5935b8da64deff5af74f27
+Author: Sérgio Cipolla
+Date: Mon Apr 25 22:10:40 2011 +0200
+
+ l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%
+
+ New status: 29 messages complete with 0 fuzzies and 0 untranslated.
+
+ Transmitted-via: Transifex (translations.xfce.org).
+
+commit 70cf2195e56471af3afe5ce0b85ad2f3a832313b
+Author: Sérgio Cipolla
+Date: Thu Apr 21 16:21:44 2011 +0200
+
+ l10n: Updated Portuguese (Brazilian) (pt_BR) translation to 100%
+
+ New status: 29 messages complete with 0 fuzzies and 0 untranslated.
+
+ Transmitted-via: Transifex (translations.xfce.org).
+
+commit 4cbc97a7f0efc157b78219c4a53bc6511feafb4d
+Author: Praveen Illa
+Date: Thu Apr 21 15:26:36 2011 +0200
+
+ l10n: full Telugu translation
+
+ New status: 29 messages complete with 0 fuzzies and 0 untranslated.
+
+ Transmitted-via: Transifex (translations.xfce.org).
+
+commit 01a0493069c2351266702b7ae54c75df6add3ece
+Author: Nick Schermer
+Date: Sat Apr 16 12:02:16 2011 +0200
+
+ Post release tag bump.
+
commit 5a7ef3ffc30e05fa43f054888f9b681fa220be23
Author: Nick Schermer
Date: Sat Apr 16 12:01:21 2011 +0200
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/NEWS new/garcon-0.1.8/NEWS
--- old/garcon-0.1.7/NEWS 2011-04-16 12:01:30.000000000 +0200
+++ new/garcon-0.1.8/NEWS 2011-06-19 15:35:09.000000000 +0200
@@ -1,3 +1,13 @@
+0.1.8
+=====
+- Remove the science toplevel category (bug #1038).
+- Fix merging parent menu file (bug #7169).
+- Handle local desktop file loading directly.
+- Don't unref NULL file in GarconMenuDirectory.
+- Translation updates: Telugu, Portuguese (Brazilian), Lithuanian,
+ Dutch (Flemish), Chinese (China), German (de).
+
+
0.1.7
=====
- Respect XDG priorities when returning the menu file (Bug #7470).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/aclocal.m4 new/garcon-0.1.8/aclocal.m4
--- old/garcon-0.1.7/aclocal.m4 2011-04-16 12:01:34.000000000 +0200
+++ new/garcon-0.1.8/aclocal.m4 2011-06-19 15:35:13.000000000 +0200
@@ -9196,7 +9196,8 @@
# ----------------------------------
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
@@ -9242,7 +9243,8 @@
pkg_cv_[]$1="$$1"
elif test -n "$PKG_CONFIG"; then
PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes ],
[pkg_failed=yes])
else
pkg_failed=untried
@@ -9290,9 +9292,9 @@
AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
@@ -9316,7 +9318,7 @@
_PKG_TEXT
-To get pkg-config, see http://pkg-config.freedesktop.org/.])dnl
+To get pkg-config, see http://pkg-config.freedesktop.org/.])[]dnl
])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -10898,7 +10900,7 @@
-Wno-missing-field-initializers \
-Wno-unused-parameter -Wold-style-definition \
-Wdeclaration-after-statement \
- -Wmissing-declarations -Wredundant-decls \
+ -Wmissing-declarations \
-Wmissing-noreturn -Wshadow -Wpointer-arith \
-Wcast-align -Wformat-security \
-Winit-self -Wmissing-include-dirs -Wundef \
@@ -10909,6 +10911,11 @@
xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector"
fi
+ dnl # signal.h inline is crapy on openbsd
+ if test x`uname` != x"OpenBSD"; then
+ xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls"
+ fi
+
if test x"$enable_debug" = x"full"; then
AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support])
xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror"
@@ -11014,16 +11021,18 @@
[enable_linker_opts=$enableval], [enable_linker_opts=yes])
if test "x$enable_linker_opts" != "xno"; then
- AC_MSG_CHECKING([whether $LD accepts --as-needed])
- case `$LD --as-needed -v 2>&1 &1 &1 http://bugzilla.xfce.org/.
#
@@ -573,8 +573,8 @@
# Identity of this package.
PACKAGE_NAME='garcon'
PACKAGE_TARNAME='garcon'
-PACKAGE_VERSION='0.1.7'
-PACKAGE_STRING='garcon 0.1.7'
+PACKAGE_VERSION='0.1.8'
+PACKAGE_STRING='garcon 0.1.8'
PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
PACKAGE_URL=''
@@ -1400,7 +1400,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 garcon 0.1.7 to adapt to many kinds of systems.
+\`configure' configures garcon 0.1.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1471,7 +1471,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of garcon 0.1.7:";;
+ short | recursive ) echo "Configuration of garcon 0.1.8:";;
esac
cat <<\_ACEOF
@@ -1596,7 +1596,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-garcon configure 0.1.7
+garcon configure 0.1.8
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1967,7 +1967,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by garcon $as_me 0.1.7, which was
+It was created by garcon $as_me 0.1.8, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2898,7 +2898,7 @@
# Define the identity of the package.
PACKAGE=garcon
- VERSION=0.1.7
+ VERSION=0.1.8
cat >>confdefs.h <<_ACEOF
@@ -2981,7 +2981,7 @@
GARCON_VERSION_MAJOR=0
GARCON_VERSION_MINOR=1
-GARCON_VERSION_MICRO=7
+GARCON_VERSION_MICRO=8
GARCON_VERSION_API_MAJOR=1
GARCON_VERSION_API=$GARCON_VERSION_API_MAJOR
@@ -13366,7 +13366,7 @@
- ALL_LINGUAS="ar bn ca cs da de el en_GB es eu fi fr gl he hr hu id it ja kk ku lt lv nb_NO nb nl pa pl pt_BR pt pt_PT ro ru sk sq sv tr ug uk ur zh_CN zh_TW "
+ ALL_LINGUAS="ar bn ca cs da de el en_GB es eu fi fr gl he hr hu id it ja kk ku lt lv nb_NO nb nl pa pl pt_BR pt pt_PT ro ru sk sq sv te tr ug uk ur zh_CN zh_TW "
for ac_header in locale.h
do :
@@ -14669,6 +14669,7 @@
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -15031,7 +15032,7 @@
-Wno-missing-field-initializers \
-Wno-unused-parameter -Wold-style-definition \
-Wdeclaration-after-statement \
- -Wmissing-declarations -Wredundant-decls \
+ -Wmissing-declarations \
-Wmissing-noreturn -Wshadow -Wpointer-arith \
-Wcast-align -Wformat-security \
-Winit-self -Wmissing-include-dirs -Wundef \
@@ -15042,6 +15043,10 @@
xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector"
fi
+ if test x`uname` != x"OpenBSD"; then
+ xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls"
+ fi
+
if test x"$enable_debug" = x"full"; then
$as_echo "#define DEBUG_TRACE 1" >>confdefs.h
@@ -15112,19 +15117,21 @@
if test "x$enable_linker_opts" != "xno"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts --as-needed" >&5
+ if test x`uname` != x"OpenBSD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts --as-needed" >&5
$as_echo_n "checking whether $LD accepts --as-needed... " >&6; }
- case `$LD --as-needed -v 2>&1 &5
+ case `$LD --as-needed -v 2>&1 &5
$as_echo "yes" >&6; }
- ;;
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- ;;
- esac
+ ;;
+ esac
+ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $LD accepts -O1" >&5
$as_echo_n "checking whether $LD accepts -O1... " >&6; }
case `$LD -O1 -v 2>&1 >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-garcon config.status 0.1.7
+garcon config.status 0.1.8
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/configure.in new/garcon-0.1.8/configure.in
--- old/garcon-0.1.7/configure.in 2011-04-16 12:01:31.000000000 +0200
+++ new/garcon-0.1.8/configure.in 2011-06-19 15:35:09.000000000 +0200
@@ -29,8 +29,8 @@
m4_define([garcon_version_api_major], [1])
m4_define([garcon_version_major], [0])
m4_define([garcon_version_minor], [1])
-m4_define([garcon_version_micro], [7])
-m4_define([garcon_version_build], [5a7ef3f])
+m4_define([garcon_version_micro], [8])
+m4_define([garcon_version_build], [592d5c3])
m4_define([garcon_version_tag], [])
m4_define([garcon_version], [garcon_version_major().garcon_version_minor().garcon_version_micro()ifelse(garcon_version_tag(), [git], [garcon_version_tag()-garcon_version_build()], [garcon_version_tag()])])
@@ -45,7 +45,7 @@
AC_COPYRIGHT([Copyright (c) 2007-2011 Jannis Pohlmann ])
AC_INIT([garcon], [garcon_version], [http://bugzilla.xfce.org/])
AC_PREREQ([2.50])
-AC_REVISION([5a7ef3f])
+AC_REVISION([592d5c3])
AC_CANONICAL_TARGET()
dnl ***************************
@@ -110,7 +110,7 @@
dnl ******************************
dnl *** Check for i18n support ***
dnl ******************************
-XDT_I18N([ar bn ca cs da de el en_GB es eu fi fr gl he hr hu id it ja kk ku lt lv nb_NO nb nl pa pl pt_BR pt pt_PT ro ru sk sq sv tr ug uk ur zh_CN zh_TW ])
+XDT_I18N([ar bn ca cs da de el en_GB es eu fi fr gl he hr hu id it ja kk ku lt lv nb_NO nb nl pa pl pt_BR pt pt_PT ro ru sk sq sv te tr ug uk ur zh_CN zh_TW ])
dnl ***********************************
dnl *** Check for required packages ***
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/data/xfce/Makefile.am new/garcon-0.1.8/data/xfce/Makefile.am
--- old/garcon-0.1.7/data/xfce/Makefile.am 2011-04-16 12:01:30.000000000 +0200
+++ new/garcon-0.1.8/data/xfce/Makefile.am 2011-06-19 15:35:09.000000000 +0200
@@ -32,7 +32,6 @@
xfce-network.directory.in \
xfce-office.directory.in \
xfce-other.directory.in \
- xfce-science.directory.in \
xfce-screensavers.directory.in \
xfce-settings.directory.in \
xfce-system.directory.in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/data/xfce/Makefile.in new/garcon-0.1.8/data/xfce/Makefile.in
--- old/garcon-0.1.7/data/xfce/Makefile.in 2011-04-16 12:01:36.000000000 +0200
+++ new/garcon-0.1.8/data/xfce/Makefile.in 2011-06-19 15:35:14.000000000 +0200
@@ -286,7 +286,6 @@
xfce-network.directory.in \
xfce-office.directory.in \
xfce-other.directory.in \
- xfce-science.directory.in \
xfce-screensavers.directory.in \
xfce-settings.directory.in \
xfce-system.directory.in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/data/xfce/xfce-applications.menu new/garcon-0.1.8/data/xfce/xfce-applications.menu
--- old/garcon-0.1.7/data/xfce/xfce-applications.menu 2011-04-16 12:01:30.000000000 +0200
+++ new/garcon-0.1.8/data/xfce/xfce-applications.menu 2011-06-19 15:35:09.000000000 +0200
@@ -137,14 +137,6 @@
</Menu>
<Menu>
- <Name>Science</Name>
- <Directory>xfce-science.directory</Directory>
- <Include>
- <Category>Science</Category>
- </Include>
- </Menu>
-
- <Menu>
<Name>System</Name>
<Directory>xfce-system.directory</Directory>
<Include>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/data/xfce/xfce-science.directory.in new/garcon-0.1.8/data/xfce/xfce-science.directory.in
--- old/garcon-0.1.7/data/xfce/xfce-science.directory.in 2011-04-16 12:01:30.000000000 +0200
+++ new/garcon-0.1.8/data/xfce/xfce-science.directory.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Directory
-Icon=applications-science
-_Name=Science
-_Comment=Scientific software
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/docs/reference/html/garcon-Version-Information.html new/garcon-0.1.8/docs/reference/html/garcon-Version-Information.html
--- old/garcon-0.1.7/docs/reference/html/garcon-Version-Information.html 2011-04-16 12:01:57.000000000 +0200
+++ new/garcon-0.1.8/docs/reference/html/garcon-Version-Information.html 2011-06-19 15:35:35.000000000 +0200
@@ -91,7 +91,7 @@
<hr>
<div class="refsect2">
<a name="GARCON-MICRO-VERSION:CAPS"></a><h3>GARCON_MICRO_VERSION</h3>
-<pre class="programlisting">#define GARCON_MICRO_VERSION 7
+<pre class="programlisting">#define GARCON_MICRO_VERSION 8
</pre>
<p>
The micro version number of the garcon library.
@@ -198,7 +198,7 @@
<p>
</p>
<div class="example">
-<a name="id569081"></a><p class="title"><b>Example 1. Checking the runtime version of the garcon library</b></p>
+<a name="id351208"></a><p class="title"><b>Example 1. Checking the runtime version of the garcon library</b></p>
<div class="example-contents"><pre class="programlisting">
const gchar *mismatch;
mismatch = garcon_check_version (GARCON_VERSION_MAJOR,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/docs/reference/html/index.html new/garcon-0.1.8/docs/reference/html/index.html
--- old/garcon-0.1.7/docs/reference/html/index.html 2011-04-16 12:01:57.000000000 +0200
+++ new/garcon-0.1.8/docs/reference/html/index.html 2011-06-19 15:35:35.000000000 +0200
@@ -20,7 +20,7 @@
</h3>
<div class="affiliation"><div class="address"><p><code class="email"><<a class="email" href="mailto:jannis@xfce.org">jannis@xfce.org</a>></code></p></div></div>
</div></div></div>
-<div><p class="releaseinfo">Version 0.1.7
+<div><p class="releaseinfo">Version 0.1.8
</p></div>
<div><p class="copyright">Copyright © 2006, 2007, 2008, 2009 Jannis Pohlmann</p></div>
<div><div class="legalnotice">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/docs/reference/html/pt01.html new/garcon-0.1.8/docs/reference/html/pt01.html
--- old/garcon-0.1.7/docs/reference/html/pt01.html 2011-04-16 12:01:57.000000000 +0200
+++ new/garcon-0.1.8/docs/reference/html/pt01.html 2011-06-19 15:35:35.000000000 +0200
@@ -21,7 +21,7 @@
</tr></table>
<div class="part">
<div class="titlepage"><div><div><h1 class="title">
-<a name="id563834"></a>Part I. Overview</h1></div></div></div>
+<a name="id345960"></a>Part I. Overview</h1></div></div></div>
<p>
The <span class="application">garcon</span> library depends on the following libraries:
</p>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/docs/reference/version.xml new/garcon-0.1.8/docs/reference/version.xml
--- old/garcon-0.1.7/docs/reference/version.xml 2011-04-16 12:01:43.000000000 +0200
+++ new/garcon-0.1.8/docs/reference/version.xml 2011-06-19 15:35:21.000000000 +0200
@@ -1 +1 @@
-0.1.7
+0.1.8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/garcon/garcon-config.h new/garcon-0.1.8/garcon/garcon-config.h
--- old/garcon-0.1.7/garcon/garcon-config.h 2011-04-16 12:01:43.000000000 +0200
+++ new/garcon-0.1.8/garcon/garcon-config.h 2011-06-19 15:35:21.000000000 +0200
@@ -57,7 +57,7 @@
* application compile time, rather than from the library
* linked against at application run time.
**/
-#define GARCON_MICRO_VERSION 7
+#define GARCON_MICRO_VERSION 8
/**
* GARCON_CHECK_VERSION:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/garcon/garcon-menu-directory.c new/garcon-0.1.8/garcon/garcon-menu-directory.c
--- old/garcon-0.1.7/garcon/garcon-menu-directory.c 2011-04-16 12:01:31.000000000 +0200
+++ new/garcon-0.1.8/garcon/garcon-menu-directory.c 2011-06-19 15:35:09.000000000 +0200
@@ -27,6 +27,7 @@
#include
#include
+#include
@@ -245,7 +246,8 @@
g_strfreev (directory->priv->not_show_in);
/* Free file */
- g_object_unref (directory->priv->file);
+ if (directory->priv->file != NULL)
+ g_object_unref (directory->priv->file);
(*G_OBJECT_CLASS (garcon_menu_directory_parent_class)->finalize) (object);
}
@@ -341,31 +343,18 @@
garcon_menu_directory_new (GFile *file)
{
GarconMenuDirectory *directory = NULL;
- gchar *contents;
- gsize length;
GKeyFile *rc;
gchar *name;
gchar *comment;
gchar *icon_name;
gboolean no_display;
- gboolean succeed;
g_return_val_if_fail (G_IS_FILE (file), NULL);
- /* Load the contents of the file */
- if (!g_file_load_contents (file, NULL, &contents, &length, NULL, NULL))
- return NULL;
-
/* Open the keyfile */
- rc = g_key_file_new ();
- succeed = g_key_file_load_from_data (rc, contents, length, G_KEY_FILE_NONE, NULL);
- g_free (contents);
- if (G_UNLIKELY (!succeed))
- {
- /* Cleanup and leave */
- g_key_file_free (rc);
- return NULL;
- }
+ rc = _garcon_keyfile_load (file, NULL);
+ if (G_UNLIKELY (rc == NULL))
+ return NULL;
/* Parse name, exec command and icon name */
name = g_key_file_get_locale_string (rc, G_KEY_FILE_DESKTOP_GROUP,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/garcon/garcon-menu-item.c new/garcon-0.1.8/garcon/garcon-menu-item.c
--- old/garcon-0.1.7/garcon/garcon-menu-item.c 2011-04-16 12:01:31.000000000 +0200
+++ new/garcon-0.1.8/garcon/garcon-menu-item.c 2011-06-19 15:35:09.000000000 +0200
@@ -702,9 +702,6 @@
{
GarconMenuItem *item = NULL;
GKeyFile *rc;
- gchar *contents;
- gsize length = 0;
- gboolean succeed;
GList *categories = NULL;
gboolean terminal;
gboolean no_display;
@@ -722,19 +719,10 @@
g_return_val_if_fail (G_IS_FILE (file), NULL);
- /* Load the contents of the file */
- if (!g_file_load_contents (file, NULL, &contents, &length, NULL, NULL) || length == 0)
- return NULL;
-
/* Open the keyfile */
- rc = g_key_file_new ();
- succeed = g_key_file_load_from_data (rc, contents, length, G_KEY_FILE_NONE, NULL);
- g_free (contents);
- if (G_UNLIKELY (!succeed))
- {
- g_key_file_free (rc);
- return NULL;
- }
+ rc = _garcon_keyfile_load (file, NULL);
+ if (G_UNLIKELY (rc == NULL))
+ return NULL;
/* Parse name and exec command */
name = GET_LOCALE_KEY (string, G_KEY_FILE_DESKTOP_KEY_NAME);
@@ -867,38 +855,22 @@
{
GKeyFile *rc;
gboolean boolean;
- gboolean succeed;
GList *categories = NULL;
GList *lp;
GList *old_categories = NULL;
gchar **mt;
gchar **str_list;
- gchar *contents;
gchar *string;
gchar *name;
gchar *exec;
- gsize length = 0;
g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE);
g_return_val_if_fail (G_IS_FILE (file), FALSE);
g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
- /* Load the contents of the file */
- if (!g_file_load_contents (file, NULL, &contents, &length, NULL, error))
- return FALSE;
-
- /* Leave when the file is empty */
- if (G_UNLIKELY (length == 0))
- {
- g_set_error_literal (error, 0, 0, "The desktop file is empty.");
- return FALSE;
- }
-
/* Open the keyfile */
- rc = g_key_file_new ();
- succeed = g_key_file_load_from_data (rc, contents, length, G_KEY_FILE_NONE, error);
- g_free (contents);
- if (G_UNLIKELY (!succeed))
+ rc = _garcon_keyfile_load (file, error);
+ if (G_UNLIKELY (rc == NULL))
return FALSE;
/* Check if there is a name and exec key */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/garcon/garcon-menu-merger.c new/garcon-0.1.8/garcon/garcon-menu-merger.c
--- old/garcon-0.1.7/garcon/garcon-menu-merger.c 2011-04-16 12:01:30.000000000 +0200
+++ new/garcon-0.1.8/garcon/garcon-menu-merger.c 2011-06-19 15:35:09.000000000 +0200
@@ -631,9 +631,9 @@
node->data = garcon_menu_node_create (GARCON_MENU_NODE_TYPE_MERGE_FILE,
GUINT_TO_POINTER (GARCON_MENU_MERGE_FILE_PATH));
garcon_menu_node_tree_set_merge_file_filename (node, absolute_path);
+ break;
}
g_object_unref (absolute);
- break;
}
g_object_unref (config_dir);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/garcon/garcon-private.c new/garcon-0.1.8/garcon/garcon-private.c
--- old/garcon-0.1.7/garcon/garcon-private.c 2011-04-16 12:01:31.000000000 +0200
+++ new/garcon-0.1.8/garcon/garcon-private.c 2011-06-19 15:35:09.000000000 +0200
@@ -107,3 +107,49 @@
return uri;
}
+
+
+
+
+GKeyFile *
+_garcon_keyfile_load (GFile *file,
+ GError **error)
+{
+ GKeyFile *rc;
+ gchar *path;
+ gchar *contents;
+ gsize length = 0;
+ gboolean result = FALSE;
+
+ /* Open the keyfile */
+ rc = g_key_file_new ();
+
+ /* Load the contents of the file */
+ if (G_LIKELY (g_file_is_native (file)))
+ {
+ path = g_file_get_path (file);
+ result = g_key_file_load_from_file (rc, path, G_KEY_FILE_NONE, error);
+ g_free (path);
+ }
+ else if (g_file_load_contents (file, NULL, &contents, &length, NULL, error))
+ {
+ /* Leave when the file is empty */
+ if (G_UNLIKELY (length == 0))
+ {
+ g_set_error_literal (error, 0, 0, "The desktop file is empty.");
+ g_key_file_free (rc);
+ return NULL;
+ }
+
+ result = g_key_file_load_from_data (rc, contents, length, G_KEY_FILE_NONE, error);
+ g_free (contents);
+ }
+
+ if (!result)
+ {
+ g_key_file_free (rc);
+ return NULL;
+ }
+
+ return rc;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/garcon/garcon-private.h new/garcon-0.1.8/garcon/garcon-private.h
--- old/garcon-0.1.7/garcon/garcon-private.h 2011-04-16 12:01:31.000000000 +0200
+++ new/garcon-0.1.8/garcon/garcon-private.h 2011-06-19 15:35:09.000000000 +0200
@@ -41,6 +41,9 @@
gchar *_garcon_file_get_uri_relative_to_file (const gchar *path,
GFile *file);
+GKeyFile *_garcon_keyfile_load (GFile *file,
+ GError **error);
+
G_END_DECLS
#endif /* !__GARCON_PRIVATE_H__ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/po/POTFILES.in new/garcon-0.1.8/po/POTFILES.in
--- old/garcon-0.1.7/po/POTFILES.in 2011-04-16 12:01:31.000000000 +0200
+++ new/garcon-0.1.8/po/POTFILES.in 2011-06-19 15:35:09.000000000 +0200
@@ -7,7 +7,6 @@
data/xfce/xfce-network.directory.in
data/xfce/xfce-office.directory.in
data/xfce/xfce-other.directory.in
-data/xfce/xfce-science.directory.in
data/xfce/xfce-screensavers.directory.in
data/xfce/xfce-settings.directory.in
data/xfce/xfce-system.directory.in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/po/de.po new/garcon-0.1.8/po/de.po
--- old/garcon-0.1.7/po/de.po 2011-04-16 12:01:31.000000000 +0200
+++ new/garcon-0.1.8/po/de.po 2011-06-19 15:35:09.000000000 +0200
@@ -3,19 +3,19 @@
# This file is distributed under the same license as the libxfce4menu package.
# Jannis Pohlmann , 2007, 2009.
# Enrico Tröger , 2009.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: 4.6.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-16 14:36+0100\n"
+"POT-Creation-Date: 2011-05-06 10:05+0000\n"
"PO-Revision-Date: 2009-08-15 03:30+0100\n"
"Last-Translator: Jannis Pohlmann \n"
"Language-Team: German \n"
-"Language: de\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/xfce/xfce-accessories.directory.in.h:1
@@ -36,7 +36,7 @@
#: ../data/xfce/xfce-education.directory.in.h:1
msgid "Education"
-msgstr "Education"
+msgstr "Bildung"
#: ../data/xfce/xfce-education.directory.in.h:2
msgid "Educational software"
@@ -44,7 +44,7 @@
#: ../data/xfce/xfce-games.directory.in.h:1
msgid "Games"
-msgstr "Spiel"
+msgstr "Spiele"
#: ../data/xfce/xfce-games.directory.in.h:2
msgid "Games, puzzles, and other fun software"
@@ -60,7 +60,7 @@
#: ../data/xfce/xfce-multimedia.directory.in.h:1
msgid "Audio and video players and editors"
-msgstr "Audio- und Videowidergabeprogramme bzw. Bearbeitungswerkzeuge"
+msgstr "Audio- und Videowiedergabeprogramme und Bearbeitungswerkzeuge"
#: ../data/xfce/xfce-multimedia.directory.in.h:2
msgid "Multimedia"
@@ -96,7 +96,7 @@
#: ../data/xfce/xfce-science.directory.in.h:2
msgid "Scientific software"
-msgstr "wissenschaftliche Software"
+msgstr "Wissenschaftliche Software"
#: ../data/xfce/xfce-screensavers.directory.in.h:1
msgid "Screensaver applets"
@@ -125,17 +125,17 @@
#: ../garcon/garcon-menu.c:698
#, c-format
msgid "File \"%s\" not found"
-msgstr "Datei »%s« nicht gefunden"
+msgstr "Datei »%s« wurde nicht gefunden"
#: ../garcon/garcon-menu-parser.c:278
#, c-format
msgid "Could not load menu file data from %s: %s"
-msgstr "Menüinformationen konnten nicht aus der Datei %s geladen werden: %s"
+msgstr "Menüinformationen konnten nicht aus der Datei »%s« geladen werden: %s"
#: ../garcon/garcon-menu-parser.c:284
#, c-format
msgid "Could not load menu file data from %s"
-msgstr "Menüinformationen konnten nicht aus der Datei %s geladen werden"
+msgstr "Menüinformationen konnten nicht aus der Datei »%s« geladen werden"
#~ msgid "No suitable application menu file found"
#~ msgstr "Keine passende Datei für das Anwendungsmenü gefunden"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/po/lt.po new/garcon-0.1.8/po/lt.po
--- old/garcon-0.1.7/po/lt.po 2011-04-16 12:01:31.000000000 +0200
+++ new/garcon-0.1.8/po/lt.po 2011-06-19 15:35:09.000000000 +0200
@@ -2,21 +2,20 @@
# Copyright (C) YEAR THE garcon'S COPYRIGHT HOLDER
# This file is distributed under the same license as the garcon package.
# Ričardas Vasiulis , 2010.
-#
+#
msgid ""
msgstr ""
"Project-Id-Version: garcon\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-16 14:36+0100\n"
+"POT-Creation-Date: 2011-05-18 16:05+0000\n"
"PO-Revision-Date: 2010-11-11 23:15+0300\n"
"Last-Translator: Ričardas V. \n"
"Language-Team: Lithuanian <->\n"
-"Language: lt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n"
-"%100>=20) ? 1 : 2\n"
+"Language: lt\n"
+"Plural-Forms: n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2\n"
#: ../data/xfce/xfce-accessories.directory.in.h:1
msgid "Accessories"
@@ -126,7 +125,7 @@
#: ../garcon/garcon-menu.c:698
#, c-format
msgid "File \"%s\" not found"
-msgstr ""
+msgstr "Failas „%s” nerastas"
#: ../garcon/garcon-menu-parser.c:278
#, c-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/po/nl.po new/garcon-0.1.8/po/nl.po
--- old/garcon-0.1.7/po/nl.po 2011-04-16 12:01:31.000000000 +0200
+++ new/garcon-0.1.8/po/nl.po 2011-06-19 15:35:09.000000000 +0200
@@ -1,29 +1,30 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
+# Dutch translation of the garcon package.
+# Copyright (C) The Xfce development team.
+# This file is distributed under the same license as the
+# garcon package.
+# Pjotr, 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: garcon\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-16 14:36+0100\n"
-"PO-Revision-Date: 2010-04-30 16:15+0100\n"
-"Last-Translator: Vincent Tunru \n"
-"Language-Team: Dutch \n"
-"Language: nl\n"
+"POT-Creation-Date: 2011-06-17 10:06+0000\n"
+"PO-Revision-Date: 2011-06-15 16:15+0200\n"
+"Last-Translator: Pjotr\n"
+"Language-Team: Dutch (Flemish)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Dutch\n"
+"Language: nl (Dutch)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../data/xfce/xfce-accessories.directory.in.h:1
msgid "Accessories"
-msgstr "Accessoires"
+msgstr "Hulpmiddelen"
#: ../data/xfce/xfce-accessories.directory.in.h:2
msgid "Common desktop tools and applications"
-msgstr "Algemene hulpmiddelen en toepassingen"
+msgstr "Algemene gereedschappen en toepassingen"
#: ../data/xfce/xfce-development.directory.in.h:1
msgid "Development"
@@ -31,23 +32,23 @@
#: ../data/xfce/xfce-development.directory.in.h:2
msgid "Software development tools"
-msgstr "Software-ontwikkeling"
+msgstr "Gereedschappen voor ontwikkelaars"
#: ../data/xfce/xfce-education.directory.in.h:1
msgid "Education"
-msgstr "Educatief"
+msgstr "Onderwijs"
#: ../data/xfce/xfce-education.directory.in.h:2
msgid "Educational software"
-msgstr "Educatieve software"
+msgstr "Educatieve programma's"
#: ../data/xfce/xfce-games.directory.in.h:1
msgid "Games"
-msgstr "Amusement"
+msgstr "Spelletjes"
#: ../data/xfce/xfce-games.directory.in.h:2
msgid "Games, puzzles, and other fun software"
-msgstr "Games, puzzels en ander tijdverdrijf"
+msgstr "Spelletjes, puzzels en ander prettig tijdverdrijf"
#: ../data/xfce/xfce-graphics.directory.in.h:1
msgid "Graphics"
@@ -59,7 +60,7 @@
#: ../data/xfce/xfce-multimedia.directory.in.h:1
msgid "Audio and video players and editors"
-msgstr "Audio- en videospelers en -bewerkers"
+msgstr "Geluid- en videospelers en -bewerkers"
#: ../data/xfce/xfce-multimedia.directory.in.h:2
msgid "Multimedia"
@@ -79,11 +80,11 @@
#: ../data/xfce/xfce-office.directory.in.h:2
msgid "Office and productivity applications"
-msgstr "Kantoor- en productiviteitstoepassingen"
+msgstr "Kantoor- en productiviteittoepassingen"
#: ../data/xfce/xfce-other.directory.in.h:1
msgid "Applications that don't fit into other categories"
-msgstr "Toepassingen die niet in andere categorieën thuishoren"
+msgstr "Toepassingen die niet in andere categorieën passen"
#: ../data/xfce/xfce-other.directory.in.h:2
msgid "Other"
@@ -95,11 +96,11 @@
#: ../data/xfce/xfce-science.directory.in.h:2
msgid "Scientific software"
-msgstr "Wetenschappelijke software"
+msgstr "Wetenschappelijke programma's"
#: ../data/xfce/xfce-screensavers.directory.in.h:1
msgid "Screensaver applets"
-msgstr "Schermbeveiligingsapplets"
+msgstr "Schermbeveiligingtoepassingen"
#: ../data/xfce/xfce-screensavers.directory.in.h:2
msgid "Screensavers"
@@ -107,7 +108,9 @@
#: ../data/xfce/xfce-settings.directory.in.h:1
msgid "Desktop and system settings applications"
-msgstr "Bureablad- en systeeminstellingen"
+msgstr ""
+"Toepassingen voor bureaubladgebruik en\n"
+"voor systeeminstellingen"
#: ../data/xfce/xfce-settings.directory.in.h:2
msgid "Settings"
@@ -124,14 +127,14 @@
#: ../garcon/garcon-menu.c:698
#, c-format
msgid "File \"%s\" not found"
-msgstr ""
+msgstr "Bestand \"%s\" niet gevonden"
#: ../garcon/garcon-menu-parser.c:278
#, c-format
msgid "Could not load menu file data from %s: %s"
-msgstr "Kan gegevens van menubestand niet laden uit %s: %s"
+msgstr "Kon gegevens van menubestand niet laden vanuit %s: %s"
#: ../garcon/garcon-menu-parser.c:284
#, c-format
msgid "Could not load menu file data from %s"
-msgstr "Kan gegevens van menubestand niet laden uit %s"
+msgstr "Kon gegevens van menubestand niet laden vanuit %s"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/po/pt_BR.po new/garcon-0.1.8/po/pt_BR.po
--- old/garcon-0.1.7/po/pt_BR.po 2011-04-16 12:01:31.000000000 +0200
+++ new/garcon-0.1.8/po/pt_BR.po 2011-06-19 15:35:09.000000000 +0200
@@ -3,22 +3,23 @@
# This file is distributed under the same license as the libxfce package.
# Og Maciel , 2007.
# Henrique P. Machado , 2010.
+# Sérgio Cipolla , 2011.
#
msgid ""
msgstr ""
"Project-Id-Version: libxfce 4menu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-16 14:36+0100\n"
-"PO-Revision-Date: 2010-12-06 00:44-0200\n"
-"Last-Translator: Henrique P. Machado \n"
+"POT-Creation-Date: 2011-04-25 16:05+0000\n"
+"PO-Revision-Date: 2011-04-25 17:09-0300\n"
+"Last-Translator: Sérgio Cipolla \n"
"Language-Team: Brazilian Portuguese \n"
-"Language: pt_BR\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Country: BRAZIL\n"
+"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Poedit-Language: Portuguese\n"
-"X-Poedit-Country: BRAZIL\n"
#: ../data/xfce/xfce-accessories.directory.in.h:1
msgid "Accessories"
@@ -74,7 +75,7 @@
#: ../data/xfce/xfce-network.directory.in.h:2
msgid "Network applications and utilities"
-msgstr "Aplicativos de rede e utilitários"
+msgstr "Aplicativos e utilitários de rede"
#: ../data/xfce/xfce-office.directory.in.h:1
msgid "Office"
@@ -110,7 +111,7 @@
#: ../data/xfce/xfce-settings.directory.in.h:1
msgid "Desktop and system settings applications"
-msgstr "Aplicativos de Área de trabalho e de configuração do sistema"
+msgstr "Aplicativos de configuração da área de trabalho e do sistema"
#: ../data/xfce/xfce-settings.directory.in.h:2
msgid "Settings"
@@ -122,7 +123,7 @@
#: ../data/xfce/xfce-system.directory.in.h:2
msgid "System tools and utilities"
-msgstr "Ferramentas do sistema e utilitários"
+msgstr "Ferramentas e utilitários do sistema"
#: ../garcon/garcon-menu.c:698
#, c-format
@@ -132,18 +133,18 @@
#: ../garcon/garcon-menu-parser.c:278
#, c-format
msgid "Could not load menu file data from %s: %s"
-msgstr "Não foi possível carregar dados do arquivo de menu %s: %s"
+msgstr "Não foi possível carregar dados de arquivo de menu de %s: %s"
#: ../garcon/garcon-menu-parser.c:284
#, c-format
msgid "Could not load menu file data from %s"
-msgstr "Não foi possível carregar dados do arquivo de menu de %s"
+msgstr "Não foi possível carregar dados de arquivo de menu de %s"
#~ msgid "No suitable application menu file found"
#~ msgstr "Nenhum arquivo de menu de aplicativos encontrado"
#~ msgid "XfceMenu: Display Menu Test"
-#~ msgstr "XfceMenu: Mostrar o menu de teste"
+#~ msgstr "XfceMenu: mostrar o menu de teste"
#~ msgid "_Show menu"
#~ msgstr "_Mostrar menu"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/po/te.po new/garcon-0.1.8/po/te.po
--- old/garcon-0.1.7/po/te.po 1970-01-01 01:00:00.000000000 +0100
+++ new/garcon-0.1.8/po/te.po 2011-06-19 15:35:09.000000000 +0200
@@ -0,0 +1,136 @@
+# Xfce Telugu Translation.
+# Copyright (C) 2003-2011 Xfce Development Team 2011.
+# This file is distributed under the same license as the PACKAGE package.
+# Praveen Illa , 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: garcon.master\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-04-21 10:05+0000\n"
+"PO-Revision-Date: 2011-04-21 17:57+0530\n"
+"Last-Translator: Praveen Illa \n"
+"Language-Team: Telugu \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"
+
+#: ../data/xfce/xfce-accessories.directory.in.h:1
+msgid "Accessories"
+msgstr "సహాయకాలు"
+
+#: ../data/xfce/xfce-accessories.directory.in.h:2
+msgid "Common desktop tools and applications"
+msgstr "సాధారణ డెస్క్టాప్ సాధనాలు మరియు అనువర్తనాలు"
+
+#: ../data/xfce/xfce-development.directory.in.h:1
+msgid "Development"
+msgstr "అభివృద్ధి"
+
+#: ../data/xfce/xfce-development.directory.in.h:2
+msgid "Software development tools"
+msgstr "సాఫ్ట్వేర్ అభివృద్ధి సాధనాలు"
+
+#: ../data/xfce/xfce-education.directory.in.h:1
+msgid "Education"
+msgstr "విద్య"
+
+#: ../data/xfce/xfce-education.directory.in.h:2
+msgid "Educational software"
+msgstr "విద్య సాఫ్ట్వేర్"
+
+#: ../data/xfce/xfce-games.directory.in.h:1
+msgid "Games"
+msgstr "ఆటలు"
+
+#: ../data/xfce/xfce-games.directory.in.h:2
+msgid "Games, puzzles, and other fun software"
+msgstr "ఆటలు, పజిల్స్, మరియు ఇతర సరదా సాఫ్ట్వేర్"
+
+#: ../data/xfce/xfce-graphics.directory.in.h:1
+msgid "Graphics"
+msgstr "రేఖాచిత్రాలు"
+
+#: ../data/xfce/xfce-graphics.directory.in.h:2
+msgid "Graphics creation and manipulation applications"
+msgstr "రేఖాచిత్రాలను సృష్టించుట మరియు అభిసంధాన అనువర్తనాలు"
+
+#: ../data/xfce/xfce-multimedia.directory.in.h:1
+msgid "Audio and video players and editors"
+msgstr "ఆడియో మరియు వీడియా ఆటకాలు మరియు కూర్పరులు"
+
+#: ../data/xfce/xfce-multimedia.directory.in.h:2
+msgid "Multimedia"
+msgstr "బహుళమాద్యమం"
+
+#: ../data/xfce/xfce-network.directory.in.h:1
+msgid "Network"
+msgstr "నెట్వర్క్"
+
+#: ../data/xfce/xfce-network.directory.in.h:2
+msgid "Network applications and utilities"
+msgstr "నెట్వర్క్ అనువర్తనాలు మరియు వినియోగాలు"
+
+#: ../data/xfce/xfce-office.directory.in.h:1
+msgid "Office"
+msgstr "కార్యాలయం"
+
+#: ../data/xfce/xfce-office.directory.in.h:2
+msgid "Office and productivity applications"
+msgstr "కార్యాలయ మరియు ఉత్పాదక అనువర్తనాలు"
+
+#: ../data/xfce/xfce-other.directory.in.h:1
+msgid "Applications that don't fit into other categories"
+msgstr "ఇతర విభాగాలలో సరిపోని అనువర్తనాలు"
+
+#: ../data/xfce/xfce-other.directory.in.h:2
+msgid "Other"
+msgstr "ఇతర"
+
+#: ../data/xfce/xfce-science.directory.in.h:1
+msgid "Science"
+msgstr "శాస్త్రము"
+
+#: ../data/xfce/xfce-science.directory.in.h:2
+msgid "Scientific software"
+msgstr "వైజ్ఞానిక సాఫ్ట్వేర్"
+
+#: ../data/xfce/xfce-screensavers.directory.in.h:1
+msgid "Screensaver applets"
+msgstr "తెరకాపరి ఆప్లెట్స్"
+
+#: ../data/xfce/xfce-screensavers.directory.in.h:2
+msgid "Screensavers"
+msgstr "తెరకాపరులు"
+
+#: ../data/xfce/xfce-settings.directory.in.h:1
+msgid "Desktop and system settings applications"
+msgstr "డెస్క్టాప్ మరియు వ్యవస్థ అనువర్తనాలు అమరికలు"
+
+#: ../data/xfce/xfce-settings.directory.in.h:2
+msgid "Settings"
+msgstr "అమరికలు"
+
+#: ../data/xfce/xfce-system.directory.in.h:1
+msgid "System"
+msgstr "వ్యవస్థ"
+
+#: ../data/xfce/xfce-system.directory.in.h:2
+msgid "System tools and utilities"
+msgstr "వ్యవస్థ సాధనాలు మరియు వినియోగాలు"
+
+#: ../garcon/garcon-menu.c:698
+#, c-format
+msgid "File \"%s\" not found"
+msgstr "\"%s\" ఫైల్ కనపడలేదు"
+
+#: ../garcon/garcon-menu-parser.c:278
+#, c-format
+msgid "Could not load menu file data from %s: %s"
+msgstr "%s నుండి మెనూ ఫైలును లోడుచేయుట వీలుకాదు: %s"
+
+#: ../garcon/garcon-menu-parser.c:284
+#, c-format
+msgid "Could not load menu file data from %s"
+msgstr "%s నుండి మెనూ ఫైలును లోడుచేయుట వీలుకాదు"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/garcon-0.1.7/po/zh_CN.po new/garcon-0.1.8/po/zh_CN.po
--- old/garcon-0.1.7/po/zh_CN.po 2011-04-16 12:01:31.000000000 +0200
+++ new/garcon-0.1.8/po/zh_CN.po 2011-06-19 15:35:09.000000000 +0200
@@ -8,14 +8,14 @@
msgstr ""
"Project-Id-Version: 0.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-16 14:36+0100\n"
+"POT-Creation-Date: 2011-04-28 04:05+0000\n"
"PO-Revision-Date: 2010-11-23 22:57+0800\n"
"Last-Translator: Hunt Xu \n"
"Language-Team: Simplified Chinese \n"
-"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
#: ../data/xfce/xfce-accessories.directory.in.h:1
msgid "Accessories"
@@ -23,7 +23,7 @@
#: ../data/xfce/xfce-accessories.directory.in.h:2
msgid "Common desktop tools and applications"
-msgstr "常见的桌面工具和应用程序"
+msgstr "常见桌面工具和应用程序"
#: ../data/xfce/xfce-development.directory.in.h:1
msgid "Development"
@@ -47,7 +47,7 @@
#: ../data/xfce/xfce-games.directory.in.h:2
msgid "Games, puzzles, and other fun software"
-msgstr "游戏,拼图,和其他有趣的软件"
+msgstr "游戏、拼图和其他有趣的软件"
#: ../data/xfce/xfce-graphics.directory.in.h:1
msgid "Graphics"
@@ -71,7 +71,7 @@
#: ../data/xfce/xfce-network.directory.in.h:2
msgid "Network applications and utilities"
-msgstr "网络应用程序和工具"
+msgstr "网络程序和工具"
#: ../data/xfce/xfce-office.directory.in.h:1
msgid "Office"
@@ -79,11 +79,11 @@
#: ../data/xfce/xfce-office.directory.in.h:2
msgid "Office and productivity applications"
-msgstr "办公与生产应用程序"
+msgstr "办公与生产力程序"
#: ../data/xfce/xfce-other.directory.in.h:1
msgid "Applications that don't fit into other categories"
-msgstr "未归入分类的其它应用程序"
+msgstr "未归类的其它程序"
#: ../data/xfce/xfce-other.directory.in.h:2
msgid "Other"
@@ -107,7 +107,7 @@
#: ../data/xfce/xfce-settings.directory.in.h:1
msgid "Desktop and system settings applications"
-msgstr "桌面与系统设置应用程序"
+msgstr "桌面与系统设置程序"
#: ../data/xfce/xfce-settings.directory.in.h:2
msgid "Settings"
@@ -124,20 +124,20 @@
#: ../garcon/garcon-menu.c:698
#, c-format
msgid "File \"%s\" not found"
-msgstr "文件 \"%s\" 未找到"
+msgstr "未找到 \"%s\" 文件"
#: ../garcon/garcon-menu-parser.c:278
#, c-format
msgid "Could not load menu file data from %s: %s"
-msgstr "无法从 %s 中读取菜单文件数据: %s"
+msgstr "无法从 %s 中加载菜单文件数据: %s"
#: ../garcon/garcon-menu-parser.c:284
#, c-format
msgid "Could not load menu file data from %s"
-msgstr "无法从 %s 中读取菜单文件数据"
+msgstr "无法从 %s 中加载菜单文件数据"
#~ msgid "No suitable application menu file found"
-#~ msgstr "没有找到对应的菜单文件"
+#~ msgstr "没有找到对应的程序菜单文件"
#~ msgid "XfceMenu: Display Menu Test"
#~ msgstr "Xfce 菜单:测试目录显示"
@@ -146,7 +146,7 @@
#~ msgstr "显示菜单(_S)"
#~ msgid "Failed to locate the system menu"
-#~ msgstr "找不到系统菜单"
+#~ msgstr "载人系统菜单失败"
#~ msgid "Failed to create the libxfce4menu item cache in %s."
-#~ msgstr "无法在 %s 建立 libxfce4menu 缓存区."
+#~ msgstr "无法在 %s 创建 libxfce4menu 对象缓存区."
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org