diff -Nru lxappearance-0.3.0~svn20090913/aclocal.m4 lxappearance-0.4.0/aclocal.m4 --- lxappearance-0.3.0~svn20090913/aclocal.m4 2009-09-13 11:27:20.000000000 +0100 +++ lxappearance-0.4.0/aclocal.m4 2010-01-06 15:30:25.000000000 +0000 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.2 -*- Autoconf -*- +# generated automatically by aclocal 1.11 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],, -[m4_warning([this file was generated for autoconf 2.63. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, +[m4_warning([this file was generated for autoconf 2.65. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -848,10 +848,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.10' +[am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.2], [], +m4_if([$1], [1.11], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -867,7 +867,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.2])dnl +[AM_AUTOMAKE_VERSION([1.11])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -950,14 +950,14 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 9 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -970,6 +970,7 @@ AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl _AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -983,14 +984,14 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 10 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -1047,6 +1048,16 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -1064,7 +1075,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -1074,19 +1095,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -1236,13 +1261,13 @@ # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 13 +# serial 16 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -1259,7 +1284,7 @@ # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.60])dnl +[AC_PREREQ([2.62])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -1310,8 +1335,8 @@ AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -1319,24 +1344,37 @@ AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header @@ -1359,7 +1397,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1370,7 +1408,14 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -1397,27 +1442,38 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless `enable' is passed literally. +# For symmetry, `disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl + AC_SUBST([MAINT])dnl ] ) @@ -1425,13 +1481,13 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_MAKE_INCLUDE() # ----------------- @@ -1440,7 +1496,7 @@ [am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -1450,24 +1506,24 @@ _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi AC_SUBST([am__include]) AC_SUBST([am__quote]) @@ -1477,14 +1533,14 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 6 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -1501,7 +1557,14 @@ AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -1572,14 +1635,14 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_SANITY_CHECK # --------------- @@ -1588,16 +1651,29 @@ # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac + # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$[*]" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$[*]" != "X $srcdir/configure conftest.file" \ @@ -1650,18 +1726,25 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. diff -Nru lxappearance-0.3.0~svn20090913/config.h.in lxappearance-0.4.0/config.h.in --- lxappearance-0.3.0~svn20090913/config.h.in 2009-09-13 11:27:21.000000000 +0100 +++ lxappearance-0.4.0/config.h.in 2010-01-06 15:30:27.000000000 +0000 @@ -1,5 +1,8 @@ /* config.h.in. Generated from configure.in by autoheader. */ +/* Cursor theme support is not well implemented */ +#undef CURSOR_THEME + /* always defined to indicate that i18n is enabled */ #undef ENABLE_NLS @@ -63,6 +66,9 @@ /* Define to the one symbol short name of this package. */ #undef PACKAGE_TARNAME +/* Define to the home page for this package. */ +#undef PACKAGE_URL + /* Define to the version of this package. */ #undef PACKAGE_VERSION diff -Nru lxappearance-0.3.0~svn20090913/configure lxappearance-0.4.0/configure --- lxappearance-0.3.0~svn20090913/configure 2009-09-13 11:27:23.000000000 +0100 +++ lxappearance-0.4.0/configure 2010-01-06 15:30:32.000000000 +0000 @@ -1,18 +1,22 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63. +# Generated by GNU Autoconf 2.65. +# # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# +# # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -20,23 +24,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -44,7 +40,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -55,7 +57,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -78,13 +80,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -94,15 +89,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -114,12 +109,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -131,330 +130,299 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi - -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename -- "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - # CDPATH. -$as_unset CDPATH - +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test "x$CONFIG_SHELL" = x; then - if (eval ":") 2>/dev/null; then - as_have_required=yes + as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : + emulate sh + NULLCMD=: + # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which + # is contrary to our usage. Disable this feature. + alias -g '\${1+\"\$@\"}'='\"\$@\"' + setopt NO_GLOB_SUBST else - as_have_required=no + case \`(set -o) 2>/dev/null\` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; +esac fi - - if test $as_have_required = yes && (eval ": -(as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +" + as_required="as_fn_return () { (exit \$1); } +as_fn_success () { as_fn_return 0; } +as_fn_failure () { as_fn_return 1; } +as_fn_ret_success () { return 0; } +as_fn_ret_failure () { return 1; } exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +as_fn_success || { exitcode=1; echo as_fn_success failed.; } +as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } +as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } +as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } +if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : + +else + exitcode=1; echo positional parameters were not saved. +fi +test x\$exitcode = x0 || exit 1" + as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO + as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO + eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && + test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 +test \$(( 1 + 1 )) = 2 || exit 1" + if (eval "$as_required") 2>/dev/null; then : + as_have_required=yes else - exitcode=1 - echo positional parameters were not saved. + as_have_required=no fi + if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -test \$exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=\$LINENO - as_lineno_2=\$LINENO - test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && - test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -") 2> /dev/null; then - : else - as_candidate_shells= - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_found=false for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - case $as_dir in + as_found=: + case $as_dir in #( /*) for as_base in sh bash ksh sh5; do - as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + # Try only shells that exist, to save several forks. + as_shell=$as_dir/$as_base + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : + CONFIG_SHELL=$as_shell as_have_required=yes + if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : + break 2 +fi +fi done;; esac + as_found=false done +$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && + { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : + CONFIG_SHELL=$SHELL as_have_required=yes +fi; } IFS=$as_save_IFS - for as_shell in $as_candidate_shells $SHELL; do - # Try only shells that exist, to save several forks. - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { ("$as_shell") 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -_ASEOF -}; then - CONFIG_SHELL=$as_shell - as_have_required=yes - if { "$as_shell" 2> /dev/null <<\_ASEOF -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; -esac - -fi - - -: -(as_func_return () { - (exit $1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} - -exitcode=0 -if as_func_success; then - : -else - exitcode=1 - echo as_func_success failed. -fi - -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi - -if as_func_ret_success; then - : -else - exitcode=1 - echo as_func_ret_success failed. -fi - -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. -fi - -if ( set x; as_func_ret_success y && test x = "$1" ); then - : -else - exitcode=1 - echo positional parameters were not saved. -fi - -test $exitcode = 0) || { (exit 1); exit 1; } - -( - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } - -_ASEOF -}; then - break -fi - -fi - - done - - if test "x$CONFIG_SHELL" != x; then - for as_var in BASH_ENV ENV - do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var - done + if test "x$CONFIG_SHELL" != x; then : + # We cannot yet assume a decent shell, so we have to provide a + # neutralization value for shells without unset; and this also + # works around shells that cannot unset nonexistent variables. + BASH_ENV=/dev/null + ENV=/dev/null + (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV export CONFIG_SHELL exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} fi - - if test $as_have_required = no; then - echo This script requires a shell more modern than all the - echo shells that I found on your system. Please install a - echo modern shell, or manually run the script under such a - echo shell if you do have one. - { (exit 1); exit 1; } + if test x$as_have_required = xno; then : + $as_echo "$0: This script requires a shell more modern than all" + $as_echo "$0: the shells that I found on your system." + if test x${ZSH_VERSION+set} = xset ; then + $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" + $as_echo "$0: be upgraded to zsh 4.3.4 or later." + else + $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, +$0: including any error possibly output before this +$0: message. Then install a modern shell, or manually run +$0: the script under such a shell if you do have one." + fi + exit 1 fi - - fi - fi +SHELL=${CONFIG_SHELL-/bin/sh} +export SHELL +# Unset more variables known to interfere with behavior of common tools. +CLICOLOR_FORCE= GREP_OPTIONS= +unset CLICOLOR_FORCE GREP_OPTIONS + +## --------------------- ## +## M4sh Shell Functions. ## +## --------------------- ## +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" -(eval "as_func_return () { - (exit \$1) -} -as_func_success () { - as_func_return 0 -} -as_func_failure () { - as_func_return 1 -} -as_func_ret_success () { - return 0 -} -as_func_ret_failure () { - return 1 -} +} # as_fn_mkdir_p +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append -exitcode=0 -if as_func_success; then - : +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' else - exitcode=1 - echo as_func_success failed. -fi + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith -if as_func_failure; then - exitcode=1 - echo as_func_failure succeeded. -fi -if as_func_ret_success; then - : +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr else - exitcode=1 - echo as_func_ret_success failed. + as_expr=false fi -if as_func_ret_failure; then - exitcode=1 - echo as_func_ret_failure succeeded. +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false fi -if ( set x; as_func_ret_success y && test x = \"\$1\" ); then - : +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname else - exitcode=1 - echo positional parameters were not saved. + as_dirname=false fi -test \$exitcode = 0") || { - echo No shell found that supports shell functions. - echo Please tell bug-autoconf@gnu.org about your system, - echo including any error possibly output before this message. - echo This can help us improve future autoconf versions. - echo Configuration will now proceed without shell functions. -} +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) + as_lineno_1=$LINENO as_lineno_1a=$LINENO + as_lineno_2=$LINENO as_lineno_2a=$LINENO + eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && + test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { + # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) sed -n ' p /[$]LINENO/= @@ -471,8 +439,7 @@ s/-\n.*// ' >$as_me.lineno && chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } + { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the @@ -482,29 +449,18 @@ exit } - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi - ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -534,7 +490,7 @@ rmdir conf$$.dir 2>/dev/null if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -553,10 +509,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -570,8 +526,8 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -589,7 +545,6 @@ subdirs= MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME= @@ -597,6 +552,7 @@ PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= +PACKAGE_URL= ac_unique_file="configure.in" # Factoring default headers for most tests. @@ -635,7 +591,9 @@ # include #endif" -ac_subst_vars='LTLIBOBJS +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS LIBOBJS ENABLE_REGENERATE_MAN_FALSE ENABLE_REGENERATE_MAN_TRUE @@ -762,6 +720,7 @@ program_transform_name prefix exec_prefix +PACKAGE_URL PACKAGE_BUGREPORT PACKAGE_STRING PACKAGE_VERSION @@ -776,6 +735,7 @@ enable_nls enable_dependency_tracking enable_man +enable_cursor_theme with_xml_catalog ' ac_precious_vars='build_alias @@ -898,8 +858,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -925,8 +884,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1130,8 +1088,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1147,8 +1104,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2 - { (exit 1); exit 1; }; } + as_fn_error "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1178,17 +1134,17 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) { $as_echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } + -*) as_fn_error "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information." ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } + case $ac_envvar in #( + '' | [0-9]* | *[!_$as_cr_alnum]* ) + as_fn_error "invalid variable name: \`$ac_envvar'" ;; + esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1205,15 +1161,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { $as_echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } + as_fn_error "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 - { (exit 1); exit 1; }; } ;; + fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1236,8 +1190,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; } + as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1267,11 +1220,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - { $as_echo "$as_me: error: working directory cannot be determined" >&2 - { (exit 1); exit 1; }; } + as_fn_error "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 - { (exit 1); exit 1; }; } + as_fn_error "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1310,13 +1261,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } + as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2 - { (exit 1); exit 1; }; } + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1421,6 +1370,7 @@ --enable-dependency-tracking do not reject slow dependency extractors --enable-man regenerate roff man pages from Docbook [default=no] + Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) @@ -1433,7 +1383,7 @@ LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility @@ -1445,6 +1395,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to the package provider. _ACEOF ac_status=$? fi @@ -1508,21 +1459,372 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.63 +generated by GNU Autoconf 2.65 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF exit fi + +## ------------------------ ## +## Autoconf initialization. ## +## ------------------------ ## + +# ac_fn_c_try_compile LINENO +# -------------------------- +# Try to compile conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext + if { { ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compile") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_compile + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link + +# ac_fn_c_check_func LINENO FUNC VAR +# ---------------------------------- +# Tests whether FUNC exists, setting the cache variable VAR accordingly +ac_fn_c_check_func () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +/* Define $2 to an innocuous variant, in case declares $2. + For example, HP-UX 11i declares gettimeofday. */ +#define $2 innocuous_$2 + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $2 (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $2 + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char $2 (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_$2 || defined __stub___$2 +choke me +#endif + +int +main () +{ +return $2 (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_func + +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + +# ac_fn_c_try_run LINENO +# ---------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes +# that executables *can* be run. +ac_fn_c_try_run () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then : + ac_retval=0 +else + $as_echo "$as_me: program exited with status $ac_status" >&5 + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=$ac_status +fi + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + as_fn_set_status $ac_retval + +} # ac_fn_c_try_run + +# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists, giving a warning if it cannot be compiled using +# the include files in INCLUDES and setting the cache variable VAR +# accordingly. +ac_fn_c_check_header_mongrel () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +else + # Is the header compilable? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 +$as_echo_n "checking $2 usability... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + ac_header_compiler=yes +else + ac_header_compiler=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 +$as_echo "$ac_header_compiler" >&6; } + +# Is the header present? +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 +$as_echo_n "checking $2 presence... " >&6; } +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <$2> +_ACEOF +if ac_fn_c_try_cpp "$LINENO"; then : + ac_header_preproc=yes +else + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 +$as_echo "$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( + yes:no: ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 +$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; + no:yes:* ) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 +$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 +$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 +$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 +$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 +$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} + ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=\$ac_header_compiler" +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } +fi + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_mongrel + +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + eval "$3=yes" +else + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + +} # ac_fn_c_check_header_compile cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -1558,8 +1860,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" -done + $as_echo "PATH: $as_dir" + done IFS=$as_save_IFS } >&5 @@ -1596,9 +1898,9 @@ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" + as_fn_append ac_configure_args1 " '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -1614,13 +1916,13 @@ -* ) ac_must_keep_next=true ;; esac fi - ac_configure_args="$ac_configure_args '$ac_arg'" + as_fn_append ac_configure_args " '$ac_arg'" ;; esac done done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } +{ ac_configure_args0=; unset ac_configure_args0;} +{ ac_configure_args1=; unset ac_configure_args1;} # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there @@ -1645,13 +1947,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -1723,39 +2025,41 @@ exit $exit_status ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal + trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. rm -f -r conftest* confdefs.h +$as_echo "/* confdefs.h */" > confdefs.h + # Predefined preprocessor variables. cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF - cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF +cat >>confdefs.h <<_ACEOF +#define PACKAGE_URL "$PACKAGE_URL" +_ACEOF + # Let the site file select an alternate cache file if it wants to. # Prefer an explicitly selected file to automatically selected ones. @@ -1773,8 +2077,8 @@ for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then - { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" @@ -1782,10 +2086,10 @@ done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5 + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . "$cache_file";; @@ -1793,7 +2097,7 @@ esac fi else - { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 $as_echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1808,11 +2112,11 @@ eval ac_new_val=\$ac_env_${ac_var}_value case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; @@ -1822,17 +2126,17 @@ ac_old_val_w=`echo x $ac_old_val` ac_new_val_w=`echo x $ac_new_val` if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} ac_cache_corrupted=: else - { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} eval $ac_var=\$ac_old_val fi - { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 $as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 $as_echo "$as_me: current value: \`$ac_new_val'" >&2;} fi;; esac @@ -1844,35 +2148,20 @@ esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + *) as_fn_append ac_configure_args " '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi - - - - - - - - - - - - - - - - +## -------------------- ## +## Main body of script. ## +## -------------------- ## ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -1881,28 +2170,20 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.10' +am__api_version='1.11' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi + for ac_t in install-sh install.sh shtool; do + if test -f "$ac_dir/$ac_t"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/$ac_t -c" + break 2 + fi + done done if test -z "$ac_aux_dir"; then - { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 -$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -1928,10 +2209,10 @@ # OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. # Reject install programs that cannot install multiple files. -{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 $as_echo_n "checking for a BSD-compatible install... " >&6; } if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then +if test "${ac_cv_path_install+set}" = set; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -1939,11 +2220,11 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in #(( + ./ | .// | /[cC]/* | \ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ /usr/ucb/* ) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. @@ -1980,7 +2261,7 @@ ;; esac -done + done IFS=$as_save_IFS rm -rf conftest.one conftest.two conftest.dir @@ -1996,7 +2277,7 @@ INSTALL=$ac_install_sh fi fi -{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 $as_echo "$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2007,21 +2288,34 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; +esac + # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$*" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$*" != "X $srcdir/configure conftest.file" \ @@ -2031,11 +2325,8 @@ # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -$as_echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "ls -t appears to fail. Make sure there is not a broken +alias in your environment" "$LINENO" 5 fi test "$2" = conftest.file @@ -2044,13 +2335,10 @@ # Ok. : else - { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -$as_echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "newly created file is older than distributed files! +Check your system clock" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" @@ -2065,44 +2353,161 @@ # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " else am_missing_run= - { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi -{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 -$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } -if test -z "$MKDIR_P"; then - if test "${ac_cv_path_mkdir+set}" = set; then +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then : $as_echo_n "(cached) " >&6 else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in mkdir gmkdir; do - for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue - case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( - 'mkdir (GNU coreutils) '* | \ - 'mkdir (coreutils) '* | \ - 'mkdir (fileutils) '4.1*) - ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext - break 3;; - esac - done - done -done -IFS=$as_save_IFS + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 +$as_echo_n "checking for a thread-safe mkdir -p... " >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done + done +IFS=$as_save_IFS fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -2110,11 +2515,10 @@ # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi -{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } mkdir_p="$MKDIR_P" @@ -2127,9 +2531,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then +if test "${ac_cv_prog_AWK+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2140,24 +2544,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:$LINENO: result: $AWK" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 $as_echo "$AWK" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2165,11 +2569,11 @@ test -n "$AWK" && break done -{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2187,11 +2591,11 @@ rm -f conftest.make fi if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } SET_MAKE= else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -2211,9 +2615,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2229,7 +2631,7 @@ # Define the identity of the package. PACKAGE=lxappearance - VERSION=0.3.0 + VERSION=0.4.0 cat >>confdefs.h <<_ACEOF @@ -2257,108 +2659,6 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:$LINENO: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. @@ -2373,16 +2673,17 @@ ac_config_headers="$ac_config_headers config.h" -{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. -if test "${enable_maintainer_mode+set}" = set; then +if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else USE_MAINTAINER_MODE=no fi - { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 $as_echo "$USE_MAINTAINER_MODE" >&6; } if test $USE_MAINTAINER_MODE = yes; then MAINTAINER_MODE_TRUE= @@ -2398,16 +2699,16 @@ # Init intltool - { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. -if test "${enable_nls+set}" = set; then +if test "${enable_nls+set}" = set; then : enableval=$enable_nls; USE_NLS=$enableval else USE_NLS=yes fi - { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 $as_echo "$USE_NLS" >&6; } @@ -2419,44 +2720,44 @@ am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. -{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 $as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi -{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 $as_echo "$_am_result" >&6; } rm -f confinc confmf # Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then +if test "${enable_dependency_tracking+set}" = set; then : enableval=$enable_dependency_tracking; fi @@ -2481,9 +2782,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2494,24 +2795,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2521,9 +2822,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2534,24 +2835,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2560,7 +2861,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2574,9 +2875,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2587,24 +2888,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2614,9 +2915,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2628,18 +2929,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -2658,10 +2959,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2673,9 +2974,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2686,24 +2987,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2717,9 +3018,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2730,24 +3031,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -2760,7 +3061,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -2771,57 +3072,37 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -2837,8 +3118,8 @@ # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -2854,17 +3135,17 @@ done rm -f $ac_rmfiles -if { (ac_try="$ac_link_default" +if { { ac_try="$ac_link_default" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_link_default") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. # So ignore a value of `no', otherwise this would lead to `EXEEXT = no' # in a Makefile. We should not override ac_cv_exeext if it was cached, @@ -2881,7 +3162,7 @@ # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; then :; else ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` fi @@ -2900,84 +3181,42 @@ else ac_file='' fi - -{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } -if test -z "$ac_file"; then - $as_echo "$as_me: failed program was:" >&5 +if test -z "$ac_file"; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; }; } +{ as_fn_set_status 77 +as_fn_error "C compiler cannot create executables +See \`config.log' for more details." "$LINENO" 5; }; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi - +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (case "(($ac_try" in +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 +$as_echo_n "checking for suffix of executables... " >&6; } +if { { ac_try="$ac_link" +case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } - fi - fi -fi -{ $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -2992,32 +3231,83 @@ esac done else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." "$LINENO" 5; } fi - -rm -f conftest$ac_cv_exeext -{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +rm -f conftest conftest$ac_cv_exeext +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then +if test "${ac_cv_objext+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3029,17 +3319,17 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (ac_try="$ac_compile" +if { { ac_try="$ac_compile" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 (eval "$ac_compile") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then : for ac_file in conftest.o conftest.obj conftest.*; do test -f "$ac_file" || continue; case $ac_file in @@ -3052,31 +3342,23 @@ $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "cannot compute suffix of object files: cannot compile +See \`config.log' for more details." "$LINENO" 5; } fi - rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 $as_echo "$ac_cv_objext" >&6; } OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3090,37 +3372,16 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -3129,20 +3390,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3153,35 +3410,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3192,36 +3425,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -3232,42 +3441,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -3284,18 +3468,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -3352,32 +3532,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -3388,17 +3545,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -3408,9 +3567,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3436,6 +3595,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -3453,7 +3617,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -3463,19 +3637,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -3499,7 +3677,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -3519,35 +3697,31 @@ case "$am__api_version" in 1.01234) - { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5 -$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; esac if test -n ""; then - { $as_echo "$as_me:$LINENO: checking for intltool >= " >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= " >&5 $as_echo_n "checking for intltool >= ... " >&6; } INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool or later." >&5 -$as_echo "$as_me: error: Your intltool is too old. You need intltool or later." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "Your intltool is too old. You need intltool or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. set dummy intltool-update; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then +if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_UPDATE in @@ -3560,14 +3734,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3575,19 +3749,19 @@ fi INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE if test -n "$INTLTOOL_UPDATE"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 $as_echo "$INTLTOOL_UPDATE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "intltool-merge", so it can be a program name with args. set dummy intltool-merge; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then +if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_MERGE in @@ -3600,14 +3774,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3615,19 +3789,19 @@ fi INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE if test -n "$INTLTOOL_MERGE"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 $as_echo "$INTLTOOL_MERGE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "intltool-extract", so it can be a program name with args. set dummy intltool-extract; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then +if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_EXTRACT in @@ -3640,14 +3814,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3655,18 +3829,16 @@ fi INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT if test -n "$INTLTOOL_EXTRACT"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 $as_echo "$INTLTOOL_EXTRACT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5 -$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -3788,9 +3960,9 @@ # Check the gettext tools to make sure they are GNU # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then +if test "${ac_cv_path_XGETTEXT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $XGETTEXT in @@ -3803,14 +3975,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3818,19 +3990,19 @@ fi XGETTEXT=$ac_cv_path_XGETTEXT if test -n "$XGETTEXT"; then - { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 $as_echo "$XGETTEXT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "msgmerge", so it can be a program name with args. set dummy msgmerge; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGMERGE+set}" = set; then +if test "${ac_cv_path_MSGMERGE+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MSGMERGE in @@ -3843,14 +4015,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3858,19 +4030,19 @@ fi MSGMERGE=$ac_cv_path_MSGMERGE if test -n "$MSGMERGE"; then - { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 $as_echo "$MSGMERGE" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then +if test "${ac_cv_path_MSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $MSGFMT in @@ -3883,14 +4055,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3898,19 +4070,19 @@ fi MSGFMT=$ac_cv_path_MSGFMT if test -n "$MSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 $as_echo "$MSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then +if test "${ac_cv_path_GMSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -3923,14 +4095,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -3939,33 +4111,29 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 $as_echo "$GMSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5 -$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then +if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_PERL in @@ -3978,14 +4146,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -3993,41 +4161,35 @@ fi INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL if test -n "$INTLTOOL_PERL"; then - { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 $as_echo "$INTLTOOL_PERL" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test -z "$INTLTOOL_PERL"; then - { { $as_echo "$as_me:$LINENO: error: perl not found" >&5 -$as_echo "$as_me: error: perl not found" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "perl not found" "$LINENO" 5 fi -{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 $as_echo_n "checking for perl >= 5.8.1... " >&6; } $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 if test $? -ne 0; then - { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5 -$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 else IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" - { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 $as_echo "$IT_PERL_VERSION" >&6; } fi if test "x" != "xno-xml"; then - { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 $as_echo_n "checking for XML::Parser... " >&6; } if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - { $as_echo "$as_me:$LINENO: result: ok" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5 -$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 fi fi @@ -4037,11 +4199,7 @@ # Set DATADIRNAME correctly if it is not set yet # (copied from glib-gettext.m4) if test -z "$DATADIRNAME"; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4053,120 +4211,13 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : DATADIRNAME=share else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in + case $host in *-*-solaris*) - { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -$as_echo_n "checking for bind_textdomain_codeset... " >&6; } -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. - For example, HP-UX 11i declares gettimeofday. */ -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind_textdomain_codeset (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef bind_textdomain_codeset - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bind_textdomain_codeset (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset -choke me -#endif - -int -main () -{ -return bind_textdomain_codeset (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_bind_textdomain_codeset=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_bind_textdomain_codeset=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : DATADIRNAME=share else DATADIRNAME=lib @@ -4178,10 +4229,8 @@ ;; esac fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi @@ -4189,17 +4238,13 @@ -{ $as_echo "$as_me:$LINENO: checking for library containing strerror" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing strerror" >&5 $as_echo_n "checking for library containing strerror... " >&6; } -if test "${ac_cv_search_strerror+set}" = set; then +if test "${ac_cv_search_strerror+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -4224,54 +4269,27 @@ ac_res=-l$ac_lib LIBS="-l$ac_lib $ac_func_search_save_LIBS" fi - rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then + if ac_fn_c_try_link "$LINENO"; then : ac_cv_search_strerror=$ac_res -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext - if test "${ac_cv_search_strerror+set}" = set; then +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_strerror+set}" = set; then : break fi done -if test "${ac_cv_search_strerror+set}" = set; then - : +if test "${ac_cv_search_strerror+set}" = set; then : + else ac_cv_search_strerror=no fi rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_strerror" >&5 $as_echo "$ac_cv_search_strerror" >&6; } ac_res=$ac_cv_search_strerror -if test "$ac_res" != no; then +if test "$ac_res" != no; then : test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi @@ -4284,9 +4302,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4297,24 +4315,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4324,9 +4342,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4337,24 +4355,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4363,7 +4381,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -4377,9 +4395,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4390,24 +4408,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4417,9 +4435,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4431,18 +4449,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -4461,10 +4479,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4476,9 +4494,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4489,24 +4507,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4520,9 +4538,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4533,24 +4551,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -4563,7 +4581,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -4574,62 +4592,42 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4643,37 +4641,16 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -4682,20 +4659,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4706,35 +4679,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4745,36 +4694,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -4785,42 +4710,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -4837,18 +4737,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -4905,32 +4801,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -4941,17 +4814,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4961,9 +4836,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -4989,6 +4864,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -5006,7 +4886,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -5016,19 +4906,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -5052,7 +4946,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -5075,9 +4969,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5088,24 +4982,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5115,9 +5009,9 @@ ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -5128,24 +5022,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5154,7 +5048,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5168,9 +5062,9 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5181,24 +5075,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5208,9 +5102,9 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5222,18 +5116,18 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS if test $ac_prog_rejected = yes; then @@ -5252,10 +5146,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5267,9 +5161,9 @@ do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then +if test "${ac_cv_prog_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -5280,24 +5174,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:$LINENO: result: $CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 $as_echo "$CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5311,9 +5205,9 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -5324,24 +5218,24 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 $as_echo "$ac_ct_CC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -5354,7 +5248,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -5365,62 +5259,42 @@ fi -test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "no acceptable C compiler found in \$PATH +See \`config.log' for more details." "$LINENO" 5; } # Provide some information about the compiler. -$as_echo "$as_me:$LINENO: checking for C compiler version" >&5 +$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 set X $ac_compile ac_compiler=$2 -{ (ac_try="$ac_compiler --version >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler --version >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -v >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -v >&5") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (ac_try="$ac_compiler -V >&5" +for ac_option in --version -v -V -qversion; do + { { ac_try="$ac_compiler $ac_option >&5" case "(($ac_try" in *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; *) ac_try_echo=$ac_try;; esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compiler -V >&5") 2>&5 +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_compiler $ac_option >&5") 2>conftest.err ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } + if test -s conftest.err; then + sed '10a\ +... rest of stderr output deleted ... + 10q' conftest.err >conftest.er1 + cat conftest.er1 >&5 + fi + rm -f conftest.er1 conftest.err + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } +done -{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then +if test "${ac_cv_c_compiler_gnu+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5434,37 +5308,16 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_compiler_gnu=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_compiler_gnu=no + ac_compiler_gnu=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 $as_echo "$ac_cv_c_compiler_gnu" >&6; } if test $ac_compiler_gnu = yes; then GCC=yes @@ -5473,20 +5326,16 @@ fi ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 $as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then +if test "${ac_cv_prog_cc_g+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag ac_c_werror_flag=yes ac_cv_prog_cc_g=no CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5497,35 +5346,11 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - CFLAGS="" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + CFLAGS="" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5536,36 +5361,12 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_compile "$LINENO"; then : - ac_c_werror_flag=$ac_save_c_werror_flag +else + ac_c_werror_flag=$ac_save_c_werror_flag CFLAGS="-g" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -5576,42 +5377,17 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_g=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ac_c_werror_flag=$ac_save_c_werror_flag fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 $as_echo "$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -5628,18 +5404,14 @@ CFLAGS= fi fi -{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then +if test "${ac_cv_prog_cc_c89+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -5696,32 +5468,9 @@ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" do CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then + if ac_fn_c_try_compile "$LINENO"; then : ac_cv_prog_cc_c89=$ac_arg -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - fi - rm -f core conftest.err conftest.$ac_objext test "x$ac_cv_prog_cc_c89" != "xno" && break done @@ -5732,17 +5481,19 @@ # AC_CACHE_VAL case "x$ac_cv_prog_cc_c89" in x) - { $as_echo "$as_me:$LINENO: result: none needed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 $as_echo "none needed" >&6; } ;; xno) - { $as_echo "$as_me:$LINENO: result: unsupported" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 $as_echo "unsupported" >&6; } ;; *) CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 $as_echo "$ac_cv_prog_cc_c89" >&6; } ;; esac +if test "x$ac_cv_prog_cc_c89" != xno; then : +fi ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -5752,9 +5503,9 @@ depcc="$CC" am_compiler_list= -{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 $as_echo_n "checking dependency style of $depcc... " >&6; } -if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then +if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -5780,6 +5531,11 @@ if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -5797,7 +5553,17 @@ done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -5807,19 +5573,23 @@ break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -5843,7 +5613,7 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5 $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; } CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type @@ -5866,14 +5636,14 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 $as_echo_n "checking how to run the C preprocessor... " >&6; } # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then + if test "${ac_cv_prog_CPP+set}" = set; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -5888,11 +5658,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -5901,78 +5667,34 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then +if $ac_preproc_ok; then : break fi @@ -5984,7 +5706,7 @@ else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:$LINENO: result: $CPP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 $as_echo "$CPP" >&6; } ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -5995,11 +5717,7 @@ # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #ifdef __STDC__ # include @@ -6008,87 +5726,40 @@ #endif Syntax error _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - : -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_cpp "$LINENO"; then : +else # Broken: fails on valid input. continue fi - rm -f conftest.err conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then +if ac_fn_c_try_cpp "$LINENO"; then : # Broken: success on invalid input. continue else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - # Passes both tests. ac_preproc_ok=: break fi - rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : +if $ac_preproc_ok; then : + else - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +as_fn_error "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." "$LINENO" 5; } fi ac_ext=c @@ -6098,9 +5769,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 $as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then +if test "${ac_cv_path_GREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -6111,7 +5782,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do + for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue @@ -6131,7 +5802,7 @@ $as_echo 'GREP' >> "conftest.nl" "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_GREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_GREP="$ac_path_GREP" @@ -6146,26 +5817,24 @@ $ac_path_GREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 $as_echo "$ac_cv_path_GREP" >&6; } GREP="$ac_cv_path_GREP" -{ $as_echo "$as_me:$LINENO: checking for egrep" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 $as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then +if test "${ac_cv_path_EGREP+set}" = set; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -6179,7 +5848,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do + for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue @@ -6199,7 +5868,7 @@ $as_echo 'EGREP' >> "conftest.nl" "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - ac_count=`expr $ac_count + 1` + as_fn_arith $ac_count + 1 && ac_count=$as_val if test $ac_count -gt ${ac_path_EGREP_max-0}; then # Best one so far, save it but keep looking for a better one ac_cv_path_EGREP="$ac_path_EGREP" @@ -6214,12 +5883,10 @@ $ac_path_EGREP_found && break 3 done done -done + done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 -$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -6227,21 +5894,17 @@ fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 $as_echo "$ac_cv_path_EGREP" >&6; } EGREP="$ac_cv_path_EGREP" -{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 $as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then +if test "${ac_cv_header_stdc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -6256,48 +5919,23 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then +if ac_fn_c_try_compile "$LINENO"; then : ac_cv_header_stdc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_header_stdc=no + ac_cv_header_stdc=no fi - rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : + $EGREP "memchr" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -6307,18 +5945,14 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : + $EGREP "free" >/dev/null 2>&1; then : + else ac_cv_header_stdc=no fi @@ -6328,14 +5962,10 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : : else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include @@ -6362,57 +5992,28 @@ return 0; } _ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - : -else - $as_echo "$as_me: program exited with status $ac_status" >&5 -$as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +if ac_fn_c_try_run "$LINENO"; then : -( exit $ac_status ) -ac_cv_header_stdc=no +else + ac_cv_header_stdc=no fi -rm -rf conftest.dSYM -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 $as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi # Check whether --enable-man was given. -if test "${enable_man+set}" = set; then +if test "${enable_man+set}" = set; then : enableval=$enable_man; enable_man="${enableval}" else enable_man=no @@ -6420,16 +6021,27 @@ fi -pkg_modules="gtk+-2.0 >= 2.12.0" + +$as_echo "#define CURSOR_THEME 0" >>confdefs.h + +# Check whether --enable-cursor-theme was given. +if test "${enable_cursor_theme+set}" = set; then : + enableval=$enable_cursor_theme; $as_echo "#define CURSOR_THEME 1" >>confdefs.h + + +fi + + +pkg_modules="gtk+-2.0 >= 2.16.0 gmodule-export-2.0" 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. set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -6442,14 +6054,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -6457,10 +6069,10 @@ fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 $as_echo "$PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6470,9 +6082,9 @@ ac_pt_PKG_CONFIG=$PKG_CONFIG # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then +if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -6485,14 +6097,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -6500,10 +6112,10 @@ fi ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG if test -n "$ac_pt_PKG_CONFIG"; then - { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 $as_echo "$ac_pt_PKG_CONFIG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -6512,7 +6124,7 @@ else case $cross_compiling:$ac_tool_warned in yes:) -{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac @@ -6525,13 +6137,13 @@ fi if test -n "$PKG_CONFIG"; then _pkg_min_version=0.9.0 - { $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } PKG_CONFIG="" fi @@ -6539,7 +6151,7 @@ fi pkg_failed=no -{ $as_echo "$as_me:$LINENO: checking for PACKAGE" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PACKAGE" >&5 $as_echo_n "checking for PACKAGE... " >&6; } if test -n "$PKG_CONFIG"; then @@ -6547,11 +6159,11 @@ pkg_cv_PACKAGE_CFLAGS="$PACKAGE_CFLAGS" else if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\""; } >&5 ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_PACKAGE_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules" 2>/dev/null` else pkg_failed=yes @@ -6565,11 +6177,11 @@ pkg_cv_PACKAGE_LIBS="$PACKAGE_LIBS" else if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\"") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\""; } >&5 ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then pkg_cv_PACKAGE_LIBS=`$PKG_CONFIG --libs "$pkg_modules" 2>/dev/null` else pkg_failed=yes @@ -6596,7 +6208,7 @@ # Put the nasty error message in config.log where it belongs echo "$PACKAGE_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements ($pkg_modules) were not met: + as_fn_error "Package requirements ($pkg_modules) were not met: $PACKAGE_PKG_ERRORS @@ -6606,33 +6218,11 @@ Alternatively, you may set the environment variables PACKAGE_CFLAGS and PACKAGE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. -" >&5 -$as_echo "$as_me: error: Package requirements ($pkg_modules) were not met: - -$PACKAGE_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables PACKAGE_CFLAGS -and PACKAGE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} - { (exit 1); exit 1; }; } +" "$LINENO" 5 elif test $pkg_failed = untried; then - { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ { $as_echo "$as_me:$LINENO: error: 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. - -Alternatively, you may set the environment variables PACKAGE_CFLAGS -and PACKAGE_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see . -See \`config.log' for more details." >&5 -$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +as_fn_error "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. @@ -6641,12 +6231,11 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; }; } +See \`config.log' for more details." "$LINENO" 5; } else PACKAGE_CFLAGS=$pkg_cv_PACKAGE_CFLAGS PACKAGE_LIBS=$pkg_cv_PACKAGE_LIBS - { $as_echo "$as_me:$LINENO: result: yes" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } : fi @@ -6661,71 +6250,16 @@ _ACEOF -ALL_LINGUAS="af ar cs da de es et eu fa fi fr gl hr hu id it ja ko lt ml ms nb nl nn pl ps pt pt_BR ru sk sl sv tr uk ur ur_PK vi zh_CN zh_TW" +ALL_LINGUAS="af ar be@latin bg bn bn_IN ca cs da de dz el en_GB es et eu fa fi fr frp gl gu he hr hu id it ja ka ko lt mk ml ms nb nl nn oc pa pl ps pt pt_BR ru sk sl sr sr@Latn sv ta th tr uk ur ur_PK vi zh_CN zh_TW" # On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - eval "$as_ac_Header=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_Header=no" -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default +" +eval as_val=\$$as_ac_Header + if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -6736,146 +6270,12 @@ - -for ac_header in locale.h -do -as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5 -$as_echo_n "checking $ac_header usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5 -$as_echo_n "checking $ac_header presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 -$as_echo_n "checking for $ac_header... " >&6; } -if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -ac_res=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - -fi -as_val=`eval 'as_val=${'$as_ac_Header'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_header in locale.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default" +if test "x$ac_cv_header_locale_h" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define HAVE_LOCALE_H 1 _ACEOF fi @@ -6883,16 +6283,12 @@ done if test $ac_cv_header_locale_h = yes; then - { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5 $as_echo_n "checking for LC_MESSAGES... " >&6; } -if test "${am_cv_val_LC_MESSAGES+set}" = set; then +if test "${am_cv_val_LC_MESSAGES+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include int @@ -6903,46 +6299,19 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : am_cv_val_LC_MESSAGES=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - am_cv_val_LC_MESSAGES=no + am_cv_val_LC_MESSAGES=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5 $as_echo "$am_cv_val_LC_MESSAGES" >&6; } if test $am_cv_val_LC_MESSAGES = yes; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_LC_MESSAGES 1 -_ACEOF +$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h fi fi @@ -6955,150 +6324,20 @@ XGETTEXT=: INTLLIBS= - if test "${ac_cv_header_libintl_h+set}" = set; then - { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 -$as_echo_n "checking for libintl.h... " >&6; } -if test "${ac_cv_header_libintl_h+set}" = set; then - $as_echo_n "(cached) " >&6 -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -$as_echo "$ac_cv_header_libintl_h" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5 -$as_echo_n "checking libintl.h usability... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5 -$as_echo_n "checking libintl.h presence... " >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5 -$as_echo_n "checking for libintl.h... " >&6; } -if test "${ac_cv_header_libintl_h+set}" = set; then - $as_echo_n "(cached) " >&6 -else - ac_cv_header_libintl_h=$ac_header_preproc -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -$as_echo "$ac_cv_header_libintl_h" >&6; } - -fi -if test "x$ac_cv_header_libintl_h" = x""yes; then + ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default" +if test "x$ac_cv_header_libintl_h" = x""yes; then : gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" # # First check in libc # - { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5 $as_echo_n "checking for ngettext in libc... " >&6; } -if test "${gt_cv_func_ngettext_libc+set}" = set; then +if test "${gt_cv_func_ngettext_libc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -7111,201 +6350,57 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : gt_cv_func_ngettext_libc=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_ngettext_libc=no + gt_cv_func_ngettext_libc=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5 $as_echo "$gt_cv_func_ngettext_libc" >&6; } if test "$gt_cv_func_ngettext_libc" = "yes" ; then - { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5 $as_echo_n "checking for dgettext in libc... " >&6; } -if test "${gt_cv_func_dgettext_libc+set}" = set; then +if test "${gt_cv_func_dgettext_libc+set}" = set; then : $as_echo_n "(cached) " >&6 else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - -int -main () -{ -return !dgettext ("","") - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - gt_cv_func_dgettext_libc=yes -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - gt_cv_func_dgettext_libc=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext - -fi -{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5 -$as_echo "$gt_cv_func_dgettext_libc" >&6; } - fi - - if test "$gt_cv_func_ngettext_libc" = "yes" ; then - -for ac_func in bind_textdomain_codeset -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +#include - eval "$as_ac_var=no" +int +main () +{ +return !dgettext ("","") + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + gt_cv_func_dgettext_libc=yes +else + gt_cv_func_dgettext_libc=no fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5 +$as_echo "$gt_cv_func_dgettext_libc" >&6; } + fi + + if test "$gt_cv_func_ngettext_libc" = "yes" ; then + for ac_func in bind_textdomain_codeset +do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF fi @@ -7320,18 +6415,14 @@ || test "$gt_cv_func_ngettext_libc" != "yes" \ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then - { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5 $as_echo_n "checking for bindtextdomain in -lintl... " >&6; } -if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then +if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -7349,55 +6440,26 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_bindtextdomain=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_bindtextdomain=no + ac_cv_lib_intl_bindtextdomain=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5 $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; } -if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 +if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 $as_echo_n "checking for ngettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then +if test "${ac_cv_lib_intl_ngettext+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -7415,55 +6477,26 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_ngettext=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=no + ac_cv_lib_intl_ngettext=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 $as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5 +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5 $as_echo_n "checking for dgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dgettext+set}" = set; then +if test "${ac_cv_lib_intl_dgettext+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -7481,43 +6514,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_dgettext=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dgettext=no + ac_cv_lib_intl_dgettext=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5 $as_echo "$ac_cv_lib_intl_dgettext" >&6; } -if test "x$ac_cv_lib_intl_dgettext" = x""yes; then +if test "x$ac_cv_lib_intl_dgettext" = x""yes; then : gt_cv_func_dgettext_libintl=yes fi @@ -7527,22 +6535,18 @@ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then - { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5 $as_echo_n "checking if -liconv is needed to use gettext... " >&6; } - { $as_echo "$as_me:$LINENO: result: " >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } - { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5 $as_echo_n "checking for ngettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_ngettext+set}" = set; then +if test "${ac_cv_lib_intl_ngettext+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -7560,55 +6564,26 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_ngettext=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_ngettext=no + ac_cv_lib_intl_ngettext=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5 $as_echo "$ac_cv_lib_intl_ngettext" >&6; } -if test "x$ac_cv_lib_intl_ngettext" = x""yes; then - { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5 +if test "x$ac_cv_lib_intl_ngettext" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5 $as_echo_n "checking for dcgettext in -lintl... " >&6; } -if test "${ac_cv_lib_intl_dcgettext+set}" = set; then +if test "${ac_cv_lib_intl_dcgettext+set}" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lintl -liconv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -7626,43 +6601,18 @@ return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then +if ac_fn_c_try_link "$LINENO"; then : ac_cv_lib_intl_dcgettext=yes else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_intl_dcgettext=no + ac_cv_lib_intl_dcgettext=no fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5 $as_echo "$ac_cv_lib_intl_dcgettext" >&6; } -if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then +if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then : gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else @@ -7684,102 +6634,12 @@ glib_save_LIBS="$LIBS" LIBS="$LIBS -lintl $libintl_extra_libs" unset ac_cv_func_bind_textdomain_codeset - -for ac_func in bind_textdomain_codeset -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in bind_textdomain_codeset +do : + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF fi @@ -7809,15 +6669,13 @@ if test "$gt_cv_have_gettext" = "yes"; then -cat >>confdefs.h <<\_ACEOF -#define HAVE_GETTEXT 1 -_ACEOF +$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSGFMT+set}" = set; then +if test "${ac_cv_path_MSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else case "$MSGFMT" in @@ -7842,118 +6700,28 @@ fi MSGFMT="$ac_cv_path_MSGFMT" if test "$MSGFMT" != "no"; then - { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 $as_echo "$MSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi if test "$MSGFMT" != "no"; then glib_save_LIBS="$LIBS" LIBS="$LIBS $INTLLIBS" - -for ac_func in dcgettext -do -as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5 -$as_echo_n "checking for $ac_func... " >&6; } -if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$ac_func || defined __stub___$ac_func -choke me -#endif - -int -main () -{ -return $ac_func (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - eval "$as_ac_var=yes" -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - eval "$as_ac_var=no" -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -ac_res=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -as_val=`eval 'as_val=${'$as_ac_var'} - $as_echo "$as_val"'` - if test "x$as_val" = x""yes; then + for ac_func in dcgettext +do : + ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext" +if test "x$ac_cv_func_dcgettext" = x""yes; then : cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define HAVE_DCGETTEXT 1 _ACEOF fi done MSGFMT_OPTS= - { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5 $as_echo_n "checking if msgfmt accepts -c... " >&6; } cat >conftest.foo <<_ACEOF @@ -7968,14 +6736,14 @@ "Content-Transfer-Encoding: 8bit\n" _ACEOF -if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5 +if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5 ($MSGFMT -c -o /dev/null conftest.foo) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } -else { $as_echo "$as_me:$LINENO: result: no" >&5 +else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } echo "$as_me: failed input was:" >&5 sed 's/^/| /' conftest.foo >&5 @@ -7983,9 +6751,9 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GMSGFMT+set}" = set; then +if test "${ac_cv_path_GMSGFMT+set}" = set; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -7998,14 +6766,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" @@ -8014,19 +6782,19 @@ fi GMSGFMT=$ac_cv_path_GMSGFMT if test -n "$GMSGFMT"; then - { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 $as_echo "$GMSGFMT" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XGETTEXT+set}" = set; then +if test "${ac_cv_path_XGETTEXT+set}" = set; then : $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in @@ -8051,144 +6819,33 @@ fi XGETTEXT="$ac_cv_path_XGETTEXT" if test "$XGETTEXT" != ":"; then - { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 $as_echo "$XGETTEXT" >&6; } -else - { $as_echo "$as_me:$LINENO: result: no" >&5 -$as_echo "no" >&6; } -fi - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - CATOBJEXT=.gmo - DATADIRNAME=share -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - case $host in - *-*-solaris*) - { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5 -$as_echo_n "checking for bind_textdomain_codeset... " >&6; } -if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then - $as_echo_n "(cached) " >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define bind_textdomain_codeset to an innocuous variant, in case declares bind_textdomain_codeset. - For example, HP-UX 11i declares gettimeofday. */ -#define bind_textdomain_codeset innocuous_bind_textdomain_codeset - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char bind_textdomain_codeset (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef bind_textdomain_codeset +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char bind_textdomain_codeset (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset -choke me -#endif + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ int main () { -return bind_textdomain_codeset (); +extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr ; return 0; } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" -$as_echo "$ac_try_echo") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then - ac_cv_func_bind_textdomain_codeset=yes +if ac_fn_c_try_link "$LINENO"; then : + CATOBJEXT=.gmo + DATADIRNAME=share else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_bind_textdomain_codeset=no -fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5 -$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; } -if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then + case $host in + *-*-solaris*) + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" +if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then : CATOBJEXT=.gmo DATADIRNAME=share else @@ -8203,10 +6860,8 @@ ;; esac fi - -rm -rf conftest.dSYM -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$glib_save_LIBS" INSTOBJEXT=.mo else @@ -8220,9 +6875,7 @@ if test "$gt_cv_have_gettext" = "yes" ; then -cat >>confdefs.h <<\_ACEOF -#define ENABLE_NLS 1 -_ACEOF +$as_echo "#define ENABLE_NLS 1" >>confdefs.h fi @@ -8230,7 +6883,7 @@ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then : ; else - { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5 $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; } XGETTEXT=":" fi @@ -8263,7 +6916,7 @@ if test "x$ALL_LINGUAS" = "x"; then LINGUAS= else - { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 $as_echo_n "checking for catalogs to be installed... " >&6; } NEW_LINGUAS= for presentlang in $ALL_LINGUAS; do @@ -8288,7 +6941,7 @@ fi done LINGUAS=$NEW_LINGUAS - { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 $as_echo "$LINGUAS" >&6; } fi @@ -8324,9 +6977,9 @@ if test x"$enable_man" = x"yes"; then # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XSLTPROC+set}" = set; then +if test "${ac_cv_path_XSLTPROC+set}" = set; then : $as_echo_n "(cached) " >&6 else case $XSLTPROC in @@ -8339,14 +6992,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS ;; @@ -8354,10 +7007,10 @@ fi XSLTPROC=$ac_cv_path_XSLTPROC if test -n "$XSLTPROC"; then - { $as_echo "$as_me:$LINENO: result: $XSLTPROC" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 $as_echo "$XSLTPROC" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8370,7 +7023,7 @@ # check for the presence of the XML catalog # Check whether --with-xml-catalog was given. -if test "${with_xml_catalog+set}" = set; then +if test "${with_xml_catalog+set}" = set; then : withval=$with_xml_catalog; else with_xml_catalog=/etc/xml/catalog @@ -8379,23 +7032,23 @@ jh_found_xmlcatalog=true XML_CATALOG_FILE="$with_xml_catalog" - { $as_echo "$as_me:$LINENO: checking for XML catalog ($XML_CATALOG_FILE)" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML catalog ($XML_CATALOG_FILE)" >&5 $as_echo_n "checking for XML catalog ($XML_CATALOG_FILE)... " >&6; } if test -f "$XML_CATALOG_FILE"; then - { $as_echo "$as_me:$LINENO: result: found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 $as_echo "found" >&6; } else jh_found_xmlcatalog=false - { $as_echo "$as_me:$LINENO: result: not found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } fi # check for the xmlcatalog program # Extract the first word of "xmlcatalog", so it can be a program name with args. set dummy xmlcatalog; ac_word=$2 -{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XMLCATALOG+set}" = set; then +if test "${ac_cv_path_XMLCATALOG+set}" = set; then : $as_echo_n "(cached) " >&6 else case $XMLCATALOG in @@ -8408,14 +7061,14 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do + for ac_exec_ext in '' $ac_executable_extensions; do if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then ac_cv_path_XMLCATALOG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done -done + done IFS=$as_save_IFS test -z "$ac_cv_path_XMLCATALOG" && ac_cv_path_XMLCATALOG="no" @@ -8424,10 +7077,10 @@ fi XMLCATALOG=$ac_cv_path_XMLCATALOG if test -n "$XMLCATALOG"; then - { $as_echo "$as_me:$LINENO: result: $XMLCATALOG" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLCATALOG" >&5 $as_echo "$XMLCATALOG" >&6; } else - { $as_echo "$as_me:$LINENO: result: no" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -8443,35 +7096,35 @@ fi - { $as_echo "$as_me:$LINENO: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XML DTD V4.1.2 in XML catalog" >&5 $as_echo_n "checking for DocBook XML DTD V4.1.2 in XML catalog... " >&6; } if $jh_found_xmlcatalog && \ - { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"-//OASIS//DTD DocBook XML V4.1.2//EN\" >&2"; } >&5 ($XMLCATALOG --noout "$XML_CATALOG_FILE" "-//OASIS//DTD DocBook XML V4.1.2//EN" >&2) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - { $as_echo "$as_me:$LINENO: result: found" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 $as_echo "found" >&6; } else - { $as_echo "$as_me:$LINENO: result: not found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } enable_man=no fi - { $as_echo "$as_me:$LINENO: checking for DocBook XSL Stylesheets >= 1.70.1 in XML catalog" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XSL Stylesheets >= 1.70.1 in XML catalog" >&5 $as_echo_n "checking for DocBook XSL Stylesheets >= 1.70.1 in XML catalog... " >&6; } if $jh_found_xmlcatalog && \ - { ($as_echo "$as_me:$LINENO: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2") >&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$XMLCATALOG --noout \"\$XML_CATALOG_FILE\" \"http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl\" >&2"; } >&5 ($XMLCATALOG --noout "$XML_CATALOG_FILE" "http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl" >&2) 2>&5 ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - { $as_echo "$as_me:$LINENO: result: found" >&5 + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 $as_echo "found" >&6; } else - { $as_echo "$as_me:$LINENO: result: not found" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } enable_man=no fi @@ -8516,13 +7169,13 @@ case $ac_val in #( *${as_nl}*) case $ac_var in #( - *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 + *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) $as_unset $ac_var ;; + *) { eval $ac_var=; unset $ac_var;} ;; esac ;; esac done @@ -8530,8 +7183,8 @@ (set) 2>&1 | case $as_nl`(ac_space=' '; set) 2>&1` in #( *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). + # `set' does not quote correctly, so add quotes: double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \. sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" @@ -8554,11 +7207,11 @@ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 $as_echo "$as_me: updating cache $cache_file" >&6;} cat confcache >$cache_file else - { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi @@ -8578,68 +7231,59 @@ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR # will be set to the directory where LIBOBJS objects are built. - ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' + as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" + as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' done LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"AMDEP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"AMDEP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi ac_config_commands="$ac_config_commands po/stamp-it" if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"am__fastdepCC\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_REGENERATE_MAN_TRUE}" && test -z "${ENABLE_REGENERATE_MAN_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_REGENERATE_MAN\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"ENABLE_REGENERATE_MAN\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "conditional \"ENABLE_REGENERATE_MAN\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 $as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +as_write_fail=0 +cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -8649,17 +7293,18 @@ debug=false ac_cs_recheck=false ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +SHELL=\${CONFIG_SHELL-$SHELL} +export SHELL +_ASEOF +cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 +## -------------------- ## +## M4sh Initialization. ## +## -------------------- ## # Be more Bourne compatible DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : emulate sh NULLCMD=: # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which @@ -8667,23 +7312,15 @@ alias -g '${1+"$@"}'='"$@"' setopt NO_GLOB_SUBST else - case `(set -o) 2>/dev/null` in - *posix*) set -o posix ;; + case `(set -o) 2>/dev/null` in #( + *posix*) : + set -o posix ;; #( + *) : + ;; esac - fi - - -# PATH needs CR -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - as_nl=' ' export as_nl @@ -8691,7 +7328,13 @@ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then +# Prefer a ksh shell builtin over an external printf program on Solaris, +# but without wasting forks for bash or zsh. +if test -z "$BASH_VERSION$ZSH_VERSION" \ + && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then + as_echo='print -r --' + as_echo_n='print -rn --' +elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then as_echo='printf %s\n' as_echo_n='printf %s' else @@ -8702,7 +7345,7 @@ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' as_echo_n_body='eval arg=$1; - case $arg in + case $arg in #( *"$as_nl"*) expr "X$arg" : "X\\(.*\\)$as_nl"; arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; @@ -8725,13 +7368,6 @@ } fi -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - # IFS # We need space, tab and new line, in precisely that order. Quoting is @@ -8741,15 +7377,15 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. -case $0 in +case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break + done IFS=$as_save_IFS ;; @@ -8761,12 +7397,16 @@ fi if test ! -f "$as_myself"; then $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - { (exit 1); exit 1; } + exit 1 fi -# Work around bugs in pre-3.0 UWIN ksh. -for as_var in ENV MAIL MAILPATH -do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +# Unset variables that we do not need and which cause bugs (e.g. in +# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" +# suppresses any "Segmentation fault" message there. '((' could +# trigger a bug in pdksh 5.2.14. +for as_var in BASH_ENV ENV MAIL MAILPATH +do eval test x\${$as_var+set} = xset \ + && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : done PS1='$ ' PS2='> ' @@ -8778,7 +7418,89 @@ LANGUAGE=C export LANGUAGE -# Required to use basename. +# CDPATH. +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH + + +# as_fn_error ERROR [LINENO LOG_FD] +# --------------------------------- +# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are +# provided, also output the error to LOG_FD, referencing LINENO. Then exit the +# script with status $?, using 1 if that was 0. +as_fn_error () +{ + as_status=$?; test $as_status -eq 0 && as_status=1 + if test "$3"; then + as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + fi + $as_echo "$as_me: error: $1" >&2 + as_fn_exit $as_status +} # as_fn_error + + +# as_fn_set_status STATUS +# ----------------------- +# Set $? to STATUS, without forking. +as_fn_set_status () +{ + return $1 +} # as_fn_set_status + +# as_fn_exit STATUS +# ----------------- +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. +as_fn_exit () +{ + set +e + as_fn_set_status $1 + exit $1 +} # as_fn_exit + +# as_fn_unset VAR +# --------------- +# Portably unset VAR. +as_fn_unset () +{ + { eval $1=; unset $1;} +} +as_unset=as_fn_unset +# as_fn_append VAR VALUE +# ---------------------- +# Append the text in VALUE to the end of the definition contained in VAR. Take +# advantage of any shell optimizations that allow amortized linear growth over +# repeated appends, instead of the typical quadratic growth present in naive +# implementations. +if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : + eval 'as_fn_append () + { + eval $1+=\$2 + }' +else + as_fn_append () + { + eval $1=\$$1\$2 + } +fi # as_fn_append + +# as_fn_arith ARG... +# ------------------ +# Perform arithmetic evaluation on the ARGs, and store the result in the +# global $as_val. Take advantage of shells that can avoid forks. The arguments +# must be portable across $(()) and expr. +if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : + eval 'as_fn_arith () + { + as_val=$(( $* )) + }' +else + as_fn_arith () + { + as_val=`expr "$@" || test $? -eq 1` + } +fi # as_fn_arith + + if expr a : '\(a\)' >/dev/null 2>&1 && test "X`expr 00001 : '.*\(...\)'`" = X001; then as_expr=expr @@ -8792,8 +7514,12 @@ as_basename=false fi +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi -# Name of the executable. as_me=`$as_basename -- "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ @@ -8813,76 +7539,25 @@ } s/.*/./; q'` -# CDPATH. -$as_unset CDPATH - - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line after each line using $LINENO; the second 'sed' - # does the real work. The second script uses 'N' to pair each - # line-number line with the line containing $LINENO, and appends - # trailing '-' during substitution so that $LINENO is not a special - # case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # scripts with optimization help from Paolo Bonzini. Blame Lee - # E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | - sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno - N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop - s/-\n.*// - ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" - # Exit status is that of the last command. - exit -} - - -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in +case `echo -n x` in #((((( -n*) - case `echo 'x\c'` in + case `echo 'xy\c'` in *c*) ECHO_T=' ';; # ECHO_T is single tab character. - *) ECHO_C='\c';; + xy) ECHO_C='\c';; + *) echo `echo ksh88 bug on AIX 6.1` > /dev/null + ECHO_T=' ';; esac;; *) ECHO_N='-n';; esac -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr -else - as_expr=false -fi rm -f conf$$ conf$$.exe conf$$.file if test -d conf$$.dir; then @@ -8911,8 +7586,56 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null + +# as_fn_mkdir_p +# ------------- +# Create "$as_dir" as a directory, including parents if necessary. +as_fn_mkdir_p () +{ + + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || eval $as_mkdir_p || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + + +} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p=: + as_mkdir_p='mkdir -p "$as_dir"' else test -d ./-p && rmdir ./-p as_mkdir_p=false @@ -8931,10 +7654,10 @@ if test -d "$1"; then test -d "$1/."; else - case $1 in + case $1 in #( -*)set "./$1";; esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( ???[sx]*):;;*)false;;esac;fi '\'' sh ' @@ -8949,13 +7672,19 @@ exec 6>&1 +## ----------------------------------- ## +## Main body of $CONFIG_STATUS script. ## +## ----------------------------------- ## +_ASEOF +test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 -# Save the log message, to keep $[0] and so on meaningful, and to +cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +# Save the log message, to keep $0 and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.63. Invocation command line was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -8987,13 +7716,15 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. +\`$as_me' instantiates files and other configuration actions +from templates according to the current configuration. Unless the files +and actions are specified as TAGs, all are instantiated by default. -Usage: $0 [OPTION]... [FILE]... +Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -9012,16 +7743,17 @@ Configuration commands: $config_commands -Report bugs to ." +Report bugs to the package provider." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.63, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" -Copyright (C) 2008 Free Software Foundation, Inc. +Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -9057,6 +7789,8 @@ ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) @@ -9064,20 +7798,19 @@ case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - CONFIG_FILES="$CONFIG_FILES '$ac_optarg'" + as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; --header | --heade | --head | --hea ) $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; esac - CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'" + as_fn_append CONFIG_HEADERS " '$ac_optarg'" ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - { $as_echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; };; + as_fn_error "ambiguous option: \`$1' +Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ @@ -9085,11 +7818,10 @@ ac_cs_silent=: ;; # This is an error. - -*) { $as_echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } ;; + -*) as_fn_error "unrecognized option: \`$1' +Try \`$0 --help' for more information." ;; - *) ac_config_targets="$ac_config_targets $1" + *) as_fn_append ac_config_targets " $1" ac_need_defaults=false ;; esac @@ -9150,9 +7882,7 @@ "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; + *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -9179,7 +7909,7 @@ trap 'exit_status=$? { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status ' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 + trap 'as_fn_exit 1' 1 2 13 15 } # Create a (secure) tmp directory for tmp files. @@ -9190,11 +7920,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || -{ - $as_echo "$as_me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} +} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -9202,10 +7928,16 @@ if test -n "$CONFIG_FILES"; then -ac_cr=' ' +ac_cr=`echo X | tr X '\015'` +# On cygwin, bash can eat \r inside `` if the user requested igncr. +# But we know of no other shell where ac_cr would be empty at this +# point, so we can use a bashism as a fallback. +if test "x$ac_cr" = x; then + eval ac_cr=\$\'\\r\' +fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\\r' + ac_cs_awk_cr='\r' else ac_cs_awk_cr=$ac_cr fi @@ -9219,24 +7951,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -9258,7 +7984,7 @@ t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -9272,7 +7998,7 @@ t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -9325,9 +8051,7 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5 -$as_echo "$as_me: error: could not setup config files machinery" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not setup config files machinery" "$LINENO" 5 _ACEOF # VPATH may cause trouble with some makes, so we remove $(srcdir), @@ -9368,9 +8092,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then - { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5 -$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -9455,9 +8177,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5 -$as_echo "$as_me: error: could not setup config headers machinery" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -9470,9 +8190,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 -$as_echo "$as_me: error: invalid tag $ac_tag" >&2;} - { (exit 1); exit 1; }; };; + :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -9500,12 +8218,10 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;} - { (exit 1); exit 1; }; };; + as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - ac_file_inputs="$ac_file_inputs '$ac_f'" + as_fn_append ac_file_inputs " '$ac_f'" done # Let's still pretend it is `configure' which instantiates (i.e., don't @@ -9516,7 +8232,7 @@ `' by configure.' if test x"$ac_file" != x-; then configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:$LINENO: creating $ac_file" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 $as_echo "$as_me: creating $ac_file" >&6;} fi # Neutralize special characters interpreted by sed in replacement strings. @@ -9529,9 +8245,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } ;; + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -9559,47 +8273,7 @@ q } s/.*/./; q'` - { as_dir="$ac_dir" - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir="$ac_dir"; as_fn_mkdir_p ac_builddir=. case "$ac_dir" in @@ -9656,7 +8330,6 @@ # If the template does not know about datarootdir, expand it. # FIXME: This hack should be removed a few years after 2.60. ac_datarootdir_hack=; ac_datarootdir_seen= - ac_sed_dataroot=' /datarootdir/ { p @@ -9666,12 +8339,11 @@ /@docdir@/p /@infodir@/p /@localedir@/p -/@mandir@/p -' +/@mandir@/p' case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in *datarootdir*) ac_datarootdir_seen=yes;; *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 @@ -9681,7 +8353,7 @@ s&@infodir@&$infodir&g s&@localedir@&$localedir&g s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; + s&\\\${datarootdir}&$datarootdir&g' ;; esac _ACEOF @@ -9710,14 +8382,12 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' which seems to be undefined. Please make sure it is defined." >&2;} @@ -9727,9 +8397,7 @@ -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -9740,25 +8408,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then - { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5 -$as_echo "$as_me: error: could not create $ac_file" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5 -$as_echo "$as_me: error: could not create -" >&2;} - { (exit 1); exit 1; }; } + || as_fn_error "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -9796,7 +8458,7 @@ s/.*/./; q'`/stamp-h$_am_stamp_count ;; - :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5 + :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 $as_echo "$as_me: executing $ac_file commands" >&6;} ;; esac @@ -9891,47 +8553,7 @@ q } s/.*/./; q'` - { as_dir=$dirpart/$fdir - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -$as_echo "$as_me: error: cannot create directory $as_dir" >&2;} - { (exit 1); exit 1; }; }; } + as_dir=$dirpart/$fdir; as_fn_mkdir_p # echo "creating $dirpart/$file" echo '# dummy' > "$dirpart/$file" done @@ -9943,9 +8565,7 @@ esac ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5 -$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;} - { (exit 1); exit 1; }; } + as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" @@ -9968,15 +8588,12 @@ done # for ac_tag -{ (exit 0); exit 0; } +as_fn_exit 0 _ACEOF -chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -9997,10 +8614,10 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } + $ac_cs_success || as_fn_exit $? fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi diff -Nru lxappearance-0.3.0~svn20090913/configure.in lxappearance-0.4.0/configure.in --- lxappearance-0.3.0~svn20090913/configure.in 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/configure.in 2009-12-19 11:05:54.000000000 +0000 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.in) -AM_INIT_AUTOMAKE(lxappearance, 0.3.0) +AM_INIT_AUTOMAKE(lxappearance, 0.4.0) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE @@ -20,7 +20,12 @@ [enable_man=no] ) -pkg_modules="gtk+-2.0 >= 2.12.0" +AC_DEFINE([CURSOR_THEME],0,[Cursor theme support is not well implemented]) +AC_ARG_ENABLE(cursor-theme,[], + AC_DEFINE([CURSOR_THEME],1) +) + +pkg_modules="gtk+-2.0 >= 2.16.0 gmodule-export-2.0" PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) AC_SUBST(PACKAGE_CFLAGS) AC_SUBST(PACKAGE_LIBS) @@ -30,7 +35,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) dnl Add the languages which your application supports here. -ALL_LINGUAS="af ar cs da de es et eu fa fi fr gl hr hu id it ja ko lt ml ms nb nl nn pl ps pt pt_BR ru sk sl sv tr uk ur ur_PK vi zh_CN zh_TW" +ALL_LINGUAS="af ar be@latin bg bn bn_IN ca cs da de dz el en_GB es et eu fa fi fr frp gl gu he hr hu id it ja ka ko lt mk ml ms nb nl nn oc pa pl ps pt pt_BR ru sk sl sr sr@Latn sv ta th tr uk ur ur_PK vi zh_CN zh_TW" AM_GLIB_GNU_GETTEXT if test x"$enable_man" = x"yes"; then diff -Nru lxappearance-0.3.0~svn20090913/data/demo.ui lxappearance-0.4.0/data/demo.ui --- lxappearance-0.3.0~svn20090913/data/demo.ui 1970-01-01 01:00:00.000000000 +0100 +++ lxappearance-0.4.0/data/demo.ui 2010-01-06 15:34:18.000000000 +0000 @@ -0,0 +1,556 @@ + + + + + + + + + + + + Test Item 1 + + + Test Item 2 + + + Test Item 3 + + + + + 1 + 100 + 1 + + + 100 + 10 + + + Type some characters here to test currently selected font. + + + True + vertical + + + + True + + + True + _File + True + + + + + gtk-new + True + True + True + + + + + gtk-open + True + True + True + + + + + gtk-save + True + True + True + + + + + gtk-save-as + True + True + True + + + + + True + + + + + gtk-quit + True + True + True + + + + + + + + + True + _Edit + True + + + + + gtk-cut + True + True + True + + + + + gtk-copy + True + True + True + + + + + gtk-paste + True + True + True + + + + + gtk-delete + True + True + True + + + + + + + + + True + _Help + True + + + + + gtk-about + True + True + True + + + + + + + + + False + False + 0 + + + + + True + + + True + both + False + + + True + True + gtk-go-back + + + False + True + + + + + True + gtk-go-forward + + + False + True + + + + + True + True + gtk-stop + + + False + True + + + + + + + False + False + 1 + + + + + True + True + + + True + True + automatic + automatic + in + + + True + True + 100 + 8 + + + + + + + True + Tab1 + + + False + + + + + True + + + True + 4 + 0 + + + True + 4 + 4 + + + True + vertical + 4 + + + Radio Button + True + True + False + True + True + True + + + False + False + 0 + + + + + Radio Button + True + True + False + True + True + radiobutton1 + + + False + False + 1 + + + + + True + + + False + 2 + + + + + Check Button + True + True + False + True + True + + + False + False + 3 + + + + + True + True + ● + + + False + False + 4 + + + + + + + + + True + Demo + True + + + + + 0 + + + + + True + 4 + vertical + + + True + True + 0.60000002384200002 + 0.10000000149 + 60 % + + + False + False + 0 + + + + + True + True + adjustment2 + + + False + 1 + + + + + True + + + True + True + ● + adjustment1 + 1 + + + 0 + + + + + True + True + True + + + True + 0 + 0 + + + True + 2 + + + True + gtk-find + + + False + False + 0 + + + + + True + button + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + False + 2 + + + + + True + liststore1 + + + + 0 + + + + + False + 3 + + + + + 1 + + + + + 1 + + + + + True + Tab2 + + + 1 + False + + + + + True + True + automatic + automatic + in + + + True + True + textbuffer1 + + + + + 2 + + + + + True + Tab3 + + + 2 + False + + + + + True + True + never + in + + + True + True + True + + + + + 3 + + + + + True + Tab4 + + + 3 + False + + + + + 2 + + + + + True + 2 + + + False + False + 3 + + + + diff -Nru lxappearance-0.3.0~svn20090913/data/lxappearance.ui lxappearance-0.4.0/data/lxappearance.ui --- lxappearance-0.3.0~svn20090913/data/lxappearance.ui 1970-01-01 01:00:00.000000000 +0100 +++ lxappearance-0.4.0/data/lxappearance.ui 2010-01-06 15:34:18.000000000 +0000 @@ -0,0 +1,526 @@ + + + + + + + + + + + + Icons only + + + Text only + + + Text below icons + + + Text beside icons + + + + + Appearance Settings + 640 + 450 + dialog + + + + True + vertical + + + True + + + True + True + + + True + vertical + + + True + 4 + 4 + Available Window Themes + + + False + False + 0 + + + + + True + True + automatic + automatic + + + True + True + False + + + + + 1 + + + + + True + + + True + _Font: + True + font + + + False + 4 + 0 + + + + + 100 + True + True + False + 2 + True + True + + + + 1 + + + + + False + False + 4 + 2 + + + + + + + True + Window + + + False + + + + + True + vertical + + + True + 4 + 4 + Available Icon Themes + + + False + False + 0 + + + + + True + True + automatic + automatic + + + True + True + False + + + + + 1 + + + + + True + 2 + 4 + + + True + True + False + + + + True + 0 + 0 + + + True + 2 + + + True + gtk-add + + + False + False + 0 + + + + + True + _Install + True + + + False + False + 1 + + + + + + + + + 0 + + + + + gtk-remove + True + False + True + + + + 1 + + + + + False + 2 + 2 + + + + + 1 + + + + + True + Icon + + + 1 + False + + + + + vertical + + + True + 4 + 4 + Available Cursor Themes + + + False + False + 0 + + + + + True + True + automatic + automatic + + + True + True + False + + + + + 1 + + + + + True + + + True + Size + + + False + False + 4 + 0 + + + + + True + Small + + + False + False + 4 + 1 + + + + + True + True + adjustment1 + 0 + False + + + + 2 + + + + + True + Large + + + False + False + 4 + 3 + + + + + False + 8 + 2 + + + + + 2 + + + + + True + Cursor + + + 2 + False + + + + + True + vertical + 4 + + + True + 4 + vertical + + + True + 0 + Toolbar Style: + + + False + False + 0 + + + + + True + liststore1 + + + + + 0 + + + + + 1 + + + + + False + 0 + + + + + + + + 3 + + + + + True + Other + + + 3 + False + + + + + False + 0 + + + + + True + vertical + + + True + <b>Preview</b> + True + + + False + False + 0 + + + + + True + 6 + 0 + + + True + 4 + 4 + + + + + + + + 1 + + + + + 1 + + + + + 2 + + + + + True + end + + + gtk-apply + True + True + True + False + True + + + + False + False + 0 + + + + + gtk-close + True + True + True + False + True + + + + False + False + 1 + + + + + False + end + 0 + + + + + + apply + closebutton + + + + 16 + 16 + 64 + 1 + + diff -Nru lxappearance-0.3.0~svn20090913/debian/changelog lxappearance-0.4.0/debian/changelog --- lxappearance-0.3.0~svn20090913/debian/changelog 2010-01-17 18:36:12.000000000 +0000 +++ lxappearance-0.4.0/debian/changelog 2010-01-17 18:36:12.000000000 +0000 @@ -1,17 +1,38 @@ -lxappearance (0.3.0~svn20090913-0ubuntu1~ppa1) karmic; urgency=low +lxappearance (0.4.0-1ubuntu1~ppa1) karmic; urgency=low - * Backport to Karmic + * Backport with --as-needed - -- Julien Lavergne Thu, 19 Nov 2009 08:55:15 -0600 + -- Julien Lavergne Sat, 16 Jan 2010 16:16:30 +0100 -lxappearance (0.3.0~svn20090913-0ubuntu1) lucid; urgency=low +lxappearance (0.4.0-1) unstable; urgency=low - * New upstream snapshot to bring support to the new lxsession. - * debian/patches/01_fix_infinite_loop.dpatch: disable, merged upstream. - * debian/control: - - Bump build-depends libgtk2.0-dev (>= 2.12) + * New upstream release (Closes: #562564, #532847) + - Replace all Glade-generated code with GtkBuilder + - Use icon names defined in newer icon naming spec. + - UI adjustment + - Fix memory leaks and compiler warnings. + - Translation update + + -- Andrew Lee (æŽå¥ç§‹) Thu, 07 Jan 2010 00:11:40 +0800 + +lxappearance (0.3.0+svn20091218-1) unstable; urgency=low + + * Sync with upstream for bug fix + - fix category in lxappearance.desktop + - Cursor theme modification is disabled by default since it is buggy + - Translation update + + -- Andrew Lee (æŽå¥ç§‹) Fri, 18 Dec 2009 15:35:01 +0800 + +lxappearance (0.3+svn20091101-1) unstable; urgency=low + + * New upstream release (Closes:#559463) + - Support the latest lxsession-Xsettings-daemon + - Cursor size support + * Drop dpatch. (patches merged into upstream) + * Update homepage url - -- Julien Lavergne Sun, 13 Sep 2009 12:35:39 +0200 + -- Andrew Lee (æŽå¥ç§‹) Sat, 05 Dec 2009 12:33:48 +0800 lxappearance (0.2.1-2) unstable; urgency=low diff -Nru lxappearance-0.3.0~svn20090913/debian/control lxappearance-0.4.0/debian/control --- lxappearance-0.3.0~svn20090913/debian/control 2010-01-17 18:36:12.000000000 +0000 +++ lxappearance-0.4.0/debian/control 2010-01-17 18:36:12.000000000 +0000 @@ -3,9 +3,9 @@ Priority: extra Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Andrew Lee (æŽå¥ç§‹) -Build-Depends: debhelper (>= 5), autotools-dev, libgtk2.0-dev (>= 2.12), libglib2.0-dev (>= 2.6), docbook-xsl, intltool, dpatch -Standards-Version: 3.8.2 -Homepage: http://lxde.sf.net +Build-Depends: debhelper (>= 5), autotools-dev, libgtk2.0-dev (>= 2.6), libglib2.0-dev (>= 2.6), docbook-xsl, docbook-xml, xsltproc, intltool +Standards-Version: 3.8.3 +Homepage: http://lxde.org Package: lxappearance Architecture: any diff -Nru lxappearance-0.3.0~svn20090913/debian/patches/00list lxappearance-0.4.0/debian/patches/00list --- lxappearance-0.3.0~svn20090913/debian/patches/00list 2010-01-17 18:36:12.000000000 +0000 +++ lxappearance-0.4.0/debian/patches/00list 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -#01_fix_infinite_loop.dpatch diff -Nru lxappearance-0.3.0~svn20090913/debian/patches/01_fix_infinite_loop.dpatch lxappearance-0.4.0/debian/patches/01_fix_infinite_loop.dpatch --- lxappearance-0.3.0~svn20090913/debian/patches/01_fix_infinite_loop.dpatch 2010-01-17 18:36:12.000000000 +0000 +++ lxappearance-0.4.0/debian/patches/01_fix_infinite_loop.dpatch 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_fix_infinite_loop.dpatch by Andrew Lee (æŽå¥ç§‹) -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: solve the problem on runs configure in infinite loop. - -@DPATCH@ -diff -urNad lxappearance-0.2.1~/configure.in lxappearance-0.2.1/configure.in ---- lxappearance-0.2.1~/configure.in 2009-07-06 05:09:44.000000000 +0800 -+++ lxappearance-0.2.1/configure.in 2009-08-15 21:18:56.970649510 +0800 -@@ -5,6 +5,9 @@ - AM_CONFIG_HEADER(config.h) - AM_MAINTAINER_MODE - -+# Init intltool -+IT_PROG_INTLTOOL -+ - AC_ISC_POSIX - AC_PROG_CC - AM_PROG_CC_STDC diff -Nru lxappearance-0.3.0~svn20090913/debian/rules lxappearance-0.4.0/debian/rules --- lxappearance-0.3.0~svn20090913/debian/rules 2010-01-17 18:36:12.000000000 +0000 +++ lxappearance-0.4.0/debian/rules 2010-01-17 18:36:12.000000000 +0000 @@ -9,7 +9,7 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make +#include /usr/share/dpatch/dpatch.make # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) @@ -17,7 +17,7 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -config.status: patch-stamp configure +config.status: configure dh_testdir # Add here commands to configure the package. ifneq "$(wildcard /usr/share/misc/config.sub)" "" @@ -26,8 +26,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif - /usr/bin/autoreconf -fiv - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --enable-man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --enable-man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" build: build-stamp @@ -41,7 +40,7 @@ touch $@ -clean: unpatch +clean: dh_testdir dh_testroot rm -f build-stamp diff -Nru lxappearance-0.3.0~svn20090913/depcomp lxappearance-0.4.0/depcomp --- lxappearance-0.3.0~svn20090913/depcomp 2009-09-13 11:27:22.000000000 +0100 +++ lxappearance-0.4.0/depcomp 2010-01-06 15:30:30.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2007-03-29.01 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free +# Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,6 +85,15 @@ depmode=dashmstdout fi +cygpath_u="cygpath -u -f -" +if test "$depmode" = msvcmsys; then + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u="sed s,\\\\\\\\,/,g" + depmode=msvisualcpp +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -192,14 +199,14 @@ ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' -' ' ' >> $depfile - echo >> $depfile +' ' ' >> "$depfile" + echo >> "$depfile" # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile + >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -328,7 +335,12 @@ if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + sed -ne '2,${ + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -404,7 +416,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -455,32 +467,39 @@ "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift fi # X makedepend shift - cleared=no - for arg in "$@"; do + cleared=no eat=no + for arg + do case $cleared in no) set ""; shift cleared=yes ;; esac + if test $eat = yes; then + eat=no + continue + fi case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done - obj_suffix="`echo $object | sed 's/^.*\././'`" + obj_suffix=`echo "$object" | sed 's/^.*\././'` touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" @@ -500,7 +519,7 @@ # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -538,13 +557,27 @@ msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. + # always write the preprocessed file to stdout. "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + IFS=" " for arg do case "$arg" in + -o) + shift + ;; + $object) + shift + ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift @@ -557,16 +590,23 @@ ;; esac done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; +msvcmsys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + none) exec "$@" ;; @@ -585,5 +625,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru lxappearance-0.3.0~svn20090913/INSTALL lxappearance-0.4.0/INSTALL --- lxappearance-0.3.0~svn20090913/INSTALL 2009-09-13 11:27:22.000000000 +0100 +++ lxappearance-0.4.0/INSTALL 2010-01-06 15:30:30.000000000 +0000 @@ -2,7 +2,7 @@ ************************* Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008 Free Software Foundation, Inc. +2006, 2007, 2008, 2009 Free Software Foundation, Inc. This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -159,7 +159,7 @@ CC is not installed, it is recommended to use the following options in order to use an ANSI C compiler: - ./configure CC="cc -Ae" + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" and if that doesn't work, install pre-built binaries of GCC for HP-UX. @@ -174,6 +174,16 @@ ./configure CC="cc -nodtk" + On Solaris, don't put `/usr/ucb' early in your `PATH'. This +directory contains several dysfunctional programs; working variants of +these programs are available in `/usr/bin'. So, if you need `/usr/ucb' +in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', +not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== @@ -189,7 +199,8 @@ where SYSTEM can have one of these forms: - OS KERNEL-OS + OS + KERNEL-OS See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't diff -Nru lxappearance-0.3.0~svn20090913/install-sh lxappearance-0.4.0/install-sh --- lxappearance-0.3.0~svn20090913/install-sh 2009-09-13 11:27:22.000000000 +0100 +++ lxappearance-0.4.0/install-sh 2010-01-06 15:30:29.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2006-12-25.00 +scriptversion=2009-04-28.21; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -515,5 +515,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru lxappearance-0.3.0~svn20090913/ltmain.sh lxappearance-0.4.0/ltmain.sh --- lxappearance-0.3.0~svn20090913/ltmain.sh 2009-09-13 11:27:21.000000000 +0100 +++ lxappearance-0.4.0/ltmain.sh 2010-01-06 15:30:27.000000000 +0000 @@ -1,6 +1,6 @@ # Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6 +# ltmain.sh (GNU libtool) 2.2.6b # Written by Gordon Matzigkeit , 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. @@ -65,7 +65,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-1ubuntu1 +# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2 # automake: $automake_version # autoconf: $autoconf_version # @@ -73,9 +73,9 @@ PROGRAM=ltmain.sh PACKAGE=libtool -VERSION="2.2.6 Debian-2.2.6a-1ubuntu1" +VERSION="2.2.6b Debian-2.2.6b-2" TIMESTAMP="" -package_revision=1.3012 +package_revision=1.3017 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -5347,19 +5347,19 @@ # It is a libtool convenience library, so add in its objects. convenience="$convenience $ladir/$objdir/$old_library" old_convenience="$old_convenience $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_duplicate_deps ; then + case "$tmp_libs " in + *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + esac + fi + tmp_libs="$tmp_libs $deplib" + done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done continue fi # $pass = conv @@ -5896,6 +5896,7 @@ if test "$link_all_deplibs" != no; then # Add the search paths of all dependency libraries for deplib in $dependency_libs; do + path= case $deplib in -L*) path="$deplib" ;; *.la) diff -Nru lxappearance-0.3.0~svn20090913/lxappearance.desktop lxappearance-0.4.0/lxappearance.desktop --- lxappearance-0.3.0~svn20090913/lxappearance.desktop 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/lxappearance.desktop 2010-01-06 15:34:19.000000000 +0000 @@ -1,97 +1,81 @@ [Desktop Entry] -Encoding=UTF-8 Name=Appearance +Name[af]=Voorkoms Name[ar]=المظهر -Name[be@latin]=Vyhlad Name[bg]=Външен вид -Name[bn]=চেহারা Name[bn_IN]=চেহারা Name[ca]=Aparença Name[cs]=Vzhled Name[da]=Udseende Name[de]=Erscheinungsbild -Name[dz]=འབྱུང་སྣང་ Name[el]=Εμφάνιση -Name[en_GB]=Appearance Name[es]=Apariencia Name[et]=Välimus Name[eu]=Itxura Name[fi]=Ulkoasu Name[fr]=Apparence Name[gl]=Aparencia -Name[gu]=દેખાવ +Name[he]=מר××” Name[hu]=Megjelenés Name[it]=Aspetto Name[ja]=外観ã®è¨­å®š -Name[ka]=გáƒáƒ áƒ”მáƒáƒ¡ იერსáƒáƒ®áƒ” Name[ko]=모양새 Name[lt]=IÅ¡vaizda -Name[mk]=Изглед Name[ml]=കാഴàµà´š Name[nb]=Utseende Name[nl]=Uiterlijk -Name[oc]=Aparéncia -Name[pa]=ਦਿੱਖ Name[pl]=WyglÄ…d Name[pt]=Aparência Name[pt_BR]=Aparência Name[ru]=Внешний вид +Name[sk]=Vzhľad +Name[sl]=Nastavitve izgleda Name[sr]=Изглед -Name[sr@Latn]=Izgled Name[sv]=Utseende -Name[ta]=தோறà¯à®±à®®à¯ -Name[th]=รูปโฉม Name[uk]=Зовнішній виглÑд Name[vi]=Diện mạo Name[zh_CN]=外观 Name[zh_TW]=外觀設定 Comment=Customize the look of the desktop +Comment[af]=Pas die voorkoms van die werkskerm aan Comment[ar]=خصّص مظهر سطح المكتب -Comment[be@latin]=Źmiani vyhlad staÅ‚a Comment[bg]=ÐаÑтройване на Ð²ÑŠÐ½ÑˆÐ½Ð¸Ñ Ð²Ð¸Ð´ на Ñ€Ð°Ð±Ð¾Ñ‚Ð½Ð¸Ñ Ð¿Ð»Ð¾Ñ‚ -Comment[bn]=ডেসà§à¦•à¦Ÿà¦ªà§‡à¦° চেহারা পছনà§à¦¦ অনà§à¦¸à¦¾à¦°à§‡ নিরà§à¦§à¦¾à¦°à¦£ করà§à¦¨ Comment[bn_IN]=ডেসà§à¦•à¦Ÿà¦ªà§‡à¦° চেহারা পছনà§à¦¦ অনà§à¦¸à¦¾à¦°à§‡ নিরà§à¦§à¦¾à¦°à¦£ করà§à¦¨ Comment[ca]=Personalitzeu l'aparença de l'escriptori +Comment[cs]=PÅ™izpůsobit vzhled pracovní plochy Comment[da]=Tilpas skrivebordets udseende Comment[de]=Aussehen des Desktops anpassen -Comment[dz]=ཌེཀསི་ཊོཔ་གི་མà½à½¼à½„་སྣང་སྲོལ་སྒྲིག་འབད Comment[el]=ΠÏοσαÏμόστε την εμφάνιση της επιφάνειας εÏγασίας σας -Comment[en_GB]=Customise the look of the desktop Comment[es]=Personalizar la apariencia del escritorio Comment[et]=Töölaua välimuse kohandamine Comment[eu]=Pertsonalizatu mahaigainaren itxura Comment[fi]=Muuta työpöydän ulkoasua Comment[fr]=Personnaliser l'apparence du bureau -Comment[gu]=ડેસà«àª•àªŸà«‹àªªàª¨à«‹ દેખાવ વૈવિધà«àª¯àªªà«‚રà«àª£ બનાવો +Comment[he]=הת×מת מר××” שולחן העבודה Comment[hu]=Az asztal megjelenésének testreszabása Comment[it]=Personalizza l'aspetto dell'ambiente grafico Comment[ja]=デスクトップã®è¦‹æ˜ ãˆã‚’設定ã—ã¾ã™ -Comment[ka]=სáƒáƒ›áƒ£áƒ¨áƒáƒ მáƒáƒ’იდის ხედის გáƒáƒšáƒáƒ›áƒáƒ–ებრComment[ko]=ë°ìŠ¤í¬íƒ‘ì˜ ëª¨ì–‘ìƒˆë¥¼ 설정합니다 Comment[lt]=Keisti darbo aplinkos iÅ¡vaizdÄ… -Comment[mk]=Прилагодете го изгледот на работната околина Comment[ml]=പണിയിടതàµà´¤àµ† à´šà´¿à´Ÿàµà´Ÿà´ªàµà´ªàµ†à´Ÿàµà´¤àµà´¤àµà´• Comment[nb]=Tilpass utseende for skrivebordet Comment[nl]=De achtergrond van het bureaublad instellen -Comment[pa]=ਡੈਸਕਟਾਪ ਲਈ ਪਸੰਦੀਦਾ ਦਿੱਖ Comment[pl]=Dostosuj wyglÄ…d pulpitu Comment[pt]=Personalizar a aparência do ambiente de trabalho Comment[pt_BR]=Personalizar a aparência da área de trabalho Comment[ru]=ÐаÑтройте тему рабочего Ñтола +Comment[sk]=PrispôsobiÅ¥ vzhľad pracovného prostredia +Comment[sl]=Prilagajanje videza namizja Comment[sr]=Прилагодите изглед радне површи -Comment[sr@Latn]=Prilagodite izgled radne povrÅ¡i Comment[sv]=Anpassa utseendet för skrivbordet -Comment[ta]=கணிமேசைகà¯à®•à®¾à®© காடà¯à®šà®¿à®¯à¯ˆ தனிபà¯à®ªà®¯à®©à®¾à®•à¯à®•à¯à®• -Comment[th]=ปรับà¹à¸•à¹ˆà¸‡à¸£à¸¹à¸›à¹‚ฉมของพื้นโต๊ะ Comment[uk]=Ðалаштувати виглÑд робочого Ñтолу Comment[vi]=Tùy chỉnh màn hình ná»n Comment[zh_CN]=自定义桌é¢å¤–观 Comment[zh_TW]=自訂桌é¢å¤–觀 Exec=lxappearance -Icon=gtk-preferences +Icon=preferences-desktop-theme Terminal=false Type=Application StartupNotify=true -Categories=Settings;DesktopSettings;X-LXDE-Settings; +Categories=Settings;DesktopSettings;X-LXDE-Settings;GTK; NotShowIn=GNOME;XFCE; - diff -Nru lxappearance-0.3.0~svn20090913/Makefile.am lxappearance-0.4.0/Makefile.am --- lxappearance-0.3.0~svn20090913/Makefile.am 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/Makefile.am 2009-12-19 11:05:54.000000000 +0000 @@ -1,13 +1,26 @@ -## Process this file with automake to produce Makefile.in +NULL= SUBDIRS = src po man +ui_in_files= \ + data/lxappearance.glade \ + data/demo.glade \ + $(NULL) +uidir=$(datadir)/lxappearance +ui_DATA = $(ui_in_files:.glade=.ui) + +%.ui: %.glade + cp $< $@ + support_scriptdir=$(datadir)/lxappearance support_script_DATA= \ - scripts/install-icon-theme.sh + scripts/install-icon-theme.sh \ + $(NULL) desktopdir=$(datadir)/applications -desktop_DATA=lxappearance.desktop +desktop_in_files=lxappearance.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ install-data-hook: for script in $(DESTDIR)$(support_scriptdir)/*.sh; do \ @@ -16,5 +29,8 @@ EXTRA_DIST = \ autogen.sh \ + $(ui_DATA) \ $(support_script_DATA) \ - $(desktop_DATA) + $(desktop_DATA) \ + $(NULL) + diff -Nru lxappearance-0.3.0~svn20090913/Makefile.in lxappearance-0.4.0/Makefile.in --- lxappearance-0.3.0~svn20090913/Makefile.in 2009-09-13 11:27:22.000000000 +0100 +++ lxappearance-0.4.0/Makefile.in 2010-01-06 15:30:30.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -45,6 +47,7 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -59,14 +62,30 @@ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(desktopdir)" \ - "$(DESTDIR)$(support_scriptdir)" -desktopDATA_INSTALL = $(INSTALL_DATA) -support_scriptDATA_INSTALL = $(INSTALL_DATA) -DATA = $(desktop_DATA) $(support_script_DATA) + "$(DESTDIR)$(support_scriptdir)" "$(DESTDIR)$(uidir)" +DATA = $(desktop_DATA) $(support_script_DATA) $(ui_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -74,9 +93,34 @@ distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } + { test ! -d "$(distdir)" \ + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr "$(distdir)"; }; } +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print @@ -138,6 +182,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -196,17 +241,29 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +NULL = SUBDIRS = src po man +ui_in_files = \ + data/lxappearance.glade \ + data/demo.glade \ + $(NULL) + +uidir = $(datadir)/lxappearance +ui_DATA = $(ui_in_files:.glade=.ui) support_scriptdir = $(datadir)/lxappearance support_script_DATA = \ - scripts/install-icon-theme.sh + scripts/install-icon-theme.sh \ + $(NULL) desktopdir = $(datadir)/applications -desktop_DATA = lxappearance.desktop +desktop_in_files = lxappearance.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) EXTRA_DIST = \ autogen.sh \ + $(ui_DATA) \ $(support_script_DATA) \ - $(desktop_DATA) + $(desktop_DATA) \ + $(NULL) all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive @@ -218,15 +275,15 @@ @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -242,9 +299,10 @@ $(SHELL) ./config.status --recheck $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): config.h: stamp-h1 @if test ! -f $@; then \ @@ -256,7 +314,7 @@ @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -265,38 +323,64 @@ install-desktopDATA: $(desktop_DATA) @$(NORMAL_INSTALL) test -z "$(desktopdir)" || $(MKDIR_P) "$(DESTDIR)$(desktopdir)" - @list='$(desktop_DATA)'; for p in $$list; do \ + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(desktopDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(desktopdir)/$$f'"; \ - $(desktopDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(desktopdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \ done uninstall-desktopDATA: @$(NORMAL_UNINSTALL) - @list='$(desktop_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(desktopdir)/$$f'"; \ - rm -f "$(DESTDIR)$(desktopdir)/$$f"; \ - done + @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(desktopdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(desktopdir)" && rm -f $$files install-support_scriptDATA: $(support_script_DATA) @$(NORMAL_INSTALL) test -z "$(support_scriptdir)" || $(MKDIR_P) "$(DESTDIR)$(support_scriptdir)" - @list='$(support_script_DATA)'; for p in $$list; do \ + @list='$(support_script_DATA)'; test -n "$(support_scriptdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(support_scriptDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(support_scriptdir)/$$f'"; \ - $(support_scriptDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(support_scriptdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(support_scriptdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(support_scriptdir)" || exit $$?; \ done uninstall-support_scriptDATA: @$(NORMAL_UNINSTALL) - @list='$(support_script_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(support_scriptdir)/$$f'"; \ - rm -f "$(DESTDIR)$(support_scriptdir)/$$f"; \ + @list='$(support_script_DATA)'; test -n "$(support_scriptdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(support_scriptdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(support_scriptdir)" && rm -f $$files +install-uiDATA: $(ui_DATA) + @$(NORMAL_INSTALL) + test -z "$(uidir)" || $(MKDIR_P) "$(DESTDIR)$(uidir)" + @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(uidir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(uidir)" || exit $$?; \ done +uninstall-uiDATA: + @$(NORMAL_UNINSTALL) + @list='$(ui_DATA)'; test -n "$(uidir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(uidir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(uidir)" && rm -f $$files + # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -321,7 +405,7 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -355,16 +439,16 @@ else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -379,7 +463,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -391,7 +475,7 @@ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ @@ -400,36 +484,41 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) + test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -445,38 +534,54 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ done - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) + || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) @@ -489,6 +594,10 @@ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -517,6 +626,8 @@ bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -528,9 +639,11 @@ mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ @@ -552,13 +665,15 @@ && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @cd $(distuninstallcheck_dir) \ + @$(am__cd) '$(distuninstallcheck_dir)' \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ @@ -580,7 +695,7 @@ all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(support_scriptdir)"; do \ + for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(support_scriptdir)" "$(DESTDIR)$(uidir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -603,6 +718,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -622,28 +738,40 @@ html: html-recursive +html-am: + info: info-recursive info-am: -install-data-am: install-desktopDATA install-support_scriptDATA +install-data-am: install-desktopDATA install-support_scriptDATA \ + install-uiDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook - install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -664,33 +792,41 @@ ps-am: -uninstall-am: uninstall-desktopDATA uninstall-support_scriptDATA +uninstall-am: uninstall-desktopDATA uninstall-support_scriptDATA \ + uninstall-uiDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-data-am install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ + ctags-recursive install-am install-data-am install-strip \ + tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am am--refresh check check-am clean clean-generic \ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \ - dist-lzma dist-shar dist-tarZ dist-zip distcheck distclean \ - distclean-generic distclean-hdr distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-data install-data-am \ - install-data-hook install-desktopDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-support_scriptDATA installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ - pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-desktopDATA uninstall-support_scriptDATA - + dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \ + distclean distclean-generic distclean-hdr distclean-tags \ + distcleancheck distdir distuninstallcheck dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-data-hook install-desktopDATA \ + install-dvi install-dvi-am install-exec install-exec-am \ + install-html install-html-am install-info install-info-am \ + install-man install-pdf install-pdf-am install-ps \ + install-ps-am install-strip install-support_scriptDATA \ + install-uiDATA installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \ + tags-recursive uninstall uninstall-am uninstall-desktopDATA \ + uninstall-support_scriptDATA uninstall-uiDATA + + +%.ui: %.glade + cp $< $@ +@INTLTOOL_DESKTOP_RULE@ install-data-hook: for script in $(DESTDIR)$(support_scriptdir)/*.sh; do \ chmod +x $$script; \ done + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru lxappearance-0.3.0~svn20090913/man/lxappearance.1 lxappearance-0.4.0/man/lxappearance.1 --- lxappearance-0.3.0~svn20090913/man/lxappearance.1 2009-09-13 11:32:44.000000000 +0100 +++ lxappearance-0.4.0/man/lxappearance.1 2010-01-06 15:35:22.000000000 +0000 @@ -1,19 +1,36 @@ +'\" t .\" Title: LXAPPEARANCE .\" Author: Ying-Chun Liu -.\" Generator: DocBook XSL Stylesheets v1.73.2 +.\" Generator: DocBook XSL Stylesheets v1.75.2 .\" Date: April 20, 2008 .\" Manual: http://LXDE.org .\" Source: http://LXDE.org +.\" Language: English .\" .TH "LXAPPEARANCE" "1" "April 20, 2008" "http://LXDE\&.org" "http://LXDE.org" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) .ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- .SH "NAME" lxappearance \- GTK+ theme switcher .SH "SYNOPSIS" -.HP 13 +.HP \w'\fBlxappearance\fR\ 'u \fBlxappearance\fR .SH "DESCRIPTION" .PP @@ -26,7 +43,7 @@ .SH "AUTHOR" .PP This manual page was written by paulliu - +grandpaul@gmail\&.com for the Debian system (but may be used by others)\&. Permission is granted to copy, distribute and/or modify this document under the terms of the @@ -36,16 +53,17 @@ On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL\&. .PP The source code of this manual page should be in -\fI\&.sgml\fR +\&.sgml format\&. It is better not to modify the -\fI\&.1\fR +\&.1 file directly\&. .SH "AUTHOR" .PP \fBYing\-Chun Liu\fR -.sp -1n -.IP "" 4 +.RS 4 Author. +.RE .SH "COPYRIGHT" +.br Copyright \(co 2008 paulliu .br diff -Nru lxappearance-0.3.0~svn20090913/man/Makefile.in lxappearance-0.4.0/man/Makefile.in --- lxappearance-0.3.0~svn20090913/man/Makefile.in 2009-09-13 11:27:22.000000000 +0100 +++ lxappearance-0.4.0/man/Makefile.in 2010-01-06 15:30:30.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,8 +16,9 @@ @SET_MAKE@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -39,8 +41,30 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' man1dir = $(mandir)/man1 am__installdirs = "$(DESTDIR)$(man1dir)" NROFF = nroff @@ -103,6 +127,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -184,9 +209,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu man/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu man/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -204,51 +229,45 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -install-man1: $(man1_MANS) $(man_MANS) +$(am__aclocal_m4_deps): +install-man1: $(man_MANS) @$(NORMAL_INSTALL) test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ + @list=''; test -n "$(man1dir)" || exit 0; \ + { for i in $$list; do echo "$$i"; done; \ + l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.1[a-z]*$$/p'; \ + } | while read p; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; echo "$$p"; \ + done | \ + sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \ + sed 'N;N;s,\n, ,g' | { \ + list=; while read file base inst; do \ + if test "$$base" = "$$inst"; then list="$$list $$file"; else \ + echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ + $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \ + fi; \ done; \ - for i in $$list; do \ - if test -f $$i; then file=$$i; \ - else file=$(srcdir)/$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \ - $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \ - done + for i in $$list; do echo "$$i"; done | $(am__base_list) | \ + while read files; do \ + test -z "$$files" || { \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \ + done; } + uninstall-man1: @$(NORMAL_UNINSTALL) - @list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \ - l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \ - for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - case "$$ext" in \ - 1*) ;; \ - *) ext='1' ;; \ - esac; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed -e 's/^.*\///'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \ - rm -f "$(DESTDIR)$(man1dir)/$$inst"; \ - done + @list=''; test -n "$(man1dir)" || exit 0; \ + files=`{ for i in $$list; do echo "$$i"; done; \ + l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \ + sed -n '/\.1[a-z]*$$/p'; \ + } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ + -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ + test -z "$$files" || { \ + echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } tags: TAGS TAGS: @@ -257,6 +276,19 @@ distdir: $(DISTFILES) + @list='$(MANS)'; if test -n "$$list"; then \ + list=`for p in $$list; do \ + if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ + if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ + if test -n "$$list" && \ + grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ + echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ + grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ + echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ + echo " typically \`make maintainer-clean' will remove them" >&2; \ + exit 1; \ + else :; fi; \ + else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -272,13 +304,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -310,6 +346,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -328,6 +365,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -336,18 +375,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-man1 install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -393,6 +442,7 @@ @ENABLE_REGENERATE_MAN_FALSE@ @echo " in order to regenerate man pages." @ENABLE_REGENERATE_MAN_FALSE@ @echo "" @ENABLE_REGENERATE_MAN_FALSE@ @false + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff -Nru lxappearance-0.3.0~svn20090913/missing lxappearance-0.4.0/missing --- lxappearance-0.3.0~svn20090913/missing 2009-09-13 11:27:22.000000000 +0100 +++ lxappearance-0.4.0/missing 2010-01-06 15:30:29.000000000 +0000 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to ." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # Now exit if we have it, but it failed. Also exit now if we # don't have it and --version was passed (most likely to detect -# the program). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff -Nru lxappearance-0.3.0~svn20090913/po/af.po lxappearance-0.4.0/po/af.po --- lxappearance-0.3.0~svn20090913/po/af.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/af.po 2009-12-21 10:17:39.000000000 +0000 @@ -3,179 +3,184 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-10 09:29+0100\n" +"Last-Translator: F Wolff \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Pootle 1.1.0\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "" +#: ../src/main-dlg.c:650 +msgid "Select an icon theme" +msgstr "Kies 'n ikoontema" -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "" +#: ../src/main-dlg.c:657 +msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" +msgstr "*.tar.gz, *.tar.bz2 (ikoontema)" -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "" +#: ../src/demo.c:56 +msgid "Column" +msgstr "Kolom" -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "" +#: ../src/demo.c:65 +msgid "Item" +msgstr "Item" -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" +#: ../data/demo.glade.h:1 +msgid "Check Button" msgstr "" -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" +#: ../data/demo.glade.h:2 +msgid "Demo" msgstr "" -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" +#: ../data/demo.glade.h:3 +msgid "Radio Button" msgstr "" -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " +#: ../data/demo.glade.h:4 +msgid "Tab1" msgstr "" -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" +#: ../data/demo.glade.h:5 +msgid "Tab2" msgstr "" -#: ../src/main-dlg-ui.c:196 -msgid "Text only" +#: ../data/demo.glade.h:6 +msgid "Tab3" msgstr "" -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" +#: ../data/demo.glade.h:7 +msgid "Tab4" msgstr "" -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" +#: ../data/demo.glade.h:8 +msgid "Test Item 1" msgstr "" -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" +#: ../data/demo.glade.h:9 +msgid "Test Item 2" msgstr "" -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" +#: ../data/demo.glade.h:10 +msgid "Test Item 3" msgstr "" -#: ../src/main-dlg.c:620 -msgid "Select an icon theme" -msgstr "" +#: ../data/demo.glade.h:11 +msgid "Type some characters here to test currently selected font." +msgstr "Tik 'n paar karakters hier om die tans gekose lettertipe te toets." -#: ../src/main-dlg.c:627 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "R_edigeer" -#: ../src/demo.c:56 -msgid "Column" -msgstr "" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Lêer" -#: ../src/demo.c:65 -msgid "Item" -msgstr "" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Hulp" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" +#: ../data/demo.glade.h:15 +msgid "button" msgstr "" -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "" +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Voorskou" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "" +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Voorkomsinstellings" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "" +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Beskikbare muiswysertemas" -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "" +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Beskikbare ikoontemas" -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "" +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Beskikbare venstertemas" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 -msgid "Tab1" -msgstr "" +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Muiswyser" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ikoon" -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "" +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Slegs ikone" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "" +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Groot" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "" +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Ander" -#: ../src/demo-ui.c:323 -msgid "Test Item 1" -msgstr "" +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Grootte" -#: ../src/demo-ui.c:324 -msgid "Test Item 2" -msgstr "" +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Klein" -#: ../src/demo-ui.c:325 -msgid "Test Item 3" -msgstr "" +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Teks onder ikone" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "" +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Teks langs ikone" -#: ../src/demo-ui.c:340 ../demo.glade.h:14 -msgid "Type some characters here to test currently selected font." -msgstr "" +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Slegs teks" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "" +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Nutsbalkstyl: " -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "" +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Venster" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Lettertipe" -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Installeer" -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "" +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Voorkoms" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Pas die voorkoms van die werkskerm aan" + +#~ msgid "Back" +#~ msgstr "Terug" + +#~ msgid "Forward" +#~ msgstr "Vorentoe" + +#~ msgid "Stop" +#~ msgstr "Stop" diff -Nru lxappearance-0.3.0~svn20090913/po/ar.po lxappearance-0.4.0/po/ar.po --- lxappearance-0.3.0~svn20090913/po/ar.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/ar.po 2009-12-25 07:59:30.000000000 +0000 @@ -7,75 +7,20 @@ msgstr "" "Project-Id-Version: LXAppearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-01-26 10:40+0200\n" -"Last-Translator: Ahmad Farghal \n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-21 11:16+0100\n" +"Last-Translator: Ismaeel AL-zahrani \n" "Language-Team: Arabic\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Pootle 1.1.0\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "إعدادات المظهر" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "سمات النواÙØ° المتوÙرة" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "ال_خط:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "الناÙذة" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "سمات الأيقونات المتوÙرة" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_ثبّÙت" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "الأيقونات" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "شكل شريط الأدوات:" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "أيقونات Ùقط" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "نص Ùقط" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "نص أسÙÙ„ الأيقونات" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "نص بجانب الأيقونات" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "أخرى" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "معاينة" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "انتق سمة أيقونات" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (سمة أيقونات)" @@ -87,101 +32,180 @@ msgid "Item" msgstr "عنصر" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_ملÙ" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "ت_حرير" - -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "Ù…_ساعدة" - -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "للخلÙ" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "زر تأشير" -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "للأمام" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "استعراض" -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Ù‚Ù" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "زر انتقاء" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "لسان1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "زر انتقاء" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "زر تأشير" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "لسان2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "استعراض" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "لسان3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "زر" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "لسان4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "عنصر اختباري 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "عنصر اختباري 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "عنصر اختباري 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "لسان2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +# اﻷحر٠هي الترجمة الأÙضل لكلمة characters +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." -msgstr "اكتب بعض المحار٠هنا لتختبر الخط المنتقى حاليا." +msgstr "اكتب بعض اﻷحر٠هنا لتختبر الخط المنتقى حاليا." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "لسان3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_تحرير" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "لسان4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_ملÙ" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"عنصر اختباري 1\n" -"عنصر اختباري 2\n" -"عنصر اختباري 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"أيقونات Ùقط\n" -"نص Ùقط\n" -"نص أسÙÙ„ الأيقونات\n" -"نص بجانب الأيقونات" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "غير قادر على إيجاد مل٠الصورة البكسلية: %s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_مساعدة" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "زر" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "معاينة" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "إعدادات المظهر" + +#: ../data/lxappearance.glade.h:3 +#, fuzzy +msgid "Available Cursor Themes" +msgstr "سمات الأيقونات المتوÙرة" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "سمات الأيقونات المتوÙرة" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "سمات النواÙØ° المتوÙرة" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "المؤشر" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "الأيقونات" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "أيقونات Ùقط" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "كبير" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "أخرى" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "حجم" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "صغير" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "نص أسÙÙ„ الأيقونات" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "نص بجانب الأيقونات" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "نص Ùقط" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "شكل شريط الأدوات:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "الناÙذة" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_الخط:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_ثبّÙت" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "المظهر" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "خصّص مظهر سطح المكتب" + +#~ msgid "Back" +#~ msgstr "للخلÙ" + +#~ msgid "Forward" +#~ msgstr "للأمام" + +#~ msgid "Stop" +#~ msgstr "Ù‚Ù" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "عنصر اختباري 1\n" +#~ "عنصر اختباري 2\n" +#~ "عنصر اختباري 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "غير قادر على إيجاد مل٠الصورة البكسلية: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "أيقونات Ùقط\n" +#~ "نص Ùقط\n" +#~ "نص أسÙÙ„ الأيقونات\n" +#~ "نص بجانب الأيقونات" diff -Nru lxappearance-0.3.0~svn20090913/po/bg.po lxappearance-0.4.0/po/bg.po --- lxappearance-0.3.0~svn20090913/po/bg.po 2009-09-13 11:23:09.000000000 +0100 +++ lxappearance-0.4.0/po/bg.po 2009-12-21 10:17:43.000000000 +0000 @@ -3,179 +3,211 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-10-09 22:32+0200\n" +"Last-Translator: Rossen Karpuzov \n" +"Language-Team: Mandriva User Group - Bulgaria \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Pootle 1.1.0\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "" +#: ../src/main-dlg.c:650 +msgid "Select an icon theme" +msgstr "Избор на тема за икони" -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "" +#: ../src/main-dlg.c:657 +msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" +msgstr "*.tar.gz, *.tar.bz2 (Тема за икони)" -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "" +#: ../src/demo.c:56 +msgid "Column" +msgstr "Колона" -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "" +#: ../src/demo.c:65 +msgid "Item" +msgstr "Елемент" -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "" +#: ../data/demo.glade.h:1 +#, fuzzy +msgid "Check Button" +msgstr "Група бутони" -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "ДемонÑтрациÑ" -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "" +#: ../data/demo.glade.h:3 +#, fuzzy +msgid "Radio Button" +msgstr "Превключвател" -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "" +#: ../data/demo.glade.h:4 +msgid "Tab1" +msgstr "Отм1" -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Отм2" -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Отм3" -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Отм4" -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "" +#: ../data/demo.glade.h:8 +msgid "Test Item 1" +msgstr "ТеÑÑ‚ елемент 1" -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "" +#: ../data/demo.glade.h:9 +msgid "Test Item 2" +msgstr "ТеÑÑ‚ елемент 2" -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "" +#: ../data/demo.glade.h:10 +msgid "Test Item 3" +msgstr "ТеÑÑ‚ елемент 3" -#: ../src/main-dlg.c:620 -msgid "Select an icon theme" -msgstr "" +#: ../data/demo.glade.h:11 +msgid "Type some characters here to test currently selected font." +msgstr "Ðапишете нÑкакъв текÑÑ‚ тук, за да теÑтвате Ð¸Ð·Ð±Ñ€Ð°Ð½Ð¸Ñ ÑˆÑ€Ð¸Ñ„Ñ‚." -#: ../src/main-dlg.c:627 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Редактиране" -#: ../src/demo.c:56 -msgid "Column" -msgstr "" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Файл" -#: ../src/demo.c:65 -msgid "Item" -msgstr "" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Помощ" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "" +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "бутон" -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "" +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Преглед" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "" +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "ÐаÑтройване на Ð²ÑŠÐ½ÑˆÐ½Ð¸Ñ Ð²Ð¸Ð´" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "" +#: ../data/lxappearance.glade.h:3 +#, fuzzy +msgid "Available Cursor Themes" +msgstr "Ðалични теми Ñ Ð¸ÐºÐ¾Ð½Ð¸" -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "" +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Ðалични теми Ñ Ð¸ÐºÐ¾Ð½Ð¸" -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "" +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Ðалични теми за прозорци" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 -msgid "Tab1" +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" msgstr "" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Икона" -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "" +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Само икони" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" +#: ../data/lxappearance.glade.h:9 +msgid "Large" msgstr "" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "" +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Други" -#: ../src/demo-ui.c:323 -msgid "Test Item 1" +#: ../data/lxappearance.glade.h:11 +msgid "Size" msgstr "" -#: ../src/demo-ui.c:324 -msgid "Test Item 2" +#: ../data/lxappearance.glade.h:12 +msgid "Small" msgstr "" -#: ../src/demo-ui.c:325 -msgid "Test Item 3" -msgstr "" +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "ТекÑÑ‚ под иконите" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "" +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "ТекÑÑ‚ до иконите" -#: ../src/demo-ui.c:340 ../demo.glade.h:14 -msgid "Type some characters here to test currently selected font." -msgstr "" +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Само текÑÑ‚" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "" +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Стил на лентата Ñ Ð¸Ð½Ñтрументи:" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "" +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Прозорец" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Шрифт:" -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_ИнÑталиране" -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "" +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Външен вид" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "ÐаÑтройване на Ð²ÑŠÐ½ÑˆÐ½Ð¸Ñ Ð²Ð¸Ð´ на Ñ€Ð°Ð±Ð¾Ñ‚Ð½Ð¸Ñ Ð¿Ð»Ð¾Ñ‚" + +#~ msgid "Back" +#~ msgstr "Ðазад" + +#~ msgid "Forward" +#~ msgstr "Ðапред" + +#~ msgid "Stop" +#~ msgstr "Стоп" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "ТеÑÑ‚ елемент 1\n" +#~ "ТеÑÑ‚ елемент 2\n" +#~ "ТеÑÑ‚ елемент 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Ðе може да Ñе намери pixmap файла: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Само икони\n" +#~ "Само текÑÑ‚\n" +#~ "ТекÑÑ‚ под икони\n" +#~ "ТекÑÑ‚ край икони" diff -Nru lxappearance-0.3.0~svn20090913/po/bn_IN.po lxappearance-0.4.0/po/bn_IN.po --- lxappearance-0.3.0~svn20090913/po/bn_IN.po 2009-09-13 11:23:09.000000000 +0100 +++ lxappearance-0.4.0/po/bn_IN.po 2009-12-21 10:17:43.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-07-29 11:08+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-08 18:00+0100\n" "Last-Translator: Sankarshan \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -16,67 +16,11 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 1.1.0\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "চেহারা ছবির বিবিধ বৈশিষà§à¦Ÿà§à¦¯" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "উপলবà§à¦§ উইনà§à¦¡à§‹ থিম" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "ফনà§à¦Ÿ(_F):" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "উইনà§à¦¡à§‹" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "উপলবà§à¦§ আইকন থিম" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "ইনসà§à¦Ÿà¦² করা হবে (_I)" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "আইকন" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "টà§à¦²à¦¬à¦¾à¦°à§‡à¦° বিনà§à¦¯à¦¾à¦¸:" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "শà§à¦§à§à¦®à¦¾à¦¤à§à¦° আইকন" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "শà§à¦§à§à¦®à¦¾à¦¤à§à¦° টেকà§à¦¸à¦Ÿ" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "আইকনের নীচে টেকà§à¦¸à¦Ÿ" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "আইকনের পাশে টেকà§à¦¸à¦Ÿ" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "অনà§à¦¯à¦¾à¦¨à§à¦¯" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "পূরà§à¦¬à¦ªà§à¦°à¦¦à¦°à§à¦¶à¦¨" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "à¦à¦•à¦Ÿà¦¿ আইকন থিম নিরà§à¦¬à¦¾à¦šà¦¨ করà§à¦¨" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (আইকন থিম)" @@ -88,101 +32,178 @@ msgid "Item" msgstr "বসà§à¦¤à§" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "ফাইল(_F)" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "সমà§à¦ªà¦¾à¦¦à¦¨à¦¾(_E)" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Check Button" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "সহায়িকা(_H)" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "ডেমো" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "পূরà§à¦¬à¦¬à¦°à§à¦¤à§€" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "ফরওয়ারà§à¦¡" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "বনà§à¦§ করা হবে" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Radio Button" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Tab1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Radio Button" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Check Button" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Tab2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "ডেমো" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Tab3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "button" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Tab4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Test Item 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Test Item 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Test Item 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Tab2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "বরà§à¦¤à¦®à¦¾à¦¨à§‡ নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ ফনà§à¦Ÿ-টি পরীকà§à¦·à¦¾ করার জনà§à¦¯ কিছৠঅকà§à¦·à¦° টাইপ করà§à¦¨à¥¤" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Tab3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "সমà§à¦ªà¦¾à¦¦à¦¨à¦¾(_E)" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Tab4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "ফাইল(_F)" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"শà§à¦§à§à¦®à¦¾à¦¤à§à¦° আইকন\n" -"শà§à¦§à§à¦®à¦¾à¦¤à§à¦° টেকà§à¦¸à¦Ÿ\n" -"আইকনের নীচে টেকà§à¦¸à¦Ÿ\n" -"আইকনের পাশে টেকà§à¦¸à¦Ÿ" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "পিকà§à¦¸à¦®à§à¦¯à¦¾à¦ª ফাইল: %s খà§à¦œà§‡à¦ পাওয়া যায়নি" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "সহায়িকা(_H)" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "button" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "পূরà§à¦¬à¦ªà§à¦°à¦¦à¦°à§à¦¶à¦¨" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "চেহারা ছবির বিবিধ বৈশিষà§à¦Ÿà§à¦¯" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "উপলবà§à¦§ কারà§à¦¸à¦¾à¦° থিম" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "উপলবà§à¦§ আইকন থিম" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "উপলবà§à¦§ উইনà§à¦¡à§‹ থিম" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "কারà§à¦¸à¦¾à¦°" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "আইকন" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "শà§à¦§à§à¦®à¦¾à¦¤à§à¦° আইকন" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "বড়" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "অনà§à¦¯à¦¾à¦¨à§à¦¯" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "আকার" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "ছোট" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "আইকনের নীচে টেকà§à¦¸à¦Ÿ" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "আইকনের পাশে টেকà§à¦¸à¦Ÿ" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "শà§à¦§à§à¦®à¦¾à¦¤à§à¦° টেকà§à¦¸à¦Ÿ" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "টà§à¦²à¦¬à¦¾à¦°à§‡à¦° বিনà§à¦¯à¦¾à¦¸:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "উইনà§à¦¡à§‹" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "ফনà§à¦Ÿ(_F):" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "ইনসà§à¦Ÿà¦² করা হবে (_I)" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "চেহারা" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "ডেসà§à¦•à¦Ÿà¦ªà§‡à¦° চেহারা পছনà§à¦¦ অনà§à¦¸à¦¾à¦°à§‡ নিরà§à¦§à¦¾à¦°à¦£ করà§à¦¨" + +#~ msgid "Back" +#~ msgstr "পূরà§à¦¬à¦¬à¦°à§à¦¤à§€" + +#~ msgid "Forward" +#~ msgstr "ফরওয়ারà§à¦¡" + +#~ msgid "Stop" +#~ msgstr "বনà§à¦§ করা হবে" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "পিকà§à¦¸à¦®à§à¦¯à¦¾à¦ª ফাইল: %s খà§à¦œà§‡à¦ পাওয়া যায়নি" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "শà§à¦§à§à¦®à¦¾à¦¤à§à¦° আইকন\n" +#~ "শà§à¦§à§à¦®à¦¾à¦¤à§à¦° টেকà§à¦¸à¦Ÿ\n" +#~ "আইকনের নীচে টেকà§à¦¸à¦Ÿ\n" +#~ "আইকনের পাশে টেকà§à¦¸à¦Ÿ" diff -Nru lxappearance-0.3.0~svn20090913/po/ca.po lxappearance-0.4.0/po/ca.po --- lxappearance-0.3.0~svn20090913/po/ca.po 1970-01-01 01:00:00.000000000 +0100 +++ lxappearance-0.4.0/po/ca.po 2009-12-21 10:17:43.000000000 +0000 @@ -0,0 +1,210 @@ +# lxappearance.po CATALAN TRANSLATION +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-08 17:06+0100\n" +"Last-Translator: Josep Sanchez \n" +"Language-Team: LXDE Catalan translation group\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Pootle 1.1.0\n" + +#: ../src/main-dlg.c:650 +msgid "Select an icon theme" +msgstr "Trieu un tema d'icones" + +#: ../src/main-dlg.c:657 +msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" +msgstr "*.tar.gz, *.tar.bz2 (Tema d'icones)" + +#: ../src/demo.c:56 +msgid "Column" +msgstr "Columna" + +#: ../src/demo.c:65 +msgid "Item" +msgstr "Element" + +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Botó de comprovació" + +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demostració" + +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Botó de selecció" + +#: ../data/demo.glade.h:4 +msgid "Tab1" +msgstr "Pestanya1" + +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Pestanya 2" + +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Pestanya 3" + +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Pestanya 4" + +#: ../data/demo.glade.h:8 +msgid "Test Item 1" +msgstr "Verifica l'element 1" + +#: ../data/demo.glade.h:9 +msgid "Test Item 2" +msgstr "Verifica l'element 2" + +#: ../data/demo.glade.h:10 +msgid "Test Item 3" +msgstr "Verifica l'element 3" + +#: ../data/demo.glade.h:11 +msgid "Type some characters here to test currently selected font." +msgstr "" +"Teclegeu alguns caràcters per a verificar el tipus de lletra seleccionat" + +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Edita" + +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Fitxer" + +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Ajuda" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "botó" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Previsualització" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Paràmetres d'aspecte" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Temes de cursor disponibles" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Temes d'icones disponibles" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Temes de finestres disponibles" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Cursor" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Icona" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Només icones" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Gran" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Altre" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Mida" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Petit" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Text sota les icones" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Text al costat de les icones" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Només text" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Estil de la barra d'eines:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Finestra" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Tipus de lletra:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Instal·la" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Aparença" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Personalitzeu l'aparença de l'escriptori" + +#~ msgid "Back" +#~ msgstr "Enrera" + +#~ msgid "Forward" +#~ msgstr "Endavant" + +#~ msgid "Stop" +#~ msgstr "Atura" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Verifica l'element 1\n" +#~ "Verifica l'element 2\n" +#~ "Verifica l'element 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "No s'ha pogut localitzar el fitxer pixmap: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Només icones\n" +#~ "Només text\n" +#~ "Text sota les icones\n" +#~ "Text al costat de les icones" diff -Nru lxappearance-0.3.0~svn20090913/po/cs.po lxappearance-0.4.0/po/cs.po --- lxappearance-0.3.0~svn20090913/po/cs.po 2009-09-05 22:29:00.000000000 +0100 +++ lxappearance-0.4.0/po/cs.po 2009-12-21 10:17:37.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: lxappearance 0.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-02-07 17:31+0100\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-09 17:42+0100\n" "Last-Translator: Michal Várady \n" "Language-Team: Czech\n" "MIME-Version: 1.0\n" @@ -16,67 +16,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Nastavení vzhledu" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Dostupné motivy oken" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Písmo:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Okno" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Dostupné motivy ikon" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Nainstalovat" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Ikona" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Styl panelu nástrojů:" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Pouze ikony" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Pouze text" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Text pod ikonami" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Text vedle ikon" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Jiný" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Ukázka" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Vyberte motiv ikon" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Motiv ikon)" @@ -88,101 +32,178 @@ msgid "Item" msgstr "Položka" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Soubor" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Upravit" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "ZaÅ¡krtávací tlaÄítko" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_NápovÄ›da" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demo" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "ZpÄ›t" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "VpÅ™ed" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Zastavit" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "PÅ™epínaÄ" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Karta1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "PÅ™epínaÄ" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "ZaÅ¡krtávací tlaÄítko" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Karta2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Demo" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Karta3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "tlaÄítko" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Karta4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Testovací položka 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Testovací položka 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Testovací položka 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Karta2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Zde napiÅ¡te nÄ›kolik znaků pro vyzkouÅ¡ení vybraného písma." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Karta3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Upravit" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Karta4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Soubor" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Testovací položka 1\n" -"Testovací položka 2\n" -"Testovací položka 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Poze ikony\n" -"Pouze text\n" -"Text pod ikonami\n" -"Text vedle ikon" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Nelze najít soubor obrázku: %s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_NápovÄ›da" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "tlaÄítko" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Ukázka" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Nastavení vzhledu" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Dostupné motivy kurzorů" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Dostupné motivy ikon" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Dostupné motivy oken" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Kurzor" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ikona" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Pouze ikony" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Velká" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Jiný" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Velikost" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Malá" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Text pod ikonami" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Text vedle ikon" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Pouze text" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Styl panelu nástrojů:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Okno" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Písmo:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Nainstalovat" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Vzhled" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "PÅ™izpůsobit vzhled pracovní plochy" + +#~ msgid "Back" +#~ msgstr "ZpÄ›t" + +#~ msgid "Forward" +#~ msgstr "VpÅ™ed" + +#~ msgid "Stop" +#~ msgstr "Zastavit" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Testovací položka 1\n" +#~ "Testovací položka 2\n" +#~ "Testovací položka 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Nelze najít soubor obrázku: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Poze ikony\n" +#~ "Pouze text\n" +#~ "Text pod ikonami\n" +#~ "Text vedle ikon" diff -Nru lxappearance-0.3.0~svn20090913/po/da.po lxappearance-0.4.0/po/da.po --- lxappearance-0.3.0~svn20090913/po/da.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/da.po 2010-01-06 05:17:45.000000000 +0000 @@ -8,76 +8,20 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-03-23 16:38+0100\n" -"Last-Translator: charlie tyrrestrup \n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-30 10:17+0100\n" +"Last-Translator: Vidar Jon Bauge \n" "Language-Team: Danish\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 1.1.0\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Indstillinger for udseende" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Tilgængelige Temaer for Vinduer" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Skrifttype:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Vindue" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Tilgængelige Temaer for Ikoner" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Installer" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Ikon" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Udseende til Værktøjslinjen: " - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Kun ikoner" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Kun Tekst" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Tekst Under Ikonerne" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Tekst Ved Siden Af Ikonerne" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Andet" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "ForhÃ¥ndsvisning" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Vælg Ikon Tema" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Ikon Tema)" @@ -89,101 +33,178 @@ msgid "Item" msgstr "Objekt" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Fil" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Rediger" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Check Button" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Hjælp" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demo" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Tilbage" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Fremover" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Stop" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Radio Button" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Tab1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Radio Button" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Check Button" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Tab2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Demo" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Tab3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "knap" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Tab4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Test Objekt 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Test Objekt 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Test Objekt 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Tab2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Skriv noget her, for at se den valgte skrifttype." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Tab3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Rediger" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Tab4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Fil" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Test Objekt 1\n" -"Test Objekt 2\n" -"Test Objekt 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Kun ikoner\n" -"Kun tekst\n" -"Tekst under ikonerne\n" -"Tekst ved siden af ikonerne" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Fandt ikke billedfilen: %s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Hjælp" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "knap" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "ForhÃ¥ndsvisning" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Indstillinger for udseende" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Tilgængelige Temaer for Musepeger" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Tilgængelige Temaer for Ikoner" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Tilgængelige Temaer for Vinduer" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Musepeger" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ikon" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Kun ikoner" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Stor" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Andet" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Størrelse" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Lille" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Tekst Under Ikonerne" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Tekst Ved Siden Af Ikonerne" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Kun Tekst" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Udseende til Værktøjslinjen: " + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Vindue" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Skrifttype:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Installer" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Udseende" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Tilpas skrivebordets udseende" + +#~ msgid "Back" +#~ msgstr "Tilbage" + +#~ msgid "Forward" +#~ msgstr "Fremover" + +#~ msgid "Stop" +#~ msgstr "Stop" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Test Objekt 1\n" +#~ "Test Objekt 2\n" +#~ "Test Objekt 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Fandt ikke billedfilen: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Kun ikoner\n" +#~ "Kun tekst\n" +#~ "Tekst under ikonerne\n" +#~ "Tekst ved siden af ikonerne" diff -Nru lxappearance-0.3.0~svn20090913/po/de.po lxappearance-0.4.0/po/de.po --- lxappearance-0.3.0~svn20090913/po/de.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/de.po 2009-12-21 10:17:43.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: 2009-07-19 13:25+0100\n" "Last-Translator: Mario Blättermann \n" "Language-Team: Deutsch \n" @@ -16,67 +16,11 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 1.1.0\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Erscheinungsbild-Einstellungen" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Verfügbare Themen" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Schrift:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Fenster" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Verfügbare Symbolthemen" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Installieren" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Symbol" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Stil der Werkzeugleiste: " - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Nur Symbole" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Nur Text" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Text unter Symbolen" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Text neben Symbolen" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Andere" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Vorschau" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Symbolthema auswählen" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Symbolthema)" @@ -88,116 +32,178 @@ msgid "Item" msgstr "Eintrag" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Datei" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Bearbeiten" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Auswahlfeld" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Hilfe" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demo" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Zurück" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Vorwärts" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Stop" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Auswahlknopf" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Reiter1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Auswahlknopf" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Auswahlfeld" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Reiter2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Demo" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Reiter3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "Knopf" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Reiter4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Testeintrag 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Testeintrag 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Testeintrag 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Reiter2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Geben Sie hier Text ein, um die Schriftauswahl zu testen. " -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Reiter3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Bearbeiten" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Reiter4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Datei" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Testeintrag 1\n" -"Testeintrag 2\n" -"Testeintrag 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Nur Symbole\n" -"Nur Text\n" -"Text unter Symbolen\n" -"Text neben Symbolen" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Bilddatei konnte nicht gefunden werden: %s" - -#~ msgid "Available Cursor Themes" -#~ msgstr "Verfügbare Cursorthemen" - -#~ msgid "Size" -#~ msgstr "Größe" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Hilfe" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "Knopf" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Vorschau" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Erscheinungsbild-Einstellungen" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Verfügbare Cursorthemen" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Verfügbare Symbolthemen" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Verfügbare Themen" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Cursor" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Symbol" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Nur Symbole" -#~ msgid "Small" -#~ msgstr "Klein" +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Groß" -#~ msgid "Large" -#~ msgstr "Groß" +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Andere" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Größe" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Klein" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Text unter Symbolen" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Text neben Symbolen" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Nur Text" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Stil der Werkzeugleiste: " + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Fenster" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Schrift:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Installieren" -#~ msgid "Cursor" -#~ msgstr "Cursor" +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Erscheinungsbild" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Aussehen des Desktops anpassen" + +#~ msgid "Back" +#~ msgstr "Zurück" + +#~ msgid "Forward" +#~ msgstr "Vorwärts" + +#~ msgid "Stop" +#~ msgstr "Stop" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Testeintrag 1\n" +#~ "Testeintrag 2\n" +#~ "Testeintrag 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Bilddatei konnte nicht gefunden werden: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Nur Symbole\n" +#~ "Nur Text\n" +#~ "Text unter Symbolen\n" +#~ "Text neben Symbolen" diff -Nru lxappearance-0.3.0~svn20090913/po/el.po lxappearance-0.4.0/po/el.po --- lxappearance-0.3.0~svn20090913/po/el.po 1970-01-01 01:00:00.000000000 +0100 +++ lxappearance-0.4.0/po/el.po 2010-01-06 05:17:45.000000000 +0000 @@ -0,0 +1,211 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: lxappearance\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-27 21:12+0100\n" +"Last-Translator: George Vasilakos \n" +"Language-Team: Greek\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Pootle 1.1.0\n" +"X-Poedit-Language: Greek\n" +"X-Poedit-Country: GREECE\n" + +#: ../src/main-dlg.c:650 +msgid "Select an icon theme" +msgstr "Επιλογή ενός θέματος εικονιδίων" + +#: ../src/main-dlg.c:657 +msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" +msgstr "*.tar.gz, *.tar.bz2 (Θέμα εικονιδίων)" + +#: ../src/demo.c:56 +msgid "Column" +msgstr "Στήλη" + +#: ../src/demo.c:65 +msgid "Item" +msgstr "Αντικείμενο" + +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Κουμπί ενεÏγοποίησης" + +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Δοκιμή" + +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Κουμπί επιλογής" + +#: ../data/demo.glade.h:4 +msgid "Tab1" +msgstr "ΚαÏτέλα 1" + +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "ΚαÏτέλα 2" + +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "ΚαÏτέλα 3" + +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "ΚαÏτέλα 4" + +#: ../data/demo.glade.h:8 +msgid "Test Item 1" +msgstr "Δοκιμαστικό αντικείμενο 1" + +#: ../data/demo.glade.h:9 +msgid "Test Item 2" +msgstr "Δοκιμαστικό αντικείμενο 2" + +#: ../data/demo.glade.h:10 +msgid "Test Item 3" +msgstr "Δοκιμαστικό αντικείμενο 3" + +#: ../data/demo.glade.h:11 +msgid "Type some characters here to test currently selected font." +msgstr "ΠληκτÏολογήστε χαÏακτήÏες για δοκιμή της Ï„Ïέχουσας γÏαμματοσειÏάς." + +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_ΕπεξεÏγασία" + +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_ΑÏχείο" + +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Βοήθεια" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "κουμπί" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "ΠÏοεπισκόπηση" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Ρυθμίσεις εμφάνισης" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Διαθέσιμα θέματα δεικτών" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Διαθέσιμα θέματα εικονιδίων" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Διαθέσιμα θέματα παÏαθÏÏων" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Δείκτης" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Εικονίδιο" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Μόνο εικονίδια" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Μεγάλο" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Άλλα" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Μέγεθος" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "ΜικÏÏŒ" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Κείμενο κάτω από τα εικονίδια" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Κείμενο δίπλα από τα εικονίδια" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Μόνο κείμενο" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Στυλ γÏαμμής εÏγαλείων:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "ΠαÏάθυÏο" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_ΓÏαμματοσειÏά:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Εγκατάσταση" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Εμφάνιση" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "ΠÏοσαÏμόστε την εμφάνιση της επιφάνειας εÏγασίας σας" + +#~ msgid "Back" +#~ msgstr "Πίσω" + +#~ msgid "Forward" +#~ msgstr "ΜπÏοστά" + +#~ msgid "Stop" +#~ msgstr "Σταμάτα" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Δοκιμή αντικειμένου 1\n" +#~ "Δοκιμή αντικειμένου 2\n" +#~ "Δοκιμή αντικειμένου 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "ΑδÏνατη η εÏÏεση αÏχείου pixmap: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Μόνο Εικονίδια\n" +#~ "Μόνο κείμενο\n" +#~ "Κείμενο κάτω από τα εικονίδια\n" +#~ "Κείμενο δίπλα από τα εικονίδια" diff -Nru lxappearance-0.3.0~svn20090913/po/es.po lxappearance-0.4.0/po/es.po --- lxappearance-0.3.0~svn20090913/po/es.po 2009-09-05 22:29:00.000000000 +0100 +++ lxappearance-0.4.0/po/es.po 2009-12-21 10:17:38.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-05-31 16:11+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-08 19:54+0100\n" "Last-Translator: Hugo Florentino \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -19,67 +19,11 @@ "X-Generator: Pootle 1.1.0\n" "X-Poedit-Language: Spanish\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Configuración de apariencia" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Temas de ventana disponibles" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Fuente:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Ventana" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Temas de iconos disponibles" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Instalar" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Icono" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Estilo de barra de herramientas: " - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Sólo iconos" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Sólo texto" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Texto bajo los iconos" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Texto al lado de los iconos" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Otro" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Vista previa" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Seleccione un tema de iconos" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Tema de iconos)" @@ -91,101 +35,178 @@ msgid "Item" msgstr "Elemento" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Archivo" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Edición" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Caja de selección" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "A_yuda" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demostración" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Atrás" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Adelante" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Detener" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Botón de selección" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Pestaña1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Botón de selección" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Caja de selección" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Pestaña2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Demostración" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Pestaña3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "botón" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Pestaña4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Elemento de prueba 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Elemento de prueba 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Elemento de prueba 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Pestaña2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Digite algunos caracteres acá para probar la fuente seleccionada." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Pestaña3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Edición" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Pestaña4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Archivo" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Elemento de prueba 1\n" -"Elemento de prueba 2\n" -"Elemento de prueba 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Sólo iconos\n" -"Sólo texto\n" -"Texto debajo de los iconos\n" -"Texto al lado de los iconos" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "No se encontro el archivo de imagen: %s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "A_yuda" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "botón" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Vista previa" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Configuración de apariencia" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Temas de cursores disponibles" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Temas de iconos disponibles" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Temas de ventana disponibles" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Cursor" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Icono" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Sólo iconos" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Grande" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Otro" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Tamaño" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Pequeño" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Texto bajo los iconos" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Texto al lado de los iconos" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Sólo texto" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Estilo de barra de herramientas: " + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Ventana" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Fuente:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Instalar" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Apariencia" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Personalizar la apariencia del escritorio" + +#~ msgid "Back" +#~ msgstr "Atrás" + +#~ msgid "Forward" +#~ msgstr "Adelante" + +#~ msgid "Stop" +#~ msgstr "Detener" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Elemento de prueba 1\n" +#~ "Elemento de prueba 2\n" +#~ "Elemento de prueba 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "No se encontro el archivo de imagen: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Sólo iconos\n" +#~ "Sólo texto\n" +#~ "Texto debajo de los iconos\n" +#~ "Texto al lado de los iconos" diff -Nru lxappearance-0.3.0~svn20090913/po/et.po lxappearance-0.4.0/po/et.po --- lxappearance-0.3.0~svn20090913/po/et.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/et.po 2010-01-06 05:17:45.000000000 +0000 @@ -8,85 +8,110 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-08-23 17:34+0300\n" +"POT-Creation-Date: 2009-12-08 15:20+0100\n" +"PO-Revision-Date: 2009-12-08 19:07+0300\n" "Last-Translator: Mattias Põldaru \n" "Language-Team: Gnome Estonian Translation Team \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/main-dlg-ui.c:70 +#: ../src/main-dlg-ui.c:80 #: ../lxappearance.glade.h:2 msgid "Appearance Settings" msgstr "Välimuse sätted" -#: ../src/main-dlg-ui.c:90 -#: ../lxappearance.glade.h:4 +#: ../src/main-dlg-ui.c:99 +#: ../lxappearance.glade.h:5 msgid "Available Window Themes" msgstr "Aknateemad" -#: ../src/main-dlg-ui.c:110 -#: ../lxappearance.glade.h:13 +#: ../src/main-dlg-ui.c:118 +#: ../lxappearance.glade.h:18 msgid "_Font:" msgstr "_Kiri:" -#: ../src/main-dlg-ui.c:122 -#: ../lxappearance.glade.h:12 +#: ../src/main-dlg-ui.c:130 +#: ../lxappearance.glade.h:17 msgid "Window" msgstr "Aken" -#: ../src/main-dlg-ui.c:130 -#: ../lxappearance.glade.h:3 +#: ../src/main-dlg-ui.c:138 +#: ../lxappearance.glade.h:4 msgid "Available Icon Themes" msgstr "Ikooniteemad" -#: ../src/main-dlg-ui.c:167 -#: ../lxappearance.glade.h:14 +#: ../src/main-dlg-ui.c:174 +#: ../lxappearance.glade.h:19 msgid "_Install" msgstr "_Paigalda" -#: ../src/main-dlg-ui.c:174 -#: ../lxappearance.glade.h:5 +#: ../src/main-dlg-ui.c:181 +#: ../lxappearance.glade.h:7 msgid "Icon" msgstr "Ikoon" -#: ../src/main-dlg-ui.c:187 -#: ../lxappearance.glade.h:11 +#: ../src/main-dlg-ui.c:190 +#: ../lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Saadaolevad kursorid" + +#: ../src/main-dlg-ui.c:209 +#: ../lxappearance.glade.h:14 +msgid "Size" +msgstr "Suurus" + +#: ../src/main-dlg-ui.c:213 +#: ../lxappearance.glade.h:15 +msgid "Small" +msgstr "Väike" + +#: ../src/main-dlg-ui.c:223 +#: ../lxappearance.glade.h:12 +msgid "Large" +msgstr "Suur" + +#: ../src/main-dlg-ui.c:227 +#: ../lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Kursor" + +#: ../src/main-dlg-ui.c:241 +#: ../lxappearance.glade.h:16 msgid "Toolbar Style: " msgstr "Tööriistariba stiil:" -#: ../src/main-dlg-ui.c:195 +#: ../src/main-dlg-ui.c:249 msgid "Icons only" msgstr "Ainult ikoonid" -#: ../src/main-dlg-ui.c:196 +#: ../src/main-dlg-ui.c:250 msgid "Text only" msgstr "Ainult tekst" -#: ../src/main-dlg-ui.c:197 +#: ../src/main-dlg-ui.c:251 msgid "Text below icons" msgstr "Tekst ikoonide all" -#: ../src/main-dlg-ui.c:198 +#: ../src/main-dlg-ui.c:252 msgid "Text beside icons" msgstr "Tekst ikoonide kõrval" -#: ../src/main-dlg-ui.c:200 -#: ../lxappearance.glade.h:10 +#: ../src/main-dlg-ui.c:254 +#: ../lxappearance.glade.h:13 msgid "Other" msgstr "Muu" -#: ../src/main-dlg-ui.c:208 +#: ../src/main-dlg-ui.c:266 #: ../lxappearance.glade.h:1 msgid "Preview" msgstr "Eelvaade" -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:635 msgid "Select an icon theme" msgstr "Vali ikooniteema" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:642 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (ikooniteema)" @@ -196,7 +221,7 @@ "Testkirje 2\n" "Testkirje 3" -#: ../lxappearance.glade.h:6 +#: ../lxappearance.glade.h:8 msgid "" "Icons only\n" "Text only\n" @@ -214,3 +239,13 @@ msgid "Couldn't find pixmap file: %s" msgstr "Pixmap faili ei suudetud leida: %s" +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Välimus" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Töölaua välimuse kohandamine" + + + diff -Nru lxappearance-0.3.0~svn20090913/po/eu.po lxappearance-0.4.0/po/eu.po --- lxappearance-0.3.0~svn20090913/po/eu.po 2009-09-05 22:29:00.000000000 +0100 +++ lxappearance-0.4.0/po/eu.po 2009-12-21 10:17:38.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: lxappearance 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: \n" "Last-Translator: Alain Mendizabal \n" "Language-Team: Basque \n" @@ -11,67 +11,11 @@ "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Basque\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Itxura ezarpenak" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Leiho kudeatzaile gaiak" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Letra tipoa:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Leihoa" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Ikono gaiak" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Instalatu" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Ikonoa" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Tresna-barraren estiloa:" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Ikonoak bakarrik" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Testua bakarrik" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Testua ikonoen azpian" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Testua ikonoen alboan" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Bestelakoak" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Aurreikuspena" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Aukeratu ikono gaia" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Ikono gaia)" @@ -83,101 +27,179 @@ msgid "Item" msgstr "Elementua" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Fitxategia" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Editatu" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Hautapen botoia" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Laguntza" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Proba" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Atzera" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Aurrera" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Gelditu" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Aukera botoia" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Fitxa1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Aukera botoia" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Hautapen botoia" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Fitxa2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Proba" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Fitxa3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "botoia" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Fitxa4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Proba-elementua 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Proba-elementua 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Proba-elementua 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Fitxa2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Idatzi hemen karaktere batzuk aukeratutako letra tipoa probatzeko." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Fitxa3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Editatu" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Fitxa4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Fitxategia" + +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Laguntza" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "botoia" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Aurreikuspena" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Itxura ezarpenak" + +#: ../data/lxappearance.glade.h:3 +#, fuzzy +msgid "Available Cursor Themes" +msgstr "Ikono gaiak" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Ikono gaiak" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Leiho kudeatzaile gaiak" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ikonoa" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Ikonoak bakarrik" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" msgstr "" -"Proba elementua 1\n" -"Proba elementua 2\n" -"Proba elementua 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Bestelakoak" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" msgstr "" -"Ikonoak bakarrik\n" -"Testua bakarrik\n" -"Testua ikonoen azpian\n" -"Testua ikonoen alboan" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Ezin izan da %s pixmap fitxategia aurkitu" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Testua ikonoen azpian" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Testua ikonoen alboan" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Testua bakarrik" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Tresna-barraren estiloa:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Leihoa" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Letra tipoa:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Instalatu" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Itxura" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Pertsonalizatu mahaigainaren itxura" + +#~ msgid "Back" +#~ msgstr "Atzera" + +#~ msgid "Forward" +#~ msgstr "Aurrera" + +#~ msgid "Stop" +#~ msgstr "Gelditu" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Proba elementua 1\n" +#~ "Proba elementua 2\n" +#~ "Proba elementua 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Ezin izan da %s pixmap fitxategia aurkitu" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Ikonoak bakarrik\n" +#~ "Testua bakarrik\n" +#~ "Testua ikonoen azpian\n" +#~ "Testua ikonoen alboan" diff -Nru lxappearance-0.3.0~svn20090913/po/fa.po lxappearance-0.4.0/po/fa.po --- lxappearance-0.3.0~svn20090913/po/fa.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/fa.po 2009-12-21 10:17:43.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,166 +16,162 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" +#: ../src/main-dlg.c:650 +msgid "Select an icon theme" msgstr "" -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" +#: ../src/main-dlg.c:657 +msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "" -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" +#: ../src/demo.c:56 +msgid "Column" msgstr "" -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" +#: ../src/demo.c:65 +msgid "Item" msgstr "" -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" +#: ../data/demo.glade.h:1 +msgid "Check Button" msgstr "" -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" +#: ../data/demo.glade.h:2 +msgid "Demo" msgstr "" -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" +#: ../data/demo.glade.h:3 +msgid "Radio Button" msgstr "" -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " +#: ../data/demo.glade.h:4 +msgid "Tab1" msgstr "" -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" +#: ../data/demo.glade.h:5 +msgid "Tab2" msgstr "" -#: ../src/main-dlg-ui.c:196 -msgid "Text only" +#: ../data/demo.glade.h:6 +msgid "Tab3" msgstr "" -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" +#: ../data/demo.glade.h:7 +msgid "Tab4" msgstr "" -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" +#: ../data/demo.glade.h:8 +msgid "Test Item 1" msgstr "" -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" +#: ../data/demo.glade.h:9 +msgid "Test Item 2" msgstr "" -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" +#: ../data/demo.glade.h:10 +msgid "Test Item 3" msgstr "" -#: ../src/main-dlg.c:620 -msgid "Select an icon theme" +#: ../data/demo.glade.h:11 +msgid "Type some characters here to test currently selected font." msgstr "" -#: ../src/main-dlg.c:627 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" +#: ../data/demo.glade.h:12 +msgid "_Edit" msgstr "" -#: ../src/demo.c:56 -msgid "Column" +#: ../data/demo.glade.h:13 +msgid "_File" msgstr "" -#: ../src/demo.c:65 -msgid "Item" +#: ../data/demo.glade.h:14 +msgid "_Help" msgstr "" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" +#: ../data/demo.glade.h:15 +msgid "button" msgstr "" -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" +#: ../data/lxappearance.glade.h:1 +msgid "Preview" msgstr "" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" msgstr "" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" msgstr "" -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" msgstr "" -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" msgstr "" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 -msgid "Tab1" +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" msgstr "" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" msgstr "" -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" msgstr "" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" +#: ../data/lxappearance.glade.h:9 +msgid "Large" msgstr "" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" +#: ../data/lxappearance.glade.h:10 +msgid "Other" msgstr "" -#: ../src/demo-ui.c:323 -msgid "Test Item 1" +#: ../data/lxappearance.glade.h:11 +msgid "Size" msgstr "" -#: ../src/demo-ui.c:324 -msgid "Test Item 2" +#: ../data/lxappearance.glade.h:12 +msgid "Small" msgstr "" -#: ../src/demo-ui.c:325 -msgid "Test Item 3" +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" msgstr "" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" msgstr "" -#: ../src/demo-ui.c:340 ../demo.glade.h:14 -msgid "Type some characters here to test currently selected font." +#: ../data/lxappearance.glade.h:15 +msgid "Text only" msgstr "" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " msgstr "" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" msgstr "" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" msgstr "" diff -Nru lxappearance-0.3.0~svn20090913/po/fi.po lxappearance-0.4.0/po/fi.po --- lxappearance-0.3.0~svn20090913/po/fi.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/fi.po 2009-12-21 10:17:43.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: 2008-04-30 21:12+0200\n" "Last-Translator: Elias Julkunen \n" "Language-Team: LANGUAGE \n" @@ -15,67 +15,11 @@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Ulkoasun asetukset" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Käytettävissä olevat ikkunateemat" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Kirjasin:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Ikkuna" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Käytettävissä olevat kuvaketeemat" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Asenna" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Kuvake" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Työkalupalkin tyyli:" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Vain kuvakkeet" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Vain teksti" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Teksti kuvakkeiden jälkeen" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Tekti kuvakkeiden vieressä" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Muu" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Esikatsele" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Valitse kuvaketeema" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Kuvaketeema)" @@ -87,94 +31,156 @@ msgid "Item" msgstr "Kohta" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Tiedosto" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Muokkaa" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Valintaruutu" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Apua" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Esimerkki" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Edellinen" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Seuraava" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Pysäytä" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Valintanappi" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Välilehti1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Valintanappi" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Valintaruutu" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Välilehti2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Esimerkki" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Välilehti3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "painike" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Välilehti4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Kokeilukohta 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Kokeilukohta 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Kokeilukohta 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Välilehti2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Kirjoita joitain merkkejä kokeillaksesi nykyistä kirjasintyyppiä." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Välilehti3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Muokkaa" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Välilehti4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Tiedosto" + +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Apua" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "painike" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Esikatsele" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Ulkoasun asetukset" + +#: ../data/lxappearance.glade.h:3 +#, fuzzy +msgid "Available Cursor Themes" +msgstr "Käytettävissä olevat kuvaketeemat" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Käytettävissä olevat kuvaketeemat" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Käytettävissä olevat ikkunateemat" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Kuvake" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Vain kuvakkeet" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" msgstr "" -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Muu" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" msgstr "" -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" +#: ../data/lxappearance.glade.h:12 +msgid "Small" msgstr "" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Teksti kuvakkeiden jälkeen" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Tekti kuvakkeiden vieressä" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Vain teksti" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Työkalupalkin tyyli:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Ikkuna" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Kirjasin:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Asenna" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Ulkoasu" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Muuta työpöydän ulkoasua" + +#~ msgid "Back" +#~ msgstr "Edellinen" + +#~ msgid "Forward" +#~ msgstr "Seuraava" + +#~ msgid "Stop" +#~ msgstr "Pysäytä" diff -Nru lxappearance-0.3.0~svn20090913/po/fr.po lxappearance-0.4.0/po/fr.po --- lxappearance-0.3.0~svn20090913/po/fr.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/fr.po 2009-12-21 10:17:41.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: lxappearance r839\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-04-10 01:28+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-12 15:13+0100\n" "Last-Translator: Cilyan Olowen \n" "Language-Team: GNOME French Team \n" "MIME-Version: 1.0\n" @@ -19,67 +19,11 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 1.1.0\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Paramètres de l'apparence" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Thèmes de fenêtre disponibles :" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Police :" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Fenêtre" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Thèmes d'icônes disponibles :" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Installer" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Icônes" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Style des barres d'outils : " - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Icônes uniquement" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Texte uniquement" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Texte sous les icônes" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Texte à côté des icônes" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Autres" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Prévisualisation" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Sélectionnez un thème d'icônes" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (thème d'icônes)" @@ -91,101 +35,178 @@ msgid "Item" msgstr "Élément" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Fichier" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "É_dition" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Case à cocher" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "Aid_e" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Démonstration" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Précédant" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Suivant" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Arrêter" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Bouton radio" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Onglet1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Bouton radio" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Case à cocher" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Onglet2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Démonstration" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Onglet3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "bouton" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Onglet4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Élément de test 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Élément de test 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Élément de test 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Onglet2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Saisissez du texte ici pour tester la police sélectionnée." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Onglet3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "É_dition" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Onglet4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Fichier" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Élément de test 1\n" -"Élément de test 2\n" -"Élément de test 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Icônes seulement\n" -"Texte seulement\n" -"Texte sous les icônes\n" -"Texte à côté des icônes" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Impossible de trouver le fichier image : %s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "Aid_e" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "bouton" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Prévisualisation" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Paramètres de l'apparence" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Thèmes disponibles pour le pointeur :" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Thèmes d'icônes disponibles :" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Thèmes de fenêtre disponibles :" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Pointeur" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Icônes" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Icônes uniquement" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Grand" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Autres" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Taille" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Petit" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Texte sous les icônes" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Texte à côté des icônes" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Texte uniquement" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Style des barres d'outils : " + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Fenêtre" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Police :" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Installer" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Apparence" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Personnaliser l'apparence du bureau" + +#~ msgid "Back" +#~ msgstr "Précédant" + +#~ msgid "Forward" +#~ msgstr "Suivant" + +#~ msgid "Stop" +#~ msgstr "Arrêter" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Élément de test 1\n" +#~ "Élément de test 2\n" +#~ "Élément de test 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Impossible de trouver le fichier image : %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Icônes seulement\n" +#~ "Texte seulement\n" +#~ "Texte sous les icônes\n" +#~ "Texte à côté des icônes" diff -Nru lxappearance-0.3.0~svn20090913/po/gl.po lxappearance-0.4.0/po/gl.po --- lxappearance-0.3.0~svn20090913/po/gl.po 2009-09-13 11:23:09.000000000 +0100 +++ lxappearance-0.4.0/po/gl.po 2009-12-21 10:17:41.000000000 +0000 @@ -7,76 +7,20 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-09-11 12:18+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-10-27 15:15+0100\n" "Last-Translator: Indalecio Freiría Santos \n" -"Language-Team: LANGUAGE \n" +"Language-Team: Proxecto Trasno \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 1.1.0\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Configuración da Aparencia" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Temas de xanela dispoñíbeis" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Fonte:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Xanela" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Temas de iconas dispoñíbeis" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Instalar" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Icona" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Estilo de barra de ferramentas: " - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Só iconas" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Só texto" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Texto debaixo das iconas" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Texto ao lado das iconas" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Outro" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Vista previa" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Seleccione un tema de iconas" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Tema de iconas)" @@ -88,101 +32,179 @@ msgid "Item" msgstr "Elemento" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Ficheiro" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Edición" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Caixa de selección" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Axuda" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demostración" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Atrás" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Adiante" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Deter" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Botón de selección" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Separador1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Botón de Selección" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Caixa de Selección" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Separador2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Demostración" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Separador3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "botón" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Separador4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Elemento de proba 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Elemento de proba 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Elemento de proba 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Separador2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Escriba algúns caracteres aquí para probar a fonte seleccionada." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Separador3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Edición" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Separador4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Ficheiro" + +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Axuda" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "botón" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Vista previa" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Configuración da aparencia" + +#: ../data/lxappearance.glade.h:3 +#, fuzzy +msgid "Available Cursor Themes" +msgstr "Temas de iconas dispoñíbeis" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Temas de iconas dispoñíbeis" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Temas de xanela dispoñíbeis" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Icona" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Só iconas" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Outro" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Texto debaixo das iconas" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Texto ao lado das iconas" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Só texto" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Estilo de barra de ferramentas: " + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Xanela" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Fonte:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Instalar" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Aparencia" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "" + +#~ msgid "Back" +#~ msgstr "Atrás" + +#~ msgid "Forward" +#~ msgstr "Adiante" + +#~ msgid "Stop" +#~ msgstr "Deter" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Elemento de proba 1\n" -"Elemento de proba 2\n" -"Elemento de proba 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Só iconas\n" -"Só texto\n" -"Texto debaixo das iconas\n" -"Texto ao lado das iconas" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Non se atopou o ficheiro de imaxe: %s" +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Elemento de proba 1\n" +#~ "Elemento de proba 2\n" +#~ "Elemento de proba 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Non se atopou o ficheiro de imaxe: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Só iconas\n" +#~ "Só texto\n" +#~ "Texto debaixo das iconas\n" +#~ "Texto ao lado das iconas" diff -Nru lxappearance-0.3.0~svn20090913/po/he.po lxappearance-0.4.0/po/he.po --- lxappearance-0.3.0~svn20090913/po/he.po 1970-01-01 01:00:00.000000000 +0100 +++ lxappearance-0.4.0/po/he.po 2009-12-21 10:17:43.000000000 +0000 @@ -0,0 +1,209 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-08 15:45+0100\n" +"Last-Translator: Yaron Shahrbani \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Pootle 1.1.0\n" + +#: ../src/main-dlg.c:650 +msgid "Select an icon theme" +msgstr "בחירת ערכת × ×•×©× ×œ×¡×ž×œ×™×" + +#: ../src/main-dlg.c:657 +msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" +msgstr "*.tar.gz, *.tar.bz2 (ערכת × ×•×©× ×œ×¡×ž×œ×™×)" + +#: ../src/demo.c:56 +msgid "Column" +msgstr "עמודה" + +#: ../src/demo.c:65 +msgid "Item" +msgstr "פריט" + +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "לחצן סימון" + +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "הדגמה" + +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "לחצן ברירה" + +#: ../data/demo.glade.h:4 +msgid "Tab1" +msgstr "לשונית1" + +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "לשונית2" + +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "לשונית3" + +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "לשונית4" + +#: ../data/demo.glade.h:8 +msgid "Test Item 1" +msgstr "פריט לבדיקה 1" + +#: ../data/demo.glade.h:9 +msgid "Test Item 2" +msgstr "פריט לבדיקה 2" + +#: ../data/demo.glade.h:10 +msgid "Test Item 3" +msgstr "פריט לבדיקה 3" + +#: ../data/demo.glade.h:11 +msgid "Type some characters here to test currently selected font." +msgstr "× × ×œ×”×§×œ×™×“ כמה ×ª×•×•×™× ×›×“×™ לבדוק ×ת הגופן הנבחר הנוכחי." + +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "×¢_ריכה" + +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_קובץ" + +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "×¢_זרה" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "לחצן" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "תצוגה מקדימה" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "הגדרות המר××”" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "ערכות סמני העכבר הזמינות" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "ערכות ×”× ×•×©× ×”×–×ž×™× ×•×ª לסמלי×" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "ערכות × ×•×©× ×”×–×ž×™× ×•×ª לחלונות" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "סמן העכבר" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "סמל" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "×¡×ž×œ×™× ×‘×œ×‘×“" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "גדול" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "×חר" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "גודל" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "קטן" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "טקסט מתחת לסמלי×" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "טקסט לצד הסמלי×" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "טקסט בלבד" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "סגנון סרגל הכלי×: " + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "חלון" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_גופן:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "×”_תקנה" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "מר××”" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "הת×מת מר××” שולחן העבודה" + +#~ msgid "Back" +#~ msgstr "×חורה" + +#~ msgid "Forward" +#~ msgstr "קדימה" + +#~ msgid "Stop" +#~ msgstr "עצירה" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "פריט לבדיקה1\n" +#~ "פריט לבדיקה 2\n" +#~ "פריט לבדיקה 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "×œ× × ×™×ª×Ÿ ל×תר ×ת קובץ ×”Ö¾pixmapâ€: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "×¡×ž×œ×™× ×‘×œ×‘×“\n" +#~ "טקסט בלבד\n" +#~ "טקסט מתחת לסמלי×\n" +#~ "טקסט לצד הסמלי×" diff -Nru lxappearance-0.3.0~svn20090913/po/hr.po lxappearance-0.4.0/po/hr.po --- lxappearance-0.3.0~svn20090913/po/hr.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/hr.po 2009-12-21 10:17:42.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: lxappearance_hr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: \n" "Last-Translator: Boljsa \n" "Language-Team: \n" @@ -12,67 +12,11 @@ "X-Poedit-Language: Croatian\n" "X-Poedit-Country: CROATIA\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Postavke Izgleda" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Dostupne Teme Prozora" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Font:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Prozor" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Dostupne Teme Ikona" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Instaliraj" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Ikona" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Stil Alatne Trake:" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Samo ikone" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Samo tekst" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Tekst ispod ikona" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Tekst iznad ikona" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Ostalo" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Pregled" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Odaberite temu ikona" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Tema Ikone)" @@ -84,102 +28,181 @@ msgid "Item" msgstr "Stavka" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Datoteka" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Ureðivanje" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Dugme Provjere" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Pomoæ" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demo" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Natrag" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Naprijed" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Stop" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Dugme Radio" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Tab1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Dugme Radio" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Dugme Provjere" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Tab2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Demo" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Tab3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "dugme" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Tab4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Testna Stavka 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Testna Stavka 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Testna Stavka 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Tab2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "" "Upi¹ite nekoliko znakova ovdje kako bi testirali trenutno izabrani font." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Tab3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Ureðivanje" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Tab4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Datoteka" + +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Pomoæ" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "dugme" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Pregled" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Postavke Izgleda" + +#: ../data/lxappearance.glade.h:3 +#, fuzzy +msgid "Available Cursor Themes" +msgstr "Dostupne Teme Ikona" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Dostupne Teme Ikona" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Dostupne Teme Prozora" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ikona" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Samo ikone" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Ostalo" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Tekst ispod ikona" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Tekst iznad ikona" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Samo tekst" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Stil Alatne Trake:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Prozor" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Font:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Instaliraj" + +#: ../lxappearance.desktop.in.h:1 +#, fuzzy +msgid "Appearance" +msgstr "Postavke Izgleda" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "" + +#~ msgid "Back" +#~ msgstr "Natrag" + +#~ msgid "Forward" +#~ msgstr "Naprijed" + +#~ msgid "Stop" +#~ msgstr "Stop" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Testna Stavka 1\n" -"Testna Stavka 2\n" -"Testna Stavka 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Samo ikone\n" -"Samo tekst\n" -"Samo tekst ispod ikona\n" -"Samo tekst iznad ikona" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Ne mogu pronaæi pixmap datoteku: %s" +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Testna Stavka 1\n" +#~ "Testna Stavka 2\n" +#~ "Testna Stavka 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Ne mogu pronaæi pixmap datoteku: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Samo ikone\n" +#~ "Samo tekst\n" +#~ "Samo tekst ispod ikona\n" +#~ "Samo tekst iznad ikona" diff -Nru lxappearance-0.3.0~svn20090913/po/hu.po lxappearance-0.4.0/po/hu.po --- lxappearance-0.3.0~svn20090913/po/hu.po 2009-09-05 22:29:00.000000000 +0100 +++ lxappearance-0.4.0/po/hu.po 2009-12-21 10:17:38.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lxappearance 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: 2009-05-25 15:41+0100\n" "Last-Translator: SZERVÃC Attila \n" "Language-Team: Hungarian \n" @@ -18,77 +18,11 @@ "X-Poedit-Country: HUNGARY\n" "X-Poedit-SourceCharset: iso-8859-1\n" -#: ../src/main-dlg-ui.c:70 -#: ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Megjelenés beállításai" - -#: ../src/main-dlg-ui.c:90 -#: ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "ElérhetÅ‘ ablak témák" - -#: ../src/main-dlg-ui.c:110 -#: ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "Betű:" - -#: ../src/main-dlg-ui.c:122 -#: ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Ablak" - -#: ../src/main-dlg-ui.c:130 -#: ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "ElérhetÅ‘ ikon-témák" - -#: ../src/main-dlg-ui.c:167 -#: ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "Telepít" - -#: ../src/main-dlg-ui.c:174 -#: ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Ikon" - -#: ../src/main-dlg-ui.c:187 -#: ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Eszköztárstílus:" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Csak ikonok" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Csak szöveg" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Szöveg az ikonok alatt" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Szöveg az ikonok mellett" - -#: ../src/main-dlg-ui.c:200 -#: ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Egyéb" - -#: ../src/main-dlg-ui.c:208 -#: ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "ElÅ‘nézet" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Válassz egy ikontémát" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Ikontéma)" @@ -100,126 +34,188 @@ msgid "Item" msgstr "Elem" -#: ../src/demo-ui.c:116 -#: ../demo.glade.h:16 -msgid "_File" -msgstr "_Fájl" - -#: ../src/demo-ui.c:148 -#: ../demo.glade.h:15 -msgid "_Edit" -msgstr "Sz_erkesztés" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "KijelölÅ‘ gomb" -#: ../src/demo-ui.c:171 -#: ../demo.glade.h:17 -msgid "_Help" -msgstr "_Súgó" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demó" -#: ../src/demo-ui.c:196 -#: ../demo.glade.h:1 -msgid "Back" -msgstr "Vissza" - -#: ../src/demo-ui.c:202 -#: ../demo.glade.h:4 -msgid "Forward" -msgstr "ElÅ‘re" - -#: ../src/demo-ui.c:207 -#: ../demo.glade.h:6 -msgid "Stop" -msgstr "Stop" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Rádió gomb" -#: ../src/demo-ui.c:224 -#: ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Lap1" -#: ../src/demo-ui.c:246 -#: ../src/demo-ui.c:252 -#: ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Rádió gomb" - -#: ../src/demo-ui.c:262 -#: ../demo.glade.h:2 -msgid "Check Button" -msgstr "KijelölÅ‘ gomb" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Lap2" -#: ../src/demo-ui.c:271 -#: ../demo.glade.h:3 -msgid "Demo" -msgstr "Demó" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Lap3" -#: ../src/demo-ui.c:316 -#: ../demo.glade.h:18 -msgid "button" -msgstr "gomb" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Lap4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Teszt elem 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Teszt elem 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Teszt elem 3" -#: ../src/demo-ui.c:327 -#: ../demo.glade.h:8 -msgid "Tab2" -msgstr "Lap2" - -#: ../src/demo-ui.c:340 -#: ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Gépelj pár betűt a most kijelölt betű kipróbálásához" -#: ../src/demo-ui.c:342 -#: ../demo.glade.h:9 -msgid "Tab3" -msgstr "Lap3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "Sz_erkesztés" -#: ../src/demo-ui.c:357 -#: ../demo.glade.h:10 -msgid "Tab4" -msgstr "Lap4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Fájl" + +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Súgó" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "gomb" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "ElÅ‘nézet" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Megjelenés beállításai" + +#: ../data/lxappearance.glade.h:3 +#, fuzzy +msgid "Available Cursor Themes" +msgstr "ElérhetÅ‘ ikon-témák" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "ElérhetÅ‘ ikon-témák" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "ElérhetÅ‘ ablak témák" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ikon" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Csak ikonok" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Egyéb" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" +#: ../data/lxappearance.glade.h:11 +msgid "Size" msgstr "" -"Teszt elem 1\n" -"Teszt elem 2\n" -"Teszt elem 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" msgstr "" -"Csak ikonok\n" -"Csak szöveg\n" -"Szöveg az ikonok alatt\n" -"Szöveg az ikonok mellett" - -#: ../src/glade-support.c:90 -#: ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "E pixel-térkép fájl nem található: %s" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Szöveg az ikonok alatt" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Szöveg az ikonok mellett" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Csak szöveg" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Eszköztárstílus:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Ablak" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "Betű:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "Telepít" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Megjelenés" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Az asztal megjelenésének testreszabása" + +#~ msgid "Back" +#~ msgstr "Vissza" + +#~ msgid "Forward" +#~ msgstr "ElÅ‘re" + +#~ msgid "Stop" +#~ msgstr "Stop" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Teszt elem 1\n" +#~ "Teszt elem 2\n" +#~ "Teszt elem 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "E pixel-térkép fájl nem található: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Csak ikonok\n" +#~ "Csak szöveg\n" +#~ "Szöveg az ikonok alatt\n" +#~ "Szöveg az ikonok mellett" #~ msgid "Available Fonts" #~ msgstr "ElérhetÅ‘ betűk" + #~ msgid "Font Size:" #~ msgstr "Betű-méret:" + #~ msgid "Style:" #~ msgstr "Stílus" - diff -Nru lxappearance-0.3.0~svn20090913/po/id.po lxappearance-0.4.0/po/id.po --- lxappearance-0.3.0~svn20090913/po/id.po 2009-09-13 11:23:09.000000000 +0100 +++ lxappearance-0.4.0/po/id.po 2009-12-21 10:17:40.000000000 +0000 @@ -2,12 +2,12 @@ # Copyright (C) YEAR THE lxappearance'S COPYRIGHT HOLDER # This file is distributed under the same license as the lxappearance package. # Andhika Padmawan , Rahman Yusri Aftian , 2009. -# +# msgid "" msgstr "" "Project-Id-Version: lxappearance 0.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: 2009-03-04 21:59+0700\n" "Last-Translator: Andhika Padmawan \n" "Language-Team: Indonesian \n" @@ -15,173 +15,196 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Pengaturan Tampilan" +#: ../src/main-dlg.c:650 +msgid "Select an icon theme" +msgstr "Pilih tema ikon" -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Tema Jendela Tersedia" +#: ../src/main-dlg.c:657 +msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" +msgstr "*.tar.gz, *.tar.bz2 (Tema Ikon)" -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Fonta:" +#: ../src/demo.c:56 +msgid "Column" +msgstr "Kolom" -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Jendela" +#: ../src/demo.c:65 +msgid "Item" +msgstr "Item" -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Tema Ikon Tersedia" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Tombol Cek" -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Instal" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demo" -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Ikon" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Tombol Radio" -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Gaya Batang Alat:" +#: ../data/demo.glade.h:4 +msgid "Tab1" +msgstr "Tab1" -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Hanya ikon" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Tab2" -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Hanya teks" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Tab3" -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Teks di bawah ikon" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Tab4" -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Teks di samping ikon" +#: ../data/demo.glade.h:8 +msgid "Test Item 1" +msgstr "Item Tes 1" -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Lainnya" +#: ../data/demo.glade.h:9 +msgid "Test Item 2" +msgstr "Item Tes 2" + +#: ../data/demo.glade.h:10 +msgid "Test Item 3" +msgstr "Item Tes 3" -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 +#: ../data/demo.glade.h:11 +msgid "Type some characters here to test currently selected font." +msgstr "Ketik beberapa karakter di sini untuk mencoba fonta terpilih saat ini." + +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Sunting" + +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Berkas" + +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "Ba_ntuan" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "tombol" + +#: ../data/lxappearance.glade.h:1 msgid "Preview" msgstr "Pratayang" -#: ../src/main-dlg.c:620 -msgid "Select an icon theme" -msgstr "Pilih tema ikon" +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Pengaturan Tampilan" -#: ../src/main-dlg.c:627 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" -msgstr "*.tar.gz, *.tar.bz2 (Tema Ikon)" +#: ../data/lxappearance.glade.h:3 +#, fuzzy +msgid "Available Cursor Themes" +msgstr "Tema Ikon Tersedia" -#: ../src/demo.c:56 -msgid "Column" -msgstr "Kolom" +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Tema Ikon Tersedia" -#: ../src/demo.c:65 -msgid "Item" -msgstr "Item" +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Tema Jendela Tersedia" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Berkas" +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "" -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Sunting" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ikon" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "Ba_ntuan" +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Hanya ikon" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Mundur" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Maju" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Stop" +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 -msgid "Tab1" -msgstr "Tab1" +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Lainnya" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Tombol Radio" +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "" -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Tombol Cek" +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Demo" +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Teks di bawah ikon" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "tombol" +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Teks di samping ikon" -#: ../src/demo-ui.c:323 -msgid "Test Item 1" -msgstr "Item Tes 1" +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Hanya teks" -#: ../src/demo-ui.c:324 -msgid "Test Item 2" -msgstr "Item Tes 2" +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Gaya Batang Alat:" -#: ../src/demo-ui.c:325 -msgid "Test Item 3" -msgstr "Item Tes 3" +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Jendela" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Tab2" +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Fonta:" -#: ../src/demo-ui.c:340 ../demo.glade.h:14 -msgid "Type some characters here to test currently selected font." -msgstr "Ketik beberapa karakter di sini untuk mencoba fonta terpilih saat ini." +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Instal" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Tab3" +#: ../lxappearance.desktop.in.h:1 +#, fuzzy +msgid "Appearance" +msgstr "Pengaturan Tampilan" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Tab4" +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Item Tes 1\n" -"Item Tes 2\n" -"Item Tes 3" +#~ msgid "Back" +#~ msgstr "Mundur" -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Hanya ikon\n" -"Hanya teks\n" -"Teks di bawah ikon\n" -"Teks di samping ikon" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Tak dapat menemukan berkas pixmap: %s" +#~ msgid "Forward" +#~ msgstr "Maju" + +#~ msgid "Stop" +#~ msgstr "Stop" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Item Tes 1\n" +#~ "Item Tes 2\n" +#~ "Item Tes 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Tak dapat menemukan berkas pixmap: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Hanya ikon\n" +#~ "Hanya teks\n" +#~ "Teks di bawah ikon\n" +#~ "Teks di samping ikon" diff -Nru lxappearance-0.3.0~svn20090913/po/it.po lxappearance-0.4.0/po/it.po --- lxappearance-0.3.0~svn20090913/po/it.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/it.po 2009-12-21 10:17:42.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: lxappearance 0.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-04-27 17:07+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-08 16:36+0100\n" "Last-Translator: Alessandro Pellizzari \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -18,67 +18,11 @@ "X-Poedit-Language: Italian\n" "X-Poedit-Country: ITALY\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Impostazioni della presentazione" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Temi finestre disponibili" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Carattere" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Finestra" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Temi di icone disponibili" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Installa" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Icona" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Stile della barra strumenti" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Solo icone" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Solo testo" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Testo sotto le icone" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Testo a fianco delle icone" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Altro" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Anteprima" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Selezionare un tema di icone" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Tema di icone)" @@ -90,101 +34,178 @@ msgid "Item" msgstr "Elemento" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_File" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Modifica" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Bottone di scelta" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Aiuto" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Dimostrazione" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Indietro" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Avanti" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Stop" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Bottone radio" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Tab1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Bottone radio" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Bottone di scelta" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Tab2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Dimostrazione" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Tab3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "pulsante" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Tab4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Elemento test 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Elemento test 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Elemento test 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Tab2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Digitare un testo qui per provare il carattere attualmente selezionato" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Tab3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Modifica" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Tab4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_File" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Elemento di prova 1\n" -"Elemento di prova 2\n" -"Elemento di prova 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Solo Icone\n" -"Solo testo\n" -"Testo sotto le icone\n" -"Testo a fianco delle icone" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Impossibile trovare file pixmap: %s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Aiuto" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "pulsante" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Anteprima" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Impostazioni della presentazione" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Temi di cursori disponibili" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Temi di icone disponibili" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Temi finestre disponibili" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Cursore" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Icona" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Solo icone" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Grande" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Altro" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Dimensioni" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Piccolo" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Testo sotto le icone" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Testo a fianco delle icone" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Solo testo" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Stile della barra strumenti: " + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Finestra" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Carattere" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Installa" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Aspetto" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Personalizza l'aspetto dell'ambiente grafico" + +#~ msgid "Back" +#~ msgstr "Indietro" + +#~ msgid "Forward" +#~ msgstr "Avanti" + +#~ msgid "Stop" +#~ msgstr "Stop" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Elemento di prova 1\n" +#~ "Elemento di prova 2\n" +#~ "Elemento di prova 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Impossibile trovare file pixmap: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Solo Icone\n" +#~ "Solo testo\n" +#~ "Testo sotto le icone\n" +#~ "Testo a fianco delle icone" diff -Nru lxappearance-0.3.0~svn20090913/po/ja.po lxappearance-0.4.0/po/ja.po --- lxappearance-0.3.0~svn20090913/po/ja.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/ja.po 2009-12-21 10:17:43.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: lxappearance 0.3.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: 2009-07-17 20:31+0900\n" "Last-Translator: Hironao Komatsu \n" "Language-Team: Japanese \n" @@ -17,67 +17,11 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "外観ã®è¨­å®š" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "利用å¯èƒ½ãªã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒ†ãƒ¼ãƒž" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "フォント(_F):" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "ウィンドウ" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "利用å¯èƒ½ãªã‚¢ã‚¤ã‚³ãƒ³ãƒ†ãƒ¼ãƒž" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "インストール(_I)" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "アイコン" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "ツールãƒãƒ¼ã®ã‚¹ã‚¿ã‚¤ãƒ«: " - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "アイコンã®ã¿" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "テキストã®ã¿" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "アイコンã®ä¸‹ã«ãƒ†ã‚­ã‚¹ãƒˆ" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "アイコンã®æ¨ªã«ãƒ†ã‚­ã‚¹ãƒˆ" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "ãã®ä»–" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "プレビュー" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "アイコンテーマã®é¸æŠž" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (アイコンテーマ)" @@ -89,117 +33,179 @@ msgid "Item" msgstr "アイテム" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "ファイル(_F)" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "編集(_E)" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "ヘルプ(_H)" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "デモ" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "戻る" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "進む" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "åœæ­¢" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "ラジオボタン" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "タブ1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "ラジオボタン" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "ãƒã‚§ãƒƒã‚¯ãƒœã‚¿ãƒ³" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "タブ2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "デモ" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "タブ3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "ボタン" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "タブ4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "テストアイテム 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "テストアイテム 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "テストアイテム 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "タブ2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "" "ç¾åœ¨é¸æŠžã—ã¦ã„るフォントを試ã™ãŸã‚ã«, ã“ã“ã«æ–‡å­—を入力ã—ã¦ã¿ã¦ãã ã•ã„." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "タブ3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "編集(_E)" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "タブ4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "ファイル(_F)" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"テストアイテム 1\n" -"テストアイテム 2\n" -"テストアイテム 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"アイコンã®ã¿\n" -"テキストã®ã¿\n" -"アイコンã®ä¸‹ã«ãƒ†ã‚­ã‚¹ãƒˆ\n" -"アイコンã®æ¨ªã«ãƒ†ã‚­ã‚¹ãƒˆ" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "pixmap ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“: %s" - -#~ msgid "Available Cursor Themes" -#~ msgstr "利用å¯èƒ½ãªã‚«ãƒ¼ã‚½ãƒ«ãƒ†ãƒ¼ãƒž" - -#~ msgid "Size" -#~ msgstr "サイズ" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "ヘルプ(_H)" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "ボタン" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "プレビュー" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "外観ã®è¨­å®š" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "利用å¯èƒ½ãªã‚«ãƒ¼ã‚½ãƒ«ãƒ†ãƒ¼ãƒž" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "利用å¯èƒ½ãªã‚¢ã‚¤ã‚³ãƒ³ãƒ†ãƒ¼ãƒž" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "利用å¯èƒ½ãªã‚¦ã‚£ãƒ³ãƒ‰ã‚¦ãƒ†ãƒ¼ãƒž" -#~ msgid "Small" -#~ msgstr "å°ã•ã„" +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "カーソル" -#~ msgid "Large" -#~ msgstr "大ãã„" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "アイコン" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "アイコンã®ã¿" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "大ãã„" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "ãã®ä»–" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "サイズ" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "å°ã•ã„" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "アイコンã®ä¸‹ã«ãƒ†ã‚­ã‚¹ãƒˆ" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "アイコンã®æ¨ªã«ãƒ†ã‚­ã‚¹ãƒˆ" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "テキストã®ã¿" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "ツールãƒãƒ¼ã®ã‚¹ã‚¿ã‚¤ãƒ«: " + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "ウィンドウ" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "フォント(_F):" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "インストール(_I)" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "外観ã®è¨­å®š" -#~ msgid "Cursor" -#~ msgstr "カーソル" +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "デスクトップã®è¦‹æ˜ ãˆã‚’設定ã—ã¾ã™" + +#~ msgid "Back" +#~ msgstr "戻る" + +#~ msgid "Forward" +#~ msgstr "進む" + +#~ msgid "Stop" +#~ msgstr "åœæ­¢" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "テストアイテム 1\n" +#~ "テストアイテム 2\n" +#~ "テストアイテム 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "pixmap ファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "アイコンã®ã¿\n" +#~ "テキストã®ã¿\n" +#~ "アイコンã®ä¸‹ã«ãƒ†ã‚­ã‚¹ãƒˆ\n" +#~ "アイコンã®æ¨ªã«ãƒ†ã‚­ã‚¹ãƒˆ" diff -Nru lxappearance-0.3.0~svn20090913/po/ko.po lxappearance-0.4.0/po/ko.po --- lxappearance-0.3.0~svn20090913/po/ko.po 2009-09-05 22:29:00.000000000 +0100 +++ lxappearance-0.4.0/po/ko.po 2009-12-21 10:17:38.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,166 +16,162 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" +#: ../src/main-dlg.c:650 +msgid "Select an icon theme" msgstr "" -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" +#: ../src/main-dlg.c:657 +msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "" -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" +#: ../src/demo.c:56 +msgid "Column" msgstr "" -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" +#: ../src/demo.c:65 +msgid "Item" msgstr "" -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" +#: ../data/demo.glade.h:1 +msgid "Check Button" msgstr "" -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" +#: ../data/demo.glade.h:2 +msgid "Demo" msgstr "" -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" +#: ../data/demo.glade.h:3 +msgid "Radio Button" msgstr "" -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " +#: ../data/demo.glade.h:4 +msgid "Tab1" msgstr "" -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" +#: ../data/demo.glade.h:5 +msgid "Tab2" msgstr "" -#: ../src/main-dlg-ui.c:196 -msgid "Text only" +#: ../data/demo.glade.h:6 +msgid "Tab3" msgstr "" -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" +#: ../data/demo.glade.h:7 +msgid "Tab4" msgstr "" -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" +#: ../data/demo.glade.h:8 +msgid "Test Item 1" msgstr "" -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" +#: ../data/demo.glade.h:9 +msgid "Test Item 2" msgstr "" -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" +#: ../data/demo.glade.h:10 +msgid "Test Item 3" msgstr "" -#: ../src/main-dlg.c:620 -msgid "Select an icon theme" +#: ../data/demo.glade.h:11 +msgid "Type some characters here to test currently selected font." msgstr "" -#: ../src/main-dlg.c:627 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" +#: ../data/demo.glade.h:12 +msgid "_Edit" msgstr "" -#: ../src/demo.c:56 -msgid "Column" +#: ../data/demo.glade.h:13 +msgid "_File" msgstr "" -#: ../src/demo.c:65 -msgid "Item" +#: ../data/demo.glade.h:14 +msgid "_Help" msgstr "" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" +#: ../data/demo.glade.h:15 +msgid "button" msgstr "" -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" +#: ../data/lxappearance.glade.h:1 +msgid "Preview" msgstr "" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" msgstr "" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" msgstr "" -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" msgstr "" -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" msgstr "" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 -msgid "Tab1" +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" msgstr "" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" msgstr "" -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" msgstr "" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" +#: ../data/lxappearance.glade.h:9 +msgid "Large" msgstr "" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" +#: ../data/lxappearance.glade.h:10 +msgid "Other" msgstr "" -#: ../src/demo-ui.c:323 -msgid "Test Item 1" +#: ../data/lxappearance.glade.h:11 +msgid "Size" msgstr "" -#: ../src/demo-ui.c:324 -msgid "Test Item 2" +#: ../data/lxappearance.glade.h:12 +msgid "Small" msgstr "" -#: ../src/demo-ui.c:325 -msgid "Test Item 3" +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" msgstr "" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" msgstr "" -#: ../src/demo-ui.c:340 ../demo.glade.h:14 -msgid "Type some characters here to test currently selected font." +#: ../data/lxappearance.glade.h:15 +msgid "Text only" msgstr "" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " msgstr "" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" +#: ../data/lxappearance.glade.h:17 +msgid "Window" msgstr "" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" msgstr "" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "모양새" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "ë°ìŠ¤í¬íƒ‘ì˜ ëª¨ì–‘ìƒˆë¥¼ 설정합니다" diff -Nru lxappearance-0.3.0~svn20090913/po/LINGUAS lxappearance-0.4.0/po/LINGUAS --- lxappearance-0.3.0~svn20090913/po/LINGUAS 2009-09-13 11:23:09.000000000 +0100 +++ lxappearance-0.4.0/po/LINGUAS 2009-10-11 08:02:23.000000000 +0100 @@ -1,11 +1,12 @@ -# Please keep it in alphabetical order af ar bg bn_IN +ca cs da de +el es et eu @@ -13,6 +14,7 @@ fi fr gl +he hr hu id @@ -27,8 +29,8 @@ nn pl ps -pt_BR pt +pt_BR ru sk sl diff -Nru lxappearance-0.3.0~svn20090913/po/lt.po lxappearance-0.4.0/po/lt.po --- lxappearance-0.3.0~svn20090913/po/lt.po 2009-09-13 11:23:09.000000000 +0100 +++ lxappearance-0.4.0/po/lt.po 2009-12-21 10:17:42.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-09-10 20:51+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-08 20:25+0100\n" "Last-Translator: Julius Vitkauskas \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -16,67 +16,11 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 1.1.0\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "IÅ¡vaizdos nustatymai" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Langų temos" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Å riftas:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Langas" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Piktogramų temos" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "Pr_idÄ—ti" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Piktograma" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Ä®rankių juostos stilius: " - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Tik piktogramos" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Tik tekstas" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Tekstas po piktogramomis" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Tekstas su piktogramomis" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Kita" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "PeržiÅ«ra" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Pasirinkti piktogramų temÄ…" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (piktogramų tema)" @@ -88,101 +32,178 @@ msgid "Item" msgstr "Elementas" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Failas" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Keisti" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "PažymÄ—jimas" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Pagalba" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demonstracija" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Atgal" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Pirmyn" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Stop" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Radio mygtukas" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "KortelÄ—1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Radio mygtukas" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "PažymÄ—jimas" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "KortelÄ—2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Demonstracija" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "KortelÄ—3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "mygtukas" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "KortelÄ—4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Bandomasis pasirinkimas 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Bandomasis pasirinkimas 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Bandomasis pasirinkimas 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "KortelÄ—2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Ä®veskite kÄ… nors pasirinktam Å¡riftui iÅ¡bandyti." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "KortelÄ—3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Keisti" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "KortelÄ—4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Failas" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Bandomasis pasirinkimas 1\n" -"Bandomasis pasirinkimas 2\n" -"Bandomasis pasirinkimas 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Tik piktogramos\n" -"Tik tekstas\n" -"Tekstas po piktogramomis\n" -"Tekstas su piktogramomis" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Negalima rasti pixmap failo: %s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Pagalba" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "mygtukas" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "PeržiÅ«ra" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "IÅ¡vaizdos nustatymai" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Žymeklių temos" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Piktogramų temos" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Langų temos" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Žymeklis" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Piktograma" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Tik piktogramos" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Didelis" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Kita" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Dydis" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Mažas" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Tekstas po piktogramomis" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Tekstas su piktogramomis" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Tik tekstas" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Ä®rankių juostos stilius: " + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Langas" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Å riftas:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "Pr_idÄ—ti" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "IÅ¡vaizda" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Keisti darbo aplinkos iÅ¡vaizdÄ…" + +#~ msgid "Back" +#~ msgstr "Atgal" + +#~ msgid "Forward" +#~ msgstr "Pirmyn" + +#~ msgid "Stop" +#~ msgstr "Stop" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Bandomasis pasirinkimas 1\n" +#~ "Bandomasis pasirinkimas 2\n" +#~ "Bandomasis pasirinkimas 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Negalima rasti pixmap failo: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Tik piktogramos\n" +#~ "Tik tekstas\n" +#~ "Tekstas po piktogramomis\n" +#~ "Tekstas su piktogramomis" diff -Nru lxappearance-0.3.0~svn20090913/po/Makefile.in.in lxappearance-0.4.0/po/Makefile.in.in --- lxappearance-0.3.0~svn20090913/po/Makefile.in.in 2009-09-13 11:27:21.000000000 +0100 +++ lxappearance-0.4.0/po/Makefile.in.in 2010-01-06 15:30:28.000000000 +0000 @@ -56,7 +56,7 @@ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi) -USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep '^$$lang$$' $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep '^$$lang$$'`"; then printf "$$lang "; fi; done; fi) +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi) USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) diff -Nru lxappearance-0.3.0~svn20090913/po/ml.po lxappearance-0.4.0/po/ml.po --- lxappearance-0.3.0~svn20090913/po/ml.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/ml.po 2009-12-21 10:17:41.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,166 +16,162 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" +#: ../src/main-dlg.c:650 +msgid "Select an icon theme" msgstr "" -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" +#: ../src/main-dlg.c:657 +msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "" -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" +#: ../src/demo.c:56 +msgid "Column" msgstr "" -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" +#: ../src/demo.c:65 +msgid "Item" msgstr "" -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" +#: ../data/demo.glade.h:1 +msgid "Check Button" msgstr "" -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" +#: ../data/demo.glade.h:2 +msgid "Demo" msgstr "" -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" +#: ../data/demo.glade.h:3 +msgid "Radio Button" msgstr "" -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " +#: ../data/demo.glade.h:4 +msgid "Tab1" msgstr "" -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" +#: ../data/demo.glade.h:5 +msgid "Tab2" msgstr "" -#: ../src/main-dlg-ui.c:196 -msgid "Text only" +#: ../data/demo.glade.h:6 +msgid "Tab3" msgstr "" -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" +#: ../data/demo.glade.h:7 +msgid "Tab4" msgstr "" -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" +#: ../data/demo.glade.h:8 +msgid "Test Item 1" msgstr "" -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" +#: ../data/demo.glade.h:9 +msgid "Test Item 2" msgstr "" -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" +#: ../data/demo.glade.h:10 +msgid "Test Item 3" msgstr "" -#: ../src/main-dlg.c:620 -msgid "Select an icon theme" +#: ../data/demo.glade.h:11 +msgid "Type some characters here to test currently selected font." msgstr "" -#: ../src/main-dlg.c:627 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" +#: ../data/demo.glade.h:12 +msgid "_Edit" msgstr "" -#: ../src/demo.c:56 -msgid "Column" +#: ../data/demo.glade.h:13 +msgid "_File" msgstr "" -#: ../src/demo.c:65 -msgid "Item" +#: ../data/demo.glade.h:14 +msgid "_Help" msgstr "" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" +#: ../data/demo.glade.h:15 +msgid "button" msgstr "" -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" +#: ../data/lxappearance.glade.h:1 +msgid "Preview" msgstr "" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" msgstr "" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" msgstr "" -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" msgstr "" -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" msgstr "" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 -msgid "Tab1" +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" msgstr "" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" msgstr "" -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" msgstr "" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" +#: ../data/lxappearance.glade.h:9 +msgid "Large" msgstr "" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" +#: ../data/lxappearance.glade.h:10 +msgid "Other" msgstr "" -#: ../src/demo-ui.c:323 -msgid "Test Item 1" +#: ../data/lxappearance.glade.h:11 +msgid "Size" msgstr "" -#: ../src/demo-ui.c:324 -msgid "Test Item 2" +#: ../data/lxappearance.glade.h:12 +msgid "Small" msgstr "" -#: ../src/demo-ui.c:325 -msgid "Test Item 3" +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" msgstr "" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" msgstr "" -#: ../src/demo-ui.c:340 ../demo.glade.h:14 -msgid "Type some characters here to test currently selected font." +#: ../data/lxappearance.glade.h:15 +msgid "Text only" msgstr "" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " msgstr "" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" +#: ../data/lxappearance.glade.h:17 +msgid "Window" msgstr "" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" msgstr "" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "കാഴàµà´š" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "പണിയിടതàµà´¤àµ† à´šà´¿à´Ÿàµà´Ÿà´ªàµà´ªàµ†à´Ÿàµà´¤àµà´¤àµà´•" diff -Nru lxappearance-0.3.0~svn20090913/po/ms.po lxappearance-0.4.0/po/ms.po --- lxappearance-0.3.0~svn20090913/po/ms.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/ms.po 2009-12-21 10:17:38.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: 2009-06-08 16:20+0200\n" "Last-Translator: Umarzuki Bin Mochlis Moktar \n" "Language-Team: LANGUAGE \n" @@ -16,73 +16,13 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 1.1.0\n" -# By Phyz -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Tetapan Penampilan" - -# by Phyz -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Tema Tetingkap yang Tersedia" - -# by Phyz -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Fon:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Tingkap" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Tema Ikon Tersedia" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Pemasangan" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Ikon" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Stail Bar Peralatan:" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Ikon sahaja" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Teks Sahaja" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Teks di bawah ikon" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Teks di sisi ikon" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Lain-lain" - -# by Phyz -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Pralihat" - # by Phyz -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Pilih satu tema ikon" # by Phyz -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Tema Ikon)" @@ -96,115 +36,199 @@ msgstr "Item" # by Phyz -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Fail" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Butang Semakan" # by Phyz -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Sunting" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demo" # by Phyz -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Bantuan" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Butang Radio" + +#: ../data/demo.glade.h:4 +msgid "Tab1" +msgstr "Tab1" + +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Tab2" + +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Tab3" + +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Tab4" # by Phyz -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "_Kebelakang" +#: ../data/demo.glade.h:8 +msgid "Test Item 1" +msgstr "Uji Item 1" # by Phyz -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "_Kehadapan" +#: ../data/demo.glade.h:9 +msgid "Test Item 2" +msgstr "Uji Item 2" # by Phyz -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Berhenti" +#: ../data/demo.glade.h:10 +msgid "Test Item 3" +msgstr "Uji Item 3" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 -msgid "Tab1" -msgstr "Tab1" +# by Phyz +#: ../data/demo.glade.h:11 +msgid "Type some characters here to test currently selected font." +msgstr "Taip beberapa karaktor di sini untuk menguji fon yang kini dipilihkan." # by Phyz -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Butang Radio" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Sunting" # by Phyz -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Butang Semakan" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Fail" # by Phyz -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Demo" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Bantuan" # by Phyz -#: ../src/demo-ui.c:316 ../demo.glade.h:18 +#: ../data/demo.glade.h:15 msgid "button" msgstr "Butang" # by Phyz -#: ../src/demo-ui.c:323 -msgid "Test Item 1" -msgstr "Uji Item 1" +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Pralihat" -# by Phyz -#: ../src/demo-ui.c:324 -msgid "Test Item 2" -msgstr "Uji Item 2" +# By Phyz +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Tetapan Penampilan" + +#: ../data/lxappearance.glade.h:3 +#, fuzzy +msgid "Available Cursor Themes" +msgstr "Tema Ikon Tersedia" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Tema Ikon Tersedia" # by Phyz -#: ../src/demo-ui.c:325 -msgid "Test Item 3" -msgstr "Uji Item 3" +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Tema Tetingkap yang Tersedia" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Tab2" +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ikon" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Ikon sahaja" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Lain-lain" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Teks di bawah ikon" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Teks di sisi ikon" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Teks Sahaja" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Stail Bar Peralatan:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Tingkap" # by Phyz -#: ../src/demo-ui.c:340 ../demo.glade.h:14 -msgid "Type some characters here to test currently selected font." -msgstr "Taip beberapa karaktor di sini untuk menguji fon yang kini dipilihkan." +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Fon:" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Tab3" +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Pemasangan" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Tab4" +# By Phyz +#: ../lxappearance.desktop.in.h:1 +#, fuzzy +msgid "Appearance" +msgstr "Tetapan Penampilan" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Uji Item 1\n" -"Uji Item 2\n" -"Uji Item 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Ikon sahaja\n" -"Teks sahaja\n" -"Teks di bawah ikon\n" -"Teks di sisi ikon" - -# by Phyz -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Fail pixmap gagal ditemui: %s" +# by Phyz +#~ msgid "Back" +#~ msgstr "_Kebelakang" + +# by Phyz +#~ msgid "Forward" +#~ msgstr "_Kehadapan" + +# by Phyz +#~ msgid "Stop" +#~ msgstr "Berhenti" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Uji Item 1\n" +#~ "Uji Item 2\n" +#~ "Uji Item 3" + +# by Phyz +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Fail pixmap gagal ditemui: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Ikon sahaja\n" +#~ "Teks sahaja\n" +#~ "Teks di bawah ikon\n" +#~ "Teks di sisi ikon" diff -Nru lxappearance-0.3.0~svn20090913/po/nb.po lxappearance-0.4.0/po/nb.po --- lxappearance-0.3.0~svn20090913/po/nb.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/nb.po 2009-12-21 10:17:40.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,166 +16,162 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" +#: ../src/main-dlg.c:650 +msgid "Select an icon theme" msgstr "" -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" +#: ../src/main-dlg.c:657 +msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "" -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" +#: ../src/demo.c:56 +msgid "Column" msgstr "" -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" +#: ../src/demo.c:65 +msgid "Item" msgstr "" -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" +#: ../data/demo.glade.h:1 +msgid "Check Button" msgstr "" -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" +#: ../data/demo.glade.h:2 +msgid "Demo" msgstr "" -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" +#: ../data/demo.glade.h:3 +msgid "Radio Button" msgstr "" -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " +#: ../data/demo.glade.h:4 +msgid "Tab1" msgstr "" -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" +#: ../data/demo.glade.h:5 +msgid "Tab2" msgstr "" -#: ../src/main-dlg-ui.c:196 -msgid "Text only" +#: ../data/demo.glade.h:6 +msgid "Tab3" msgstr "" -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" +#: ../data/demo.glade.h:7 +msgid "Tab4" msgstr "" -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" +#: ../data/demo.glade.h:8 +msgid "Test Item 1" msgstr "" -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" +#: ../data/demo.glade.h:9 +msgid "Test Item 2" msgstr "" -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" +#: ../data/demo.glade.h:10 +msgid "Test Item 3" msgstr "" -#: ../src/main-dlg.c:620 -msgid "Select an icon theme" +#: ../data/demo.glade.h:11 +msgid "Type some characters here to test currently selected font." msgstr "" -#: ../src/main-dlg.c:627 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" +#: ../data/demo.glade.h:12 +msgid "_Edit" msgstr "" -#: ../src/demo.c:56 -msgid "Column" +#: ../data/demo.glade.h:13 +msgid "_File" msgstr "" -#: ../src/demo.c:65 -msgid "Item" +#: ../data/demo.glade.h:14 +msgid "_Help" msgstr "" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" +#: ../data/demo.glade.h:15 +msgid "button" msgstr "" -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" +#: ../data/lxappearance.glade.h:1 +msgid "Preview" msgstr "" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" msgstr "" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" msgstr "" -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" msgstr "" -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" msgstr "" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 -msgid "Tab1" +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" msgstr "" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" msgstr "" -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" msgstr "" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" +#: ../data/lxappearance.glade.h:9 +msgid "Large" msgstr "" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" +#: ../data/lxappearance.glade.h:10 +msgid "Other" msgstr "" -#: ../src/demo-ui.c:323 -msgid "Test Item 1" +#: ../data/lxappearance.glade.h:11 +msgid "Size" msgstr "" -#: ../src/demo-ui.c:324 -msgid "Test Item 2" +#: ../data/lxappearance.glade.h:12 +msgid "Small" msgstr "" -#: ../src/demo-ui.c:325 -msgid "Test Item 3" +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" msgstr "" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" msgstr "" -#: ../src/demo-ui.c:340 ../demo.glade.h:14 -msgid "Type some characters here to test currently selected font." +#: ../data/lxappearance.glade.h:15 +msgid "Text only" msgstr "" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " msgstr "" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" +#: ../data/lxappearance.glade.h:17 +msgid "Window" msgstr "" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" msgstr "" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Utseende" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Tilpass utseende for skrivebordet" diff -Nru lxappearance-0.3.0~svn20090913/po/nl.po lxappearance-0.4.0/po/nl.po --- lxappearance-0.3.0~svn20090913/po/nl.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/nl.po 2009-12-25 07:59:31.000000000 +0000 @@ -7,85 +7,20 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-05-04 14:56+0100\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-22 08:06+0100\n" "Last-Translator: Sander De Voogdt \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Pootle 1.1.0\n" -#: ../src/main-dlg-ui.c:70 -#: ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Instellingen voor het Uiterlijk" - -#: ../src/main-dlg-ui.c:90 -#: ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Beschikbare Vensterthema's" - -#: ../src/main-dlg-ui.c:110 -#: ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "Lettertype: " - -#: ../src/main-dlg-ui.c:122 -#: ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Venster" - -#: ../src/main-dlg-ui.c:130 -#: ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Beschikbare Icoonthema's" - -#: ../src/main-dlg-ui.c:167 -#: ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "Installeren" - -#: ../src/main-dlg-ui.c:174 -#: ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Icoon" - -#: ../src/main-dlg-ui.c:187 -#: ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Stijl van de werkbalk:" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Alleen Iconen" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Alleen Tekst" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Tekst onder de iconen" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Tekst naast de iconen" - -#: ../src/main-dlg-ui.c:200 -#: ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Andere" - -#: ../src/main-dlg-ui.c:208 -#: ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Voorbeeld" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Kies een icoonthema" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Icoonthema)" @@ -97,119 +32,178 @@ msgid "Item" msgstr "Item" -#: ../src/demo-ui.c:116 -#: ../demo.glade.h:16 -msgid "_File" -msgstr "Bestand" - -#: ../src/demo-ui.c:148 -#: ../demo.glade.h:15 -msgid "_Edit" -msgstr "Bewerken" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Aanvink Knop" -#: ../src/demo-ui.c:171 -#: ../demo.glade.h:17 -msgid "_Help" -msgstr "Help" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demo" -#: ../src/demo-ui.c:196 -#: ../demo.glade.h:1 -msgid "Back" -msgstr "Terug" - -#: ../src/demo-ui.c:202 -#: ../demo.glade.h:4 -msgid "Forward" -msgstr "Verder" - -#: ../src/demo-ui.c:207 -#: ../demo.glade.h:6 -msgid "Stop" -msgstr "Stop" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Radio Knop" -#: ../src/demo-ui.c:224 -#: ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Tab1" -#: ../src/demo-ui.c:246 -#: ../src/demo-ui.c:252 -#: ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Radio Knop" - -#: ../src/demo-ui.c:262 -#: ../demo.glade.h:2 -msgid "Check Button" -msgstr "Aanvink Knop" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Tab2" -#: ../src/demo-ui.c:271 -#: ../demo.glade.h:3 -msgid "Demo" -msgstr "Demo" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Tab3" -#: ../src/demo-ui.c:316 -#: ../demo.glade.h:18 -msgid "button" -msgstr "knop" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Tab4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Test Item 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Test Item 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Test Item 3" -#: ../src/demo-ui.c:327 -#: ../demo.glade.h:8 -msgid "Tab2" -msgstr "Tab2" - -#: ../src/demo-ui.c:340 -#: ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Tiep enkele letters hier om uw geselecteerd font te testen" -#: ../src/demo-ui.c:342 -#: ../demo.glade.h:9 -msgid "Tab3" -msgstr "Tab3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "Bewerken" -#: ../src/demo-ui.c:357 -#: ../demo.glade.h:10 -msgid "Tab4" -msgstr "Tab4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "Bestand" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Alleen Iconen\n" -"Alleen Tekst\n" -"Tekst onder iconen\n" -"Tekst naast iconen" - -#: ../src/glade-support.c:90 -#: ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Kan pixmap bestand niet vinden: %s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "Help" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "knop" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Voorbeeld" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Instellingen voor het Uiterlijk" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Beschikbare Muisaanwijzer thema's" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Beschikbare Icoonthema's" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Beschikbare Vensterthema's" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Muisaanwijzer" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Icoon" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Alleen Iconen" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Groot" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Andere" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Grootte" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Klein" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Tekst onder de iconen" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Tekst naast de iconen" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Alleen Tekst" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Stijl van de werkbalk:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Venster" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "Lettertype: " + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "Installeren" +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Uiterlijk" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "De achtergrond van het bureaublad instellen" + +#~ msgid "Back" +#~ msgstr "Terug" + +#~ msgid "Forward" +#~ msgstr "Verder" + +#~ msgid "Stop" +#~ msgstr "Stop" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Kan pixmap bestand niet vinden: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Alleen Iconen\n" +#~ "Alleen Tekst\n" +#~ "Tekst onder iconen\n" +#~ "Tekst naast iconen" diff -Nru lxappearance-0.3.0~svn20090913/po/nn.po lxappearance-0.4.0/po/nn.po --- lxappearance-0.3.0~svn20090913/po/nn.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/nn.po 2009-12-21 10:17:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: 2009-07-27 20:31+0200\n" "Last-Translator: Karl Ove Hufthammer \n" "Language-Team: Norwegian Nynorsk \n" @@ -17,67 +17,11 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 0.3\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Set opp utsjÃ¥nad" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Tilgjengelege vindaugstema" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Skrift:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Vindauge" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Tilgjengelege ikontema" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Installer" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Ikon" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Verktøylinjestil: " - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Berre ikon" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Berre tekst" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Tekst under ikon" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Tekst ved sidan av ikon" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Anna" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "førehandsvising" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Vel ikontema" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (ikontema)" @@ -89,116 +33,179 @@ msgid "Item" msgstr "Element" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Fil" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Rediger" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Avkryssingsboks" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Hjelp" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demonstrasjon" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Tilbake" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Fram" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Stopp" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Radioknapp" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Fane 1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Radioknapp" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Avkryssingsboks" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Fane 2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Demonstrasjon" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Fane 3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "knapp" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Fane 4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Testelement 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Testelement 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Testelement 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Fane 2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Skriv inn litt tekst her for prøva den valde skrifta." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Fane 3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Rediger" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Fane 4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Fil" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Testelement 1\n" -"Testelement 2\n" -"Testelement 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Hjelp" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "knapp" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "førehandsvising" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Set opp utsjÃ¥nad" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Tilgjengelege peikartema" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Tilgjengelege ikontema" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Tilgjengelege vindaugstema" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Peikar" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ikon" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Berre ikon" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Stor" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Anna" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Storleik" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Liten" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Tekst under ikon" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Tekst ved sidan av ikon" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Berre tekst" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Verktøylinjestil: " + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Vindauge" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Skrift:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Installer" + +#: ../lxappearance.desktop.in.h:1 +#, fuzzy +msgid "Appearance" +msgstr "Set opp utsjÃ¥nad" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" msgstr "" -"Berre ikon\n" -"Berre tekst\n" -"Tekst under ikon\n" -"Tekst ved sidan av ikon" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Fann ikkje biletfila: %s" - -#~ msgid "Available Cursor Themes" -#~ msgstr "Tilgjengelege peikartema" - -#~ msgid "Size" -#~ msgstr "Storleik" -#~ msgid "Small" -#~ msgstr "Liten" +#~ msgid "Back" +#~ msgstr "Tilbake" + +#~ msgid "Forward" +#~ msgstr "Fram" -#~ msgid "Large" -#~ msgstr "Stor" +#~ msgid "Stop" +#~ msgstr "Stopp" -#~ msgid "Cursor" -#~ msgstr "Peikar" +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Testelement 1\n" +#~ "Testelement 2\n" +#~ "Testelement 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Fann ikkje biletfila: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Berre ikon\n" +#~ "Berre tekst\n" +#~ "Tekst under ikon\n" +#~ "Tekst ved sidan av ikon" diff -Nru lxappearance-0.3.0~svn20090913/po/pl.po lxappearance-0.4.0/po/pl.po --- lxappearance-0.3.0~svn20090913/po/pl.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/pl.po 2010-01-06 05:17:45.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: pl_PL\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-02-15 17:39-0000\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-28 02:50+0100\n" "Last-Translator: Artur Kruszewski \n" "Language-Team: Polish\n" "MIME-Version: 1.0\n" @@ -17,69 +17,13 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: KBabel 1.11.4\n" +"X-Generator: Pootle 1.1.0\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Ustawienia wyglÄ…du" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "DostÄ™pne Motywy" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Czcionka:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Okno" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "DostÄ™pne Motywy Ikon" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Instaluj" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Ikony" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Styl paska narzÄ™dziowego" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Tylko ikony" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Tylko tekst" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Tekst pod ikonami" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Tekst obok ikon" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Inne" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "PodglÄ…d" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Wybierz motyw ikon" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Motyw Ikon)" @@ -91,101 +35,178 @@ msgid "Item" msgstr "Pozycja" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "P_lik" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Edycja" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Przycisk zaznaczania" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Pomoc" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demo" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Powrót" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Do przodu" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Zatrzymaj" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Przycisk Radio" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Karta1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Przycisk Radio" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Przycisk zaznaczania" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Karta2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Demo" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Karta3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "przycisk" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Karta4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Testowa pozycja 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Testowa pozycja 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Testowa pozycja 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Karta2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Napisz coÅ› tutaj, żeby przetestować wybranÄ… czcionkÄ™." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Karta3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Edycja" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Karta4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "P_lik" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Element testowy 1\n" -"Element testowy 2\n" -"Element testowy 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Tylko ikony\n" -"Tylko tekst\n" -"Tekst pod ikonami\n" -"Tekst obok ikon" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Nie można odnaleźć pliku pixmap: %s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Pomoc" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "przycisk" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "PodglÄ…d" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Ustawienia wyglÄ…du" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "DostÄ™pne motywy kursorów" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "DostÄ™pne Motywy Ikon" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "DostÄ™pne Motywy" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Kursor" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ikony" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Tylko ikony" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Duży" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Inne" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Rozmiar" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "MaÅ‚y" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Tekst pod ikonami" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Tekst obok ikon" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Tylko tekst" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Styl paska narzÄ™dziowego" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Okno" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Czcionka:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Instaluj" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "WyglÄ…d" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Dostosuj wyglÄ…d pulpitu" + +#~ msgid "Back" +#~ msgstr "Powrót" + +#~ msgid "Forward" +#~ msgstr "Do przodu" + +#~ msgid "Stop" +#~ msgstr "Zatrzymaj" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Element testowy 1\n" +#~ "Element testowy 2\n" +#~ "Element testowy 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Nie można odnaleźć pliku pixmap: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Tylko ikony\n" +#~ "Tylko tekst\n" +#~ "Tekst pod ikonami\n" +#~ "Tekst obok ikon" diff -Nru lxappearance-0.3.0~svn20090913/po/POTFILES.in lxappearance-0.4.0/po/POTFILES.in --- lxappearance-0.3.0~svn20090913/po/POTFILES.in 2009-09-05 22:29:00.000000000 +0100 +++ lxappearance-0.4.0/po/POTFILES.in 2009-12-19 11:05:54.000000000 +0000 @@ -1,10 +1,9 @@ # List of source files containing translatable strings. src/main.c -src/main-dlg-ui.c src/main-dlg.c src/demo.c -src/demo-ui.c -demo.glade -lxappearance.glade -src/glade-support.c +data/demo.glade +data/lxappearance.glade +# files added by intltool-prepare +lxappearance.desktop.in diff -Nru lxappearance-0.3.0~svn20090913/po/ps.po lxappearance-0.4.0/po/ps.po --- lxappearance-0.3.0~svn20090913/po/ps.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/ps.po 2009-12-21 10:17:39.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,166 +16,162 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" +#: ../src/main-dlg.c:650 +msgid "Select an icon theme" msgstr "" -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" +#: ../src/main-dlg.c:657 +msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "" -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" +#: ../src/demo.c:56 +msgid "Column" msgstr "" -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" +#: ../src/demo.c:65 +msgid "Item" msgstr "" -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" +#: ../data/demo.glade.h:1 +msgid "Check Button" msgstr "" -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" +#: ../data/demo.glade.h:2 +msgid "Demo" msgstr "" -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" +#: ../data/demo.glade.h:3 +msgid "Radio Button" msgstr "" -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " +#: ../data/demo.glade.h:4 +msgid "Tab1" msgstr "" -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" +#: ../data/demo.glade.h:5 +msgid "Tab2" msgstr "" -#: ../src/main-dlg-ui.c:196 -msgid "Text only" +#: ../data/demo.glade.h:6 +msgid "Tab3" msgstr "" -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" +#: ../data/demo.glade.h:7 +msgid "Tab4" msgstr "" -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" +#: ../data/demo.glade.h:8 +msgid "Test Item 1" msgstr "" -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" +#: ../data/demo.glade.h:9 +msgid "Test Item 2" msgstr "" -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" +#: ../data/demo.glade.h:10 +msgid "Test Item 3" msgstr "" -#: ../src/main-dlg.c:620 -msgid "Select an icon theme" +#: ../data/demo.glade.h:11 +msgid "Type some characters here to test currently selected font." msgstr "" -#: ../src/main-dlg.c:627 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" +#: ../data/demo.glade.h:12 +msgid "_Edit" msgstr "" -#: ../src/demo.c:56 -msgid "Column" +#: ../data/demo.glade.h:13 +msgid "_File" msgstr "" -#: ../src/demo.c:65 -msgid "Item" +#: ../data/demo.glade.h:14 +msgid "_Help" msgstr "" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" +#: ../data/demo.glade.h:15 +msgid "button" msgstr "" -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" +#: ../data/lxappearance.glade.h:1 +msgid "Preview" msgstr "" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" msgstr "" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" msgstr "" -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" msgstr "" -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" msgstr "" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 -msgid "Tab1" +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" msgstr "" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" msgstr "" -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" msgstr "" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" +#: ../data/lxappearance.glade.h:9 +msgid "Large" msgstr "" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" +#: ../data/lxappearance.glade.h:10 +msgid "Other" msgstr "" -#: ../src/demo-ui.c:323 -msgid "Test Item 1" +#: ../data/lxappearance.glade.h:11 +msgid "Size" msgstr "" -#: ../src/demo-ui.c:324 -msgid "Test Item 2" +#: ../data/lxappearance.glade.h:12 +msgid "Small" msgstr "" -#: ../src/demo-ui.c:325 -msgid "Test Item 3" +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" msgstr "" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" msgstr "" -#: ../src/demo-ui.c:340 ../demo.glade.h:14 -msgid "Type some characters here to test currently selected font." +#: ../data/lxappearance.glade.h:15 +msgid "Text only" msgstr "" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " msgstr "" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" msgstr "" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" msgstr "" diff -Nru lxappearance-0.3.0~svn20090913/po/pt_BR.po lxappearance-0.4.0/po/pt_BR.po --- lxappearance-0.3.0~svn20090913/po/pt_BR.po 2009-09-05 22:29:00.000000000 +0100 +++ lxappearance-0.4.0/po/pt_BR.po 2009-12-21 10:17:37.000000000 +0000 @@ -8,76 +8,21 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-03-11 18:28-0300\n" -"Last-Translator: Henrique P. Machado \n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-08 17:06+0100\n" +"Last-Translator: Og Maciel \n" "Language-Team: Brazilian Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Pootle 1.1.0\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Configurações de aparências" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Temas de janelas disponíveis" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Fonte:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Janela" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Temas de ícones disponíveis" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Instalar" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Ãcone" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Estilo da barra de ferramentas: " - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Somente ícones" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Somente texto" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Texto abaixo dos ícones" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Texto ao lado dos ícones" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Outro" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Visualizar" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Selecione um tema de ícones" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Tema de ícones)" @@ -89,101 +34,178 @@ msgid "Item" msgstr "Item" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Arquivo" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Editar" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Botão de verificação" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "Aj_uda" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demonstração" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Voltar" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Avançar" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Parar" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Botão de seleção" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Aba1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Botão de seleção" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Botão de verificação" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Aba2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Demonstração" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Aba3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "botão" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Aba4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Testar item 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Testar item 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Testar item 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Aba2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "" "Digite alguns caracteres aqui para testar a fonte atualmente selecionada." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Aba3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Editar" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Aba4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Arquivo" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Testar item 1\n" -"Testar item 2\n" -"Testar item 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Somente ícones\n" -"Somente texto\n" -"Texto acima dos íconesTexto abaixo dos ícones" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Não foi possível encontrar o arquivo pixmap: %s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "Aj_uda" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "botão" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Visualizar" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Configurações de aparências" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Temas de cursores disponíveis" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Temas de ícones disponíveis" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Temas de janelas disponíveis" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Cursor" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ãcone" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Somente ícones" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Grande" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Outro" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Tamanho" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Pequeno" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Texto abaixo dos ícones" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Texto ao lado dos ícones" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Somente texto" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Estilo da barra de ferramentas: " + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Janela" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Fonte:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Instalar" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Aparência" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Personalizar a aparência da área de trabalho" + +#~ msgid "Back" +#~ msgstr "Voltar" + +#~ msgid "Forward" +#~ msgstr "Avançar" + +#~ msgid "Stop" +#~ msgstr "Parar" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Testar item 1\n" +#~ "Testar item 2\n" +#~ "Testar item 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Não foi possível encontrar o arquivo pixmap: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Somente ícones\n" +#~ "Somente texto\n" +#~ "Texto acima dos íconesTexto abaixo dos ícones" diff -Nru lxappearance-0.3.0~svn20090913/po/pt.po lxappearance-0.4.0/po/pt.po --- lxappearance-0.3.0~svn20090913/po/pt.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/pt.po 2010-01-06 05:17:45.000000000 +0000 @@ -7,88 +7,23 @@ msgstr "" "Project-Id-Version: lxappearance 0.2.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-05-05 17:24-0000\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-29 16:21+0100\n" "Last-Translator: Sérgio Marques \n" "Language-Team: Portuguese PT \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 1.1.0\n" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: PORTUGAL\n" -#: ../src/main-dlg-ui.c:70 -#: ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Definições de Aparência" - -#: ../src/main-dlg-ui.c:90 -#: ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Temas de Janela Disponíveis" - -#: ../src/main-dlg-ui.c:110 -#: ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Fonte:" - -#: ../src/main-dlg-ui.c:122 -#: ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Janela" - -#: ../src/main-dlg-ui.c:130 -#: ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Temas de Ãcones Disponíveis" - -#: ../src/main-dlg-ui.c:167 -#: ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Intalar" - -#: ../src/main-dlg-ui.c:174 -#: ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Ãcone" - -#: ../src/main-dlg-ui.c:187 -#: ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Estilo da Barra de Ferramentas:" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Apenas ícones" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Apenas texto" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Texto por baixo dos ícones" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Texto ao lado dos ícones" - -#: ../src/main-dlg-ui.c:200 -#: ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Outros" - -#: ../src/main-dlg-ui.c:208 -#: ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Pré-visualizar" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Seleccione um tema de ícones" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Tema de Ãcones)" @@ -100,119 +35,179 @@ msgid "Item" msgstr "Item" -#: ../src/demo-ui.c:116 -#: ../demo.glade.h:16 -msgid "_File" -msgstr "_Ficheiro" - -#: ../src/demo-ui.c:148 -#: ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Editar" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Botão de Visto" -#: ../src/demo-ui.c:171 -#: ../demo.glade.h:17 -msgid "_Help" -msgstr "_Ajuda" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demo" -#: ../src/demo-ui.c:196 -#: ../demo.glade.h:1 -msgid "Back" -msgstr "Voltar" - -#: ../src/demo-ui.c:202 -#: ../demo.glade.h:4 -msgid "Forward" -msgstr "Avançar" - -#: ../src/demo-ui.c:207 -#: ../demo.glade.h:6 -msgid "Stop" -msgstr "Parar" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Botão de Rádio" -#: ../src/demo-ui.c:224 -#: ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Separador1" -#: ../src/demo-ui.c:246 -#: ../src/demo-ui.c:252 -#: ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Botão de Rádio" - -#: ../src/demo-ui.c:262 -#: ../demo.glade.h:2 -msgid "Check Button" -msgstr "Botão de Visto" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Separador2" -#: ../src/demo-ui.c:271 -#: ../demo.glade.h:3 -msgid "Demo" -msgstr "Demo" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Separador3" -#: ../src/demo-ui.c:316 -#: ../demo.glade.h:18 -msgid "button" -msgstr "botão" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Separador4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Item de Teste 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Item de Teste 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Item de Teste 3" -#: ../src/demo-ui.c:327 -#: ../demo.glade.h:8 -msgid "Tab2" -msgstr "Separador2" - -#: ../src/demo-ui.c:340 -#: ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." -msgstr "Escreva alguns caracteres para testar a fonte actualmente seleccionada." +msgstr "" +"Escreva alguns caracteres para testar a fonte actualmente seleccionada." -#: ../src/demo-ui.c:342 -#: ../demo.glade.h:9 -msgid "Tab3" -msgstr "Separador3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Editar" -#: ../src/demo-ui.c:357 -#: ../demo.glade.h:10 -msgid "Tab4" -msgstr "Separador4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Ficheiro" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Item de Teste 1\n" -"Item de Teste 2\n" -"Item de Teste 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Apenas ícones\n" -"Apenas texto\n" -"Texto em baixo dos ícones\n" -"Texto ao lado dos ícones" - -#: ../src/glade-support.c:90 -#: ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Não foi possível encontrar: %s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Ajuda" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "botão" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Pré-visualizar" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Definições de Aparência" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Temas de Cursor Disponíveis" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Temas de Ãcones Disponíveis" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Temas de Janela Disponíveis" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Cursor" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ãcone" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Apenas ícones" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Grande" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Outros" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Tamanho" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Pequeno" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Texto por baixo dos ícones" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Texto ao lado dos ícones" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Apenas texto" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Estilo da Barra de Ferramentas:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Janela" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Fonte:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Instalar" +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Aparência" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Personalizar a aparência do ambiente de trabalho" + +#~ msgid "Back" +#~ msgstr "Voltar" + +#~ msgid "Forward" +#~ msgstr "Avançar" + +#~ msgid "Stop" +#~ msgstr "Parar" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Item de Teste 1\n" +#~ "Item de Teste 2\n" +#~ "Item de Teste 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Não foi possível encontrar: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Apenas ícones\n" +#~ "Apenas texto\n" +#~ "Texto em baixo dos ícones\n" +#~ "Texto ao lado dos ícones" diff -Nru lxappearance-0.3.0~svn20090913/po/ru.po lxappearance-0.4.0/po/ru.po --- lxappearance-0.3.0~svn20090913/po/ru.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/ru.po 2009-12-21 10:17:39.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: 2009-02-10 22:25+0300\n" "Last-Translator: Vitaly Pashkov \n" "Language-Team: Russian\n" @@ -20,67 +20,11 @@ "X-Poedit-Language: Russian\n" "X-Poedit-Country: RUSSIAN FEDERATION\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "ÐаÑтройки внешнего вида" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "ДоÑтупные темы окон" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Шрифт:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Окна" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "ДоÑтупные темы значков" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_УÑтановить" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Значки" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Стиль панели инÑтрументов:" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Только значки" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Только текÑÑ‚" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "ТекÑÑ‚ под значками" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "ТекÑÑ‚ Ñ€Ñдом Ñо значками" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Другие" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "ПредпроÑмотр" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Выберите тему значков" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Тема значков)" @@ -92,101 +36,179 @@ msgid "Item" msgstr "Элемент" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Файл" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Правка" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Флажок" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Справка" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "ДемонÑтрациÑ" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Ðазад" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Вперед" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Стоп" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Переключатель" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Вкладка1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Переключатель" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Флажок" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Вкладка2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "ДемонÑтрациÑ" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Вкладка3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "кнопка" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Вкладка4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "ТеÑтовый Ñлемент 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "ТеÑтовый Ñлемент 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "ТеÑтовый Ñлемент 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Вкладка2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Введите Ñюда неÑколько Ñимволов Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð²ÐµÑ€ÐºÐ¸ выбранного шрифта." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Вкладка3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Правка" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Вкладка4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Файл" + +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Справка" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "кнопка" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "ПредпроÑмотр" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "ÐаÑтройки внешнего вида" + +#: ../data/lxappearance.glade.h:3 +#, fuzzy +msgid "Available Cursor Themes" +msgstr "ДоÑтупные темы значков" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "ДоÑтупные темы значков" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "ДоÑтупные темы окон" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Значки" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Только значки" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" msgstr "" -"ТеÑтовый Ñлемент 1\n" -"ТеÑтовый Ñлемент 2\n" -"ТеÑтовый Ñлемент 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Другие" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" msgstr "" -"Только значки\n" -"Только текÑÑ‚\n" -"ТекÑÑ‚ под значками\n" -"ТекÑÑ‚ Ñ€Ñдом Ñо значками" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Ðе могу найти файл изображениÑ: %s" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "ТекÑÑ‚ под значками" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "ТекÑÑ‚ Ñ€Ñдом Ñо значками" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Только текÑÑ‚" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Стиль панели инÑтрументов:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Окна" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Шрифт:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_УÑтановить" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Внешний вид" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "ÐаÑтройте тему рабочего Ñтола" + +#~ msgid "Back" +#~ msgstr "Ðазад" + +#~ msgid "Forward" +#~ msgstr "Вперед" + +#~ msgid "Stop" +#~ msgstr "Стоп" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "ТеÑтовый Ñлемент 1\n" +#~ "ТеÑтовый Ñлемент 2\n" +#~ "ТеÑтовый Ñлемент 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Ðе могу найти файл изображениÑ: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Только значки\n" +#~ "Только текÑÑ‚\n" +#~ "ТекÑÑ‚ под значками\n" +#~ "ТекÑÑ‚ Ñ€Ñдом Ñо значками" diff -Nru lxappearance-0.3.0~svn20090913/po/sk.po lxappearance-0.4.0/po/sk.po --- lxappearance-0.3.0~svn20090913/po/sk.po 2009-09-05 22:29:00.000000000 +0100 +++ lxappearance-0.4.0/po/sk.po 2009-12-21 10:17:38.000000000 +0000 @@ -7,75 +7,19 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-02-13 16:04+0100\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-08 17:40+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Nastavenia vzhľadu" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Dostupné témy vzhľadu okien" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Písmo:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Okno" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Dostupné témy vzhľadu ikon" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "Na_inÅ¡talovaÅ¥" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Ikona" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Å týl panelu nástrojov" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Iba ikony" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Iba text" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Text pod ikonami" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Text vedľa ikon" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Iný" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Náhľad" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Vyberte tému vzhľadu ikon" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (témy ikon)" @@ -87,101 +31,178 @@ msgid "Item" msgstr "Položka" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Súbor" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_UpraviÅ¥" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "ZaÅ¡krtávacie políÄko" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Pomocník" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demo" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Späť" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Vpred" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "ZastaviÅ¥" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Výberové políÄko" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Karta1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Výberové políÄko" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "ZaÅ¡krtávacie políÄko" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Karta2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Demo" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Karta3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "tlaÄidlo" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Karta4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Testovacia položka 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Testovacia položka 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Testovacia položka 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Karta2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Sem napíšte nejaké znaky aby ste otestovali momentálne zvolené písmo." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Karta3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_UpraviÅ¥" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Karta4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Súbor" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Testovacia položka 1\n" -"Testovacia položka 2\n" -"Testovacia položka 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Iba ikony\n" -"Iba text\n" -"Text pod ikonami\n" -"Text vedľa ikon" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Nebol nájdený súbor pixmap: %s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Pomocník" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "tlaÄidlo" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Náhľad" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Nastavenia vzhľadu" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Dostupné témy vzhľadu kurzorov" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Dostupné témy vzhľadu ikon" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Dostupné témy vzhľadu okien" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Kurzor" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ikona" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Iba ikony" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Veľká" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Iný" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "VeľkosÅ¥" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Malá" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Text pod ikonami" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Text vedľa ikon" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Iba text" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Å týl panelu nástrojov" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Okno" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Písmo:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "Na_inÅ¡talovaÅ¥" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Vzhľad" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "PrispôsobiÅ¥ vzhľad pracovného prostredia" + +#~ msgid "Back" +#~ msgstr "Späť" + +#~ msgid "Forward" +#~ msgstr "Vpred" + +#~ msgid "Stop" +#~ msgstr "ZastaviÅ¥" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Testovacia položka 1\n" +#~ "Testovacia položka 2\n" +#~ "Testovacia položka 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Nebol nájdený súbor pixmap: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Iba ikony\n" +#~ "Iba text\n" +#~ "Text pod ikonami\n" +#~ "Text vedľa ikon" diff -Nru lxappearance-0.3.0~svn20090913/po/sl.po lxappearance-0.4.0/po/sl.po --- lxappearance-0.3.0~svn20090913/po/sl.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/sl.po 2009-12-21 10:17:42.000000000 +0000 @@ -6,89 +6,24 @@ msgstr "" "Project-Id-Version: lxappearance 0.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-06-28 16:37+0100\n" -"Last-Translator: Matej GaÄnik \n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-10 12:10+0100\n" +"Last-Translator: Matej \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n" +"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" +"%100==4 ? 2 : 3);\n" "X-Generator: Pootle 1.1.0\n" "X-Poedit-Language: Slovenian\n" "X-Poedit-Country: SLOVENIA\n" -#: ../src/main-dlg-ui.c:70 -#: ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Nastavitve izgleda" - -#: ../src/main-dlg-ui.c:90 -#: ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Ikonske teme" - -#: ../src/main-dlg-ui.c:110 -#: ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Pisava:" - -#: ../src/main-dlg-ui.c:122 -#: ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Okno" - -#: ../src/main-dlg-ui.c:130 -#: ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Teme" - -#: ../src/main-dlg-ui.c:167 -#: ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Namesti" - -#: ../src/main-dlg-ui.c:174 -#: ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Ikone" - -#: ../src/main-dlg-ui.c:187 -#: ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Slog orodne vrstice" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Samo ikone" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Samo tekst" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Tekst pod ikono" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Tekst ob ikoni" - -#: ../src/main-dlg-ui.c:200 -#: ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Ostalo" - -#: ../src/main-dlg-ui.c:208 -#: ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Predogled" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Izberi temo ikon" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (stisnjene ikonske teme)" @@ -100,119 +35,178 @@ msgid "Item" msgstr "Element" -#: ../src/demo-ui.c:116 -#: ../demo.glade.h:16 -msgid "_File" -msgstr "_Datoteka" - -#: ../src/demo-ui.c:148 -#: ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Uredi" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Potrditveni gumb" -#: ../src/demo-ui.c:171 -#: ../demo.glade.h:17 -msgid "_Help" -msgstr "_PomoÄ" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demo" -#: ../src/demo-ui.c:196 -#: ../demo.glade.h:1 -msgid "Back" -msgstr "Nazaj" - -#: ../src/demo-ui.c:202 -#: ../demo.glade.h:4 -msgid "Forward" -msgstr "Naprej" - -#: ../src/demo-ui.c:207 -#: ../demo.glade.h:6 -msgid "Stop" -msgstr "Ustavi" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Radijski gumb" -#: ../src/demo-ui.c:224 -#: ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Zavihek1" -#: ../src/demo-ui.c:246 -#: ../src/demo-ui.c:252 -#: ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Radijski gumb" - -#: ../src/demo-ui.c:262 -#: ../demo.glade.h:2 -msgid "Check Button" -msgstr "Potrditveni gumb" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Zavihek2" -#: ../src/demo-ui.c:271 -#: ../demo.glade.h:3 -msgid "Demo" -msgstr "Demo" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Zavihek3" -#: ../src/demo-ui.c:316 -#: ../demo.glade.h:18 -msgid "button" -msgstr "Gumb" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Zavihek4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Testni element 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Testni element 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Testni element 3" -#: ../src/demo-ui.c:327 -#: ../demo.glade.h:8 -msgid "Tab2" -msgstr "Zavihek2" - -#: ../src/demo-ui.c:340 -#: ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Za preizkus pisave vtipkajte poljubno besedilo." -#: ../src/demo-ui.c:342 -#: ../demo.glade.h:9 -msgid "Tab3" -msgstr "Zavihek3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Uredi" -#: ../src/demo-ui.c:357 -#: ../demo.glade.h:10 -msgid "Tab4" -msgstr "Zavihek4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Datoteka" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Testni predmet 1\n" -"Testni predmet 2\n" -"Testni predmet 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Samo ikone\n" -"Samo tekst\n" -"Samo tekst pod ikonami\n" -"Samo tekst nad ikonami" - -#: ../src/glade-support.c:90 -#: ../src/glade-support.c:114 -#, fuzzy, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Pixmap datoteke %s ni bilo mogoÄe najti" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_PomoÄ" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "Gumb" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Predogled" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Nastavitve izgleda" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "KazalÄne teme" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Teme" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Ikonske teme" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Kazalec" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ikone" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Samo ikone" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Velika" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Ostalo" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Velikost" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Majhna" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Tekst pod ikono" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Tekst ob ikoni" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Samo tekst" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Slog orodne vrstice" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Okno" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Pisava:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Namesti" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Nastavitve izgleda" +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Prilagajanje videza namizja" + +#~ msgid "Back" +#~ msgstr "Nazaj" + +#~ msgid "Forward" +#~ msgstr "Naprej" + +#~ msgid "Stop" +#~ msgstr "Ustavi" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Testni predmet 1\n" +#~ "Testni predmet 2\n" +#~ "Testni predmet 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Datoteke pixmap %s ni bilo mogoÄe najti" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Samo ikone\n" +#~ "Samo tekst\n" +#~ "Samo tekst pod ikonami\n" +#~ "Samo tekst nad ikonami" diff -Nru lxappearance-0.3.0~svn20090913/po/sr.po lxappearance-0.4.0/po/sr.po --- lxappearance-0.3.0~svn20090913/po/sr.po 2009-09-13 11:23:09.000000000 +0100 +++ lxappearance-0.4.0/po/sr.po 2009-12-21 10:17:43.000000000 +0000 @@ -8,86 +8,21 @@ msgstr "" "Project-Id-Version: LXAppearance 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: 2009-09-02 12:40+0100\n" "Last-Translator: Jay A. Fleming \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: ../src/main-dlg-ui.c:70 -#: ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Подешавања изгледа" - -#: ../src/main-dlg-ui.c:90 -#: ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "ДоÑтупне теме прозора" - -#: ../src/main-dlg-ui.c:110 -#: ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Фонт:" - -#: ../src/main-dlg-ui.c:122 -#: ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Прозор" - -#: ../src/main-dlg-ui.c:130 -#: ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "ДоÑтупне теме икона" - -#: ../src/main-dlg-ui.c:167 -#: ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_ИнÑталирај" - -#: ../src/main-dlg-ui.c:174 -#: ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Икона" - -#: ../src/main-dlg-ui.c:187 -#: ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Изглед траке Ñа алатима" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Само иконе" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Само текÑÑ‚" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "ТекÑÑ‚ иÑпод икона" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "ТекÑÑ‚ поред икона" - -#: ../src/main-dlg-ui.c:200 -#: ../lxappearance.glade.h:10 -msgid "Other" -msgstr "ОÑтало" - -#: ../src/main-dlg-ui.c:208 -#: ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Преглед" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Изаберите пакет Ñа темом икона" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (тема икона)" @@ -99,121 +34,179 @@ msgid "Item" msgstr "Ставка" -#: ../src/demo-ui.c:116 -#: ../demo.glade.h:16 -msgid "_File" -msgstr "_Датотека" - -#: ../src/demo-ui.c:148 -#: ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Уреди" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Дугме за потврду" -#: ../src/demo-ui.c:171 -#: ../demo.glade.h:17 -msgid "_Help" -msgstr "_Помоћ" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Демо" -#: ../src/demo-ui.c:196 -#: ../demo.glade.h:1 -msgid "Back" -msgstr "Ðазад" - -#: ../src/demo-ui.c:202 -#: ../demo.glade.h:4 -msgid "Forward" -msgstr "Ðапред" - -#: ../src/demo-ui.c:207 -#: ../demo.glade.h:6 -msgid "Stop" -msgstr "ЗауÑтави" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Радио дугме" -#: ../src/demo-ui.c:224 -#: ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "ЛиÑÑ‚-1" -#: ../src/demo-ui.c:246 -#: ../src/demo-ui.c:252 -#: ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Радио дугме" - -#: ../src/demo-ui.c:262 -#: ../demo.glade.h:2 -msgid "Check Button" -msgstr "Дугме за потврду" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "ЛиÑÑ‚-2" -#: ../src/demo-ui.c:271 -#: ../demo.glade.h:3 -msgid "Demo" -msgstr "Демо" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "ЛиÑÑ‚-3" -#: ../src/demo-ui.c:316 -#: ../demo.glade.h:18 -msgid "button" -msgstr "дугме" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "ЛиÑÑ‚-4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "ТеÑÑ‚ — Ставка 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "ТеÑÑ‚ — Ставка 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "ТеÑÑ‚ — Ставка 3" -#: ../src/demo-ui.c:327 -#: ../demo.glade.h:8 -msgid "Tab2" -msgstr "ЛиÑÑ‚-2" - -#: ../src/demo-ui.c:340 -#: ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "УнеÑите неколико карактера за проверу одабраног фонта." -#: ../src/demo-ui.c:342 -#: ../demo.glade.h:9 -msgid "Tab3" -msgstr "ЛиÑÑ‚-3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Уреди" -#: ../src/demo-ui.c:357 -#: ../demo.glade.h:10 -msgid "Tab4" -msgstr "ЛиÑÑ‚-4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Датотека" + +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Помоћ" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "дугме" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Преглед" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Подешавања изгледа" + +#: ../data/lxappearance.glade.h:3 +#, fuzzy +msgid "Available Cursor Themes" +msgstr "ДоÑтупне теме икона" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "ДоÑтупне теме икона" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "ДоÑтупне теме прозора" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" msgstr "" -"ТеÑÑ‚ — Ставка 1\n" -"ТеÑÑ‚ — Ставка 2\n" -"ТеÑÑ‚ — Ставка 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Икона" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Само иконе" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" msgstr "" -"Само иконе\n" -"Само текÑÑ‚\n" -"ТекÑÑ‚ иÑпод икона\n" -"ТекÑÑ‚ поред икона" - -#: ../src/glade-support.c:90 -#: ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Ðе могу наћи битмапирану датотеку: %s" +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "ОÑтало" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "ТекÑÑ‚ иÑпод икона" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "ТекÑÑ‚ поред икона" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Само текÑÑ‚" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Изглед траке Ñа алатима" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Прозор" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Фонт:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_ИнÑталирај" - +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Изглед" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Прилагодите изглед радне површи" + +#~ msgid "Back" +#~ msgstr "Ðазад" + +#~ msgid "Forward" +#~ msgstr "Ðапред" + +#~ msgid "Stop" +#~ msgstr "ЗауÑтави" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "ТеÑÑ‚ — Ставка 1\n" +#~ "ТеÑÑ‚ — Ставка 2\n" +#~ "ТеÑÑ‚ — Ставка 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Ðе могу наћи битмапирану датотеку: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Само иконе\n" +#~ "Само текÑÑ‚\n" +#~ "ТекÑÑ‚ иÑпод икона\n" +#~ "ТекÑÑ‚ поред икона" diff -Nru lxappearance-0.3.0~svn20090913/po/sv.po lxappearance-0.4.0/po/sv.po --- lxappearance-0.3.0~svn20090913/po/sv.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/sv.po 2009-12-21 10:17:43.000000000 +0000 @@ -7,76 +7,21 @@ msgstr "" "Project-Id-Version: lxapperance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-01-06 20:07+0100\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-08 15:42+0100\n" "Last-Translator: Martin Bagge \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Pootle 1.1.0\n" "X-Poedit-Language: Swedish\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "Inställningar för utseende" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "Tillgängliga fönsterteman" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Teckensnitt:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Fönster" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "Tillgängliga ikonteman" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_Installera" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Ikon" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Verktygsfältsstil:" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Endast ikoner" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Endast text" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "Text under ikoner" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "Text bredvid ikoner" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Annat" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "Förhandsgranska" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Välj ikontema" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Ikontema)" @@ -88,101 +33,178 @@ msgid "Item" msgstr "Objekt" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Arkiv" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Redigera" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Kryssruta" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Hjälp" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Demonstration" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "BakÃ¥t" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "FramÃ¥t" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Stopp" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Radioknapp" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Flik1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Radioknapp" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Kryssruta" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Flik2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Demonstration" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Flik3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "knapp" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Flik4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "Testobjekt 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "Testobjekt 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "Testobjekt 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Flik2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Skriv här för att testa valt teckensnitt." -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Flik3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Redigera" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Flik4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Arkiv" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"Testobjekt 1\n" -"Testobjekt 2\n" -"Testobjekt 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Endast ikoner\n" -"Endast text\n" -"Text under ikoner\n" -"Text brevid ikoner" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Kunde inte hitta pixmap-filen: %s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Hjälp" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "knapp" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "Förhandsgranska" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "Inställningar för utseende" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "Tillgängliga muspekarteman" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "Tillgängliga ikonteman" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "Tillgängliga fönsterteman" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "Muspekare" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Ikon" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Endast ikoner" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Stor" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Annat" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Storlek" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Liten" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "Text under ikoner" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "Text bredvid ikoner" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Endast text" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Verktygsfältsstil:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Fönster" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Teckensnitt:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_Installera" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Utseende" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Anpassa utseendet för skrivbordet" + +#~ msgid "Back" +#~ msgstr "BakÃ¥t" + +#~ msgid "Forward" +#~ msgstr "FramÃ¥t" + +#~ msgid "Stop" +#~ msgstr "Stopp" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "Testobjekt 1\n" +#~ "Testobjekt 2\n" +#~ "Testobjekt 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Kunde inte hitta pixmap-filen: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Endast ikoner\n" +#~ "Endast text\n" +#~ "Text under ikoner\n" +#~ "Text brevid ikoner" diff -Nru lxappearance-0.3.0~svn20090913/po/tr.po lxappearance-0.4.0/po/tr.po --- lxappearance-0.3.0~svn20090913/po/tr.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/tr.po 2009-12-21 10:17:43.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-01 15:19+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,166 +16,162 @@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" +#: ../src/main-dlg.c:650 +msgid "Select an icon theme" msgstr "" -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" +#: ../src/main-dlg.c:657 +msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "" -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" +#: ../src/demo.c:56 +msgid "Column" msgstr "" -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" +#: ../src/demo.c:65 +msgid "Item" msgstr "" -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" +#: ../data/demo.glade.h:1 +msgid "Check Button" msgstr "" -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" +#: ../data/demo.glade.h:2 +msgid "Demo" msgstr "" -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" +#: ../data/demo.glade.h:3 +msgid "Radio Button" msgstr "" -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " +#: ../data/demo.glade.h:4 +msgid "Tab1" msgstr "" -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" +#: ../data/demo.glade.h:5 +msgid "Tab2" msgstr "" -#: ../src/main-dlg-ui.c:196 -msgid "Text only" +#: ../data/demo.glade.h:6 +msgid "Tab3" msgstr "" -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" +#: ../data/demo.glade.h:7 +msgid "Tab4" msgstr "" -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" +#: ../data/demo.glade.h:8 +msgid "Test Item 1" msgstr "" -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" +#: ../data/demo.glade.h:9 +msgid "Test Item 2" msgstr "" -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" +#: ../data/demo.glade.h:10 +msgid "Test Item 3" msgstr "" -#: ../src/main-dlg.c:620 -msgid "Select an icon theme" +#: ../data/demo.glade.h:11 +msgid "Type some characters here to test currently selected font." msgstr "" -#: ../src/main-dlg.c:627 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" +#: ../data/demo.glade.h:12 +msgid "_Edit" msgstr "" -#: ../src/demo.c:56 -msgid "Column" +#: ../data/demo.glade.h:13 +msgid "_File" msgstr "" -#: ../src/demo.c:65 -msgid "Item" +#: ../data/demo.glade.h:14 +msgid "_Help" msgstr "" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" +#: ../data/demo.glade.h:15 +msgid "button" msgstr "" -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" +#: ../data/lxappearance.glade.h:1 +msgid "Preview" msgstr "" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" msgstr "" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" msgstr "" -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" msgstr "" -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" msgstr "" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 -msgid "Tab1" +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" msgstr "" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" msgstr "" -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" msgstr "" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" +#: ../data/lxappearance.glade.h:9 +msgid "Large" msgstr "" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" +#: ../data/lxappearance.glade.h:10 +msgid "Other" msgstr "" -#: ../src/demo-ui.c:323 -msgid "Test Item 1" +#: ../data/lxappearance.glade.h:11 +msgid "Size" msgstr "" -#: ../src/demo-ui.c:324 -msgid "Test Item 2" +#: ../data/lxappearance.glade.h:12 +msgid "Small" msgstr "" -#: ../src/demo-ui.c:325 -msgid "Test Item 3" +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" msgstr "" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" msgstr "" -#: ../src/demo-ui.c:340 ../demo.glade.h:14 -msgid "Type some characters here to test currently selected font." +#: ../data/lxappearance.glade.h:15 +msgid "Text only" msgstr "" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " msgstr "" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" msgstr "" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" msgstr "" diff -Nru lxappearance-0.3.0~svn20090913/po/uk.po lxappearance-0.4.0/po/uk.po --- lxappearance-0.3.0~svn20090913/po/uk.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/uk.po 2009-12-21 10:17:39.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-03-04 20:04+0100\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-08 15:45+0100\n" "Last-Translator: Y P \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -16,67 +16,11 @@ "Content-Transfer-Encoding: 8bit\n" "X-Generator: Pootle 1.1.0\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "ÐаÑтройка виглÑду" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "ДоÑтупні теми вікон" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Фонт:" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "Вікно" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "ДоÑтупні теми іконок" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_ІнÑталювати" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "Іконка" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "Стиль панелі інÑтрументів: " - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "Тільки іконки" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "Тільки текÑÑ‚" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "ТекÑÑ‚ під іконками" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "ТекÑÑ‚ за іконками" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "Інше" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "ПереглÑнути" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "Виберіть тему іконок" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (Тема іконок)" @@ -88,101 +32,178 @@ msgid "Item" msgstr "Пункт" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "_Файл" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "_Редагувати" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Клавіша перевірки" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "_Допомога" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "Демо" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "Ðазад" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "Вперед" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "Стоп" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Кнопка радіо" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "Таб1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Кнопка радіо" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Клавіша перевірки" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "Tаб2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "Демо" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "Таб3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "клавіша" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "Таб4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "ТеÑтовий пункт 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "ТеÑтовий пункт 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "ТеÑтовий пункт 3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "Tаб2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "Ðадрукуйте тут ÑкіÑÑŒ букви Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ²Ñ–Ñ€ÐºÐ¸ щойно вибраного шрифта" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "Таб3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_Редагувати" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "Таб4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Файл" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"ТеÑтовий пункт 1\n" -"ТеÑтовий пункт 2\n" -"ТеÑтовий пункт 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"Тільки іконки\n" -"Тільки текÑÑ‚\n" -"ТекÑÑ‚ під іконками\n" -"ТекÑÑ‚ за іконками" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "Ðе можу знайти pixmap файл: %s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Допомога" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "клавіша" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "ПереглÑнути" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "ÐаÑтройка виглÑду" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "ДоÑтупні теми курÑора" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "ДоÑтупні теми іконок" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "ДоÑтупні теми вікон" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "КурÑор" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "Іконка" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "Тільки іконки" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "Великий" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "Інше" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "Розмір" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "Малий" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "ТекÑÑ‚ під іконками" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "ТекÑÑ‚ за іконками" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "Тільки текÑÑ‚" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "Стиль панелі інÑтрументів: " + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "Вікно" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Фонт:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_ІнÑталювати" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Зовнішній виглÑд" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Ðалаштувати виглÑд робочого Ñтолу" + +#~ msgid "Back" +#~ msgstr "Ðазад" + +#~ msgid "Forward" +#~ msgstr "Вперед" + +#~ msgid "Stop" +#~ msgstr "Стоп" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "ТеÑтовий пункт 1\n" +#~ "ТеÑтовий пункт 2\n" +#~ "ТеÑтовий пункт 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "Ðе можу знайти pixmap файл: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "Тільки іконки\n" +#~ "Тільки текÑÑ‚\n" +#~ "ТекÑÑ‚ під іконками\n" +#~ "ТекÑÑ‚ за іконками" diff -Nru lxappearance-0.3.0~svn20090913/po/ur_PK.po lxappearance-0.4.0/po/ur_PK.po --- lxappearance-0.3.0~svn20090913/po/ur_PK.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/ur_PK.po 2009-12-21 10:17:39.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: 2009-05-09 13:01+0500\n" "Last-Translator: Muhammad Ali Makki \n" "Language-Team: Urdu \n" @@ -19,77 +19,11 @@ "X-Poedit-Country: PAKISTAN\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../src/main-dlg-ui.c:70 -#: ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "مظÛر ترتیبات" - -#: ../src/main-dlg-ui.c:90 -#: ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "دستیاب ونڈو تھیم" - -#: ../src/main-dlg-ui.c:110 -#: ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Ùونٹ:" - -#: ../src/main-dlg-ui.c:122 -#: ../lxappearance.glade.h:12 -msgid "Window" -msgstr "ونڈو" - -#: ../src/main-dlg-ui.c:130 -#: ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "دستیاب آئکن تھیم" - -#: ../src/main-dlg-ui.c:167 -#: ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_نصب کریں" - -#: ../src/main-dlg-ui.c:174 -#: ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "آئکن" - -#: ../src/main-dlg-ui.c:187 -#: ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "اوزار پٹی انداز:" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "صر٠آئکن" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "صر٠متن" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "متن آئکن Ú©Û’ نیچے" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "متن آئکن Ú©Û’ ساتھ" - -#: ../src/main-dlg-ui.c:200 -#: ../lxappearance.glade.h:10 -msgid "Other" -msgstr "دیگر" - -#: ../src/main-dlg-ui.c:208 -#: ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "معائنÛ" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "آئکن تھیم منتخب کریں" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (آئکن تھیم)" @@ -101,119 +35,180 @@ msgid "Item" msgstr "عنصر" -#: ../src/demo-ui.c:116 -#: ../demo.glade.h:16 -msgid "_File" -msgstr "_Ùائل" - -#: ../src/demo-ui.c:148 -#: ../demo.glade.h:15 -msgid "_Edit" -msgstr "_تدوین" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "چیک بٹن" -#: ../src/demo-ui.c:171 -#: ../demo.glade.h:17 -msgid "_Help" -msgstr "_Ûدایات" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "ڈیمو" -#: ../src/demo-ui.c:196 -#: ../demo.glade.h:1 -msgid "Back" -msgstr "پیچھے" - -#: ../src/demo-ui.c:202 -#: ../demo.glade.h:4 -msgid "Forward" -msgstr "Ø¢Ú¯Û’" - -#: ../src/demo-ui.c:207 -#: ../demo.glade.h:6 -msgid "Stop" -msgstr "روکیں" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "ریڈیو بٹن" -#: ../src/demo-ui.c:224 -#: ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "ٹیب1" -#: ../src/demo-ui.c:246 -#: ../src/demo-ui.c:252 -#: ../demo.glade.h:5 -msgid "Radio Button" -msgstr "ریڈیو بٹن" - -#: ../src/demo-ui.c:262 -#: ../demo.glade.h:2 -msgid "Check Button" -msgstr "چیک بٹن" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "ٹیب2" -#: ../src/demo-ui.c:271 -#: ../demo.glade.h:3 -msgid "Demo" -msgstr "ڈیمو" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "ٹیب3" -#: ../src/demo-ui.c:316 -#: ../demo.glade.h:18 -msgid "button" -msgstr "بٹن" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "ٹیب4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "تجرباتی عنصر 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "تجرباتی عنصر 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "تجرباتی عنصر 3" -#: ../src/demo-ui.c:327 -#: ../demo.glade.h:8 -msgid "Tab2" -msgstr "ٹیب2" - -#: ../src/demo-ui.c:340 -#: ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "منتخب Ú©Ø±Ø¯Û Ùونٹ کا ØªØ¬Ø±Ø¨Û Ú©Ø±Ù†Û’ Ú©Û’ لیے ÛŒÛاں Ú©Ú†Ú¾ الÙاظ لکھیں" -#: ../src/demo-ui.c:342 -#: ../demo.glade.h:9 -msgid "Tab3" -msgstr "ٹیب3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_تدوین" -#: ../src/demo-ui.c:357 -#: ../demo.glade.h:10 -msgid "Tab4" -msgstr "ٹیب4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Ùائل" + +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Ûدایات" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "بٹن" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "معائنÛ" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "مظÛر ترتیبات" + +#: ../data/lxappearance.glade.h:3 +#, fuzzy +msgid "Available Cursor Themes" +msgstr "دستیاب آئکن تھیم" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "دستیاب آئکن تھیم" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "دستیاب ونڈو تھیم" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "آئکن" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "صر٠آئکن" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "دیگر" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "متن آئکن Ú©Û’ نیچے" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "متن آئکن Ú©Û’ ساتھ" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "صر٠متن" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "اوزار پٹی انداز:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "ونڈو" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Ùونٹ:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_نصب کریں" + +#: ../lxappearance.desktop.in.h:1 +#, fuzzy +msgid "Appearance" +msgstr "مظÛر ترتیبات" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "" + +#~ msgid "Back" +#~ msgstr "پیچھے" + +#~ msgid "Forward" +#~ msgstr "Ø¢Ú¯Û’" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"تجرباتی عنصر 1\n" -"تجرباتی عنصر 2\n" -"تجرباتی عنصر 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"صر٠آئکن\n" -"صر٠متن\n" -"متن آئکن Ú©Û’ نیچے\n" -"متن آئکن Ú©Û’ ساتھ" - -#: ../src/glade-support.c:90 -#: ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "پکس میپ pixmap Ùائل Ù†Ûیں پائی گئی: %s" +#~ msgid "Stop" +#~ msgstr "روکیں" +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "تجرباتی عنصر 1\n" +#~ "تجرباتی عنصر 2\n" +#~ "تجرباتی عنصر 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "پکس میپ pixmap Ùائل Ù†Ûیں پائی گئی: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "صر٠آئکن\n" +#~ "صر٠متن\n" +#~ "متن آئکن Ú©Û’ نیچے\n" +#~ "متن آئکن Ú©Û’ ساتھ" diff -Nru lxappearance-0.3.0~svn20090913/po/ur.po lxappearance-0.4.0/po/ur.po --- lxappearance-0.3.0~svn20090913/po/ur.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/ur.po 2009-12-21 10:17:43.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: lxappearance\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: 2009-05-09 13:01+0500\n" "Last-Translator: Muhammad Ali Makki \n" "Language-Team: Urdu \n" @@ -19,77 +19,11 @@ "X-Poedit-Country: PAKISTAN\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../src/main-dlg-ui.c:70 -#: ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "مظÛر ترتیبات" - -#: ../src/main-dlg-ui.c:90 -#: ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "دستیاب ونڈو تھیم" - -#: ../src/main-dlg-ui.c:110 -#: ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "_Ùونٹ:" - -#: ../src/main-dlg-ui.c:122 -#: ../lxappearance.glade.h:12 -msgid "Window" -msgstr "ونڈو" - -#: ../src/main-dlg-ui.c:130 -#: ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "دستیاب آئکن تھیم" - -#: ../src/main-dlg-ui.c:167 -#: ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "_نصب کریں" - -#: ../src/main-dlg-ui.c:174 -#: ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "آئکن" - -#: ../src/main-dlg-ui.c:187 -#: ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "اوزار پٹی انداز:" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "صر٠آئکن" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "صر٠متن" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "متن آئکن Ú©Û’ نیچے" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "متن آئکن Ú©Û’ ساتھ" - -#: ../src/main-dlg-ui.c:200 -#: ../lxappearance.glade.h:10 -msgid "Other" -msgstr "دیگر" - -#: ../src/main-dlg-ui.c:208 -#: ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "معائنÛ" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "آئکن تھیم منتخب کریں" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (آئکن تھیم)" @@ -101,119 +35,180 @@ msgid "Item" msgstr "عنصر" -#: ../src/demo-ui.c:116 -#: ../demo.glade.h:16 -msgid "_File" -msgstr "_Ùائل" - -#: ../src/demo-ui.c:148 -#: ../demo.glade.h:15 -msgid "_Edit" -msgstr "_تدوین" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "چیک بٹن" -#: ../src/demo-ui.c:171 -#: ../demo.glade.h:17 -msgid "_Help" -msgstr "_Ûدایات" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "ڈیمو" -#: ../src/demo-ui.c:196 -#: ../demo.glade.h:1 -msgid "Back" -msgstr "پیچھے" - -#: ../src/demo-ui.c:202 -#: ../demo.glade.h:4 -msgid "Forward" -msgstr "Ø¢Ú¯Û’" - -#: ../src/demo-ui.c:207 -#: ../demo.glade.h:6 -msgid "Stop" -msgstr "روکیں" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "ریڈیو بٹن" -#: ../src/demo-ui.c:224 -#: ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "ٹیب1" -#: ../src/demo-ui.c:246 -#: ../src/demo-ui.c:252 -#: ../demo.glade.h:5 -msgid "Radio Button" -msgstr "ریڈیو بٹن" - -#: ../src/demo-ui.c:262 -#: ../demo.glade.h:2 -msgid "Check Button" -msgstr "چیک بٹن" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "ٹیب2" -#: ../src/demo-ui.c:271 -#: ../demo.glade.h:3 -msgid "Demo" -msgstr "ڈیمو" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "ٹیب3" -#: ../src/demo-ui.c:316 -#: ../demo.glade.h:18 -msgid "button" -msgstr "بٹن" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "ٹیب4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "تجرباتی عنصر 1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "تجرباتی عنصر 2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "تجرباتی عنصر 3" -#: ../src/demo-ui.c:327 -#: ../demo.glade.h:8 -msgid "Tab2" -msgstr "ٹیب2" - -#: ../src/demo-ui.c:340 -#: ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "منتخب Ú©Ø±Ø¯Û Ùونٹ کا ØªØ¬Ø±Ø¨Û Ú©Ø±Ù†Û’ Ú©Û’ لیے ÛŒÛاں Ú©Ú†Ú¾ الÙاظ لکھیں" -#: ../src/demo-ui.c:342 -#: ../demo.glade.h:9 -msgid "Tab3" -msgstr "ٹیب3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "_تدوین" -#: ../src/demo-ui.c:357 -#: ../demo.glade.h:10 -msgid "Tab4" -msgstr "ٹیب4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "_Ùائل" + +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "_Ûدایات" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "بٹن" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "معائنÛ" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "مظÛر ترتیبات" + +#: ../data/lxappearance.glade.h:3 +#, fuzzy +msgid "Available Cursor Themes" +msgstr "دستیاب آئکن تھیم" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "دستیاب آئکن تھیم" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "دستیاب ونڈو تھیم" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "آئکن" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "صر٠آئکن" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "دیگر" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "متن آئکن Ú©Û’ نیچے" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "متن آئکن Ú©Û’ ساتھ" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "صر٠متن" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "اوزار پٹی انداز:" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "ونڈو" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "_Ùونٹ:" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "_نصب کریں" + +#: ../lxappearance.desktop.in.h:1 +#, fuzzy +msgid "Appearance" +msgstr "مظÛر ترتیبات" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "" + +#~ msgid "Back" +#~ msgstr "پیچھے" + +#~ msgid "Forward" +#~ msgstr "Ø¢Ú¯Û’" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"تجرباتی عنصر 1\n" -"تجرباتی عنصر 2\n" -"تجرباتی عنصر 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"صر٠آئکن\n" -"صر٠متن\n" -"متن آئکن Ú©Û’ نیچے\n" -"متن آئکن Ú©Û’ ساتھ" - -#: ../src/glade-support.c:90 -#: ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "پکس میپ pixmap Ùائل Ù†Ûیں پائی گئی: %s" +#~ msgid "Stop" +#~ msgstr "روکیں" +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "تجرباتی عنصر 1\n" +#~ "تجرباتی عنصر 2\n" +#~ "تجرباتی عنصر 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "پکس میپ pixmap Ùائل Ù†Ûیں پائی گئی: %s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "صر٠آئکن\n" +#~ "صر٠متن\n" +#~ "متن آئکن Ú©Û’ نیچے\n" +#~ "متن آئکن Ú©Û’ ساتھ" diff -Nru lxappearance-0.3.0~svn20090913/po/vi.po lxappearance-0.4.0/po/vi.po --- lxappearance-0.3.0~svn20090913/po/vi.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/vi.po 2009-12-21 10:17:38.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,166 +16,162 @@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" +#: ../src/main-dlg.c:650 +msgid "Select an icon theme" msgstr "" -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" +#: ../src/main-dlg.c:657 +msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "" -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" +#: ../src/demo.c:56 +msgid "Column" msgstr "" -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" +#: ../src/demo.c:65 +msgid "Item" msgstr "" -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" +#: ../data/demo.glade.h:1 +msgid "Check Button" msgstr "" -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" +#: ../data/demo.glade.h:2 +msgid "Demo" msgstr "" -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" +#: ../data/demo.glade.h:3 +msgid "Radio Button" msgstr "" -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " +#: ../data/demo.glade.h:4 +msgid "Tab1" msgstr "" -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" +#: ../data/demo.glade.h:5 +msgid "Tab2" msgstr "" -#: ../src/main-dlg-ui.c:196 -msgid "Text only" +#: ../data/demo.glade.h:6 +msgid "Tab3" msgstr "" -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" +#: ../data/demo.glade.h:7 +msgid "Tab4" msgstr "" -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" +#: ../data/demo.glade.h:8 +msgid "Test Item 1" msgstr "" -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" +#: ../data/demo.glade.h:9 +msgid "Test Item 2" msgstr "" -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" +#: ../data/demo.glade.h:10 +msgid "Test Item 3" msgstr "" -#: ../src/main-dlg.c:620 -msgid "Select an icon theme" +#: ../data/demo.glade.h:11 +msgid "Type some characters here to test currently selected font." msgstr "" -#: ../src/main-dlg.c:627 -msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" +#: ../data/demo.glade.h:12 +msgid "_Edit" msgstr "" -#: ../src/demo.c:56 -msgid "Column" +#: ../data/demo.glade.h:13 +msgid "_File" msgstr "" -#: ../src/demo.c:65 -msgid "Item" +#: ../data/demo.glade.h:14 +msgid "_Help" msgstr "" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" +#: ../data/demo.glade.h:15 +msgid "button" msgstr "" -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" +#: ../data/lxappearance.glade.h:1 +msgid "Preview" msgstr "" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" msgstr "" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" msgstr "" -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" msgstr "" -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" msgstr "" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 -msgid "Tab1" +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" msgstr "" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" msgstr "" -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" msgstr "" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" +#: ../data/lxappearance.glade.h:9 +msgid "Large" msgstr "" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" +#: ../data/lxappearance.glade.h:10 +msgid "Other" msgstr "" -#: ../src/demo-ui.c:323 -msgid "Test Item 1" +#: ../data/lxappearance.glade.h:11 +msgid "Size" msgstr "" -#: ../src/demo-ui.c:324 -msgid "Test Item 2" +#: ../data/lxappearance.glade.h:12 +msgid "Small" msgstr "" -#: ../src/demo-ui.c:325 -msgid "Test Item 3" +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" msgstr "" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" msgstr "" -#: ../src/demo-ui.c:340 ../demo.glade.h:14 -msgid "Type some characters here to test currently selected font." +#: ../data/lxappearance.glade.h:15 +msgid "Text only" msgstr "" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " msgstr "" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" +#: ../data/lxappearance.glade.h:17 +msgid "Window" msgstr "" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" msgstr "" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "Diện mạo" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "Tùy chỉnh màn hình ná»n" diff -Nru lxappearance-0.3.0~svn20090913/po/zh_CN.po lxappearance-0.4.0/po/zh_CN.po --- lxappearance-0.3.0~svn20090913/po/zh_CN.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/zh_CN.po 2009-12-21 10:17:43.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" "PO-Revision-Date: 2008-08-05 15:08+0800\n" "Last-Translator: ideal <05281253@bjtu.edu.cn>\n" "Language-Team: zh_CN \n" @@ -18,67 +18,11 @@ "X-Poedit-Country: CHINA\n" "X-Poedit-SourceCharset: iso-8859-1\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "外观设置" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "å¯ç”¨çš„窗å£ä¸»é¢˜" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "字体(_T)" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "窗å£" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "å¯ç”¨çš„图标主题" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "安装(_I)" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "图标" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "工具æ æ ·å¼ï¼š" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "åªæ˜¾ç¤ºå›¾æ ‡" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "åªæ˜¾ç¤ºæ–‡å­—" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "文字在图标下方" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "文字在图标æ—" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "其他" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "预览" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "选择一个图标主题" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (图标主题)" @@ -90,94 +34,156 @@ msgid "Item" msgstr "项目" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "文件(_F)" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "编辑(_E)" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Check Button" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "帮助(_H)" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "演示" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "上一页" - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "下一页" - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "åœæ­¢" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Radio Button" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "标签1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Radio Button" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Check Button" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "标签2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "演示" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "标签3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "按钮" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "标签4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "测试项目1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "测试项目2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "测试项目3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "标签2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "在此处输入一些字符测试当å‰é€‰æ‹©çš„字体。" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "标签3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "编辑(_E)" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "标签4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "文件(_F)" + +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "帮助(_H)" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "按钮" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "预览" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "外观设置" + +#: ../data/lxappearance.glade.h:3 +#, fuzzy +msgid "Available Cursor Themes" +msgstr "å¯ç”¨çš„图标主题" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "å¯ç”¨çš„图标主题" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "å¯ç”¨çš„窗å£ä¸»é¢˜" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "图标" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "åªæ˜¾ç¤ºå›¾æ ‡" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" msgstr "" -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "其他" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" msgstr "" -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" +#: ../data/lxappearance.glade.h:12 +msgid "Small" msgstr "" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "文字在图标下方" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "文字在图标æ—" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "åªæ˜¾ç¤ºæ–‡å­—" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "工具æ æ ·å¼ï¼š" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "窗å£" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "字体(_T)" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "安装(_I)" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "外观" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "自定义桌é¢å¤–观" + +#~ msgid "Back" +#~ msgstr "上一页" + +#~ msgid "Forward" +#~ msgstr "下一页" + +#~ msgid "Stop" +#~ msgstr "åœæ­¢" diff -Nru lxappearance-0.3.0~svn20090913/po/zh_TW.po lxappearance-0.4.0/po/zh_TW.po --- lxappearance-0.3.0~svn20090913/po/zh_TW.po 2009-09-05 22:29:01.000000000 +0100 +++ lxappearance-0.4.0/po/zh_TW.po 2009-12-21 10:17:43.000000000 +0000 @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-15 19:27+0200\n" -"PO-Revision-Date: 2009-07-26 08:27+0200\n" -"Last-Translator: 羅廷中 \n" +"POT-Creation-Date: 2009-12-20 15:11+0100\n" +"PO-Revision-Date: 2009-12-19 14:33+0800\n" +"Last-Translator: 洪任諭 \n" "Language-Team: zh_TW \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -19,67 +19,11 @@ "X-Poedit-Country: TAIWAN\n" "X-Poedit-SourceCharset: iso-8859-1\n" -#: ../src/main-dlg-ui.c:70 ../lxappearance.glade.h:2 -msgid "Appearance Settings" -msgstr "外觀設定" - -#: ../src/main-dlg-ui.c:90 ../lxappearance.glade.h:4 -msgid "Available Window Themes" -msgstr "å¯ç”¨çš„視窗佈景主題" - -#: ../src/main-dlg-ui.c:110 ../lxappearance.glade.h:13 -msgid "_Font:" -msgstr "å­—åž‹" - -#: ../src/main-dlg-ui.c:122 ../lxappearance.glade.h:12 -msgid "Window" -msgstr "視窗" - -#: ../src/main-dlg-ui.c:130 ../lxappearance.glade.h:3 -msgid "Available Icon Themes" -msgstr "å¯ç”¨çš„圖示佈景主題" - -#: ../src/main-dlg-ui.c:167 ../lxappearance.glade.h:14 -msgid "_Install" -msgstr "安è£(_I)" - -#: ../src/main-dlg-ui.c:174 ../lxappearance.glade.h:5 -msgid "Icon" -msgstr "圖示" - -#: ../src/main-dlg-ui.c:187 ../lxappearance.glade.h:11 -msgid "Toolbar Style: " -msgstr "工具列樣å¼ï¼š" - -#: ../src/main-dlg-ui.c:195 -msgid "Icons only" -msgstr "åªé¡¯ç¤ºåœ–示" - -#: ../src/main-dlg-ui.c:196 -msgid "Text only" -msgstr "åªé¡¯ç¤ºæ–‡å­—" - -#: ../src/main-dlg-ui.c:197 -msgid "Text below icons" -msgstr "文字在圖示下方" - -#: ../src/main-dlg-ui.c:198 -msgid "Text beside icons" -msgstr "文字在圖示æ—" - -#: ../src/main-dlg-ui.c:200 ../lxappearance.glade.h:10 -msgid "Other" -msgstr "其他" - -#: ../src/main-dlg-ui.c:208 ../lxappearance.glade.h:1 -msgid "Preview" -msgstr "é è¦½" - -#: ../src/main-dlg.c:620 +#: ../src/main-dlg.c:650 msgid "Select an icon theme" msgstr "é¸æ“‡ä¸€å€‹åœ–示佈景主題" -#: ../src/main-dlg.c:627 +#: ../src/main-dlg.c:657 msgid "*.tar.gz, *.tar.bz2 (Icon Theme)" msgstr "*.tar.gz, *.tar.bz2 (圖示佈景主題)" @@ -91,104 +35,181 @@ msgid "Item" msgstr "é …ç›®" -#: ../src/demo-ui.c:116 ../demo.glade.h:16 -msgid "_File" -msgstr "檔案(_F)" - -#: ../src/demo-ui.c:148 ../demo.glade.h:15 -msgid "_Edit" -msgstr "編輯(_E)" +#: ../data/demo.glade.h:1 +msgid "Check Button" +msgstr "Check Button" -#: ../src/demo-ui.c:171 ../demo.glade.h:17 -msgid "_Help" -msgstr "說明(_H)" +#: ../data/demo.glade.h:2 +msgid "Demo" +msgstr "展示" -#: ../src/demo-ui.c:196 ../demo.glade.h:1 -msgid "Back" -msgstr "上一é " - -#: ../src/demo-ui.c:202 ../demo.glade.h:4 -msgid "Forward" -msgstr "下一é " - -#: ../src/demo-ui.c:207 ../demo.glade.h:6 -msgid "Stop" -msgstr "åœæ­¢" +#: ../data/demo.glade.h:3 +msgid "Radio Button" +msgstr "Radio Button" -#: ../src/demo-ui.c:224 ../demo.glade.h:7 +#: ../data/demo.glade.h:4 msgid "Tab1" msgstr "分é 1" -#: ../src/demo-ui.c:246 ../src/demo-ui.c:252 ../demo.glade.h:5 -msgid "Radio Button" -msgstr "Radio Button" - -#: ../src/demo-ui.c:262 ../demo.glade.h:2 -msgid "Check Button" -msgstr "Check Button" +#: ../data/demo.glade.h:5 +msgid "Tab2" +msgstr "分é 2" -#: ../src/demo-ui.c:271 ../demo.glade.h:3 -msgid "Demo" -msgstr "展示" +#: ../data/demo.glade.h:6 +msgid "Tab3" +msgstr "分é 3" -#: ../src/demo-ui.c:316 ../demo.glade.h:18 -msgid "button" -msgstr "按鈕" +#: ../data/demo.glade.h:7 +msgid "Tab4" +msgstr "分é 4" -#: ../src/demo-ui.c:323 +#: ../data/demo.glade.h:8 msgid "Test Item 1" msgstr "測試項目1" -#: ../src/demo-ui.c:324 +#: ../data/demo.glade.h:9 msgid "Test Item 2" msgstr "測試項目2" -#: ../src/demo-ui.c:325 +#: ../data/demo.glade.h:10 msgid "Test Item 3" msgstr "測試項目3" -#: ../src/demo-ui.c:327 ../demo.glade.h:8 -msgid "Tab2" -msgstr "分é 2" - -#: ../src/demo-ui.c:340 ../demo.glade.h:14 +#: ../data/demo.glade.h:11 msgid "Type some characters here to test currently selected font." msgstr "在這裡打一些字測試目å‰é¸æ“‡çš„å­—åž‹" -#: ../src/demo-ui.c:342 ../demo.glade.h:9 -msgid "Tab3" -msgstr "分é 3" +#: ../data/demo.glade.h:12 +msgid "_Edit" +msgstr "編輯(_E)" -#: ../src/demo-ui.c:357 ../demo.glade.h:10 -msgid "Tab4" -msgstr "分é 4" +#: ../data/demo.glade.h:13 +msgid "_File" +msgstr "檔案(_F)" -#: ../demo.glade.h:11 -msgid "" -"Test Item 1\n" -"Test Item 2\n" -"Test Item 3" -msgstr "" -"測試項目 1\n" -"測試項目 2\n" -"測試項目 3" - -#: ../lxappearance.glade.h:6 -msgid "" -"Icons only\n" -"Text only\n" -"Text below icons\n" -"Text beside icons" -msgstr "" -"åªæœ‰å°åœ–示\n" -"åªæœ‰æ–‡å­—\n" -"文字在圖示之下\n" -"文字在圖示中間" - -#: ../src/glade-support.c:90 ../src/glade-support.c:114 -#, c-format -msgid "Couldn't find pixmap file: %s" -msgstr "沒發ç¾pixmap 檔:%s" +#: ../data/demo.glade.h:14 +msgid "_Help" +msgstr "說明(_H)" + +#: ../data/demo.glade.h:15 +msgid "button" +msgstr "按鈕" + +#: ../data/lxappearance.glade.h:1 +msgid "Preview" +msgstr "é è¦½" + +#: ../data/lxappearance.glade.h:2 +msgid "Appearance Settings" +msgstr "外觀設定" + +#: ../data/lxappearance.glade.h:3 +msgid "Available Cursor Themes" +msgstr "å¯ç”¨çš„滑鼠游標佈景主題" + +#: ../data/lxappearance.glade.h:4 +msgid "Available Icon Themes" +msgstr "å¯ç”¨çš„圖示佈景主題" + +#: ../data/lxappearance.glade.h:5 +msgid "Available Window Themes" +msgstr "å¯ç”¨çš„視窗佈景主題" + +#: ../data/lxappearance.glade.h:6 +msgid "Cursor" +msgstr "游標" + +#: ../data/lxappearance.glade.h:7 +msgid "Icon" +msgstr "圖示" + +#: ../data/lxappearance.glade.h:8 +msgid "Icons only" +msgstr "åªé¡¯ç¤ºåœ–示" + +#: ../data/lxappearance.glade.h:9 +msgid "Large" +msgstr "大" + +#: ../data/lxappearance.glade.h:10 +msgid "Other" +msgstr "其他" + +#: ../data/lxappearance.glade.h:11 +msgid "Size" +msgstr "大å°" + +#: ../data/lxappearance.glade.h:12 +msgid "Small" +msgstr "å°" + +#: ../data/lxappearance.glade.h:13 +msgid "Text below icons" +msgstr "文字在圖示下方" + +#: ../data/lxappearance.glade.h:14 +msgid "Text beside icons" +msgstr "文字在圖示æ—" + +#: ../data/lxappearance.glade.h:15 +msgid "Text only" +msgstr "åªé¡¯ç¤ºæ–‡å­—" + +#: ../data/lxappearance.glade.h:16 +msgid "Toolbar Style: " +msgstr "工具列樣å¼ï¼š" + +#: ../data/lxappearance.glade.h:17 +msgid "Window" +msgstr "視窗" + +#: ../data/lxappearance.glade.h:18 +msgid "_Font:" +msgstr "å­—åž‹" + +#: ../data/lxappearance.glade.h:19 +msgid "_Install" +msgstr "安è£(_I)" + +#: ../lxappearance.desktop.in.h:1 +msgid "Appearance" +msgstr "外觀設定" + +#: ../lxappearance.desktop.in.h:2 +msgid "Customize the look of the desktop" +msgstr "自訂桌é¢å¤–觀" + +#~ msgid "Back" +#~ msgstr "上一é " + +#~ msgid "Forward" +#~ msgstr "下一é " + +#~ msgid "Stop" +#~ msgstr "åœæ­¢" + +#~ msgid "" +#~ "Test Item 1\n" +#~ "Test Item 2\n" +#~ "Test Item 3" +#~ msgstr "" +#~ "測試項目 1\n" +#~ "測試項目 2\n" +#~ "測試項目 3" + +#~ msgid "Couldn't find pixmap file: %s" +#~ msgstr "沒發ç¾pixmap 檔:%s" + +#~ msgid "" +#~ "Icons only\n" +#~ "Text only\n" +#~ "Text below icons\n" +#~ "Text beside icons" +#~ msgstr "" +#~ "åªæœ‰å°åœ–示\n" +#~ "åªæœ‰æ–‡å­—\n" +#~ "文字在圖示之下\n" +#~ "文字在圖示中間" #~ msgid "Available Fonts" #~ msgstr "å¯ç”¨çš„å­—åž‹" diff -Nru lxappearance-0.3.0~svn20090913/src/demo.c lxappearance-0.4.0/src/demo.c --- lxappearance-0.3.0~svn20090913/src/demo.c 2009-09-05 22:28:59.000000000 +0100 +++ lxappearance-0.4.0/src/demo.c 2009-12-20 12:31:38.000000000 +0000 @@ -3,10 +3,8 @@ #endif #include - +#include #include "demo.h" -#include "demo-ui.h" -#include "glade-support.h" extern gboolean under_lxsession; /* wether lxsession-xsettings daemon is active */ @@ -15,14 +13,16 @@ static void load_demo_icons() { static const char* icon_names[]={ - "gnome-fs-home", - "gnome-fs-desktop", - "gnome-fs-directory", - "gnome-fs-trash-empty", - "gnome-fs-regular", - "gnome-fs-executable", - "gnome-mime-image", - "gnome-mime-text" + "user-home", + "user-desktop", + "folder", + "folder-remote", + "user-trash", + "x-office-document", + "application-x-executable", + "image-x-generic", + "text-x-generic", + "text-html" }; int i; @@ -72,23 +72,24 @@ void show_demo( GdkNativeWindow wid ) { - GtkWidget* demo = create_demo_window(); + GtkBuilder* builder = gtk_builder_new(); + GtkWidget* demo; GtkWidget* plug; GtkWidget* top_vbox; GtkToolbarStyle tb_style; GtkWidget* tree_view; + gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "/lxappearance/demo.ui", NULL); + demo = (GtkWidget*)gtk_builder_get_object(builder, "demo"); + g_object_get( gtk_settings_get_default(), "gtk-toolbar-style", &tb_style, NULL ); - gtk_toolbar_set_style (GTK_TOOLBAR (lookup_widget(demo, "toolbar")), tb_style ); + gtk_toolbar_set_style (GTK_TOOLBAR (gtk_builder_get_object(builder, "toolbar")), tb_style ); - icon_view = GTK_ICON_VIEW( lookup_widget( demo, "icon_view" ) ); - tree_view = lookup_widget( demo, "demo_treeview" ); + icon_view = GTK_ICON_VIEW( gtk_builder_get_object(builder, "icon_view" ) ); + tree_view = (GtkWidget*)gtk_builder_get_object(builder, "demo_treeview" ); gtk_icon_view_set_pixbuf_column( icon_view, 0 ); gtk_icon_view_set_text_column( icon_view, 1 ); - gtk_icon_view_set_item_width( icon_view, 64 ); - gtk_icon_view_set_column_spacing( icon_view, 8 ); - gtk_icon_view_set_row_spacing( icon_view, 8 ); load_demo_icons(); load_demo_tree_view( (GtkTreeView*)tree_view ); @@ -110,4 +111,5 @@ gtk_container_add( (GtkContainer*)plug, demo ); gtk_widget_show( plug ); } + g_object_unref(builder); } diff -Nru lxappearance-0.3.0~svn20090913/src/demo-ui.c lxappearance-0.4.0/src/demo-ui.c --- lxappearance-0.3.0~svn20090913/src/demo-ui.c 2009-09-05 22:28:59.000000000 +0100 +++ lxappearance-0.4.0/src/demo-ui.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,442 +0,0 @@ -/* - * DO NOT EDIT THIS FILE - it is generated by Glade. - */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include -#include - -#include -#include - -#include "demo.h" -#include "demo-ui.h" -#include "glade-support.h" - -#define GLADE_HOOKUP_OBJECT(component,widget,name) \ - g_object_set_data_full (G_OBJECT (component), name, \ - gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref) - -#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \ - g_object_set_data (G_OBJECT (component), name, widget) - -GtkWidget* -create_demo_window (void) -{ - GtkWidget *demo_window; - GtkWidget *top_vbox; - GtkWidget *menubar1; - GtkWidget *menuitem1; - GtkWidget *menuitem1_menu; - GtkWidget *new1; - GtkWidget *open1; - GtkWidget *save1; - GtkWidget *save_as1; - GtkWidget *separatormenuitem1; - GtkWidget *quit1; - GtkWidget *menuitem2; - GtkWidget *menuitem2_menu; - GtkWidget *cut1; - GtkWidget *copy1; - GtkWidget *paste1; - GtkWidget *delete1; - GtkWidget *menuitem4; - GtkWidget *menuitem4_menu; - GtkWidget *about1; - GtkWidget *handlebox1; - GtkWidget *toolbar; - GtkIconSize tmp_toolbar_icon_size; - GtkWidget *toolbutton1; - GtkWidget *toolbutton2; - GtkWidget *toolbutton3; - GtkWidget *notebook2; - GtkWidget *scrolledwindow4; - GtkWidget *icon_view; - GtkWidget *label12; - GtkWidget *hbox2; - GtkWidget *frame2; - GtkWidget *alignment2; - GtkWidget *vbox6; - GtkWidget *radiobutton1; - GSList *radiobutton1_group = NULL; - GtkWidget *radiobutton2; - GtkWidget *hseparator1; - GtkWidget *checkbutton1; - GtkWidget *entry1; - GtkWidget *label16; - GtkWidget *vbox7; - GtkWidget *progressbar1; - GtkWidget *hscale1; - GtkWidget *hbox3; - GtkObject *spinbutton1_adj; - GtkWidget *spinbutton1; - GtkWidget *button1; - GtkWidget *alignment3; - GtkWidget *hbox4; - GtkWidget *image1; - GtkWidget *label18; - GtkWidget *combobox2; - GtkWidget *label13; - GtkWidget *scrolledwindow5; - GtkWidget *text_view; - GtkWidget *label14; - GtkWidget *scrolledwindow6; - GtkWidget *demo_treeview; - GtkWidget *label17; - GtkWidget *statusbar1; - GtkAccelGroup *accel_group; - GtkTooltips *tooltips; - - tooltips = gtk_tooltips_new (); - - accel_group = gtk_accel_group_new (); -/* - demo_window = gtk_window_new (GTK_WINDOW_POPUP); - gtk_widget_set_events (demo_window, GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK); - gtk_window_set_decorated (GTK_WINDOW (demo_window), FALSE); -*/ - top_vbox = gtk_vbox_new (FALSE, 0); - gtk_widget_show (top_vbox); - demo_window = top_vbox; - -/* - gtk_container_add (GTK_CONTAINER (demo_window), top_vbox); -*/ - - menubar1 = gtk_menu_bar_new (); - gtk_widget_show (menubar1); - gtk_box_pack_start (GTK_BOX (top_vbox), menubar1, FALSE, FALSE, 0); - - menuitem1 = gtk_menu_item_new_with_mnemonic (_("_File")); - gtk_widget_show (menuitem1); - gtk_container_add (GTK_CONTAINER (menubar1), menuitem1); - - menuitem1_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem1), menuitem1_menu); - - new1 = gtk_image_menu_item_new_from_stock ("gtk-new", accel_group); - gtk_widget_show (new1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), new1); - - open1 = gtk_image_menu_item_new_from_stock ("gtk-open", accel_group); - gtk_widget_show (open1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), open1); - - save1 = gtk_image_menu_item_new_from_stock ("gtk-save", accel_group); - gtk_widget_show (save1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), save1); - - save_as1 = gtk_image_menu_item_new_from_stock ("gtk-save-as", accel_group); - gtk_widget_show (save_as1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), save_as1); - - separatormenuitem1 = gtk_separator_menu_item_new (); - gtk_widget_show (separatormenuitem1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), separatormenuitem1); - gtk_widget_set_sensitive (separatormenuitem1, FALSE); - - quit1 = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group); - gtk_widget_show (quit1); - gtk_container_add (GTK_CONTAINER (menuitem1_menu), quit1); - - menuitem2 = gtk_menu_item_new_with_mnemonic (_("_Edit")); - gtk_widget_show (menuitem2); - gtk_container_add (GTK_CONTAINER (menubar1), menuitem2); - - menuitem2_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem2), menuitem2_menu); - - cut1 = gtk_image_menu_item_new_from_stock ("gtk-cut", accel_group); - gtk_widget_show (cut1); - gtk_container_add (GTK_CONTAINER (menuitem2_menu), cut1); - - copy1 = gtk_image_menu_item_new_from_stock ("gtk-copy", accel_group); - gtk_widget_show (copy1); - gtk_container_add (GTK_CONTAINER (menuitem2_menu), copy1); - - paste1 = gtk_image_menu_item_new_from_stock ("gtk-paste", accel_group); - gtk_widget_show (paste1); - gtk_container_add (GTK_CONTAINER (menuitem2_menu), paste1); - - delete1 = gtk_image_menu_item_new_from_stock ("gtk-delete", accel_group); - gtk_widget_show (delete1); - gtk_container_add (GTK_CONTAINER (menuitem2_menu), delete1); - - menuitem4 = gtk_menu_item_new_with_mnemonic (_("_Help")); - gtk_widget_show (menuitem4); - gtk_container_add (GTK_CONTAINER (menubar1), menuitem4); - - menuitem4_menu = gtk_menu_new (); - gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem4), menuitem4_menu); - - about1 = gtk_image_menu_item_new_from_stock ("gtk-about", accel_group); - gtk_widget_show (about1); - gtk_container_add (GTK_CONTAINER (menuitem4_menu), about1); - - handlebox1 = gtk_handle_box_new (); - gtk_widget_show (handlebox1); - gtk_box_pack_start (GTK_BOX (top_vbox), handlebox1, FALSE, FALSE, 0); - - toolbar = gtk_toolbar_new (); - gtk_widget_show (toolbar); - gtk_container_add (GTK_CONTAINER (handlebox1), toolbar); - gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_BOTH); - gtk_toolbar_set_show_arrow (GTK_TOOLBAR (toolbar), FALSE); - tmp_toolbar_icon_size = gtk_toolbar_get_icon_size (GTK_TOOLBAR (toolbar)); - - toolbutton1 = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-go-back"); - gtk_widget_show (toolbutton1); - gtk_container_add (GTK_CONTAINER (toolbar), toolbutton1); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolbutton1), tooltips, _("Back"), NULL); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (toolbutton1), TRUE); - - toolbutton2 = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-go-forward"); - gtk_widget_show (toolbutton2); - gtk_container_add (GTK_CONTAINER (toolbar), toolbutton2); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolbutton2), tooltips, _("Forward"), NULL); - - toolbutton3 = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-stop"); - gtk_widget_show (toolbutton3); - gtk_container_add (GTK_CONTAINER (toolbar), toolbutton3); - gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (toolbutton3), tooltips, _("Stop"), NULL); - gtk_tool_item_set_is_important (GTK_TOOL_ITEM (toolbutton3), TRUE); - - notebook2 = gtk_notebook_new (); - gtk_widget_show (notebook2); - gtk_box_pack_start (GTK_BOX (top_vbox), notebook2, TRUE, TRUE, 0); - - scrolledwindow4 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow4); - gtk_container_add (GTK_CONTAINER (notebook2), scrolledwindow4); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow4), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow4), GTK_SHADOW_IN); - - icon_view = gtk_icon_view_new (); - gtk_widget_show (icon_view); - gtk_container_add (GTK_CONTAINER (scrolledwindow4), icon_view); - - label12 = gtk_label_new (_("Tab1")); - gtk_widget_show (label12); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 0), label12); - - hbox2 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox2); - gtk_container_add (GTK_CONTAINER (notebook2), hbox2); - - frame2 = gtk_frame_new (NULL); - gtk_widget_show (frame2); - gtk_box_pack_start (GTK_BOX (hbox2), frame2, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame2), 4); - - alignment2 = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment2); - gtk_container_add (GTK_CONTAINER (frame2), alignment2); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment2), 0, 4, 4, 0); - - vbox6 = gtk_vbox_new (FALSE, 4); - gtk_widget_show (vbox6); - gtk_container_add (GTK_CONTAINER (alignment2), vbox6); - - radiobutton1 = gtk_radio_button_new_with_mnemonic (NULL, _("Radio Button")); - gtk_widget_show (radiobutton1); - gtk_box_pack_start (GTK_BOX (vbox6), radiobutton1, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton1), radiobutton1_group); - radiobutton1_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton1)); - - radiobutton2 = gtk_radio_button_new_with_mnemonic (NULL, _("Radio Button")); - gtk_widget_show (radiobutton2); - gtk_box_pack_start (GTK_BOX (vbox6), radiobutton2, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiobutton2), radiobutton1_group); - radiobutton1_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiobutton2)); - - hseparator1 = gtk_hseparator_new (); - gtk_widget_show (hseparator1); - gtk_box_pack_start (GTK_BOX (vbox6), hseparator1, FALSE, TRUE, 0); - - checkbutton1 = gtk_check_button_new_with_mnemonic (_("Check Button")); - gtk_widget_show (checkbutton1); - gtk_box_pack_start (GTK_BOX (vbox6), checkbutton1, FALSE, FALSE, 0); - - entry1 = gtk_entry_new (); - gtk_widget_show (entry1); - gtk_box_pack_start (GTK_BOX (vbox6), entry1, FALSE, FALSE, 0); - gtk_entry_set_invisible_char (GTK_ENTRY (entry1), 9679); - - label16 = gtk_label_new (_("Demo")); - gtk_widget_show (label16); - gtk_frame_set_label_widget (GTK_FRAME (frame2), label16); - gtk_label_set_use_markup (GTK_LABEL (label16), TRUE); - - vbox7 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox7); - gtk_box_pack_start (GTK_BOX (hbox2), vbox7, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (vbox7), 4); - - progressbar1 = gtk_progress_bar_new (); - gtk_widget_show (progressbar1); - gtk_box_pack_start (GTK_BOX (vbox7), progressbar1, FALSE, FALSE, 0); - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (progressbar1), 0.6); - gtk_progress_bar_set_text (GTK_PROGRESS_BAR (progressbar1), "60 %"); - - hscale1 = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 100, 10, 0, 0))); - gtk_widget_show (hscale1); - gtk_box_pack_start (GTK_BOX (vbox7), hscale1, FALSE, TRUE, 0); - - hbox3 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox3); - gtk_box_pack_start (GTK_BOX (vbox7), hbox3, FALSE, TRUE, 0); - - spinbutton1_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); - spinbutton1 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton1_adj), 1, 0); - gtk_widget_show (spinbutton1); - gtk_box_pack_start (GTK_BOX (hbox3), spinbutton1, TRUE, TRUE, 0); - - button1 = gtk_button_new (); - gtk_widget_show (button1); - gtk_box_pack_start (GTK_BOX (hbox3), button1, FALSE, FALSE, 0); - - alignment3 = gtk_alignment_new (0.5, 0.5, 0, 0); - gtk_widget_show (alignment3); - gtk_container_add (GTK_CONTAINER (button1), alignment3); - - hbox4 = gtk_hbox_new (FALSE, 2); - gtk_widget_show (hbox4); - gtk_container_add (GTK_CONTAINER (alignment3), hbox4); - - image1 = gtk_image_new_from_stock ("gtk-find", GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image1); - gtk_box_pack_start (GTK_BOX (hbox4), image1, FALSE, FALSE, 0); - - label18 = gtk_label_new_with_mnemonic (_("button")); - gtk_widget_show (label18); - gtk_box_pack_start (GTK_BOX (hbox4), label18, FALSE, FALSE, 0); - - combobox2 = gtk_combo_box_new_text (); - gtk_widget_show (combobox2); - gtk_box_pack_start (GTK_BOX (vbox7), combobox2, FALSE, TRUE, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (combobox2), _("Test Item 1")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combobox2), _("Test Item 2")); - gtk_combo_box_append_text (GTK_COMBO_BOX (combobox2), _("Test Item 3")); - - label13 = gtk_label_new (_("Tab2")); - gtk_widget_show (label13); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 1), label13); - - scrolledwindow5 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow5); - gtk_container_add (GTK_CONTAINER (notebook2), scrolledwindow5); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow5), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow5), GTK_SHADOW_IN); - - text_view = gtk_text_view_new (); - gtk_widget_show (text_view); - gtk_container_add (GTK_CONTAINER (scrolledwindow5), text_view); - gtk_text_buffer_set_text (gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)), _("Type some characters here to test currently selected font."), -1); - - label14 = gtk_label_new (_("Tab3")); - gtk_widget_show (label14); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 2), label14); - - scrolledwindow6 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow6); - gtk_container_add (GTK_CONTAINER (notebook2), scrolledwindow6); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow6), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow6), GTK_SHADOW_IN); - - demo_treeview = gtk_tree_view_new (); - gtk_widget_show (demo_treeview); - gtk_container_add (GTK_CONTAINER (scrolledwindow6), demo_treeview); - gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (demo_treeview), TRUE); - - label17 = gtk_label_new (_("Tab4")); - gtk_widget_show (label17); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook2), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook2), 3), label17); - - statusbar1 = gtk_statusbar_new (); - gtk_widget_show (statusbar1); - gtk_box_pack_start (GTK_BOX (top_vbox), statusbar1, FALSE, FALSE, 0); - - g_signal_connect ((gpointer) top_vbox, "destroy", - G_CALLBACK (gtk_main_quit), - NULL); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - -/* - GLADE_HOOKUP_OBJECT_NO_REF (demo_window, demo_window, "demo_window"); - GLADE_HOOKUP_OBJECT (demo_window, top_vbox, "top_vbox"); - GLADE_HOOKUP_OBJECT (demo_window, menubar1, "menubar1"); - GLADE_HOOKUP_OBJECT (demo_window, menuitem1, "menuitem1"); - GLADE_HOOKUP_OBJECT (demo_window, menuitem1_menu, "menuitem1_menu"); - GLADE_HOOKUP_OBJECT (demo_window, new1, "new1"); - GLADE_HOOKUP_OBJECT (demo_window, open1, "open1"); - GLADE_HOOKUP_OBJECT (demo_window, save1, "save1"); - GLADE_HOOKUP_OBJECT (demo_window, save_as1, "save_as1"); - GLADE_HOOKUP_OBJECT (demo_window, separatormenuitem1, "separatormenuitem1"); - GLADE_HOOKUP_OBJECT (demo_window, quit1, "quit1"); - GLADE_HOOKUP_OBJECT (demo_window, menuitem2, "menuitem2"); - GLADE_HOOKUP_OBJECT (demo_window, menuitem2_menu, "menuitem2_menu"); - GLADE_HOOKUP_OBJECT (demo_window, cut1, "cut1"); - GLADE_HOOKUP_OBJECT (demo_window, copy1, "copy1"); - GLADE_HOOKUP_OBJECT (demo_window, paste1, "paste1"); - GLADE_HOOKUP_OBJECT (demo_window, delete1, "delete1"); - GLADE_HOOKUP_OBJECT (demo_window, menuitem4, "menuitem4"); - GLADE_HOOKUP_OBJECT (demo_window, menuitem4_menu, "menuitem4_menu"); - GLADE_HOOKUP_OBJECT (demo_window, about1, "about1"); - GLADE_HOOKUP_OBJECT (demo_window, handlebox1, "handlebox1"); -*/ - GLADE_HOOKUP_OBJECT (demo_window, toolbar, "toolbar"); -/* - GLADE_HOOKUP_OBJECT (demo_window, toolbutton1, "toolbutton1"); - GLADE_HOOKUP_OBJECT (demo_window, toolbutton2, "toolbutton2"); - GLADE_HOOKUP_OBJECT (demo_window, toolbutton3, "toolbutton3"); - GLADE_HOOKUP_OBJECT (demo_window, notebook2, "notebook2"); - GLADE_HOOKUP_OBJECT (demo_window, scrolledwindow4, "scrolledwindow4"); -*/ - GLADE_HOOKUP_OBJECT (demo_window, icon_view, "icon_view"); -/* - GLADE_HOOKUP_OBJECT (demo_window, label12, "label12"); - GLADE_HOOKUP_OBJECT (demo_window, hbox2, "hbox2"); - GLADE_HOOKUP_OBJECT (demo_window, frame2, "frame2"); - GLADE_HOOKUP_OBJECT (demo_window, alignment2, "alignment2"); - GLADE_HOOKUP_OBJECT (demo_window, vbox6, "vbox6"); - GLADE_HOOKUP_OBJECT (demo_window, radiobutton1, "radiobutton1"); - GLADE_HOOKUP_OBJECT (demo_window, radiobutton2, "radiobutton2"); - GLADE_HOOKUP_OBJECT (demo_window, hseparator1, "hseparator1"); - GLADE_HOOKUP_OBJECT (demo_window, checkbutton1, "checkbutton1"); - GLADE_HOOKUP_OBJECT (demo_window, entry1, "entry1"); - GLADE_HOOKUP_OBJECT (demo_window, label16, "label16"); - GLADE_HOOKUP_OBJECT (demo_window, vbox7, "vbox7"); - GLADE_HOOKUP_OBJECT (demo_window, progressbar1, "progressbar1"); - GLADE_HOOKUP_OBJECT (demo_window, hscale1, "hscale1"); - GLADE_HOOKUP_OBJECT (demo_window, hbox3, "hbox3"); - GLADE_HOOKUP_OBJECT (demo_window, spinbutton1, "spinbutton1"); - GLADE_HOOKUP_OBJECT (demo_window, button1, "button1"); - GLADE_HOOKUP_OBJECT (demo_window, alignment3, "alignment3"); - GLADE_HOOKUP_OBJECT (demo_window, hbox4, "hbox4"); - GLADE_HOOKUP_OBJECT (demo_window, image1, "image1"); - GLADE_HOOKUP_OBJECT (demo_window, label18, "label18"); - GLADE_HOOKUP_OBJECT (demo_window, combobox2, "combobox2"); - GLADE_HOOKUP_OBJECT (demo_window, label13, "label13"); - GLADE_HOOKUP_OBJECT (demo_window, scrolledwindow5, "scrolledwindow5"); - GLADE_HOOKUP_OBJECT (demo_window, text_view, "text_view"); - GLADE_HOOKUP_OBJECT (demo_window, label14, "label14"); - GLADE_HOOKUP_OBJECT (demo_window, scrolledwindow6, "scrolledwindow6"); -*/ - GLADE_HOOKUP_OBJECT (demo_window, demo_treeview, "demo_treeview"); -/* - GLADE_HOOKUP_OBJECT (demo_window, label17, "label17"); - GLADE_HOOKUP_OBJECT (demo_window, statusbar1, "statusbar1"); - GLADE_HOOKUP_OBJECT_NO_REF (demo_window, tooltips, "tooltips"); - - gtk_window_add_accel_group (GTK_WINDOW (demo_window), accel_group); -*/ - return demo_window; -} - diff -Nru lxappearance-0.3.0~svn20090913/src/demo-ui.h lxappearance-0.4.0/src/demo-ui.h --- lxappearance-0.3.0~svn20090913/src/demo-ui.h 2009-09-05 22:28:59.000000000 +0100 +++ lxappearance-0.4.0/src/demo-ui.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -/* - * DO NOT EDIT THIS FILE - it is generated by Glade. - */ - -GtkWidget* create_demo_window (void); diff -Nru lxappearance-0.3.0~svn20090913/src/glade-support.c lxappearance-0.4.0/src/glade-support.c --- lxappearance-0.3.0~svn20090913/src/glade-support.c 2009-09-05 22:28:59.000000000 +0100 +++ lxappearance-0.4.0/src/glade-support.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,144 +0,0 @@ -/* - * DO NOT EDIT THIS FILE - it is generated by Glade. - */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include -#include - -#include - -#include "glade-support.h" - -GtkWidget* -lookup_widget (GtkWidget *widget, - const gchar *widget_name) -{ - GtkWidget *parent, *found_widget; - - for (;;) - { - if (GTK_IS_MENU (widget)) - parent = gtk_menu_get_attach_widget (GTK_MENU (widget)); - else - parent = widget->parent; - if (!parent) - parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey"); - if (parent == NULL) - break; - widget = parent; - } - - found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget), - widget_name); - if (!found_widget) - g_warning ("Widget not found: %s", widget_name); - return found_widget; -} - -static GList *pixmaps_directories = NULL; - -/* Use this function to set the directory containing installed pixmaps. */ -void -add_pixmap_directory (const gchar *directory) -{ - pixmaps_directories = g_list_prepend (pixmaps_directories, - g_strdup (directory)); -} - -/* This is an internally used function to find pixmap files. */ -static gchar* -find_pixmap_file (const gchar *filename) -{ - GList *elem; - - /* We step through each of the pixmaps directory to find it. */ - elem = pixmaps_directories; - while (elem) - { - gchar *pathname = g_strdup_printf ("%s%s%s", (gchar*)elem->data, - G_DIR_SEPARATOR_S, filename); - if (g_file_test (pathname, G_FILE_TEST_EXISTS)) - return pathname; - g_free (pathname); - elem = elem->next; - } - return NULL; -} - -/* This is an internally used function to create pixmaps. */ -GtkWidget* -create_pixmap (GtkWidget *widget, - const gchar *filename) -{ - gchar *pathname = NULL; - GtkWidget *pixmap; - - if (!filename || !filename[0]) - return gtk_image_new (); - - pathname = find_pixmap_file (filename); - - if (!pathname) - { - g_warning (_("Couldn't find pixmap file: %s"), filename); - return gtk_image_new (); - } - - pixmap = gtk_image_new_from_file (pathname); - g_free (pathname); - return pixmap; -} - -/* This is an internally used function to create pixmaps. */ -GdkPixbuf* -create_pixbuf (const gchar *filename) -{ - gchar *pathname = NULL; - GdkPixbuf *pixbuf; - GError *error = NULL; - - if (!filename || !filename[0]) - return NULL; - - pathname = find_pixmap_file (filename); - - if (!pathname) - { - g_warning (_("Couldn't find pixmap file: %s"), filename); - return NULL; - } - - pixbuf = gdk_pixbuf_new_from_file (pathname, &error); - if (!pixbuf) - { - fprintf (stderr, "Failed to load pixbuf file: %s: %s\n", - pathname, error->message); - g_error_free (error); - } - g_free (pathname); - return pixbuf; -} - -/* This is used to set ATK action descriptions. */ -void -glade_set_atk_action_description (AtkAction *action, - const gchar *action_name, - const gchar *description) -{ - gint n_actions, i; - - n_actions = atk_action_get_n_actions (action); - for (i = 0; i < n_actions; i++) - { - if (!strcmp (atk_action_get_name (action, i), action_name)) - atk_action_set_description (action, i, description); - } -} - diff -Nru lxappearance-0.3.0~svn20090913/src/glade-support.h lxappearance-0.4.0/src/glade-support.h --- lxappearance-0.3.0~svn20090913/src/glade-support.h 2009-09-05 22:28:59.000000000 +0100 +++ lxappearance-0.4.0/src/glade-support.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,69 +0,0 @@ -/* - * DO NOT EDIT THIS FILE - it is generated by Glade. - */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -/* - * Standard gettext macros. - */ -#ifdef ENABLE_NLS -# include -# undef _ -# define _(String) dgettext (PACKAGE, String) -# define Q_(String) g_strip_context ((String), gettext (String)) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define Q_(String) g_strip_context ((String), (String)) -# define N_(String) (String) -#endif - - -/* - * Public Functions. - */ - -/* - * This function returns a widget in a component created by Glade. - * Call it with the toplevel widget in the component (i.e. a window/dialog), - * or alternatively any widget in the component, and the name of the widget - * you want returned. - */ -GtkWidget* lookup_widget (GtkWidget *widget, - const gchar *widget_name); - - -/* Use this function to set the directory containing installed pixmaps. */ -void add_pixmap_directory (const gchar *directory); - - -/* - * Private Functions. - */ - -/* This is used to create the pixmaps used in the interface. */ -GtkWidget* create_pixmap (GtkWidget *widget, - const gchar *filename); - -/* This is used to create the pixbufs used in the interface. */ -GdkPixbuf* create_pixbuf (const gchar *filename); - -/* This is used to set ATK action descriptions. */ -void glade_set_atk_action_description (AtkAction *action, - const gchar *action_name, - const gchar *description); - diff -Nru lxappearance-0.3.0~svn20090913/src/main.c lxappearance-0.4.0/src/main.c --- lxappearance-0.3.0~svn20090913/src/main.c 2009-09-05 22:28:59.000000000 +0100 +++ lxappearance-0.4.0/src/main.c 2009-12-19 11:05:54.000000000 +0000 @@ -7,18 +7,20 @@ # include #endif +#include + #include #include #include +#include #include #include #include #include -#include "main-dlg-ui.h" +#include "main-dlg.h" #include "demo.h" -#include "glade-support.h" char tmp_rc_file[] = "/tmp/gtkrc-2.0-XXXXXX"; GtkWidget* main_dlg = NULL; @@ -76,9 +78,8 @@ /* Dirty hack: "gtk-toolbar-style" is installed in class_init of GtkToolbar */ gtk_widget_destroy( gtk_toolbar_new() ); - main_dlg = create_dlg (); - main_dlg_init( main_dlg ); - gtk_window_set_icon_name( (GtkWindow*)main_dlg, GTK_STOCK_PREFERENCES ); + main_dlg = main_dlg_new(); + gtk_window_set_icon_name( (GtkWindow*)main_dlg, "preferences-desktop-theme" ); gtk_main (); diff -Nru lxappearance-0.3.0~svn20090913/src/main-dlg.c lxappearance-0.4.0/src/main-dlg.c --- lxappearance-0.3.0~svn20090913/src/main-dlg.c 2009-09-05 22:28:59.000000000 +0100 +++ lxappearance-0.4.0/src/main-dlg.c 2009-12-20 12:31:38.000000000 +0000 @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -16,8 +17,7 @@ #include #include "main-dlg.h" -#include "main-dlg-ui.h" -#include "glade-support.h" +#include "demo.h" enum { COL_DISP_NAME, @@ -25,7 +25,8 @@ N_COLS }; -#define GET_WIDGET_WITH_TYPE(name, type) name = type( lookup_widget( dlg, #name )) +#define LOOKUP(name) gtk_builder_get_object( builder, #name ) +#define GET_WIDGET_WITH_TYPE(name, type) name = type(LOOKUP(name)) #define INIT_LIST(name, prop) \ GET_WIDGET_WITH_TYPE( name##_view, GTK_TREE_VIEW ); \ @@ -45,8 +46,10 @@ static GtkTreeView* icon_theme_view = NULL; static GtkListStore* icon_theme_list = NULL; +#if CURSOR_THEME static GtkTreeView* cursor_theme_view = NULL; static GtkListStore* cursor_theme_list = NULL; +#endif static char* gtk_theme_name = NULL; static char* icon_theme_name = NULL; @@ -115,8 +118,10 @@ fprintf( f, "gtk-icon-theme-name=\"%s\"\n", icon_theme_name ); fprintf( f, "gtk-font-name=\"%s\"\n", font_name ); fprintf( f, "gtk-toolbar-style=%d\n", tb_style ); +#if CURSOR_THEME fprintf( f, "gtk-cursor-theme-name=\"%s\"\n", cursor_theme_name ); fprintf( f, "gtk-cursor-theme-size=%d\n", cursor_theme_size ); +#endif fprintf( f, "include \"%s/.gtkrc-2.0.mine\"\n", g_get_home_dir() ); @@ -163,8 +168,10 @@ g_key_file_set_string( kf, "GTK", "sNet/IconThemeName", icon_theme_name ); g_key_file_set_string( kf, "GTK", "sGtk/FontName", font_name ); g_key_file_set_integer( kf, "GTK", "iGtk/ToolbarStyle", tb_style ); +#if CURSOR_THEME g_key_file_set_string( kf, "GTK", "sGtk/CursorThemeName", cursor_theme_name ); g_key_file_set_integer( kf, "GTK", "iGtk/CursorThemeSize", cursor_theme_size ); +#endif data = g_key_file_to_data( kf, &len, NULL ); g_key_file_free( kf ); @@ -212,6 +219,7 @@ if( under_lxsession ) g_object_set( gtk_settings_get_default(), "gtk-icon-theme-name", name, NULL ); } +#if CURSOR_THEME else if( model == GTK_TREE_MODEL (cursor_theme_list) ) /* cursor theme */ { if( name && cursor_theme_name && 0 == strcmp( name, cursor_theme_name ) ) @@ -223,6 +231,7 @@ if( under_lxsession ) g_object_set( gtk_settings_get_default(), "gtk-cursor-theme-name", name, NULL ); } +#endif if( under_lxsession ) { @@ -388,6 +397,7 @@ return disp_name != NULL; } +#if CURSOR_THEME static gboolean cursor_theme_func(const char* dir, const char* name, const char* lookup) { char* ret = NULL; @@ -404,6 +414,7 @@ */ return ret != NULL; } +#endif static void load_gtk_themes( GtkListStore* list, const char* cur_sel ) { @@ -427,6 +438,7 @@ gtk_tree_sortable_set_sort_column_id( (GtkTreeSortable*)list, 0, GTK_SORT_ASCENDING ); } +#if CURSOR_THEME static void load_cursor_themes( GtkListStore* list, const char* cur_sel ) { char* path; @@ -437,6 +449,8 @@ g_free( path ); gtk_tree_sortable_set_sort_column_id( (GtkTreeSortable*)list, 0, GTK_SORT_ASCENDING ); } +#endif + /* static void load_fonts( GtkListStore* list ) { @@ -458,8 +472,10 @@ g_signal_handlers_disconnect_by_func( socket, on_demo_loaded, dlg ); } -void main_dlg_init( GtkWidget* dlg ) +GtkWidget* main_dlg_new() { + GtkBuilder* builder = gtk_builder_new(); + GtkWidget* dlg; char* files[] = { tmp_rc_file, NULL }; char** def_files = gtk_rc_get_default_files(); char** file; @@ -481,22 +497,25 @@ else rc_file = g_build_filename( g_get_home_dir(), ".gtkrc-2.0", NULL ); } - g_object_get( gtk_settings_get_default(), "gtk-theme-name", >k_theme_name, "gtk-icon-theme-name", &icon_theme_name, "gtk-font-name", &font_name, "gtk-toolbar-style", &tb_style, +#if CURSOR_THEME "gtk-cursor-theme-name", &cursor_theme_name, "gtk-cursor-theme-size", &cursor_theme_size, +#endif NULL ); if( ! gtk_theme_name ) gtk_theme_name = g_strdup( "Raleigh" ); if( ! icon_theme_name ) icon_theme_name = g_strdup( "hicolor" ); +#if CURSOR_THEME if( ! cursor_theme_name ) cursor_theme_name = g_strdup( "default" ); +#endif if( ! font_name ) font_name = g_strdup( "Sans 10" ); if( ! cursor_theme_size ) @@ -506,13 +525,26 @@ if( ! under_lxsession ) write_rc_file( tmp_rc_file ); + gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "/lxappearance/lxappearance.ui", NULL); + gtk_builder_connect_signals(builder, NULL); + + GET_WIDGET_WITH_TYPE(dlg, GTK_WIDGET); + main_dlg = dlg; + INIT_LIST( gtk_theme, "gtk-theme-name" ) INIT_LIST( icon_theme, "gtk-icon-theme-name" ) + +#if CURSOR_THEME INIT_LIST( cursor_theme, "gtk-cursor-theme-name" ) - gtk_font_button_set_font_name( (GtkFontButton*)lookup_widget(dlg, "font"), font_name ); - gtk_range_set_value( GTK_RANGE(lookup_widget(dlg, "cursor_theme_size")), cursor_theme_size ); +#endif + + gtk_font_button_set_font_name( (GtkFontButton*)LOOKUP(font), font_name ); - gtk_combo_box_set_active( (GtkComboBox*)lookup_widget(dlg, "tb_style"), tb_style < 4 ? tb_style : 3 ); +#if CURSOR_THEME + gtk_range_set_value( GTK_RANGE(LOOKUP(cursor_theme_size)), cursor_theme_size ); +#endif + + gtk_combo_box_set_active( GTK_COMBO_BOX(LOOKUP(tb_style)), tb_style < 4 ? tb_style : 3 ); GET_WIDGET_WITH_TYPE( demo_box, GTK_WIDGET ); gtk_widget_show( demo_box ); @@ -524,7 +556,7 @@ * This will cause problems with some themes, but we have no choice. */ show_demo( (GdkNativeWindow)demo_box ); - gtk_widget_show_all( dlg ); + gtk_widget_show( dlg ); } else { @@ -540,6 +572,9 @@ } disable_apply(); + + g_object_unref(builder); + return dlg; } static void reload_all_programs( gboolean icon_only ) @@ -642,9 +677,11 @@ gtk_list_store_clear( icon_theme_list ); load_icon_themes( icon_theme_list, stdo ? stdo : "" ); +#if CURSOR_THEME /* reload all cursor themes */ gtk_list_store_clear( cursor_theme_list ); load_cursor_themes( cursor_theme_list, stdo ? stdo : "" ); +#endif } g_free( file ); } @@ -664,6 +701,7 @@ on_cursor_size_changed (GtkHScale *cursorsizescale, gpointer user_data) { +#if CURSOR_THEME cursor_theme_size = gtk_range_get_value( GTK_RANGE(cursorsizescale) ); if( under_lxsession ) @@ -676,6 +714,7 @@ write_rc_file( tmp_rc_file ); reload_demo_process(); } +#endif } void diff -Nru lxappearance-0.3.0~svn20090913/src/main-dlg.h lxappearance-0.4.0/src/main-dlg.h --- lxappearance-0.3.0~svn20090913/src/main-dlg.h 2009-09-05 22:28:59.000000000 +0100 +++ lxappearance-0.4.0/src/main-dlg.h 2009-12-19 11:05:54.000000000 +0000 @@ -1,6 +1,6 @@ #include -void main_dlg_init( GtkWidget* dlg ); +GtkWidget* main_dlg_new(); void on_apply_clicked (GtkButton *button, diff -Nru lxappearance-0.3.0~svn20090913/src/main-dlg-ui.c lxappearance-0.4.0/src/main-dlg-ui.c --- lxappearance-0.3.0~svn20090913/src/main-dlg-ui.c 2009-09-05 22:28:59.000000000 +0100 +++ lxappearance-0.4.0/src/main-dlg-ui.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,366 +0,0 @@ -/* - * DO NOT EDIT THIS FILE - it is generated by Glade. - */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include -#include - -#include -#include - -#include "main-dlg.h" -#include "main-dlg-ui.h" -#include "glade-support.h" - -#define GLADE_HOOKUP_OBJECT(component,widget,name) \ - g_object_set_data_full (G_OBJECT (component), name, \ - gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref) - -#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \ - g_object_set_data (G_OBJECT (component), name, widget) - -GtkWidget* -create_dlg (void) -{ - GtkWidget *dlg; - GtkWidget *dialog_vbox1; - GtkWidget *hbox1; - GtkWidget *notebook1; - GtkWidget *vbox4; - GtkWidget *label8; - GtkWidget *scrolledwindow1; - GtkWidget *gtk_theme_view; - GtkWidget *hbox4; - GtkWidget *label17; - GtkWidget *font; - GtkWidget *label2; - GtkWidget *vbox3; - GtkWidget *label7; - GtkWidget *scrolledwindow2; - GtkWidget *icon_theme_view; - GtkWidget *hbox5; - GtkWidget *install_theme; - GtkWidget *alignment1; - GtkWidget *hbox6; - GtkWidget *image1; - GtkWidget *label18; - GtkWidget *remove_theme; - GtkWidget *label3; - GtkWidget *vbox2; - GtkWidget *label4; - GtkWidget *scrolledwindow3; - GtkWidget *cursor_theme_view; - GtkWidget *hbox2; - GtkWidget *label6; - GtkWidget *label9; - GtkWidget *cursor_theme_size; - GtkWidget *label10; - GtkWidget *label1; - GtkWidget *vbox5; - GtkWidget *vbox6; - GtkWidget *label19; - GtkWidget *tb_style; - GtkWidget *label5; - GtkWidget *vbox1; - GtkWidget *label15; - GtkWidget *frame1; - GtkWidget *demo_box; - GtkWidget *dialog_action_area1; - GtkWidget *apply; - GtkWidget *closebutton1; - - dlg = gtk_dialog_new (); - gtk_window_set_title (GTK_WINDOW (dlg), _("Appearance Settings")); - gtk_window_set_default_size (GTK_WINDOW (dlg), 640, 450); - gtk_window_set_type_hint (GTK_WINDOW (dlg), GDK_WINDOW_TYPE_HINT_DIALOG); - - dialog_vbox1 = GTK_DIALOG (dlg)->vbox; - gtk_widget_show (dialog_vbox1); - - hbox1 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox1); - gtk_box_pack_start (GTK_BOX (dialog_vbox1), hbox1, TRUE, TRUE, 0); - - notebook1 = gtk_notebook_new (); - gtk_widget_show (notebook1); - gtk_box_pack_start (GTK_BOX (hbox1), notebook1, FALSE, TRUE, 0); - - vbox4 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox4); - gtk_container_add (GTK_CONTAINER (notebook1), vbox4); - - label8 = gtk_label_new (_("Available Window Themes")); - gtk_widget_show (label8); - gtk_box_pack_start (GTK_BOX (vbox4), label8, FALSE, FALSE, 0); - gtk_misc_set_padding (GTK_MISC (label8), 4, 4); - - scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow1); - gtk_box_pack_start (GTK_BOX (vbox4), scrolledwindow1, TRUE, TRUE, 0); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - - gtk_theme_view = gtk_tree_view_new (); - gtk_widget_show (gtk_theme_view); - gtk_container_add (GTK_CONTAINER (scrolledwindow1), gtk_theme_view); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (gtk_theme_view), FALSE); - - hbox4 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox4); - gtk_box_pack_start (GTK_BOX (vbox4), hbox4, FALSE, FALSE, 4); - - label17 = gtk_label_new_with_mnemonic (_("_Font:")); - gtk_widget_show (label17); - gtk_box_pack_start (GTK_BOX (hbox4), label17, FALSE, TRUE, 4); - - font = gtk_font_button_new (); - gtk_widget_show (font); - gtk_box_pack_start (GTK_BOX (hbox4), font, TRUE, TRUE, 0); - gtk_widget_set_size_request (font, 100, -1); - gtk_container_set_border_width (GTK_CONTAINER (font), 2); - gtk_font_button_set_use_font (GTK_FONT_BUTTON (font), TRUE); - gtk_font_button_set_use_size (GTK_FONT_BUTTON (font), TRUE); - - label2 = gtk_label_new (_("Window")); - gtk_widget_show (label2); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 0), label2); - - vbox3 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox3); - gtk_container_add (GTK_CONTAINER (notebook1), vbox3); - - label7 = gtk_label_new (_("Available Icon Themes")); - gtk_widget_show (label7); - gtk_box_pack_start (GTK_BOX (vbox3), label7, FALSE, FALSE, 0); - gtk_misc_set_padding (GTK_MISC (label7), 4, 4); - - scrolledwindow2 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow2); - gtk_box_pack_start (GTK_BOX (vbox3), scrolledwindow2, TRUE, TRUE, 0); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow2), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - - icon_theme_view = gtk_tree_view_new (); - gtk_widget_show (icon_theme_view); - gtk_container_add (GTK_CONTAINER (scrolledwindow2), icon_theme_view); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (icon_theme_view), FALSE); - - hbox5 = gtk_hbox_new (FALSE, 4); - gtk_widget_show (hbox5); - gtk_box_pack_start (GTK_BOX (vbox3), hbox5, FALSE, TRUE, 2); - gtk_container_set_border_width (GTK_CONTAINER (hbox5), 2); - - install_theme = gtk_button_new (); - gtk_widget_show (install_theme); - gtk_box_pack_start (GTK_BOX (hbox5), install_theme, TRUE, TRUE, 0); - - alignment1 = gtk_alignment_new (0.5, 0.5, 0, 0); - gtk_widget_show (alignment1); - gtk_container_add (GTK_CONTAINER (install_theme), alignment1); - - hbox6 = gtk_hbox_new (FALSE, 2); - gtk_widget_show (hbox6); - gtk_container_add (GTK_CONTAINER (alignment1), hbox6); - - image1 = gtk_image_new_from_stock ("gtk-add", GTK_ICON_SIZE_BUTTON); - gtk_widget_show (image1); - gtk_box_pack_start (GTK_BOX (hbox6), image1, FALSE, FALSE, 0); - - label18 = gtk_label_new_with_mnemonic (_("_Install")); - gtk_widget_show (label18); - gtk_box_pack_start (GTK_BOX (hbox6), label18, FALSE, FALSE, 0); - - remove_theme = gtk_button_new_from_stock ("gtk-remove"); - gtk_box_pack_start (GTK_BOX (hbox5), remove_theme, TRUE, TRUE, 0); - - label3 = gtk_label_new (_("Icon")); - gtk_widget_show (label3); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 1), label3); - - vbox2 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox2); - gtk_container_add (GTK_CONTAINER (notebook1), vbox2); - - label4 = gtk_label_new (_("Available Cursor Themes")); - gtk_widget_show (label4); - gtk_box_pack_start (GTK_BOX (vbox2), label4, FALSE, FALSE, 0); - gtk_misc_set_padding (GTK_MISC (label4), 4, 4); - - scrolledwindow3 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow3); - gtk_box_pack_start (GTK_BOX (vbox2), scrolledwindow3, TRUE, TRUE, 0); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow3), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - - cursor_theme_view = gtk_tree_view_new (); - gtk_widget_show (cursor_theme_view); - gtk_container_add (GTK_CONTAINER (scrolledwindow3), cursor_theme_view); - gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (cursor_theme_view), FALSE); - - hbox2 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox2); - gtk_box_pack_start (GTK_BOX (vbox2), hbox2, FALSE, TRUE, 8); - - label6 = gtk_label_new (_("Size")); - gtk_widget_show (label6); - gtk_box_pack_start (GTK_BOX (hbox2), label6, FALSE, FALSE, 4); - - label9 = gtk_label_new (_("Small")); - gtk_widget_show (label9); - gtk_box_pack_start (GTK_BOX (hbox2), label9, FALSE, FALSE, 4); - - cursor_theme_size = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 16, 64, 1, 0, 0))); - gtk_widget_show (cursor_theme_size); - gtk_box_pack_start (GTK_BOX (hbox2), cursor_theme_size, TRUE, TRUE, 0); - gtk_scale_set_draw_value (GTK_SCALE (cursor_theme_size), FALSE); - gtk_scale_set_digits (GTK_SCALE (cursor_theme_size), 0); - - label10 = gtk_label_new (_("Large")); - gtk_widget_show (label10); - gtk_box_pack_start (GTK_BOX (hbox2), label10, FALSE, FALSE, 4); - - label1 = gtk_label_new (_("Cursor")); - gtk_widget_show (label1); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 2), label1); - - vbox5 = gtk_vbox_new (FALSE, 4); - gtk_widget_show (vbox5); - gtk_container_add (GTK_CONTAINER (notebook1), vbox5); - - vbox6 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox6); - gtk_box_pack_start (GTK_BOX (vbox5), vbox6, FALSE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (vbox6), 4); - - label19 = gtk_label_new (_("Toolbar Style: ")); - gtk_widget_show (label19); - gtk_box_pack_start (GTK_BOX (vbox6), label19, FALSE, FALSE, 0); - gtk_misc_set_alignment (GTK_MISC (label19), 0, 0.5); - - tb_style = gtk_combo_box_new_text (); - gtk_widget_show (tb_style); - gtk_box_pack_start (GTK_BOX (vbox6), tb_style, TRUE, TRUE, 0); - gtk_combo_box_append_text (GTK_COMBO_BOX (tb_style), _("Icons only")); - gtk_combo_box_append_text (GTK_COMBO_BOX (tb_style), _("Text only")); - gtk_combo_box_append_text (GTK_COMBO_BOX (tb_style), _("Text below icons")); - gtk_combo_box_append_text (GTK_COMBO_BOX (tb_style), _("Text beside icons")); - - label5 = gtk_label_new (_("Other")); - gtk_widget_show (label5); - gtk_notebook_set_tab_label (GTK_NOTEBOOK (notebook1), gtk_notebook_get_nth_page (GTK_NOTEBOOK (notebook1), 3), label5); - - vbox1 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox1); - gtk_box_pack_start (GTK_BOX (hbox1), vbox1, TRUE, TRUE, 0); - - label15 = gtk_label_new (_("Preview")); - gtk_widget_show (label15); - gtk_box_pack_start (GTK_BOX (vbox1), label15, FALSE, FALSE, 0); - gtk_label_set_use_markup (GTK_LABEL (label15), TRUE); - - frame1 = gtk_frame_new (NULL); - gtk_widget_show (frame1); - gtk_box_pack_start (GTK_BOX (vbox1), frame1, TRUE, TRUE, 0); - gtk_container_set_border_width (GTK_CONTAINER (frame1), 6); - - demo_box = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (demo_box); - gtk_container_add (GTK_CONTAINER (frame1), demo_box); - gtk_alignment_set_padding (GTK_ALIGNMENT (demo_box), 0, 0, 4, 4); - - dialog_action_area1 = GTK_DIALOG (dlg)->action_area; - gtk_widget_show (dialog_action_area1); - gtk_button_box_set_layout (GTK_BUTTON_BOX (dialog_action_area1), GTK_BUTTONBOX_END); - - apply = gtk_button_new_from_stock ("gtk-apply"); - gtk_widget_show (apply); - gtk_dialog_add_action_widget (GTK_DIALOG (dlg), apply, GTK_RESPONSE_APPLY); - GTK_WIDGET_SET_FLAGS (apply, GTK_CAN_DEFAULT); - - closebutton1 = gtk_button_new_from_stock ("gtk-close"); - gtk_widget_show (closebutton1); - gtk_dialog_add_action_widget (GTK_DIALOG (dlg), closebutton1, GTK_RESPONSE_CLOSE); - GTK_WIDGET_SET_FLAGS (closebutton1, GTK_CAN_DEFAULT); - - g_signal_connect ((gpointer) dlg, "delete_event", - G_CALLBACK (gtk_main_quit), - NULL); - g_signal_connect ((gpointer) font, "font_set", - G_CALLBACK (on_font_changed), - NULL); - g_signal_connect ((gpointer) install_theme, "clicked", - G_CALLBACK (on_install_theme_clicked), - NULL); - g_signal_connect ((gpointer) remove_theme, "clicked", - G_CALLBACK (on_remove_theme_clicked), - NULL); - g_signal_connect ((gpointer) cursor_theme_size, "value_changed", - G_CALLBACK (on_cursor_size_changed), - NULL); - g_signal_connect ((gpointer) tb_style, "changed", - G_CALLBACK (on_tb_style_changed), - NULL); - g_signal_connect ((gpointer) apply, "clicked", - G_CALLBACK (on_apply_clicked), - NULL); - g_signal_connect ((gpointer) closebutton1, "clicked", - G_CALLBACK (gtk_main_quit), - NULL); - - gtk_label_set_mnemonic_widget (GTK_LABEL (label17), font); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (dlg, dlg, "dlg"); - GLADE_HOOKUP_OBJECT_NO_REF (dlg, dialog_vbox1, "dialog_vbox1"); - GLADE_HOOKUP_OBJECT (dlg, hbox1, "hbox1"); - GLADE_HOOKUP_OBJECT (dlg, notebook1, "notebook1"); - GLADE_HOOKUP_OBJECT (dlg, vbox4, "vbox4"); - GLADE_HOOKUP_OBJECT (dlg, label8, "label8"); - GLADE_HOOKUP_OBJECT (dlg, scrolledwindow1, "scrolledwindow1"); - GLADE_HOOKUP_OBJECT (dlg, gtk_theme_view, "gtk_theme_view"); - GLADE_HOOKUP_OBJECT (dlg, hbox4, "hbox4"); - GLADE_HOOKUP_OBJECT (dlg, label17, "label17"); - GLADE_HOOKUP_OBJECT (dlg, font, "font"); - GLADE_HOOKUP_OBJECT (dlg, label2, "label2"); - GLADE_HOOKUP_OBJECT (dlg, vbox3, "vbox3"); - GLADE_HOOKUP_OBJECT (dlg, label7, "label7"); - GLADE_HOOKUP_OBJECT (dlg, scrolledwindow2, "scrolledwindow2"); - GLADE_HOOKUP_OBJECT (dlg, icon_theme_view, "icon_theme_view"); - GLADE_HOOKUP_OBJECT (dlg, hbox5, "hbox5"); - GLADE_HOOKUP_OBJECT (dlg, install_theme, "install_theme"); - GLADE_HOOKUP_OBJECT (dlg, alignment1, "alignment1"); - GLADE_HOOKUP_OBJECT (dlg, hbox6, "hbox6"); - GLADE_HOOKUP_OBJECT (dlg, image1, "image1"); - GLADE_HOOKUP_OBJECT (dlg, label18, "label18"); - GLADE_HOOKUP_OBJECT (dlg, remove_theme, "remove_theme"); - GLADE_HOOKUP_OBJECT (dlg, label3, "label3"); - GLADE_HOOKUP_OBJECT (dlg, vbox2, "vbox2"); - GLADE_HOOKUP_OBJECT (dlg, label4, "label4"); - GLADE_HOOKUP_OBJECT (dlg, scrolledwindow3, "scrolledwindow3"); - GLADE_HOOKUP_OBJECT (dlg, cursor_theme_view, "cursor_theme_view"); - GLADE_HOOKUP_OBJECT (dlg, hbox2, "hbox2"); - GLADE_HOOKUP_OBJECT (dlg, label6, "label6"); - GLADE_HOOKUP_OBJECT (dlg, label9, "label9"); - GLADE_HOOKUP_OBJECT (dlg, cursor_theme_size, "cursor_theme_size"); - GLADE_HOOKUP_OBJECT (dlg, label10, "label10"); - GLADE_HOOKUP_OBJECT (dlg, label1, "label1"); - GLADE_HOOKUP_OBJECT (dlg, vbox5, "vbox5"); - GLADE_HOOKUP_OBJECT (dlg, vbox6, "vbox6"); - GLADE_HOOKUP_OBJECT (dlg, label19, "label19"); - GLADE_HOOKUP_OBJECT (dlg, tb_style, "tb_style"); - GLADE_HOOKUP_OBJECT (dlg, label5, "label5"); - GLADE_HOOKUP_OBJECT (dlg, vbox1, "vbox1"); - GLADE_HOOKUP_OBJECT (dlg, label15, "label15"); - GLADE_HOOKUP_OBJECT (dlg, frame1, "frame1"); - GLADE_HOOKUP_OBJECT (dlg, demo_box, "demo_box"); - GLADE_HOOKUP_OBJECT_NO_REF (dlg, dialog_action_area1, "dialog_action_area1"); - GLADE_HOOKUP_OBJECT (dlg, apply, "apply"); - GLADE_HOOKUP_OBJECT (dlg, closebutton1, "closebutton1"); - - return dlg; -} - diff -Nru lxappearance-0.3.0~svn20090913/src/main-dlg-ui.h lxappearance-0.4.0/src/main-dlg-ui.h --- lxappearance-0.3.0~svn20090913/src/main-dlg-ui.h 2009-09-05 22:28:59.000000000 +0100 +++ lxappearance-0.4.0/src/main-dlg-ui.h 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -/* - * DO NOT EDIT THIS FILE - it is generated by Glade. - */ - -GtkWidget* create_dlg (void); diff -Nru lxappearance-0.3.0~svn20090913/src/Makefile.am lxappearance-0.4.0/src/Makefile.am --- lxappearance-0.3.0~svn20090913/src/Makefile.am 2009-09-05 22:28:59.000000000 +0100 +++ lxappearance-0.4.0/src/Makefile.am 2009-12-19 11:05:54.000000000 +0000 @@ -1,19 +1,22 @@ -## Process this file with automake to produce Makefile.in +NULL= INCLUDES = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - @PACKAGE_CFLAGS@ + $(PACKAGE_CFLAGS) \ + $(NULL) bin_PROGRAMS = lxappearance lxappearance_SOURCES = \ main.c \ - glade-support.c glade-support.h \ - main-dlg-ui.c main-dlg-ui.h \ main-dlg.c main-dlg.h \ - demo-ui.c demo-ui.h \ - demo.c demo.h + demo.c demo.h \ + $(NULL) -lxappearance_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) +lxappearance_CFLAGS = \ + -Wl,--export-dynamic \ + -Werror-implicit-function-declaration \ + $(NULL) +lxappearance_LDADD = $(PACKAGE_LIBS) $(INTLLIBS) diff -Nru lxappearance-0.3.0~svn20090913/src/Makefile.in lxappearance-0.4.0/src/Makefile.in --- lxappearance-0.3.0~svn20090913/src/Makefile.in 2009-09-13 11:27:22.000000000 +0100 +++ lxappearance-0.4.0/src/Makefile.in 2010-01-06 15:30:30.000000000 +0000 @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -41,18 +43,23 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_lxappearance_OBJECTS = main.$(OBJEXT) glade-support.$(OBJEXT) \ - main-dlg-ui.$(OBJEXT) main-dlg.$(OBJEXT) demo-ui.$(OBJEXT) \ - demo.$(OBJEXT) +am__objects_1 = +am_lxappearance_OBJECTS = lxappearance-main.$(OBJEXT) \ + lxappearance-main-dlg.$(OBJEXT) lxappearance-demo.$(OBJEXT) \ + $(am__objects_1) lxappearance_OBJECTS = $(am_lxappearance_OBJECTS) am__DEPENDENCIES_1 = -lxappearance_DEPENDENCIES = $(am__DEPENDENCIES_1) +lxappearance_DEPENDENCIES = $(am__DEPENDENCIES_1) \ + $(am__DEPENDENCIES_1) +lxappearance_LINK = $(CCLD) $(lxappearance_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) @@ -119,6 +126,7 @@ PACKAGE_NAME = @PACKAGE_NAME@ PACKAGE_STRING = @PACKAGE_STRING@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -177,20 +185,25 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ +NULL = INCLUDES = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - @PACKAGE_CFLAGS@ + $(PACKAGE_CFLAGS) \ + $(NULL) lxappearance_SOURCES = \ main.c \ - glade-support.c glade-support.h \ - main-dlg-ui.c main-dlg-ui.h \ main-dlg.c main-dlg.h \ - demo-ui.c demo-ui.h \ - demo.c demo.h + demo.c demo.h \ + $(NULL) -lxappearance_LDADD = @PACKAGE_LIBS@ $(INTLLIBS) +lxappearance_CFLAGS = \ + -Wl,--export-dynamic \ + -Werror-implicit-function-declaration \ + $(NULL) + +lxappearance_LDADD = $(PACKAGE_LIBS) $(INTLLIBS) all: all-am .SUFFIXES: @@ -204,9 +217,9 @@ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu src/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu src/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -224,32 +237,47 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files clean-binPROGRAMS: -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) lxappearance$(EXEEXT): $(lxappearance_OBJECTS) $(lxappearance_DEPENDENCIES) @rm -f lxappearance$(EXEEXT) - $(LINK) $(lxappearance_OBJECTS) $(lxappearance_LDADD) $(LIBS) + $(lxappearance_LINK) $(lxappearance_OBJECTS) $(lxappearance_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -257,27 +285,66 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demo-ui.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demo.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/glade-support.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main-dlg-ui.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main-dlg.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxappearance-demo.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxappearance-main-dlg.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lxappearance-main.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +lxappearance-main.o: main.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-main.o -MD -MP -MF $(DEPDIR)/lxappearance-main.Tpo -c -o lxappearance-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-main.Tpo $(DEPDIR)/lxappearance-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='lxappearance-main.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c + +lxappearance-main.obj: main.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-main.obj -MD -MP -MF $(DEPDIR)/lxappearance-main.Tpo -c -o lxappearance-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-main.Tpo $(DEPDIR)/lxappearance-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='lxappearance-main.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` + +lxappearance-main-dlg.o: main-dlg.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-main-dlg.o -MD -MP -MF $(DEPDIR)/lxappearance-main-dlg.Tpo -c -o lxappearance-main-dlg.o `test -f 'main-dlg.c' || echo '$(srcdir)/'`main-dlg.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-main-dlg.Tpo $(DEPDIR)/lxappearance-main-dlg.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main-dlg.c' object='lxappearance-main-dlg.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-main-dlg.o `test -f 'main-dlg.c' || echo '$(srcdir)/'`main-dlg.c + +lxappearance-main-dlg.obj: main-dlg.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-main-dlg.obj -MD -MP -MF $(DEPDIR)/lxappearance-main-dlg.Tpo -c -o lxappearance-main-dlg.obj `if test -f 'main-dlg.c'; then $(CYGPATH_W) 'main-dlg.c'; else $(CYGPATH_W) '$(srcdir)/main-dlg.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-main-dlg.Tpo $(DEPDIR)/lxappearance-main-dlg.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main-dlg.c' object='lxappearance-main-dlg.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-main-dlg.obj `if test -f 'main-dlg.c'; then $(CYGPATH_W) 'main-dlg.c'; else $(CYGPATH_W) '$(srcdir)/main-dlg.c'; fi` + +lxappearance-demo.o: demo.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-demo.o -MD -MP -MF $(DEPDIR)/lxappearance-demo.Tpo -c -o lxappearance-demo.o `test -f 'demo.c' || echo '$(srcdir)/'`demo.c +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-demo.Tpo $(DEPDIR)/lxappearance-demo.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='demo.c' object='lxappearance-demo.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-demo.o `test -f 'demo.c' || echo '$(srcdir)/'`demo.c + +lxappearance-demo.obj: demo.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -MT lxappearance-demo.obj -MD -MP -MF $(DEPDIR)/lxappearance-demo.Tpo -c -o lxappearance-demo.obj `if test -f 'demo.c'; then $(CYGPATH_W) 'demo.c'; else $(CYGPATH_W) '$(srcdir)/demo.c'; fi` +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lxappearance-demo.Tpo $(DEPDIR)/lxappearance-demo.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='demo.c' object='lxappearance-demo.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lxappearance_CFLAGS) $(CFLAGS) -c -o lxappearance-demo.obj `if test -f 'demo.c'; then $(CYGPATH_W) 'demo.c'; else $(CYGPATH_W) '$(srcdir)/demo.c'; fi` + ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -290,7 +357,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -298,29 +365,34 @@ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -341,13 +413,17 @@ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -378,6 +454,7 @@ distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -398,6 +475,8 @@ html: html-am +html-am: + info: info-am info-am: @@ -406,18 +485,28 @@ install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-binPROGRAMS install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -454,6 +543,7 @@ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ uninstall-am uninstall-binPROGRAMS + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: