[meego-commits] 5954: Changes to MeeGo:1.0:Netbook:Update:Testing/google-gadgets
Roger WANG
roger.wang at intel.com
Fri Jul 23 02:43:27 UTC 2010
Hi,
I have made the following changes to google-gadgets in project MeeGo:1.0:Netbook:Update:Testing. Please review and accept ASAP.
Thank You,
Roger WANG
[This message was auto-generated]
---
Request #5954:
submit: home:wwang29:branches:MeeGo:1.0:Netbook:Update:Testing/google-gadgets(r3)(cleanup) -> MeeGo:1.0:Netbook:Update:Testing/google-gadgets
Message:
None
State: new 2010-07-22T14:37:12 wwang29
Comment: None
changes files:
--------------
--- google-gadgets.changes
+++ google-gadgets.changes
@@ -0,0 +1,3 @@
+* Fri Jul 23 10:30:30 CST 2010 Roger WANG <roger.wang at intel.com> 0.11.2.1286_1.11.5
+- update with the latest translation (BMC#2488)
+
spec files:
-----------
--- google-gadgets.spec
+++ google-gadgets.spec
@@ -2,7 +2,7 @@
%define releaserev 0.11.2
Name: google-gadgets
-Version: %{releaserev}.%{svnrev}_1.11
+Version: %{releaserev}.%{svnrev}_1.11.5
Release: 0.1
Summary: Google Gadgets for Linux
other changes:
--------------
++++++ ggl-0.11.2.tar.gz
--- Makefile.in
+++ Makefile.in
@@ -279,6 +279,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- aclocal.m4
+++ aclocal.m4
@@ -208,8 +208,9 @@
rm -f conf.xmltest
])
-# nls.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
+# nls.m4 serial 5 (gettext-0.18)
+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
+dnl Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -227,20 +228,21 @@
dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
-AC_PREREQ(2.50)
+AC_PREREQ([2.50])
AC_DEFUN([AM_NLS],
[
AC_MSG_CHECKING([whether NLS is requested])
dnl Default is enabled NLS
- AC_ARG_ENABLE(nls,
+ AC_ARG_ENABLE([nls],
[ --disable-nls do not use Native Language Support],
USE_NLS=$enableval, USE_NLS=yes)
- AC_MSG_RESULT($USE_NLS)
- AC_SUBST(USE_NLS)
+ AC_MSG_RESULT([$USE_NLS])
+ AC_SUBST([USE_NLS])
])
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
#
# Copyright © 2004 Scott James Remnant <scott at netsplit.com>.
#
@@ -268,7 +270,10 @@
AC_DEFUN([PKG_PROG_PKG_CONFIG],
[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+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])
+
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
fi
@@ -281,7 +286,6 @@
AC_MSG_RESULT([no])
PKG_CONFIG=""
fi
-
fi[]dnl
])# PKG_PROG_PKG_CONFIG
@@ -290,34 +294,31 @@
# Check to see whether a particular set of modules exists. Similar
# to PKG_CHECK_MODULES(), but does not set variables or print errors.
#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
# --------------------------------------------------------------
AC_DEFUN([PKG_CHECK_EXISTS],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
if test -n "$PKG_CONFIG" && \
AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_ifval([$2], [$2], [:])
+ m4_default([$2], [:])
m4_ifvaln([$3], [else
$3])dnl
fi])
-
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
- if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- else
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- fi
-else
- pkg_failed=untried
+[if test -n "$$1"; then
+ 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_failed=yes])
+ else
+ pkg_failed=untried
fi[]dnl
])# _PKG_CONFIG
@@ -359,16 +360,17 @@
See the pkg-config man page for more details.])
if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
- ifelse([$4], , [AC_MSG_ERROR(dnl
+ m4_default([$4], [AC_MSG_ERROR(
[Package requirements ($2) were not met:
$$1_PKG_ERRORS
@@ -376,25 +378,24 @@
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-_PKG_TEXT
-])],
- [AC_MSG_RESULT([no])
- $4])
+_PKG_TEXT])dnl
+ ])
elif test $pkg_failed = untried; then
- ifelse([$4], , [AC_MSG_FAILURE(dnl
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
[The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
- [$4])
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl
+ ])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
AC_MSG_RESULT([yes])
- ifelse([$3], , :, [$3])
+ $3
fi[]dnl
])# PKG_CHECK_MODULES
--- configure
+++ configure
@@ -916,6 +916,8 @@
ac_ct_CXX
CXXFLAGS
CXX
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
PKG_CONFIG
GGL_BUILD_LIBLTDL_FALSE
GGL_BUILD_LIBLTDL_TRUE
@@ -1168,6 +1170,8 @@
CPPFLAGS
CPP
PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
CXX
CXXFLAGS
CCC
@@ -1955,6 +1959,10 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
+ PKG_CONFIG_PATH
+ directories to add to pkg-config's search path
+ PKG_CONFIG_LIBDIR
+ path overriding pkg-config's built-in search path
CXX C++ compiler command
CXXFLAGS C++ compiler flags
CXXCPP C++ preprocessor
@@ -6876,13 +6884,13 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:6879: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:6887: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:6882: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:6890: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:6885: output\"" >&5)
+ (eval echo "\"\$as_me:6893: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -8087,7 +8095,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 8090 "configure"' > conftest.$ac_ext
+ echo '#line 8098 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9615,11 +9623,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:9618: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9626: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9622: \$? = $ac_status" >&5
+ echo "$as_me:9630: \$? = $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.
@@ -9954,11 +9962,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:9957: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9965: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9961: \$? = $ac_status" >&5
+ echo "$as_me:9969: \$? = $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.
@@ -10059,11 +10067,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:10062: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10070: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10066: \$? = $ac_status" >&5
+ echo "$as_me:10074: \$? = $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
@@ -10114,11 +10122,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:10117: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10125: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10121: \$? = $ac_status" >&5
+ echo "$as_me:10129: \$? = $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
@@ -12498,7 +12506,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12501 "configure"
+#line 12509 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12594,7 +12602,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 12597 "configure"
+#line 12605 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12840,6 +12848,10 @@
# Initialize pkg-config
+
+
+
+
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.
@@ -12952,7 +12964,6 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-
fi
# Checks for programs.
@@ -16155,11 +16166,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:16158: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16169: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16162: \$? = $ac_status" >&5
+ echo "$as_me:16173: \$? = $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.
@@ -16254,11 +16265,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:16257: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16268: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16261: \$? = $ac_status" >&5
+ echo "$as_me:16272: \$? = $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
@@ -16306,11 +16317,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:16309: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16320: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16313: \$? = $ac_status" >&5
+ echo "$as_me:16324: \$? = $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
@@ -18890,11 +18901,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT4" >&5
$as_echo_n "checking for QT4... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$QT4_CFLAGS"; then
- pkg_cv_QT4_CFLAGS="$QT4_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$QT4_CFLAGS"; then
+ pkg_cv_QT4_CFLAGS="$QT4_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3\""; } >&5
($PKG_CONFIG --exists --print-errors "QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3") 2>&5
ac_status=$?
@@ -18904,15 +18914,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$QT4_LIBS"; then
- pkg_cv_QT4_LIBS="$QT4_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$QT4_LIBS"; then
+ pkg_cv_QT4_LIBS="$QT4_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3\""; } >&5
($PKG_CONFIG --exists --print-errors "QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3") 2>&5
ac_status=$?
@@ -18922,14 +18930,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -18937,17 +18946,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- QT4_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3"`
+ QT4_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3" 2>&1`
else
- QT4_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3"`
+ QT4_PKG_ERRORS=`$PKG_CONFIG --print-errors "QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$QT4_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_qt4=no
+ has_qt4=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_qt4=no
else
QT4_CFLAGS=$pkg_cv_QT4_CFLAGS
@@ -18962,11 +18971,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT4NETWORK" >&5
$as_echo_n "checking for QT4NETWORK... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$QT4NETWORK_CFLAGS"; then
- pkg_cv_QT4NETWORK_CFLAGS="$QT4NETWORK_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$QT4NETWORK_CFLAGS"; then
+ pkg_cv_QT4NETWORK_CFLAGS="$QT4NETWORK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.3 QtNetwork >= 4.3\""; } >&5
($PKG_CONFIG --exists --print-errors "QtCore >= 4.3 QtNetwork >= 4.3") 2>&5
ac_status=$?
@@ -18976,15 +18984,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$QT4NETWORK_LIBS"; then
- pkg_cv_QT4NETWORK_LIBS="$QT4NETWORK_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$QT4NETWORK_LIBS"; then
+ pkg_cv_QT4NETWORK_LIBS="$QT4NETWORK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.3 QtNetwork >= 4.3\""; } >&5
($PKG_CONFIG --exists --print-errors "QtCore >= 4.3 QtNetwork >= 4.3") 2>&5
ac_status=$?
@@ -18994,14 +19000,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19009,17 +19016,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- QT4NETWORK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtCore >= 4.3 QtNetwork >= 4.3"`
+ QT4NETWORK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "QtCore >= 4.3 QtNetwork >= 4.3" 2>&1`
else
- QT4NETWORK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtCore >= 4.3 QtNetwork >= 4.3"`
+ QT4NETWORK_PKG_ERRORS=`$PKG_CONFIG --print-errors "QtCore >= 4.3 QtNetwork >= 4.3" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$QT4NETWORK_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_qtnetwork=no
+ has_qtnetwork=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_qtnetwork=no
else
QT4NETWORK_CFLAGS=$pkg_cv_QT4NETWORK_CFLAGS
@@ -19033,11 +19040,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT4WEBKIT" >&5
$as_echo_n "checking for QT4WEBKIT... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$QT4WEBKIT_CFLAGS"; then
- pkg_cv_QT4WEBKIT_CFLAGS="$QT4WEBKIT_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$QT4WEBKIT_CFLAGS"; then
+ pkg_cv_QT4WEBKIT_CFLAGS="$QT4WEBKIT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3 QtWebKit\""; } >&5
($PKG_CONFIG --exists --print-errors "QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3 QtWebKit") 2>&5
ac_status=$?
@@ -19047,15 +19053,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$QT4WEBKIT_LIBS"; then
- pkg_cv_QT4WEBKIT_LIBS="$QT4WEBKIT_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$QT4WEBKIT_LIBS"; then
+ pkg_cv_QT4WEBKIT_LIBS="$QT4WEBKIT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3 QtWebKit\""; } >&5
($PKG_CONFIG --exists --print-errors "QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3 QtWebKit") 2>&5
ac_status=$?
@@ -19065,14 +19069,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19080,17 +19085,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- QT4WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3 QtWebKit"`
+ QT4WEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3 QtWebKit" 2>&1`
else
- QT4WEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3 QtWebKit"`
+ QT4WEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "QtGui >= 4.3 QtCore >= 4.3 QtNetwork >= 4.3 QtWebKit" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$QT4WEBKIT_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_qtwebkit=no
+ has_qtwebkit=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_qtwebkit=no
else
QT4WEBKIT_CFLAGS=$pkg_cv_QT4WEBKIT_CFLAGS
@@ -19104,11 +19109,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT4SCRIPT" >&5
$as_echo_n "checking for QT4SCRIPT... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$QT4SCRIPT_CFLAGS"; then
- pkg_cv_QT4SCRIPT_CFLAGS="$QT4SCRIPT_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$QT4SCRIPT_CFLAGS"; then
+ pkg_cv_QT4SCRIPT_CFLAGS="$QT4SCRIPT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.4 QtScript >= 4.4\""; } >&5
($PKG_CONFIG --exists --print-errors "QtCore >= 4.4 QtScript >= 4.4") 2>&5
ac_status=$?
@@ -19118,15 +19122,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$QT4SCRIPT_LIBS"; then
- pkg_cv_QT4SCRIPT_LIBS="$QT4SCRIPT_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$QT4SCRIPT_LIBS"; then
+ pkg_cv_QT4SCRIPT_LIBS="$QT4SCRIPT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"QtCore >= 4.4 QtScript >= 4.4\""; } >&5
($PKG_CONFIG --exists --print-errors "QtCore >= 4.4 QtScript >= 4.4") 2>&5
ac_status=$?
@@ -19136,14 +19138,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19151,17 +19154,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- QT4SCRIPT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "QtCore >= 4.4 QtScript >= 4.4"`
+ QT4SCRIPT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "QtCore >= 4.4 QtScript >= 4.4" 2>&1`
else
- QT4SCRIPT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "QtCore >= 4.4 QtScript >= 4.4"`
+ QT4SCRIPT_PKG_ERRORS=`$PKG_CONFIG --print-errors "QtCore >= 4.4 QtScript >= 4.4" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$QT4SCRIPT_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_qtscript=no
+ has_qtscript=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_qtscript=no
else
QT4SCRIPT_CFLAGS=$pkg_cv_QT4SCRIPT_CFLAGS
@@ -19341,11 +19344,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CLUTTER" >&5
$as_echo_n "checking for CLUTTER... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$CLUTTER_CFLAGS"; then
- pkg_cv_CLUTTER_CFLAGS="$CLUTTER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$CLUTTER_CFLAGS"; then
+ pkg_cv_CLUTTER_CFLAGS="$CLUTTER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "clutter-1.0") 2>&5
ac_status=$?
@@ -19355,15 +19357,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$CLUTTER_LIBS"; then
- pkg_cv_CLUTTER_LIBS="$CLUTTER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$CLUTTER_LIBS"; then
+ pkg_cv_CLUTTER_LIBS="$CLUTTER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"clutter-1.0\""; } >&5
($PKG_CONFIG --exists --print-errors "clutter-1.0") 2>&5
ac_status=$?
@@ -19373,14 +19373,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19388,9 +19389,9 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "clutter-1.0"`
+ CLUTTER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "clutter-1.0" 2>&1`
else
- CLUTTER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "clutter-1.0"`
+ CLUTTER_PKG_ERRORS=`$PKG_CONFIG --print-errors "clutter-1.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$CLUTTER_PKG_ERRORS" >&5
@@ -19404,9 +19405,10 @@
Alternatively, you may set the environment variables CLUTTER_CFLAGS
and CLUTTER_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" "$LINENO" 5
+See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error "The pkg-config script could not be found or is too old. Make sure it
@@ -19424,7 +19426,7 @@
CLUTTER_LIBS=$pkg_cv_CLUTTER_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- :
+
fi
@@ -19437,11 +19439,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK2" >&5
$as_echo_n "checking for GTK2... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTK2_CFLAGS"; then
- pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GTK2_CFLAGS"; then
+ pkg_cv_GTK2_CFLAGS="$GTK2_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.0.0
pango >= 1.10.0
glib-2.0 >= 2.10.0
@@ -19469,15 +19470,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTK2_LIBS"; then
- pkg_cv_GTK2_LIBS="$GTK2_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GTK2_LIBS"; then
+ pkg_cv_GTK2_LIBS="$GTK2_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"cairo >= 1.0.0
pango >= 1.10.0
glib-2.0 >= 2.10.0
@@ -19505,14 +19504,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19520,29 +19520,29 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "cairo >= 1.0.0
+ GTK2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "cairo >= 1.0.0
pango >= 1.10.0
glib-2.0 >= 2.10.0
gtk+-2.0 >= 2.8.0
gdk-2.0 >= 2.8.0
gthread-2.0 >= 2.8.0
- fontconfig >= 2.0.0"`
+ fontconfig >= 2.0.0" 2>&1`
else
- GTK2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo >= 1.0.0
+ GTK2_PKG_ERRORS=`$PKG_CONFIG --print-errors "cairo >= 1.0.0
pango >= 1.10.0
glib-2.0 >= 2.10.0
gtk+-2.0 >= 2.8.0
gdk-2.0 >= 2.8.0
gthread-2.0 >= 2.8.0
- fontconfig >= 2.0.0"`
+ fontconfig >= 2.0.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTK2_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_gtk2=no
+ has_gtk2=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_gtk2=no
else
GTK2_CFLAGS=$pkg_cv_GTK2_CFLAGS
@@ -19576,11 +19576,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
$as_echo_n "checking for GSTREAMER... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GSTREAMER_CFLAGS"; then
- pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GSTREAMER_CFLAGS"; then
+ pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= 0.10.0
gstreamer-base-0.10 >= 0.10.0
gstreamer-plugins-base-0.10 >= 0.10.0\""; } >&5
@@ -19596,15 +19595,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GSTREAMER_LIBS"; then
- pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GSTREAMER_LIBS"; then
+ pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10 >= 0.10.0
gstreamer-base-0.10 >= 0.10.0
gstreamer-plugins-base-0.10 >= 0.10.0\""; } >&5
@@ -19620,14 +19617,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -19635,21 +19633,21 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gstreamer-0.10 >= 0.10.0
+ GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gstreamer-0.10 >= 0.10.0
gstreamer-base-0.10 >= 0.10.0
- gstreamer-plugins-base-0.10 >= 0.10.0"`
+ gstreamer-plugins-base-0.10 >= 0.10.0" 2>&1`
else
- GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gstreamer-0.10 >= 0.10.0
+ GSTREAMER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gstreamer-0.10 >= 0.10.0
gstreamer-base-0.10 >= 0.10.0
- gstreamer-plugins-base-0.10 >= 0.10.0"`
+ gstreamer-plugins-base-0.10 >= 0.10.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GSTREAMER_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_gstreamer=no
+ has_gstreamer=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_gstreamer=no
else
GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
@@ -20096,11 +20094,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSOUP" >&5
$as_echo_n "checking for LIBSOUP... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBSOUP_CFLAGS"; then
- pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBSOUP_CFLAGS"; then
+ pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.26.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.26.0") 2>&5
ac_status=$?
@@ -20110,15 +20107,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBSOUP_LIBS"; then
- pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBSOUP_LIBS"; then
+ pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.26.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.26.0") 2>&5
ac_status=$?
@@ -20128,14 +20123,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20143,17 +20139,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-2.4 >= 2.26.0"`
+ LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-2.4 >= 2.26.0" 2>&1`
else
- LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-2.4 >= 2.26.0"`
+ LIBSOUP_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-2.4 >= 2.26.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBSOUP_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_libsoup=no
+ has_libsoup=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_libsoup=no
else
LIBSOUP_CFLAGS=$pkg_cv_LIBSOUP_CFLAGS
@@ -20169,11 +20165,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSOUP_GNOME" >&5
$as_echo_n "checking for LIBSOUP_GNOME... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBSOUP_GNOME_CFLAGS"; then
- pkg_cv_LIBSOUP_GNOME_CFLAGS="$LIBSOUP_GNOME_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBSOUP_GNOME_CFLAGS"; then
+ pkg_cv_LIBSOUP_GNOME_CFLAGS="$LIBSOUP_GNOME_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-gnome-2.4 >= 2.26.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libsoup-gnome-2.4 >= 2.26.0") 2>&5
ac_status=$?
@@ -20183,15 +20178,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBSOUP_GNOME_LIBS"; then
- pkg_cv_LIBSOUP_GNOME_LIBS="$LIBSOUP_GNOME_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBSOUP_GNOME_LIBS"; then
+ pkg_cv_LIBSOUP_GNOME_LIBS="$LIBSOUP_GNOME_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-gnome-2.4 >= 2.26.0\""; } >&5
($PKG_CONFIG --exists --print-errors "libsoup-gnome-2.4 >= 2.26.0") 2>&5
ac_status=$?
@@ -20201,14 +20194,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20216,17 +20210,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBSOUP_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libsoup-gnome-2.4 >= 2.26.0"`
+ LIBSOUP_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libsoup-gnome-2.4 >= 2.26.0" 2>&1`
else
- LIBSOUP_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libsoup-gnome-2.4 >= 2.26.0"`
+ LIBSOUP_GNOME_PKG_ERRORS=`$PKG_CONFIG --print-errors "libsoup-gnome-2.4 >= 2.26.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBSOUP_GNOME_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_libsoup_gnome=no
+ has_libsoup_gnome=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_libsoup_gnome=no
else
LIBSOUP_GNOME_CFLAGS=$pkg_cv_LIBSOUP_GNOME_CFLAGS
@@ -20535,11 +20529,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
$as_echo_n "checking for DBUS... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$DBUS_CFLAGS"; then
- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$DBUS_CFLAGS"; then
+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0.2\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0.2") 2>&5
ac_status=$?
@@ -20549,15 +20542,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$DBUS_LIBS"; then
- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$DBUS_LIBS"; then
+ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 1.0.2\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-1 >= 1.0.2") 2>&5
ac_status=$?
@@ -20567,14 +20558,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20582,25 +20574,22 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1 >= 1.0.2"`
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 1.0.2" 2>&1`
else
- DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= 1.0.2"`
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 1.0.2" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
$as_echo_n "checking for DBUS... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$DBUS_CFLAGS"; then
- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$DBUS_CFLAGS"; then
+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.60\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.60") 2>&5
ac_status=$?
@@ -20610,15 +20599,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$DBUS_LIBS"; then
- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$DBUS_LIBS"; then
+ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.60\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.60") 2>&5
ac_status=$?
@@ -20628,14 +20615,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20643,17 +20631,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1 >= 0.60"`
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 0.60" 2>&1`
else
- DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= 0.60"`
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 0.60" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_dbus=no
+ has_dbus=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_dbus=no
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
@@ -20663,16 +20651,17 @@
has_dbus=old
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
$as_echo_n "checking for DBUS... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$DBUS_CFLAGS"; then
- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$DBUS_CFLAGS"; then
+ pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.60\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.60") 2>&5
ac_status=$?
@@ -20682,15 +20671,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$DBUS_LIBS"; then
- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$DBUS_LIBS"; then
+ pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.60\""; } >&5
($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.60") 2>&5
ac_status=$?
@@ -20700,14 +20687,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20715,17 +20703,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dbus-1 >= 0.60"`
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 0.60" 2>&1`
else
- DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= 0.60"`
+ DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 0.60" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$DBUS_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_dbus=no
+ has_dbus=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_dbus=no
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
@@ -20773,11 +20761,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for RSVG" >&5
$as_echo_n "checking for RSVG... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$RSVG_CFLAGS"; then
- pkg_cv_RSVG_CFLAGS="$RSVG_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$RSVG_CFLAGS"; then
+ pkg_cv_RSVG_CFLAGS="$RSVG_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.14.0\""; } >&5
($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.14.0") 2>&5
ac_status=$?
@@ -20787,15 +20774,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$RSVG_LIBS"; then
- pkg_cv_RSVG_LIBS="$RSVG_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$RSVG_LIBS"; then
+ pkg_cv_RSVG_LIBS="$RSVG_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"librsvg-2.0 >= 2.14.0\""; } >&5
($PKG_CONFIG --exists --print-errors "librsvg-2.0 >= 2.14.0") 2>&5
ac_status=$?
@@ -20805,14 +20790,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20820,17 +20806,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- RSVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "librsvg-2.0 >= 2.14.0"`
+ RSVG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "librsvg-2.0 >= 2.14.0" 2>&1`
else
- RSVG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "librsvg-2.0 >= 2.14.0"`
+ RSVG_PKG_ERRORS=`$PKG_CONFIG --print-errors "librsvg-2.0 >= 2.14.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$RSVG_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_librsvg=no
+ has_librsvg=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_librsvg=no
else
RSVG_CFLAGS=$pkg_cv_RSVG_CFLAGS
@@ -20851,11 +20837,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for STARTUP_NOTIFICATION" >&5
$as_echo_n "checking for STARTUP_NOTIFICATION... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$STARTUP_NOTIFICATION_CFLAGS"; then
- pkg_cv_STARTUP_NOTIFICATION_CFLAGS="$STARTUP_NOTIFICATION_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$STARTUP_NOTIFICATION_CFLAGS"; then
+ pkg_cv_STARTUP_NOTIFICATION_CFLAGS="$STARTUP_NOTIFICATION_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libstartup-notification-1.0 >= 0.8\""; } >&5
($PKG_CONFIG --exists --print-errors "libstartup-notification-1.0 >= 0.8") 2>&5
ac_status=$?
@@ -20865,15 +20850,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$STARTUP_NOTIFICATION_LIBS"; then
- pkg_cv_STARTUP_NOTIFICATION_LIBS="$STARTUP_NOTIFICATION_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$STARTUP_NOTIFICATION_LIBS"; then
+ pkg_cv_STARTUP_NOTIFICATION_LIBS="$STARTUP_NOTIFICATION_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libstartup-notification-1.0 >= 0.8\""; } >&5
($PKG_CONFIG --exists --print-errors "libstartup-notification-1.0 >= 0.8") 2>&5
ac_status=$?
@@ -20883,14 +20866,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20898,17 +20882,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libstartup-notification-1.0 >= 0.8"`
+ STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libstartup-notification-1.0 >= 0.8" 2>&1`
else
- STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libstartup-notification-1.0 >= 0.8"`
+ STARTUP_NOTIFICATION_PKG_ERRORS=`$PKG_CONFIG --print-errors "libstartup-notification-1.0 >= 0.8" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$STARTUP_NOTIFICATION_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_startup_notification=no
+ has_startup_notification=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_startup_notification=no
else
STARTUP_NOTIFICATION_CFLAGS=$pkg_cv_STARTUP_NOTIFICATION_CFLAGS
@@ -20929,11 +20913,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETWORK_MANAGER" >&5
$as_echo_n "checking for NETWORK_MANAGER... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$NETWORK_MANAGER_CFLAGS"; then
- pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$NETWORK_MANAGER_CFLAGS"; then
+ pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.7\""; } >&5
($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.7") 2>&5
ac_status=$?
@@ -20943,15 +20926,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$NETWORK_MANAGER_LIBS"; then
- pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$NETWORK_MANAGER_LIBS"; then
+ pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.7\""; } >&5
($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.7") 2>&5
ac_status=$?
@@ -20961,14 +20942,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -20976,25 +20958,22 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "NetworkManager >= 0.7"`
+ NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager >= 0.7" 2>&1`
else
- NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "NetworkManager >= 0.7"`
+ NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager >= 0.7" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NETWORK_MANAGER_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETWORK_MANAGER" >&5
$as_echo_n "checking for NETWORK_MANAGER... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$NETWORK_MANAGER_CFLAGS"; then
- pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$NETWORK_MANAGER_CFLAGS"; then
+ pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.6\""; } >&5
($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.6") 2>&5
ac_status=$?
@@ -21004,15 +20983,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$NETWORK_MANAGER_LIBS"; then
- pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$NETWORK_MANAGER_LIBS"; then
+ pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.6\""; } >&5
($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.6") 2>&5
ac_status=$?
@@ -21022,14 +20999,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21037,17 +21015,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "NetworkManager >= 0.6"`
+ NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager >= 0.6" 2>&1`
else
- NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "NetworkManager >= 0.6"`
+ NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager >= 0.6" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NETWORK_MANAGER_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_network_manager=no
+ has_network_manager=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_network_manager=no
else
NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
@@ -21057,16 +21035,17 @@
has_network_manager=old
fi
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NETWORK_MANAGER" >&5
$as_echo_n "checking for NETWORK_MANAGER... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$NETWORK_MANAGER_CFLAGS"; then
- pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$NETWORK_MANAGER_CFLAGS"; then
+ pkg_cv_NETWORK_MANAGER_CFLAGS="$NETWORK_MANAGER_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.6\""; } >&5
($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.6") 2>&5
ac_status=$?
@@ -21076,15 +21055,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$NETWORK_MANAGER_LIBS"; then
- pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$NETWORK_MANAGER_LIBS"; then
+ pkg_cv_NETWORK_MANAGER_LIBS="$NETWORK_MANAGER_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.6\""; } >&5
($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.6") 2>&5
ac_status=$?
@@ -21094,14 +21071,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21109,17 +21087,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "NetworkManager >= 0.6"`
+ NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "NetworkManager >= 0.6" 2>&1`
else
- NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "NetworkManager >= 0.6"`
+ NETWORK_MANAGER_PKG_ERRORS=`$PKG_CONFIG --print-errors "NetworkManager >= 0.6" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$NETWORK_MANAGER_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_network_manager=no
+ has_network_manager=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_network_manager=no
else
NETWORK_MANAGER_CFLAGS=$pkg_cv_NETWORK_MANAGER_CFLAGS
@@ -21155,11 +21133,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CONNMAN" >&5
$as_echo_n "checking for CONNMAN... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$CONNMAN_CFLAGS"; then
- pkg_cv_CONNMAN_CFLAGS="$CONNMAN_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$CONNMAN_CFLAGS"; then
+ pkg_cv_CONNMAN_CFLAGS="$CONNMAN_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"connman >= 0.37\""; } >&5
($PKG_CONFIG --exists --print-errors "connman >= 0.37") 2>&5
ac_status=$?
@@ -21169,15 +21146,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$CONNMAN_LIBS"; then
- pkg_cv_CONNMAN_LIBS="$CONNMAN_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$CONNMAN_LIBS"; then
+ pkg_cv_CONNMAN_LIBS="$CONNMAN_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"connman >= 0.37\""; } >&5
($PKG_CONFIG --exists --print-errors "connman >= 0.37") 2>&5
ac_status=$?
@@ -21187,14 +21162,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21202,17 +21178,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- CONNMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "connman >= 0.37"`
+ CONNMAN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "connman >= 0.37" 2>&1`
else
- CONNMAN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "connman >= 0.37"`
+ CONNMAN_PKG_ERRORS=`$PKG_CONFIG --print-errors "connman >= 0.37" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$CONNMAN_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_connman=no
+ has_connman=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_connman=no
else
CONNMAN_CFLAGS=$pkg_cv_CONNMAN_CFLAGS
@@ -21238,11 +21214,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPL" >&5
$as_echo_n "checking for MPL... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$MPL_CFLAGS"; then
- pkg_cv_MPL_CFLAGS="$MPL_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$MPL_CFLAGS"; then
+ pkg_cv_MPL_CFLAGS="$MPL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"moblin-panel >= 0.50.0\""; } >&5
($PKG_CONFIG --exists --print-errors "moblin-panel >= 0.50.0") 2>&5
ac_status=$?
@@ -21252,15 +21227,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$MPL_LIBS"; then
- pkg_cv_MPL_LIBS="$MPL_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$MPL_LIBS"; then
+ pkg_cv_MPL_LIBS="$MPL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"moblin-panel >= 0.50.0\""; } >&5
($PKG_CONFIG --exists --print-errors "moblin-panel >= 0.50.0") 2>&5
ac_status=$?
@@ -21270,14 +21243,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21285,17 +21259,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- MPL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "moblin-panel >= 0.50.0"`
+ MPL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "moblin-panel >= 0.50.0" 2>&1`
else
- MPL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "moblin-panel >= 0.50.0"`
+ MPL_PKG_ERRORS=`$PKG_CONFIG --print-errors "moblin-panel >= 0.50.0" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$MPL_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_mpl=no
+ has_mpl=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_mpl=no
else
MPL_CFLAGS=$pkg_cv_MPL_CFLAGS
@@ -21404,11 +21378,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKMOZEMBED" >&5
$as_echo_n "checking for GTKMOZEMBED... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTKMOZEMBED_CFLAGS"; then
- pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GTKMOZEMBED_CFLAGS"; then
+ pkg_cv_GTKMOZEMBED_CFLAGS="$GTKMOZEMBED_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtkmozembed\""; } >&5
($PKG_CONFIG --exists --print-errors "$gtkmozembed") 2>&5
ac_status=$?
@@ -21418,15 +21391,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTKMOZEMBED_LIBS"; then
- pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GTKMOZEMBED_LIBS"; then
+ pkg_cv_GTKMOZEMBED_LIBS="$GTKMOZEMBED_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtkmozembed\""; } >&5
($PKG_CONFIG --exists --print-errors "$gtkmozembed") 2>&5
ac_status=$?
@@ -21436,14 +21407,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21451,17 +21423,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$gtkmozembed"`
+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$gtkmozembed" 2>&1`
else
- GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$gtkmozembed"`
+ GTKMOZEMBED_PKG_ERRORS=`$PKG_CONFIG --print-errors "$gtkmozembed" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTKMOZEMBED_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_gtkmozembed=no
+ has_gtkmozembed=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_gtkmozembed=no
else
GTKMOZEMBED_CFLAGS=$pkg_cv_GTKMOZEMBED_CFLAGS
@@ -21511,11 +21483,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBMOZJS" >&5
$as_echo_n "checking for LIBMOZJS... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBMOZJS_CFLAGS"; then
- pkg_cv_LIBMOZJS_CFLAGS="$LIBMOZJS_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBMOZJS_CFLAGS"; then
+ pkg_cv_LIBMOZJS_CFLAGS="$LIBMOZJS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$libmozjs\""; } >&5
($PKG_CONFIG --exists --print-errors "$libmozjs") 2>&5
ac_status=$?
@@ -21525,15 +21496,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$LIBMOZJS_LIBS"; then
- pkg_cv_LIBMOZJS_LIBS="$LIBMOZJS_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$LIBMOZJS_LIBS"; then
+ pkg_cv_LIBMOZJS_LIBS="$LIBMOZJS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$libmozjs\""; } >&5
($PKG_CONFIG --exists --print-errors "$libmozjs") 2>&5
ac_status=$?
@@ -21543,14 +21512,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21558,17 +21528,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBMOZJS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$libmozjs"`
+ LIBMOZJS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$libmozjs" 2>&1`
else
- LIBMOZJS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$libmozjs"`
+ LIBMOZJS_PKG_ERRORS=`$PKG_CONFIG --print-errors "$libmozjs" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$LIBMOZJS_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_libmozjs=no
+ has_libmozjs=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_libmozjs=no
else
LIBMOZJS_CFLAGS=$pkg_cv_LIBMOZJS_CFLAGS
@@ -21869,11 +21839,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAVA_SCRIPT_CORE" >&5
$as_echo_n "checking for JAVA_SCRIPT_CORE... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$JAVA_SCRIPT_CORE_CFLAGS"; then
- pkg_cv_JAVA_SCRIPT_CORE_CFLAGS="$JAVA_SCRIPT_CORE_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$JAVA_SCRIPT_CORE_CFLAGS"; then
+ pkg_cv_JAVA_SCRIPT_CORE_CFLAGS="$JAVA_SCRIPT_CORE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit-1.0 >= 1.0.3\""; } >&5
($PKG_CONFIG --exists --print-errors "webkit-1.0 >= 1.0.3") 2>&5
ac_status=$?
@@ -21883,15 +21852,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$JAVA_SCRIPT_CORE_LIBS"; then
- pkg_cv_JAVA_SCRIPT_CORE_LIBS="$JAVA_SCRIPT_CORE_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$JAVA_SCRIPT_CORE_LIBS"; then
+ pkg_cv_JAVA_SCRIPT_CORE_LIBS="$JAVA_SCRIPT_CORE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit-1.0 >= 1.0.3\""; } >&5
($PKG_CONFIG --exists --print-errors "webkit-1.0 >= 1.0.3") 2>&5
ac_status=$?
@@ -21901,14 +21868,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -21916,17 +21884,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- JAVA_SCRIPT_CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "webkit-1.0 >= 1.0.3"`
+ JAVA_SCRIPT_CORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "webkit-1.0 >= 1.0.3" 2>&1`
else
- JAVA_SCRIPT_CORE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit-1.0 >= 1.0.3"`
+ JAVA_SCRIPT_CORE_PKG_ERRORS=`$PKG_CONFIG --print-errors "webkit-1.0 >= 1.0.3" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$JAVA_SCRIPT_CORE_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_javascriptcore=no
+ has_javascriptcore=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_javascriptcore=no
else
JAVA_SCRIPT_CORE_CFLAGS=$pkg_cv_JAVA_SCRIPT_CORE_CFLAGS
@@ -22015,11 +21983,10 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKWEBKIT" >&5
$as_echo_n "checking for GTKWEBKIT... " >&6; }
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTKWEBKIT_CFLAGS"; then
- pkg_cv_GTKWEBKIT_CFLAGS="$GTKWEBKIT_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GTKWEBKIT_CFLAGS"; then
+ pkg_cv_GTKWEBKIT_CFLAGS="$GTKWEBKIT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit-1.0 >= 1.0.3\""; } >&5
($PKG_CONFIG --exists --print-errors "webkit-1.0 >= 1.0.3") 2>&5
ac_status=$?
@@ -22029,15 +21996,13 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GTKWEBKIT_LIBS"; then
- pkg_cv_GTKWEBKIT_LIBS="$GTKWEBKIT_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
+if test -n "$GTKWEBKIT_LIBS"; then
+ pkg_cv_GTKWEBKIT_LIBS="$GTKWEBKIT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"webkit-1.0 >= 1.0.3\""; } >&5
($PKG_CONFIG --exists --print-errors "webkit-1.0 >= 1.0.3") 2>&5
ac_status=$?
@@ -22047,14 +22012,15 @@
else
pkg_failed=yes
fi
- fi
-else
- pkg_failed=untried
+ else
+ pkg_failed=untried
fi
if test $pkg_failed = yes; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
_pkg_short_errors_supported=yes
@@ -22062,17 +22028,17 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GTKWEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "webkit-1.0 >= 1.0.3"`
+ GTKWEBKIT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "webkit-1.0 >= 1.0.3" 2>&1`
else
- GTKWEBKIT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "webkit-1.0 >= 1.0.3"`
+ GTKWEBKIT_PKG_ERRORS=`$PKG_CONFIG --print-errors "webkit-1.0 >= 1.0.3" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
echo "$GTKWEBKIT_PKG_ERRORS" >&5
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- has_gtkwebkit=no
+ has_gtkwebkit=no
elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
has_gtkwebkit=no
else
GTKWEBKIT_CFLAGS=$pkg_cv_GTKWEBKIT_CFLAGS
--- extensions/Makefile.in
+++ extensions/Makefile.in
@@ -260,6 +260,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/analytics_usage_collector/Makefile.in
+++ extensions/analytics_usage_collector/Makefile.in
@@ -271,6 +271,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/clutter_edit_element/Makefile.in
+++ extensions/clutter_edit_element/Makefile.in
@@ -274,6 +274,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/curl_xml_http_request/Makefile.in
+++ extensions/curl_xml_http_request/Makefile.in
@@ -274,6 +274,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/dbus_script_class/Makefile.in
+++ extensions/dbus_script_class/Makefile.in
@@ -279,6 +279,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/default_framework/Makefile.in
+++ extensions/default_framework/Makefile.in
@@ -268,6 +268,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/default_options/Makefile.in
+++ extensions/default_options/Makefile.in
@@ -305,6 +305,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/default_options/tests/Makefile.in
+++ extensions/default_options/tests/Makefile.in
@@ -246,6 +246,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/google_gadget_manager/Makefile.in
+++ extensions/google_gadget_manager/Makefile.in
@@ -312,6 +312,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/google_gadget_manager/tests/Makefile.in
+++ extensions/google_gadget_manager/tests/Makefile.in
@@ -259,6 +259,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/gst_audio_framework/Makefile.in
+++ extensions/gst_audio_framework/Makefile.in
@@ -272,6 +272,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/gst_video_element/Makefile.in
+++ extensions/gst_video_element/Makefile.in
@@ -280,6 +280,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/gtk_edit_element/Makefile.in
+++ extensions/gtk_edit_element/Makefile.in
@@ -279,6 +279,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/gtk_flash_element/Makefile.in
+++ extensions/gtk_flash_element/Makefile.in
@@ -271,6 +271,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/gtk_system_framework/Makefile.in
+++ extensions/gtk_system_framework/Makefile.in
@@ -272,6 +272,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/gtkmoz_browser_element/Makefile.in
+++ extensions/gtkmoz_browser_element/Makefile.in
@@ -299,6 +299,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/gtkwebkit_browser_element/Makefile.in
+++ extensions/gtkwebkit_browser_element/Makefile.in
@@ -280,6 +280,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/html_flash_element/Makefile.in
+++ extensions/html_flash_element/Makefile.in
@@ -270,6 +270,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/libxml2_xml_parser/Makefile.in
+++ extensions/libxml2_xml_parser/Makefile.in
@@ -272,6 +272,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/linux_system_framework/Makefile.in
+++ extensions/linux_system_framework/Makefile.in
@@ -373,6 +373,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/linux_system_framework/tests/Makefile.in
+++ extensions/linux_system_framework/tests/Makefile.in
@@ -344,6 +344,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/qt_edit_element/Makefile.in
+++ extensions/qt_edit_element/Makefile.in
@@ -277,6 +277,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/qt_script_runtime/Makefile.in
+++ extensions/qt_script_runtime/Makefile.in
@@ -338,6 +338,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/qt_script_runtime/tests/Makefile.in
+++ extensions/qt_script_runtime/tests/Makefile.in
@@ -281,6 +281,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/qt_system_framework/Makefile.in
+++ extensions/qt_system_framework/Makefile.in
@@ -273,6 +273,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/qt_xml_http_request/Makefile.in
+++ extensions/qt_xml_http_request/Makefile.in
@@ -281,6 +281,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/qtwebkit_browser_element/Makefile.in
+++ extensions/qtwebkit_browser_element/Makefile.in
@@ -278,6 +278,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/smjs_script_runtime/Makefile.in
+++ extensions/smjs_script_runtime/Makefile.in
@@ -338,6 +338,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/smjs_script_runtime/tests/Makefile.in
+++ extensions/smjs_script_runtime/tests/Makefile.in
@@ -305,6 +305,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/soup_xml_http_request/Makefile.in
+++ extensions/soup_xml_http_request/Makefile.in
@@ -312,6 +312,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/soup_xml_http_request/tests/Makefile.in
+++ extensions/soup_xml_http_request/tests/Makefile.in
@@ -251,6 +251,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/webkit_script_runtime/Makefile.in
+++ extensions/webkit_script_runtime/Makefile.in
@@ -339,6 +339,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- extensions/webkit_script_runtime/tests/Makefile.in
+++ extensions/webkit_script_runtime/tests/Makefile.in
@@ -322,6 +322,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- gadgets/Makefile.in
+++ gadgets/Makefile.in
@@ -261,6 +261,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- gadgets/analog_clock/Makefile.in
+++ gadgets/analog_clock/Makefile.in
@@ -245,6 +245,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- gadgets/designer/Makefile.in
+++ gadgets/designer/Makefile.in
@@ -310,6 +310,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- gadgets/designer/blank_gadget/Makefile.in
+++ gadgets/designer/blank_gadget/Makefile.in
@@ -245,6 +245,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- gadgets/designer/gadget/Makefile.in
+++ gadgets/designer/gadget/Makefile.in
@@ -245,6 +245,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- gadgets/digital_alarm_clock/Makefile.in
+++ gadgets/digital_alarm_clock/Makefile.in
@@ -246,6 +246,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- gadgets/gadget_browser/Makefile.in
+++ gadgets/gadget_browser/Makefile.in
@@ -245,6 +245,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- gadgets/gadget_control/Makefile.am
+++ gadgets/gadget_control/Makefile.am
@@ -22,6 +22,7 @@
es/strings.xml \
fi/strings.xml \
fr/strings.xml \
+ gl/strings.xml \
id/strings.xml \
it/strings.xml \
ja/strings.xml \
--- gadgets/gadget_control/Makefile.in
+++ gadgets/gadget_control/Makefile.in
@@ -245,6 +245,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
@@ -347,6 +349,7 @@
es/strings.xml \
fi/strings.xml \
fr/strings.xml \
+ gl/strings.xml \
id/strings.xml \
it/strings.xml \
ja/strings.xml \
--- gadgets/gadget_control/fi/strings.xml
+++ gadgets/gadget_control/fi/strings.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<strings><GADGET_NAME>Pienoisohjelmien säätö</GADGET_NAME><GADGET_DESCRIPTION>Pienoisohjelmien säätö</GADGET_DESCRIPTION><GADGET_ABOUT_TEXT>Pienoisohjelmien säätö</GADGET_ABOUT_TEXT><SHOW_ONLY_LABEL>Näytä ainoastaan:</SHOW_ONLY_LABEL><PAGE_LABEL>{{SIVU}} / {{YHTEENSÄ}}</PAGE_LABEL><ADD_BUTTON_LABEL>Lisää</ADD_BUTTON_LABEL><STATUS_ADDING>Lisätään...</STATUS_ADDING><STATUS_ADDED>Lisätty</STATUS_ADDED><STATUS_ERROR_ADDING>Virhe</STATUS_ERROR_ADDING><STATUS_OFFLINE>Offline</STATUS_OFFLINE><UPDATE_BUTTON_LABEL>Päivitä</UPDATE_BUTTON_LABEL><STATUS_UPDATING>Päivittää...</STATUS_UPDATING><STATUS_UPDATED>Päivitetty</STATUS_UPDATED><STATUS_ERROR_UPDATING>Virhe</STATUS_ERROR_UPDATING><SEARCH_GADGETS>Hakee pienoisohjelmia</SEARCH_GADGETS><CONFIRM_EXIT>Haluatko valita Pienoisohjelmat-vyöhykkeen? Tämä poistaa kaikki asennetut pienoisohjelmat.</CONFIRM_EXIT><WELCOME_TO_GADGETS>Tervetuloa pienoisohjelmiin, ne ovat pieniä, hauskoja palasia tietokonettasi varten, Mitä haluat tehdä?</WELCOME_TO_GADGETS><WELCOME_ADD_GADGET>Lisää uusi pienoisohjelma</WELCOME_ADD_GADGET><WELCOME_CHECK_UPDATES>Tarkista päivitykset</WELCOME_CHECK_UPDATES><WELCOME_NO_UPDATES>Sorry, pienoisohjelmille ei ole päivityksiä. Voit:</WELCOME_NO_UPDATES><PLUGIN_DATA_BULLET>» </PLUGIN_DATA_BULLET><PLUGIN_DATA_SEPARATOR> / </PLUGIN_DATA_SEPARATOR><PLUGIN_VERSION>Versio</PLUGIN_VERSION><PLUGIN_KILOBYTES> KB</PLUGIN_KILOBYTES><LANGUAGE_ALL>Kaikki kielet</LANGUAGE_ALL><LANGUAGE_BG>Bulgaria</LANGUAGE_BG><LANGUAGE_CA>Katalania</LANGUAGE_CA><LANGUAGE_CS>Tsekki</LANGUAGE_CS><LANGUAGE_DA>Tanska</LANGUAGE_DA><LANGUAGE_DE>Saksa</LANGUAGE_DE><LANGUAGE_EL>Kreikka</LANGUAGE_EL><LANGUAGE_EN>Englanti (US)</LANGUAGE_EN><LANGUAGE_EN_GB>Englanti (UK)</LANGUAGE_EN_GB><LANGUAGE_ES>Espanja</LANGUAGE_ES><LANGUAGE_FI>Suomi</LANGUAGE_FI><LANGUAGE_FR>Ranska</LANGUAGE_FR><LANGUAGE_HI>Hindi</LANGUAGE_HI><LANGUAGE_HR>Kroatia</LANGUAGE_HR><LANGUAGE_HU>Unkari</LANGUAGE_HU><LANGUAGE_ID>Indonesia</LANGUAGE_ID><LANGUAGE_IT>Italia</LANGUAGE_IT><LANGUAGE_JA>Japani</LANGUAGE_JA><LANGUAGE_KO>Korea</LANGUAGE_KO><LANGUAGE_NL>Hollanti</LANGUAGE_NL><LANGUAGE_NO>Norja</LANGUAGE_NO><LANGUAGE_PL>Puola</LANGUAGE_PL><LANGUAGE_PT_BR>Portugali (Brasilia)</LANGUAGE_PT_BR><LANGUAGE_PT_PT>Portugali (Portugali)</LANGUAGE_PT_PT><LANGUAGE_RO>Romania</LANGUAGE_RO><LANGUAGE_RU>Venäjä</LANGUAGE_RU><LANGUAGE_SK>Slovakia</LANGUAGE_SK><LANGUAGE_SL>Slovenia</LANGUAGE_SL><LANGUAGE_SV>Ruotsi</LANGUAGE_SV><LANGUAGE_TH>Thai</LANGUAGE_TH><LANGUAGE_TR>Turkki</LANGUAGE_TR><LANGUAGE_ZH_CN>Kiina (yksinkertaistettu)</LANGUAGE_ZH_CN><LANGUAGE_ZH_TW>Kiina (perinteinen)</LANGUAGE_ZH_TW><CATEGORY_ALL>Kaikki</CATEGORY_ALL><CATEGORY_NEW>Uusi</CATEGORY_NEW><CATEGORY_RECOMMENDATIONS>Suositukset</CATEGORY_RECOMMENDATIONS><CATEGORY_GOOGLE>Googlen luoma</CATEGORY_GOOGLE><CATEGORY_RECENTLY_USED>Äskettäin käytetty</CATEGORY_RECENTLY_USED><CATEGORY_UPDATES>Päivitykset</CATEGORY_UPDATES><CATEGORY_NEWS>Uutiset</CATEGORY_NEWS><CATEGORY_SPORTS>Urheilu</CATEGORY_SPORTS><CATEGORY_LIFESTYLE>Lifestyle</CATEGORY_LIFESTYLE><CATEGORY_FINANCE>Rahoitus</CATEGORY_FINANCE><CATEGORY_TOOLS>Työkalut</CATEGORY_TOOLS><CATEGORY_FUN_GAMES>Hauskanpito ja pelit</CATEGORY_FUN_GAMES><CATEGORY_TECHNOLOGY>Teknologia</CATEGORY_TECHNOLOGY><CATEGORY_COMMUNICATION>Viestintä</CATEGORY_COMMUNICATION><CATEGORY_HOLIDAY>Lomat</CATEGORY_HOLIDAY></strings>
+<strings><GADGET_NAME>Pienoisohjelmien säätö</GADGET_NAME><GADGET_DESCRIPTION>Pienoisohjelmien säätö</GADGET_DESCRIPTION><GADGET_ABOUT_TEXT>Pienoisohjelmien säätö</GADGET_ABOUT_TEXT><SHOW_ONLY_LABEL>Näytä ainoastaan:</SHOW_ONLY_LABEL><PAGE_LABEL>{{PAGE}} / {{TOTAL}}</PAGE_LABEL><ADD_BUTTON_LABEL>Lisää</ADD_BUTTON_LABEL><STATUS_ADDING>Lisätään...</STATUS_ADDING><STATUS_ADDED>Lisätty</STATUS_ADDED><STATUS_ERROR_ADDING>Virhe</STATUS_ERROR_ADDING><STATUS_OFFLINE>Offline</STATUS_OFFLINE><UPDATE_BUTTON_LABEL>Päivitä</UPDATE_BUTTON_LABEL><STATUS_UPDATING>Päivittää...</STATUS_UPDATING><STATUS_UPDATED>Päivitetty</STATUS_UPDATED><STATUS_ERROR_UPDATING>Virhe</STATUS_ERROR_UPDATING><SEARCH_GADGETS>Hakee pienoisohjelmia</SEARCH_GADGETS><CONFIRM_EXIT>Haluatko valita Pienoisohjelmat-vyöhykkeen? Tämä poistaa kaikki asennetut pienoisohjelmat.</CONFIRM_EXIT><WELCOME_TO_GADGETS>Tervetuloa pienoisohjelmiin, ne ovat pieniä, hauskoja palasia tietokonettasi varten, Mitä haluat tehdä?</WELCOME_TO_GADGETS><WELCOME_ADD_GADGET>Lisää uusi pienoisohjelma</WELCOME_ADD_GADGET><WELCOME_CHECK_UPDATES>Tarkista päivitykset</WELCOME_CHECK_UPDATES><WELCOME_NO_UPDATES>Sori, pienoisohjelmille ei ole päivityksiä. Voit:</WELCOME_NO_UPDATES><PLUGIN_DATA_BULLET>» </PLUGIN_DATA_BULLET><PLUGIN_DATA_SEPARATOR> / </PLUGIN_DATA_SEPARATOR><PLUGIN_VERSION>Versio</PLUGIN_VERSION><PLUGIN_KILOBYTES> KB</PLUGIN_KILOBYTES><LANGUAGE_ALL>Kaikki kielet</LANGUAGE_ALL><LANGUAGE_BG>Bulgaria</LANGUAGE_BG><LANGUAGE_CA>Katalania</LANGUAGE_CA><LANGUAGE_CS>Tsekki</LANGUAGE_CS><LANGUAGE_DA>Tanska</LANGUAGE_DA><LANGUAGE_DE>Saksa</LANGUAGE_DE><LANGUAGE_EL>Kreikka</LANGUAGE_EL><LANGUAGE_EN>Englanti (US)</LANGUAGE_EN><LANGUAGE_EN_GB>Englanti (UK)</LANGUAGE_EN_GB><LANGUAGE_ES>Espanja</LANGUAGE_ES><LANGUAGE_FI>Suomi</LANGUAGE_FI><LANGUAGE_FR>Ranska</LANGUAGE_FR><LANGUAGE_HI>Hindi</LANGUAGE_HI><LANGUAGE_HR>Kroatia</LANGUAGE_HR><LANGUAGE_HU>Unkari</LANGUAGE_HU><LANGUAGE_ID>Indonesia</LANGUAGE_ID><LANGUAGE_IT>Italia</LANGUAGE_IT><LANGUAGE_JA>Japani</LANGUAGE_JA><LANGUAGE_KO>Korea</LANGUAGE_KO><LANGUAGE_NL>Hollanti</LANGUAGE_NL><LANGUAGE_NO>Norja</LANGUAGE_NO><LANGUAGE_PL>Puola</LANGUAGE_PL><LANGUAGE_PT_BR>Portugali (Brasilia)</LANGUAGE_PT_BR><LANGUAGE_PT_PT>Portugali (Portugali)</LANGUAGE_PT_PT><LANGUAGE_RO>Romania</LANGUAGE_RO><LANGUAGE_RU>Venäjä</LANGUAGE_RU><LANGUAGE_SK>Slovakia</LANGUAGE_SK><LANGUAGE_SL>Slovenia</LANGUAGE_SL><LANGUAGE_SV>Ruotsi</LANGUAGE_SV><LANGUAGE_TH>Thai</LANGUAGE_TH><LANGUAGE_TR>Turkki</LANGUAGE_TR><LANGUAGE_ZH_CN>Kiina (yksinkertaistettu)</LANGUAGE_ZH_CN><LANGUAGE_ZH_TW>Kiina (perinteinen)</LANGUAGE_ZH_TW><CATEGORY_ALL>Kaikki</CATEGORY_ALL><CATEGORY_NEW>Uusi</CATEGORY_NEW><CATEGORY_RECOMMENDATIONS>Suositukset</CATEGORY_RECOMMENDATIONS><CATEGORY_GOOGLE>Googlen luoma</CATEGORY_GOOGLE><CATEGORY_RECENTLY_USED>Äskettäin käytetty</CATEGORY_RECENTLY_USED><CATEGORY_UPDATES>Päivitykset</CATEGORY_UPDATES><CATEGORY_NEWS>Uutiset</CATEGORY_NEWS><CATEGORY_SPORTS>Urheilu</CATEGORY_SPORTS><CATEGORY_LIFESTYLE>Lifestyle</CATEGORY_LIFESTYLE><CATEGORY_FINANCE>Rahoitus</CATEGORY_FINANCE><CATEGORY_TOOLS>Työkalut</CATEGORY_TOOLS><CATEGORY_FUN_GAMES>Hauskanpito ja pelit</CATEGORY_FUN_GAMES><CATEGORY_TECHNOLOGY>Teknologia</CATEGORY_TECHNOLOGY><CATEGORY_COMMUNICATION>Viestintä</CATEGORY_COMMUNICATION><CATEGORY_HOLIDAY>Lomat</CATEGORY_HOLIDAY></strings>
--- gadgets/gadget_control/gl
+++ gadgets/gadget_control/gl
+(directory)
--- gadgets/gadget_control/gl/strings.xml
+++ gadgets/gadget_control/gl/strings.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<strings><GADGET_NAME>Control de trebellos</GADGET_NAME><GADGET_DESCRIPTION>Control de trebellos</GADGET_DESCRIPTION><GADGET_ABOUT_TEXT>Control de trebellos</GADGET_ABOUT_TEXT><SHOW_ONLY_LABEL>Mostrar só:</SHOW_ONLY_LABEL><PAGE_LABEL>{{PAGE}} de {{TOTAL}}</PAGE_LABEL><ADD_BUTTON_LABEL>Engadir</ADD_BUTTON_LABEL><STATUS_ADDING>A engadir...</STATUS_ADDING><STATUS_ADDED>Engadido</STATUS_ADDED><STATUS_ERROR_ADDING>Erro</STATUS_ERROR_ADDING><STATUS_OFFLINE>Desconectado</STATUS_OFFLINE><UPDATE_BUTTON_LABEL>Actualizar</UPDATE_BUTTON_LABEL><STATUS_UPDATING>A actualizar...</STATUS_UPDATING><STATUS_UPDATED>Actualizado</STATUS_UPDATED><STATUS_ERROR_UPDATING>Erro</STATUS_ERROR_UPDATING><SEARCH_GADGETS>Procurar trebellos</SEARCH_GADGETS><CONFIRM_EXIT>Desexa fechar a Zona de Trebellos? Isto elimina todos os trebellos instalados.</CONFIRM_EXIT><WELCOME_TO_GADGETS>Benvida/o a Trebellos. Son cousiñas divertidas para o computador. Que desexa facer?</WELCOME_TO_GADGETS><WELCOME_ADD_GADGET>Engadir un trebello novo</WELCOME_ADD_GADGET><WELCOME_CHECK_UPDATES>Buscar actualizacións</WELCOME_CHECK_UPDATES><WELCOME_NO_UPDATES>Desculpe; non se dispón de ningún trebello actualizado. Pode:</WELCOME_NO_UPDATES><PLUGIN_DATA_BULLET>» </PLUGIN_DATA_BULLET><PLUGIN_DATA_SEPARATOR> / </PLUGIN_DATA_SEPARATOR><PLUGIN_VERSION>Versión </PLUGIN_VERSION><PLUGIN_KILOBYTES> KB</PLUGIN_KILOBYTES><LANGUAGE_ALL>Todas as linguas</LANGUAGE_ALL><LANGUAGE_BG>Búlgaro</LANGUAGE_BG><LANGUAGE_CA>Catalán</LANGUAGE_CA><LANGUAGE_CS>Checo</LANGUAGE_CS><LANGUAGE_DA>Dinamarqués</LANGUAGE_DA><LANGUAGE_DE>Alemán</LANGUAGE_DE><LANGUAGE_EL>Grego</LANGUAGE_EL><LANGUAGE_EN>Inglés americano</LANGUAGE_EN><LANGUAGE_EN_GB>Inglés británico</LANGUAGE_EN_GB><LANGUAGE_ES>Español</LANGUAGE_ES><LANGUAGE_FI>Finlandés</LANGUAGE_FI><LANGUAGE_FR>Francés</LANGUAGE_FR><LANGUAGE_HI>Hindi</LANGUAGE_HI><LANGUAGE_HR>Croata</LANGUAGE_HR><LANGUAGE_HU>Húngaro</LANGUAGE_HU><LANGUAGE_ID>Indonesio</LANGUAGE_ID><LANGUAGE_IT>Italiano</LANGUAGE_IT><LANGUAGE_JA>Xaponés</LANGUAGE_JA><LANGUAGE_KO>Coreano</LANGUAGE_KO><LANGUAGE_NL>Holandés</LANGUAGE_NL><LANGUAGE_NO>Noruegués</LANGUAGE_NO><LANGUAGE_PL>Polaco</LANGUAGE_PL><LANGUAGE_PT_BR>Portugués (Brasil)</LANGUAGE_PT_BR><LANGUAGE_PT_PT>Portugués (Portugal)</LANGUAGE_PT_PT><LANGUAGE_RO>Romeno</LANGUAGE_RO><LANGUAGE_RU>Ruso</LANGUAGE_RU><LANGUAGE_SK>Eslovaco</LANGUAGE_SK><LANGUAGE_SL>Esloveno</LANGUAGE_SL><LANGUAGE_SV>Sueco</LANGUAGE_SV><LANGUAGE_TH>Tailandés</LANGUAGE_TH><LANGUAGE_TR>Turco</LANGUAGE_TR><LANGUAGE_ZH_CN>Chinés (simplificado)</LANGUAGE_ZH_CN><LANGUAGE_ZH_TW>Chinés (tradicional)</LANGUAGE_ZH_TW><CATEGORY_ALL>Todo</CATEGORY_ALL><CATEGORY_NEW>Novo</CATEGORY_NEW><CATEGORY_RECOMMENDATIONS>Recomendacións</CATEGORY_RECOMMENDATIONS><CATEGORY_GOOGLE>Creado por Google</CATEGORY_GOOGLE><CATEGORY_RECENTLY_USED>Empregado recentemente</CATEGORY_RECENTLY_USED><CATEGORY_UPDATES>Actualizacións</CATEGORY_UPDATES><CATEGORY_NEWS>Novas</CATEGORY_NEWS><CATEGORY_SPORTS>Deportes</CATEGORY_SPORTS><CATEGORY_LIFESTYLE>Estilo de vida</CATEGORY_LIFESTYLE><CATEGORY_FINANCE>Finanzas</CATEGORY_FINANCE><CATEGORY_TOOLS>Ferramentas</CATEGORY_TOOLS><CATEGORY_FUN_GAMES>Diversión e xogos</CATEGORY_FUN_GAMES><CATEGORY_TECHNOLOGY>Tecnoloxía</CATEGORY_TECHNOLOGY><CATEGORY_COMMUNICATION>Comunicación</CATEGORY_COMMUNICATION><CATEGORY_HOLIDAY>Vacacións</CATEGORY_HOLIDAY></strings>
--- gadgets/gadget_control/it/strings.xml
+++ gadgets/gadget_control/it/strings.xml
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
-<strings><GADGET_NAME>Controllo gadget</GADGET_NAME><GADGET_DESCRIPTION>Controllo gadget</GADGET_DESCRIPTION><GADGET_ABOUT_TEXT>Controllo gadget</GADGET_ABOUT_TEXT><SHOW_ONLY_LABEL>Mostra solo: </SHOW_ONLY_LABEL><PAGE_LABEL>{{PAGINA}} di {{TOTALE}}</PAGE_LABEL><ADD_BUTTON_LABEL>Aggiungi</ADD_BUTTON_LABEL><STATUS_ADDING>Aggiungo...</STATUS_ADDING><STATUS_ADDED>Aggiunto</STATUS_ADDED><STATUS_ERROR_ADDING>Errore</STATUS_ERROR_ADDING><STATUS_OFFLINE>Offline</STATUS_OFFLINE><UPDATE_BUTTON_LABEL>Aggiorna</UPDATE_BUTTON_LABEL><STATUS_UPDATING>Aggiorno...</STATUS_UPDATING><STATUS_UPDATED>Aggiornato</STATUS_UPDATED><STATUS_ERROR_UPDATING>Errore</STATUS_ERROR_UPDATING><SEARCH_GADGETS>Cerca gadget</SEARCH_GADGETS><CONFIRM_EXIT>Vuoi chiudere la Zona Gadget? Questo eliminerà tutti i gadget installati.</CONFIRM_EXIT><WELCOME_TO_GADGETS>Benvenuti in Gadget, piccole cose divertenti per il tuo computer. Cosa vuoi fare?</WELCOME_TO_GADGETS><WELCOME_ADD_GADGET>Aggiungi un nuovo gadget</WELCOME_ADD_GADGET><WELCOME_CHECK_UPDATES>Controlla aggiornamenti</WELCOME_CHECK_UPDATES><WELCOME_NO_UPDATES>Spiacenti, non abbiamo Gadget aggiornati al momento. Potresti:</WELCOME_NO_UPDATES><PLUGIN_DATA_BULLET>» </PLUGIN_DATA_BULLET><PLUGIN_DATA_SEPARATOR> / </PLUGIN_DATA_SEPARATOR><PLUGIN_VERSION>Versione</PLUGIN_VERSION><PLUGIN_KILOBYTES> KB</PLUGIN_KILOBYTES><LANGUAGE_ALL>Tutte le lingue</LANGUAGE_ALL><LANGUAGE_BG>Bulgaro</LANGUAGE_BG><LANGUAGE_CA>Catalano</LANGUAGE_CA><LANGUAGE_CS>Ceco</LANGUAGE_CS><LANGUAGE_DA>Danese</LANGUAGE_DA><LANGUAGE_DE>Tedesco</LANGUAGE_DE><LANGUAGE_EL>Greco</LANGUAGE_EL><LANGUAGE_EN>Inglese (US)</LANGUAGE_EN><LANGUAGE_EN_GB>Inglese (UK)</LANGUAGE_EN_GB><LANGUAGE_ES>Spagnolo</LANGUAGE_ES><LANGUAGE_FI>Finlandese</LANGUAGE_FI><LANGUAGE_FR>Francese</LANGUAGE_FR><LANGUAGE_HI>Hindi</LANGUAGE_HI><LANGUAGE_HR>Croato</LANGUAGE_HR><LANGUAGE_HU>Ungherese</LANGUAGE_HU><LANGUAGE_ID>Indonesiano</LANGUAGE_ID><LANGUAGE_IT>Italiano</LANGUAGE_IT><LANGUAGE_JA>Giapponese</LANGUAGE_JA><LANGUAGE_KO>Koreano</LANGUAGE_KO><LANGUAGE_NL>Olandese</LANGUAGE_NL><LANGUAGE_NO>Norvegese</LANGUAGE_NO><LANGUAGE_PL>Polacco</LANGUAGE_PL><LANGUAGE_PT_BR>Portoghese (Brasile)</LANGUAGE_PT_BR><LANGUAGE_PT_PT>Portoghese (Potrogallo)</LANGUAGE_PT_PT><LANGUAGE_RO>Rumeno</LANGUAGE_RO><LANGUAGE_RU>Russo</LANGUAGE_RU><LANGUAGE_SK>Slovacco</LANGUAGE_SK><LANGUAGE_SL>Sloveno</LANGUAGE_SL><LANGUAGE_SV>Svedese</LANGUAGE_SV><LANGUAGE_TH>Tailandese</LANGUAGE_TH><LANGUAGE_TR>Turco</LANGUAGE_TR><LANGUAGE_ZH_CN>Cinese (Semplificato)</LANGUAGE_ZH_CN><LANGUAGE_ZH_TW>Cinese (Tradizionale)</LANGUAGE_ZH_TW><CATEGORY_ALL>Tutto</CATEGORY_ALL><CATEGORY_NEW>Nuovo</CATEGORY_NEW><CATEGORY_RECOMMENDATIONS>Raccomandazioni</CATEGORY_RECOMMENDATIONS><CATEGORY_GOOGLE>Creato da Google</CATEGORY_GOOGLE><CATEGORY_RECENTLY_USED>Usato di recente</CATEGORY_RECENTLY_USED><CATEGORY_UPDATES>Aggiornamenti</CATEGORY_UPDATES><CATEGORY_NEWS>Notizie</CATEGORY_NEWS><CATEGORY_SPORTS>Sport</CATEGORY_SPORTS><CATEGORY_LIFESTYLE>Lifestyle</CATEGORY_LIFESTYLE><CATEGORY_FINANCE>Finanza</CATEGORY_FINANCE><CATEGORY_TOOLS>Strumenti</CATEGORY_TOOLS><CATEGORY_FUN_GAMES>Giochi e divertimento</CATEGORY_FUN_GAMES><CATEGORY_TECHNOLOGY>Tecnologia</CATEGORY_TECHNOLOGY><CATEGORY_COMMUNICATION>Comunicazione</CATEGORY_COMMUNICATION><CATEGORY_HOLIDAY>Vacanze</CATEGORY_HOLIDAY></strings>
+<strings><GADGET_NAME>Controllo gadget</GADGET_NAME><GADGET_DESCRIPTION>Controllo gadget</GADGET_DESCRIPTION><GADGET_ABOUT_TEXT>Controllo gadget</GADGET_ABOUT_TEXT><SHOW_ONLY_LABEL>Mostra solo: </SHOW_ONLY_LABEL><PAGE_LABEL>{{PAGE}} di {{TOTAL}}</PAGE_LABEL><ADD_BUTTON_LABEL>Aggiungi</ADD_BUTTON_LABEL><STATUS_ADDING>Aggiungo...</STATUS_ADDING><STATUS_ADDED>Aggiunto</STATUS_ADDED><STATUS_ERROR_ADDING>Errore</STATUS_ERROR_ADDING><STATUS_OFFLINE>Offline</STATUS_OFFLINE><UPDATE_BUTTON_LABEL>Aggiorna</UPDATE_BUTTON_LABEL><STATUS_UPDATING>Aggiorno...</STATUS_UPDATING><STATUS_UPDATED>Aggiornato</STATUS_UPDATED><STATUS_ERROR_UPDATING>Errore</STATUS_ERROR_UPDATING><SEARCH_GADGETS>Cerca gadget</SEARCH_GADGETS><CONFIRM_EXIT>Vuoi chiudere la Zona Gadget? Questo eliminerà tutti i gadget installati.</CONFIRM_EXIT><WELCOME_TO_GADGETS>Benvenuti in Gadget, piccole cose divertenti per il tuo computer. Cosa vuoi fare?</WELCOME_TO_GADGETS><WELCOME_ADD_GADGET>Aggiungi un nuovo gadget</WELCOME_ADD_GADGET><WELCOME_CHECK_UPDATES>Controlla aggiornamenti</WELCOME_CHECK_UPDATES><WELCOME_NO_UPDATES>Spiacenti, non abbiamo Gadget aggiornati al momento. Potresti:</WELCOME_NO_UPDATES><PLUGIN_DATA_BULLET>» </PLUGIN_DATA_BULLET><PLUGIN_DATA_SEPARATOR> / </PLUGIN_DATA_SEPARATOR><PLUGIN_VERSION>Versione</PLUGIN_VERSION><PLUGIN_KILOBYTES> KB</PLUGIN_KILOBYTES><LANGUAGE_ALL>Tutte le lingue</LANGUAGE_ALL><LANGUAGE_BG>Bulgaro</LANGUAGE_BG><LANGUAGE_CA>Catalano</LANGUAGE_CA><LANGUAGE_CS>Ceco</LANGUAGE_CS><LANGUAGE_DA>Danese</LANGUAGE_DA><LANGUAGE_DE>Tedesco</LANGUAGE_DE><LANGUAGE_EL>Greco</LANGUAGE_EL><LANGUAGE_EN>Inglese (US)</LANGUAGE_EN><LANGUAGE_EN_GB>Inglese (UK)</LANGUAGE_EN_GB><LANGUAGE_ES>Spagnolo</LANGUAGE_ES><LANGUAGE_FI>Finlandese</LANGUAGE_FI><LANGUAGE_FR>Francese</LANGUAGE_FR><LANGUAGE_HI>Hindi</LANGUAGE_HI><LANGUAGE_HR>Croato</LANGUAGE_HR><LANGUAGE_HU>Ungherese</LANGUAGE_HU><LANGUAGE_ID>Indonesiano</LANGUAGE_ID><LANGUAGE_IT>Italiano</LANGUAGE_IT><LANGUAGE_JA>Giapponese</LANGUAGE_JA><LANGUAGE_KO>Koreano</LANGUAGE_KO><LANGUAGE_NL>Olandese</LANGUAGE_NL><LANGUAGE_NO>Norvegese</LANGUAGE_NO><LANGUAGE_PL>Polacco</LANGUAGE_PL><LANGUAGE_PT_BR>Portoghese (Brasile)</LANGUAGE_PT_BR><LANGUAGE_PT_PT>Portoghese (Potrogallo)</LANGUAGE_PT_PT><LANGUAGE_RO>Rumeno</LANGUAGE_RO><LANGUAGE_RU>Russo</LANGUAGE_RU><LANGUAGE_SK>Slovacco</LANGUAGE_SK><LANGUAGE_SL>Sloveno</LANGUAGE_SL><LANGUAGE_SV>Svedese</LANGUAGE_SV><LANGUAGE_TH>Tailandese</LANGUAGE_TH><LANGUAGE_TR>Turco</LANGUAGE_TR><LANGUAGE_ZH_CN>Cinese (Semplificato)</LANGUAGE_ZH_CN><LANGUAGE_ZH_TW>Cinese (Tradizionale)</LANGUAGE_ZH_TW><CATEGORY_ALL>Tutto</CATEGORY_ALL><CATEGORY_NEW>Nuovo</CATEGORY_NEW><CATEGORY_RECOMMENDATIONS>Raccomandazioni</CATEGORY_RECOMMENDATIONS><CATEGORY_GOOGLE>Creato da Google</CATEGORY_GOOGLE><CATEGORY_RECENTLY_USED>Usato di recente</CATEGORY_RECENTLY_USED><CATEGORY_UPDATES>Aggiornamenti</CATEGORY_UPDATES><CATEGORY_NEWS>Notizie</CATEGORY_NEWS><CATEGORY_SPORTS>Sport</CATEGORY_SPORTS><CATEGORY_LIFESTYLE>Lifestyle</CATEGORY_LIFESTYLE><CATEGORY_FINANCE>Finanza</CATEGORY_FINANCE><CATEGORY_TOOLS>Strumenti</CATEGORY_TOOLS><CATEGORY_FUN_GAMES>Giochi e divertimento</CATEGORY_FUN_GAMES><CATEGORY_TECHNOLOGY>Tecnologia</CATEGORY_TECHNOLOGY><CATEGORY_COMMUNICATION>Comunicazione</CATEGORY_COMMUNICATION><CATEGORY_HOLIDAY>Vacanze</CATEGORY_HOLIDAY></strings>
--- gadgets/photos/Makefile.in
+++ gadgets/photos/Makefile.in
@@ -245,6 +245,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- gadgets/rss/Makefile.in
+++ gadgets/rss/Makefile.in
@@ -245,6 +245,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/Makefile.in
+++ ggadget/Makefile.in
@@ -474,6 +474,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/clutter/Makefile.in
+++ ggadget/clutter/Makefile.in
@@ -298,6 +298,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/dbus/Makefile.in
+++ ggadget/dbus/Makefile.in
@@ -322,6 +322,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/dbus/tests/Makefile.in
+++ ggadget/dbus/tests/Makefile.in
@@ -267,6 +267,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/gtk/Makefile.in
+++ ggadget/gtk/Makefile.in
@@ -360,6 +360,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/gtk/tests/Makefile.in
+++ ggadget/gtk/tests/Makefile.in
@@ -287,6 +287,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/js/Makefile.in
+++ ggadget/js/Makefile.in
@@ -299,6 +299,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/js/tests/Makefile.in
+++ ggadget/js/tests/Makefile.in
@@ -252,6 +252,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/npapi/Makefile.in
+++ ggadget/npapi/Makefile.in
@@ -325,6 +325,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/npapi/tests/Makefile.in
+++ ggadget/npapi/tests/Makefile.in
@@ -247,6 +247,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/qt/Makefile.in
+++ ggadget/qt/Makefile.in
@@ -340,6 +340,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/qt/tests/Makefile.in
+++ ggadget/qt/tests/Makefile.in
@@ -247,6 +247,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/tests/Makefile.in
+++ ggadget/tests/Makefile.in
@@ -509,6 +509,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/tests/test_modules/Makefile.in
+++ ggadget/tests/test_modules/Makefile.in
@@ -243,6 +243,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/xdg/Makefile.in
+++ ggadget/xdg/Makefile.in
@@ -321,6 +321,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- ggadget/xdg/tests/Makefile.in
+++ ggadget/xdg/tests/Makefile.in
@@ -230,6 +230,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- hosts/Makefile.in
+++ hosts/Makefile.in
@@ -263,6 +263,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- hosts/clutter/Makefile.in
+++ hosts/clutter/Makefile.in
@@ -290,6 +290,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- hosts/gtk/Makefile.in
+++ hosts/gtk/Makefile.in
@@ -364,6 +364,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- hosts/qt/Makefile.in
+++ hosts/qt/Makefile.in
@@ -344,6 +344,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- po/LINGUAS
+++ po/LINGUAS
@@ -7,6 +7,7 @@
es
fi
fr
+gl
id
it
ja
--- po/fi.po
+++ po/fi.po
@@ -2,9 +2,9 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 09:45+0000\n"
+"POT-Creation-Date: 2010-06-30 09:24+0000\n"
"PO-Revision-Date: \n"
-"Last-Translator: Eija <eija at wimma.com>\n"
+"Last-Translator: Anna Bergman <anna.b.bergman at gmail.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -415,7 +415,7 @@
#: ../po/control_strings.c:37
msgid "{{PAGE}} of {{TOTAL}}"
-msgstr "{{SIVU}} / {{YHTEENSÄ}}"
+msgstr "{{PAGE}} / {{TOTAL}}"
#: ../po/control_strings.c:40
msgid "Add"
@@ -467,7 +467,7 @@
#: ../po/control_strings.c:82
msgid "Sorry, we don't have any updated Gadgets available. You could:"
-msgstr "Sorry, pienoisohjelmille ei ole päivityksiä. Voit:"
+msgstr "Sori, pienoisohjelmille ei ole päivityksiä. Voit:"
#: ../po/control_strings.c:85
msgid "» "
--- po/gl.po
+++ po/gl.po
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Xosé <xosecalvo at gmail.com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-07-07 09:20+0000\n"
+"PO-Revision-Date: 2010-07-09 14:10+0200\n"
+"Last-Translator: Xosé <xosecalvo at gmail.com>\n"
+"Language-Team: Galego <proxecto at trasno.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.1\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: ../po/resources_strings.c:25 ../po/resources_strings.c:247
+#: ../hosts/clutter/gadgets-panel.desktop.in.in.h:1
+msgid "Gadgets"
+msgstr "Trebellos"
+
+#: ../po/resources_strings.c:28
+#, c-format
+msgid "(API Version: %s)"
+msgstr "(Versión da API: %s)"
+
+#: ../po/resources_strings.c:31
+msgid ""
+"Copyright © 2009 Google Inc. All Rights Reserved.
Licensed under the "
+"Apache License, Version 2.0:"
+msgstr ""
+"Copyright © 2009 Google Inc. Todos os dereitos reservados.
Publicado "
+"coa Licenza Apache, Versión, Version 2.0:"
+
+#: ../po/resources_strings.c:34
+msgid "For more information please visit our project site:"
+msgstr "Para máis información, visite o sitio do noso proxecto:"
+
+#: ../po/resources_strings.c:37
+msgid "%I:%M%P"
+msgstr "%I:%M%P"
+
+#: ../po/resources_strings.c:40
+msgid "%b %d"
+msgstr "%b %d"
+
+#: ../po/resources_strings.c:43 ../po/resources_strings.c:46
+#, c-format
+msgid "%dd ago"
+msgstr "hai %dd"
+
+#: ../po/resources_strings.c:49
+#, c-format
+msgid "%d day ago"
+msgstr "hai %d día"
+
+#: ../po/resources_strings.c:52
+#, c-format
+msgid "%d days ago"
+msgstr "hai % días"
+
+#: ../po/resources_strings.c:55 ../po/resources_strings.c:58
+#, c-format
+msgid "%dh ago"
+msgstr "hai %dh"
+
+#: ../po/resources_strings.c:61
+#, c-format
+msgid "%d hr ago"
+msgstr "hai %d hora"
+
+#: ../po/resources_strings.c:64
+#, c-format
+msgid "%d hrs ago"
+msgstr "hai %d horas"
+
+#: ../po/resources_strings.c:67 ../po/resources_strings.c:70
+#, c-format
+msgid "%dm ago"
+msgstr "hai %dm"
+
+#: ../po/resources_strings.c:73
+#, c-format
+msgid "%d min ago"
+msgstr "hai %d min"
+
+#: ../po/resources_strings.c:76
+#, c-format
+msgid "%d mins ago"
+msgstr "hai %d min"
+
+#: ../po/resources_strings.c:79
+msgid "Open"
+msgstr "Abrir"
+
+#: ../po/resources_strings.c:82 ../po/resources_strings.c:100
+msgid "Remove"
+msgstr "Eliminar"
+
+#: ../po/resources_strings.c:85
+msgid "Don't show me items like this"
+msgstr "Non mostrar máis elementos como este"
+
+#: ../po/resources_strings.c:88
+msgid "Previous"
+msgstr "Anterior"
+
+#: ../po/resources_strings.c:91
+msgid "Next"
+msgstr "Seguinte"
+
+#: ../po/resources_strings.c:94
+msgid "Toggle Expanded View"
+msgstr "Conmutar a vista expandida"
+
+#: ../po/resources_strings.c:97 ../po/resources_strings.c:106
+msgid "Menu"
+msgstr "Menú"
+
+#: ../po/resources_strings.c:103
+msgid "Add gadgets"
+msgstr "Engadir trebellos"
+
+#: ../po/resources_strings.c:109
+msgid "Minimize"
+msgstr "Minimizar"
+
+#: ../po/resources_strings.c:112
+msgid "Program can't start because it failed to load the following module(s):"
+msgstr ""
+"O programa non se pode iniciar porque non foi posíbel cargar o(s) módulo(s) "
+"seguinte(s):"
+
+#: ../po/resources_strings.c:115
+msgid "&About..."
+msgstr "&Acerca de..."
+
+#: ../po/resources_strings.c:118
+msgid "Add &Gadgets..."
+msgstr "En&gadir trebellos..."
+
+#: ../po/resources_strings.c:121
+msgid "Add an &iGoogle Gadget"
+msgstr "Engadir un trebello de &iGoogle"
+
+#: ../po/resources_strings.c:124
+msgid "Always on &Top"
+msgstr "&Sempre encima"
+
+#: ../po/resources_strings.c:127
+msgid "Auto &Fit"
+msgstr "A&xustar automaticamente"
+
+#: ../po/resources_strings.c:130
+msgid "A&uto Hide"
+msgstr "Agoc&har automaticamente"
+
+#: ../po/resources_strings.c:133
+msgid "&Collapse"
+msgstr "&Contraer"
+
+#: ../po/resources_strings.c:136
+msgid "&Dock to Sidebar"
+msgstr "&Ancorar na barra lateral"
+
+#: ../po/resources_strings.c:139
+msgid "Doc&k Sidebar"
+msgstr "Ancorar a &barra lateral"
+
+#: ../po/resources_strings.c:142
+msgid "E&xit"
+msgstr "&Saír"
+
+#: ../po/resources_strings.c:145
+msgid "Ex&pand"
+msgstr "Ex&pandir"
+
+#: ../po/resources_strings.c:148
+msgid "&Font Size"
+msgstr "&Tamaño da letra"
+
+#: ../po/resources_strings.c:151
+msgid "&Default"
+msgstr "&Predefinido"
+
+#: ../po/resources_strings.c:154
+msgid "&Larger"
+msgstr "Máis &grande"
+
+#: ../po/resources_strings.c:157
+msgid "&Smaller"
+msgstr "Máis &pequeno"
+
+#: ../po/resources_strings.c:160
+msgid "Hide A&ll"
+msgstr "Agochar &todo"
+
+#: ../po/resources_strings.c:163
+msgid "&Left"
+msgstr "&Esquerda"
+
+#: ../po/resources_strings.c:166
+msgid "&Options..."
+msgstr "&Opcións..."
+
+#: ../po/resources_strings.c:169
+msgid "R&emove"
+msgstr "&Eliminar"
+
+#: ../po/resources_strings.c:172
+msgid "&Right"
+msgstr "&Dereita"
+
+#: ../po/resources_strings.c:175
+msgid "Show A&ll"
+msgstr "Mostrar &todo"
+
+#: ../po/resources_strings.c:178
+msgid "&Undock from Sidebar"
+msgstr "&Sacar da barra lateral"
+
+#: ../po/resources_strings.c:181
+msgid "&Zoom"
+msgstr "&Ampliación"
+
+#: ../po/resources_strings.c:184
+msgid "100%"
+msgstr "100%"
+
+#: ../po/resources_strings.c:187
+msgid "125%"
+msgstr "125%"
+
+#: ../po/resources_strings.c:190
+msgid "150%"
+msgstr "150%"
+
+#: ../po/resources_strings.c:193
+msgid "175%"
+msgstr "175%"
+
+#: ../po/resources_strings.c:196
+msgid "200%"
+msgstr "200%"
+
+#: ../po/resources_strings.c:199
+msgid "50%"
+msgstr "50%"
+
+#: ../po/resources_strings.c:202
+msgid "75%"
+msgstr "75%"
+
+#: ../po/resources_strings.c:205
+msgid "Change &Hotkey..."
+msgstr "Mudar o ata&llo de teclado..."
+
+#: ../po/resources_strings.c:208
+msgid "De&bug Console"
+msgstr "Consola de de&puración"
+
+#: ../po/resources_strings.c:211
+msgid "&Sidebar"
+msgstr "Barra &lateral"
+
+#: ../po/resources_strings.c:214
+msgid "Feedback..."
+msgstr "Opinións..."
+
+#: ../po/resources_strings.c:217
+msgid "Third Party Gadget Installation"
+msgstr "Instalación de trebellos de terceiras partes"
+
+#: ../po/resources_strings.c:220
+msgid ""
+"Google has not tested or verified the features or security of this third "
+"party Gadget. Please confirm that you want to install:"
+msgstr ""
+"Google non ten probado ou verificado as funcionalidades nen a seguranza "
+"deste trebello de terceiras partes. Confirme que desexa instalar:"
+
+#: ../po/resources_strings.c:223
+msgid "Description: "
+msgstr "Descrición: "
+
+#: ../po/resources_strings.c:226
+msgid "Required permissions: "
+msgstr "Permisos requiridos: "
+
+#: ../po/resources_strings.c:229
+#, c-format
+msgid ""
+"A script (%s:%d) on this gadget may be busy or have stopped responding. Do "
+"you want to stop it?"
+msgstr ""
+"Un script (%s:%d) deste trebello pode estar ocupado ou ter deixado de "
+"responder. Desexa detelo?"
+
+#: ../po/resources_strings.c:232
+msgid "Change Hotkey"
+msgstr "Mudar o atallo de teclado"
+
+#: ../po/resources_strings.c:235
+msgid "Click to input the new hotkey:"
+msgstr "Prema para introducir o atallo novo:"
+
+#: ../po/resources_strings.c:238
+msgid "Press new hotkey"
+msgstr "Prema o atallo de teclado novo"
+
+#: ../po/resources_strings.c:241 ../po/resources_strings.c:253
+msgid "Clear"
+msgstr "Limpar"
+
+#: ../po/resources_strings.c:244
+msgid "Disabled"
+msgstr "Desactivado"
+
+#: ../po/resources_strings.c:250
+#, c-format
+msgid "Gadgets, press %s to show or hide gadgets."
+msgstr "Trebellos, prema %s para mostrar ou acochar os trebellos."
+
+#: ../po/resources_strings.c:256
+msgid "Trace"
+msgstr "Trazar"
+
+#: ../po/resources_strings.c:259
+msgid "Info"
+msgstr "Información"
+
+#: ../po/resources_strings.c:262
+msgid "Warning"
+msgstr "Aviso"
+
+#: ../po/resources_strings.c:265 ../po/control_strings.c:49
+#: ../po/control_strings.c:64
+msgid "Error"
+msgstr "Erro"
+
+#: ../po/resources_strings.c:268
+msgid "Lock scroll"
+msgstr "Bloquear o desprazamento"
+
+#: ../po/resources_strings.c:271
+msgid "Gadgets (GTK)"
+msgstr "Trebellos (GTK)"
+
+#: ../po/resources_strings.c:274
+msgid "Gadgets (Qt)"
+msgstr "Trebellos (Qt)"
+
+#: ../po/resources_strings.c:277 ../po/resources_strings.c:286
+msgid "Gadget Designer"
+msgstr "Deseñador de trebellos"
+
+#: ../po/resources_strings.c:280
+msgid "Run Gadgets in GNOME/GTK environment"
+msgstr "Executar os trebellos nun ambiente GNOME/GTK"
+
+#: ../po/resources_strings.c:283
+msgid "Run Gadgets in KDE/Qt environment"
+msgstr "Executar os trebellos nun ambiente KDE/Qt"
+
+#: ../po/resources_strings.c:289
+msgid "Reads content of local files and directories"
+msgstr "Le o contido dos ficheiros e directorios locais"
+
+#: ../po/resources_strings.c:292
+msgid "Creates or modifies local files and directories"
+msgstr "Crea ou modifica ficheiros e directorios locais"
+
+#: ../po/resources_strings.c:295
+msgid "Queries or modifies the status of hardware devices"
+msgstr "Inspecciona ou modifica o estado dos dispositivos de hardware"
+
+#: ../po/resources_strings.c:298
+msgid "Accesses network"
+msgstr "Accede á rede"
+
+#: ../po/resources_strings.c:301
+msgid "Accesses personalization data"
+msgstr "Accede aos datos de personalización"
+
+#: ../po/resources_strings.c:304
+msgid "Executes native code and local applications"
+msgstr "Executa código nativo e aplicativos locais"
+
+#: ../po/resources_strings.c:307
+#, c-format
+msgid "The gadget could not be loaded:
%s"
+msgstr "Non foi posíbel cargar o trebello:
%s"
+
+#: ../po/resources_strings.c:310
+#, c-format
+msgid ""
+"The gadget requires Gadgets supporting API at least version %s:
%s"
+msgstr ""
+"O trebello require a API de trebellos como mínimo na versión %s:
%s"
+
+#: ../po/resources_strings.c:313
+#, c-format
+msgid "The gadget requires Gadgets for Linux at least version %s:
%s"
+msgstr ""
+"O trebello require Gadgets for Linux como mínimo na versión %s:
%s"
+
+#: ../po/resources_strings.c:316
+msgid "The gadget doesn't work on Linux platform:%
%s"
+msgstr "O trebello non funciona na plataforma Linux:%
%s"
+
+#: ../po/resources_strings.c:319
+msgid "http://www.google.com"
+msgstr "http://www.google.com"
+
+#: ../po/control_strings.c:25 ../po/control_strings.c:28
+#: ../po/control_strings.c:31
+msgid "Gadgets Control"
+msgstr "Control de trebellos"
+
+#: ../po/control_strings.c:34
+msgid "Show only:"
+msgstr "Mostrar só:"
+
+#: ../po/control_strings.c:37
+msgid "{{PAGE}} of {{TOTAL}}"
+msgstr "{{PAGE}} de {{TOTAL}}"
+
+#: ../po/control_strings.c:40
+msgid "Add"
+msgstr "Engadir"
+
+#: ../po/control_strings.c:43
+msgid "Adding..."
+msgstr "A engadir..."
+
+#: ../po/control_strings.c:46
+msgid "Added"
+msgstr "Engadido"
+
+#: ../po/control_strings.c:52
+msgid "Offline"
+msgstr "Desconectado"
+
+#: ../po/control_strings.c:55
+msgid "Update"
+msgstr "Actualizar"
+
+#: ../po/control_strings.c:58
+msgid "Updating..."
+msgstr "A actualizar..."
+
+#: ../po/control_strings.c:61
+msgid "Updated"
+msgstr "Actualizado"
+
+#: ../po/control_strings.c:67
+msgid "Search gadgets"
+msgstr "Procurar trebellos"
+
+#: ../po/control_strings.c:70
+msgid ""
+"Do you want to close the Gadgets Zone? This will remove all your installed "
+"gadgets."
+msgstr ""
+"Desexa fechar a Zona de Trebellos? Isto elimina todos os trebellos "
+"instalados."
+
+#: ../po/control_strings.c:73
+msgid ""
+"Welcome to Gadgets, they're tiny bits of fun for your computer. What do you "
+"want to do?"
+msgstr ""
+"Benvida/o a Trebellos. Son cousiñas divertidas para o computador. Que "
+"desexa facer?"
+
+#: ../po/control_strings.c:76
+msgid "Add a new Gadget"
+msgstr "Engadir un trebello novo"
+
+#: ../po/control_strings.c:79
+msgid "Check for updates"
+msgstr "Buscar actualizacións"
+
+#: ../po/control_strings.c:82
+msgid "Sorry, we don't have any updated Gadgets available. You could:"
+msgstr "Desculpe; non se dispón de ningún trebello actualizado. Pode:"
+
+#: ../po/control_strings.c:85
+msgid "» "
+msgstr "» "
+
+#: ../po/control_strings.c:88
+msgid " / "
+msgstr " / "
+
+#: ../po/control_strings.c:91
+msgid "Version "
+msgstr "Versión "
+
+#: ../po/control_strings.c:94
+msgid " KB"
+msgstr " KB"
+
+#: ../po/control_strings.c:97
+msgid "All languages"
+msgstr "Todas as linguas"
+
+#: ../po/control_strings.c:100
+msgid "Bulgarian"
+msgstr "Búlgaro"
+
+#: ../po/control_strings.c:103
+msgid "Catalan"
+msgstr "Catalán"
+
+#: ../po/control_strings.c:106
+msgid "Czech"
+msgstr "Checo"
+
+#: ../po/control_strings.c:109
+msgid "Danish"
+msgstr "Dinamarqués"
+
+#: ../po/control_strings.c:112
+msgid "German"
+msgstr "Alemán"
+
+#: ../po/control_strings.c:115
+msgid "Greek"
+msgstr "Grego"
+
+#: ../po/control_strings.c:118
+msgid "English (US)"
+msgstr "Inglés americano"
+
+#: ../po/control_strings.c:121
+msgid "English (UK)"
+msgstr "Inglés británico"
+
+#: ../po/control_strings.c:124
+msgid "Spanish"
+msgstr "Español"
+
+#: ../po/control_strings.c:127
+msgid "Finnish"
+msgstr "Finlandés"
+
+#: ../po/control_strings.c:130
+msgid "French"
+msgstr "Francés"
+
+#: ../po/control_strings.c:133
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../po/control_strings.c:136
+msgid "Croatian"
+msgstr "Croata"
+
+#: ../po/control_strings.c:139
+msgid "Hungarian"
+msgstr "Húngaro"
+
+#: ../po/control_strings.c:142
+msgid "Indonesian"
+msgstr "Indonesio"
+
+#: ../po/control_strings.c:145
+msgid "Italian"
+msgstr "Italiano"
+
+#: ../po/control_strings.c:148
+msgid "Japanese"
+msgstr "Xaponés"
+
+#: ../po/control_strings.c:151
+msgid "Korean"
+msgstr "Coreano"
+
+#: ../po/control_strings.c:154
+msgid "Dutch"
+msgstr "Holandés"
+
+#: ../po/control_strings.c:157
+msgid "Norwegian"
+msgstr "Noruegués"
+
+#: ../po/control_strings.c:160
+msgid "Polish"
+msgstr "Polaco"
+
+#: ../po/control_strings.c:163
+msgid "Portuguese (Brazil)"
+msgstr "Portugués (Brasil)"
+
+#: ../po/control_strings.c:166
+msgid "Portuguese (Portugal)"
+msgstr "Portugués (Portugal)"
+
+#: ../po/control_strings.c:169
+msgid "Romanian"
+msgstr "Romeno"
+
+#: ../po/control_strings.c:172
+msgid "Russian"
+msgstr "Ruso"
+
+#: ../po/control_strings.c:175
+msgid "Slovak"
+msgstr "Eslovaco"
+
+#: ../po/control_strings.c:178
+msgid "Slovenian"
+msgstr "Esloveno"
+
+#: ../po/control_strings.c:181
+msgid "Swedish"
+msgstr "Sueco"
+
+#: ../po/control_strings.c:184
+msgid "Thai"
+msgstr "Tailandés"
+
+#: ../po/control_strings.c:187
+msgid "Turkish"
+msgstr "Turco"
+
+#: ../po/control_strings.c:190
+msgid "Chinese (Simplified)"
+msgstr "Chinés (simplificado)"
+
+#: ../po/control_strings.c:193
+msgid "Chinese (Traditional)"
+msgstr "Chinés (tradicional)"
+
+#: ../po/control_strings.c:196
+msgid "All"
+msgstr "Todo"
+
+#: ../po/control_strings.c:199
+msgid "New"
+msgstr "Novo"
+
+#: ../po/control_strings.c:202
+msgid "Recommendations"
+msgstr "Recomendacións"
+
+#: ../po/control_strings.c:205
+msgid "Google Created"
+msgstr "Creado por Google"
+
+#: ../po/control_strings.c:208
+msgid "Recently Used"
+msgstr "Empregado recentemente"
+
+#: ../po/control_strings.c:211
+msgid "Updates"
+msgstr "Actualizacións"
+
+#: ../po/control_strings.c:214
+msgid "News"
+msgstr "Novas"
+
+#: ../po/control_strings.c:217
+msgid "Sports"
+msgstr "Deportes"
+
+#: ../po/control_strings.c:220
+msgid "Lifestyle"
+msgstr "Estilo de vida"
+
+#: ../po/control_strings.c:223
+msgid "Finance"
+msgstr "Finanzas"
+
+#: ../po/control_strings.c:226
+msgid "Tools"
+msgstr "Ferramentas"
+
+#: ../po/control_strings.c:229
+msgid "Fun and Games"
+msgstr "Diversión e xogos"
+
+#: ../po/control_strings.c:232
+msgid "Technology"
+msgstr "Tecnoloxía"
+
+#: ../po/control_strings.c:235
+msgid "Communication"
+msgstr "Comunicación"
+
+#: ../po/control_strings.c:238
+msgid "Holidays"
+msgstr "Vacacións"
+
--- po/it.po
+++ po/it.po
@@ -2,9 +2,9 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-07 09:45+0000\n"
+"POT-Creation-Date: 2010-06-14 09:22+0000\n"
"PO-Revision-Date: \n"
-"Last-Translator: Lorenzo <lorenzo.gennaro at ptiglobal.net>\n"
+"Last-Translator: Namfon Thasanon <namfonx.thasanon at intel.com>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -415,7 +415,7 @@
#: ../po/control_strings.c:37
msgid "{{PAGE}} of {{TOTAL}}"
-msgstr "{{PAGINA}} di {{TOTALE}}"
+msgstr "{{PAGE}} di {{TOTAL}}"
#: ../po/control_strings.c:40
msgid "Add"
--- resources/Makefile.am
+++ resources/Makefile.am
@@ -133,6 +133,7 @@
es/strings.xml \
fi/strings.xml \
fr/strings.xml \
+ gl/strings.xml \
id/strings.xml \
it/strings.xml \
ja/strings.xml \
--- resources/Makefile.in
+++ resources/Makefile.in
@@ -246,6 +246,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
@@ -458,6 +460,7 @@
es/strings.xml \
fi/strings.xml \
fr/strings.xml \
+ gl/strings.xml \
id/strings.xml \
it/strings.xml \
ja/strings.xml \
--- resources/gl
+++ resources/gl
+(directory)
--- resources/gl/strings.xml
+++ resources/gl/strings.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<strings><GOOGLE_GADGETS>Trebellos</GOOGLE_GADGETS><API_VERSION>(Versión da API: %s)</API_VERSION><GGL_COPYRIGHT>Copyright © 2009 Google Inc. Todos os dereitos reservados. Publicado coa Licenza Apache, Versión, Version 2.0:</GGL_COPYRIGHT><GGL_DESCRIPTION>Para máis información, visite o sitio do noso proxecto:</GGL_DESCRIPTION><TIME_FORMAT_SHORT>%I:%M%P</TIME_FORMAT_SHORT><DATE_FORMAT_SHORT>%b %d</DATE_FORMAT_SHORT><DAY_AGO_SHORT>hai %dd</DAY_AGO_SHORT><DAYS_AGO_SHORT>hai %dd</DAYS_AGO_SHORT><DAY_AGO_LONG>hai %d día</DAY_AGO_LONG><DAYS_AGO_LONG>hai % días</DAYS_AGO_LONG><HOUR_AGO_SHORT>hai %dh</HOUR_AGO_SHORT><HOURS_AGO_SHORT>hai %dh</HOURS_AGO_SHORT><HOUR_AGO_LONG>hai %d hora</HOUR_AGO_LONG><HOURS_AGO_LONG>hai %d horas</HOURS_AGO_LONG><MINUTE_AGO_SHORT>hai %dm</MINUTE_AGO_SHORT><MINUTES_AGO_SHORT>hai %dm</MINUTES_AGO_SHORT><MINUTE_AGO_LONG>hai %d min</MINUTE_AGO_LONG><MINUTES_AGO_LONG>hai %d min</MINUTES_AGO_LONG><OPEN_CONTENT_ITEM>Abrir</OPEN_CONTENT_ITEM><REMOVE_CONTENT_ITEM>Eliminar</REMOVE_CONTENT_ITEM><DONT_SHOW_CONTENT_ITEM>Non mostrar máis elementos como este</DONT_SHOW_CONTENT_ITEM><VD_BACK_BUTTON_TOOLTIP>Anterior</VD_BACK_BUTTON_TOOLTIP><VD_FORWARD_BUTTON_TOOLTIP>Seguinte</VD_FORWARD_BUTTON_TOOLTIP><VD_POP_IN_OUT_BUTTON_TOOLTIP>Conmutar a vista expandida</VD_POP_IN_OUT_BUTTON_TOOLTIP><VD_MENU_BUTTON_TOOLTIP>Menú</VD_MENU_BUTTON_TOOLTIP><VD_CLOSE_BUTTON_TOOLTIP>Eliminar</VD_CLOSE_BUTTON_TOOLTIP><SIDEBAR_ADD_GADGETS_TOOLTIP>Engadir trebellos</SIDEBAR_ADD_GADGETS_TOOLTIP><SIDEBAR_MENU_BUTTON_TOOLTIP>Menú</SIDEBAR_MENU_BUTTON_TOOLTIP><SIDEBAR_MINIMIZE_BUTTON_TOOLTIP>Minimizar</SIDEBAR_MINIMIZE_BUTTON_TOOLTIP><LOAD_EXTENSIONS_FAIL>O programa non se pode iniciar porque non foi posíbel cargar o(s) módulo(s) seguinte(s):</LOAD_EXTENSIONS_FAIL><MENU_ITEM_ABOUT>&Acerca de...</MENU_ITEM_ABOUT><MENU_ITEM_ADD_GADGETS>En&gadir trebellos...</MENU_ITEM_ADD_GADGETS><MENU_ITEM_ADD_IGOOGLE_GADGET>Engadir un trebello de &iGoogle</MENU_ITEM_ADD_IGOOGLE_GADGET><MENU_ITEM_ALWAYS_ON_TOP>&Sempre encima</MENU_ITEM_ALWAYS_ON_TOP><MENU_ITEM_AUTO_FIT>A&xustar automaticamente</MENU_ITEM_AUTO_FIT><MENU_ITEM_AUTO_HIDE>Agoc&har automaticamente</MENU_ITEM_AUTO_HIDE><MENU_ITEM_COLLAPSE>&Contraer</MENU_ITEM_COLLAPSE><MENU_ITEM_DOCK_TO_SIDEBAR>&Ancorar na barra lateral</MENU_ITEM_DOCK_TO_SIDEBAR><MENU_ITEM_DOCK_SIDEBAR>Ancorar a &barra lateral</MENU_ITEM_DOCK_SIDEBAR><MENU_ITEM_EXIT>&Saír</MENU_ITEM_EXIT><MENU_ITEM_EXPAND>Ex&pandir</MENU_ITEM_EXPAND><MENU_ITEM_FONT_SIZE>&Tamaño da letra</MENU_ITEM_FONT_SIZE><MENU_ITEM_FONT_SIZE_DEFAULT>&Predefinido</MENU_ITEM_FONT_SIZE_DEFAULT><MENU_ITEM_FONT_SIZE_LARGER>Máis &grande</MENU_ITEM_FONT_SIZE_LARGER><MENU_ITEM_FONT_SIZE_SMALLER>Máis &pequeno</MENU_ITEM_FONT_SIZE_SMALLER><MENU_ITEM_HIDE_ALL>Agochar &todo</MENU_ITEM_HIDE_ALL><MENU_ITEM_LEFT>&Esquerda</MENU_ITEM_LEFT><MENU_ITEM_OPTIONS>&Opcións...</MENU_ITEM_OPTIONS><MENU_ITEM_REMOVE>&Eliminar</MENU_ITEM_REMOVE><MENU_ITEM_RIGHT>&Dereita</MENU_ITEM_RIGHT><MENU_ITEM_SHOW_ALL>Mostrar &todo</MENU_ITEM_SHOW_ALL><MENU_ITEM_UNDOCK_FROM_SIDEBAR>&Sacar da barra lateral</MENU_ITEM_UNDOCK_FROM_SIDEBAR><MENU_ITEM_ZOOM>&Ampliación</MENU_ITEM_ZOOM><MENU_ITEM_100P>100%</MENU_ITEM_100P><MENU_ITEM_125P>125%</MENU_ITEM_125P><MENU_ITEM_150P>150%</MENU_ITEM_150P><MENU_ITEM_175P>175%</MENU_ITEM_175P><MENU_ITEM_200P>200%</MENU_ITEM_200P><MENU_ITEM_50P>50%</MENU_ITEM_50P><MENU_ITEM_75P>75%</MENU_ITEM_75P><MENU_ITEM_CHANGE_HOTKEY>Mudar o ata&llo de teclado...</MENU_ITEM_CHANGE_HOTKEY><MENU_ITEM_DEBUG_CONSOLE>Consola de de&puración</MENU_ITEM_DEBUG_CONSOLE><MENU_ITEM_SIDEBAR>Barra &lateral</MENU_ITEM_SIDEBAR><MENU_ITEM_FEEDBACK>Opinións...</MENU_ITEM_FEEDBACK><GADGET_CONFIRM_TITLE>Instalación de trebellos de terceiras partes</GADGET_CONFIRM_TITLE><GADGET_CONFIRM_MESSAGE>Google non ten probado ou verificado as funcionalidades nen a seguranza deste trebello de terceiras partes. Confirme que desexa instalar:</GADGET_CONFIRM_MESSAGE><GADGET_DESCRIPTION>Descrición: </GADGET_DESCRIPTION><GADGET_REQUIRED_PERMISSIONS>Permisos requiridos: </GADGET_REQUIRED_PERMISSIONS><SCRIPT_BLOCKED_MESSAGE>Un script (%s:%d) deste trebello pode estar ocupado ou ter deixado de responder. Desexa detelo?</SCRIPT_BLOCKED_MESSAGE><DEFAULT_HOTKEY_DIALOG_TITLE>Mudar o atallo de teclado</DEFAULT_HOTKEY_DIALOG_TITLE><DEFAULT_HOTKEY_DIALOG_PROMPT>Prema para introducir o atallo novo:</DEFAULT_HOTKEY_DIALOG_PROMPT><HOTKEY_ENTRY_PROMPT>Prema o atallo de teclado novo</HOTKEY_ENTRY_PROMPT><CLEAR_HOTKEY>Limpar</CLEAR_HOTKEY><HOTKEY_DISABLED>Desactivado</HOTKEY_DISABLED><STATUS_ICON_TOOLTIP>Trebellos</STATUS_ICON_TOOLTIP><STATUS_ICON_TOOLTIP_WITH_HOTKEY>Trebellos, prema %s para mostrar ou acochar os trebellos.</STATUS_ICON_TOOLTIP_WITH_HOTKEY><DEBUG_CLEAR>Limpar</DEBUG_CLEAR><DEBUG_TRACE>Trazar</DEBUG_TRACE><DEBUG_INFO>Información</DEBUG_INFO><DEBUG_WARNING>Aviso</DEBUG_WARNING><DEBUG_ERROR>Erro</DEBUG_ERROR><DEBUG_LOCK_SCROLL>Bloquear o desprazamento</DEBUG_LOCK_SCROLL><HOST_GTK_DESKTOP_NAME>Trebellos (GTK)</HOST_GTK_DESKTOP_NAME><HOST_QT_DESKTOP_NAME>Trebellos (Qt)</HOST_QT_DESKTOP_NAME><GADGET_DESIGNER_NAME>Deseñador de trebellos</GADGET_DESIGNER_NAME><HOST_GTK_DESKTOP_COMMENT>Executar os trebellos nun ambiente GNOME/GTK</HOST_GTK_DESKTOP_COMMENT><HOST_QT_DESKTOP_COMMENT>Executar os trebellos nun ambiente KDE/Qt</HOST_QT_DESKTOP_COMMENT><GADGET_DESIGNER_COMMENT>Deseñador de trebellos</GADGET_DESIGNER_COMMENT><PERMISSION_FILEREAD>Le o contido dos ficheiros e directorios locais</PERMISSION_FILEREAD><PERMISSION_FILEWRITE>Crea ou modifica ficheiros e directorios locais</PERMISSION_FILEWRITE><PERMISSION_DEVICESTATUS>Inspecciona ou modifica o estado dos dispositivos de hardware</PERMISSION_DEVICESTATUS><PERMISSION_NETWORK>Accede á rede</PERMISSION_NETWORK><PERMISSION_PERSONALDATA>Accede aos datos de personalización</PERMISSION_PERSONALDATA><PERMISSION_ALLACCESS>Executa código nativo e aplicativos locais</PERMISSION_ALLACCESS><GADGET_LOAD_FAILURE>Non foi posíbel cargar o trebello: %s</GADGET_LOAD_FAILURE><GADGET_REQUIRE_API_VERSION>O trebello require a API de trebellos como mínimo na versión %s: %s</GADGET_REQUIRE_API_VERSION><GADGET_REQUIRE_HOST_VERSION>O trebello require Gadgets for Linux como mínimo na versión %s: %s</GADGET_REQUIRE_HOST_VERSION><GADGET_PLATFORM_NOT_SUPPORTED>O trebello non funciona na plataforma Linux:% %s</GADGET_PLATFORM_NOT_SUPPORTED><GOOGLE_HOMEPAGE_URL>http://www.google.com</GOOGLE_HOMEPAGE_URL></strings>
--- third_party/Makefile.in
+++ third_party/Makefile.in
@@ -261,6 +261,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- third_party/codesighs/Makefile.in
+++ third_party/codesighs/Makefile.in
@@ -249,6 +249,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- third_party/editline/Makefile.in
+++ third_party/editline/Makefile.in
@@ -246,6 +246,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- third_party/unzip/Makefile.in
+++ third_party/unzip/Makefile.in
@@ -253,6 +253,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- third_party/xdgmime/Makefile.in
+++ third_party/xdgmime/Makefile.in
@@ -263,6 +263,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- unittest/Makefile.in
+++ unittest/Makefile.in
@@ -248,6 +248,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
--- xdg/Makefile.in
+++ xdg/Makefile.in
@@ -295,6 +295,8 @@
PANEL_DIR = @PANEL_DIR@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
PREDEFINED_MACROS = @PREDEFINED_MACROS@
PTHREAD_LIBS = @PTHREAD_LIBS@
QT4NETWORK_CFLAGS = @QT4NETWORK_CFLAGS@
More information about the MeeGo-commits
mailing list