diff -Nru lxinput-0.3.0/Makefile.am lxinput-0.3.1/Makefile.am --- lxinput-0.3.0/Makefile.am 2010-08-02 11:41:50.000000000 +0000 +++ lxinput-0.3.1/Makefile.am 2011-07-29 13:10:06.000000000 +0000 @@ -2,11 +2,8 @@ SUBDIRS = src po man -ui_in_files= \ - data/lxinput.glade \ - $(NULL) -uidir=$(datadir)/lxinput -ui_DATA = $(ui_in_files:.glade=.ui) +uidir = $(datadir)/lxinput +ui_DATA = data/lxinput.ui desktopdir=$(datadir)/applications desktop_in_files = \ @@ -28,9 +25,4 @@ $(NULL) CLEANFILES = \ - $(ui_DATA) \ $(NULL) - -%.ui: %.glade - cp $< $@ - $(top_builddir)/src/xml-purge $@ diff -Nru lxinput-0.3.0/Makefile.in lxinput-0.3.1/Makefile.in --- lxinput-0.3.0/Makefile.in 2010-08-03 09:05:47.000000000 +0000 +++ lxinput-0.3.1/Makefile.in 2011-07-29 13:11:49.000000000 +0000 @@ -48,6 +48,12 @@ CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -126,8 +132,10 @@ distuninstallcheck_listfiles = find . -type f -print distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ +ADDITIONAL_FLAGS = @ADDITIONAL_FLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -186,6 +194,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -245,12 +255,8 @@ top_srcdir = @top_srcdir@ NULL = SUBDIRS = src po man -ui_in_files = \ - data/lxinput.glade \ - $(NULL) - uidir = $(datadir)/lxinput -ui_DATA = $(ui_in_files:.glade=.ui) +ui_DATA = data/lxinput.ui desktopdir = $(datadir)/applications desktop_in_files = \ data/lxinput.desktop.in \ @@ -269,7 +275,6 @@ $(NULL) CLEANFILES = \ - $(ui_DATA) \ $(NULL) all: config.h @@ -824,10 +829,6 @@ @INTLTOOL_DESKTOP_RULE@ -%.ui: %.glade - cp $< $@ - $(top_builddir)/src/xml-purge $@ - # 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 lxinput-0.3.0/aclocal.m4 lxinput-0.3.1/aclocal.m4 --- lxinput-0.3.0/aclocal.m4 2010-08-03 09:03:17.000000000 +0000 +++ lxinput-0.3.1/aclocal.m4 2011-07-29 13:11:46.000000000 +0000 @@ -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.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, +[m4_warning([this file was generated for autoconf 2.68. 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'.])]) @@ -301,7 +301,7 @@ dnl These rules are solely for the distribution goal. While doing this dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. + dnl in configure.ac. for lang in $ALL_LINGUAS; do GMOFILES="$GMOFILES $lang.gmo" POFILES="$POFILES $lang.po" @@ -430,7 +430,7 @@ dnl dnl Now the definitions that aclocal will find dnl -ifdef(glib_configure_in,[],[ +ifdef(glib_configure_ac,[],[ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ])dnl @@ -603,7 +603,7 @@ AC_DEFUN([IT_PO_SUBDIR], [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. dnl -dnl The following CONFIG_COMMANDS should be exetuted at the very end +dnl The following CONFIG_COMMANDS should be executed at the very end dnl of config.status. AC_CONFIG_COMMANDS_PRE([ AC_CONFIG_COMMANDS([$1/stamp-it], [ @@ -646,8 +646,9 @@ # AC_DEFUN([AC_PROG_INTLTOOL], ...) -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -665,20 +666,21 @@ dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(nls, + AC_ARG_ENABLE([nls], [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) # # Copyright © 2004 Scott James Remnant . # @@ -706,7 +708,10 @@ AC_DEFUN([PKG_PROG_PKG_CONFIG], [m4_pattern_forbid([^_?PKG_[A-Z_]+$]) m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) fi @@ -719,7 +724,6 @@ AC_MSG_RESULT([no]) PKG_CONFIG="" fi - fi[]dnl ])# PKG_PROG_PKG_CONFIG @@ -728,34 +732,31 @@ # Check to see whether a particular set of modules exists. Similar # to PKG_CHECK_MODULES(), but does not set variables or print errors. # -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually # -------------------------------------------------------------- AC_DEFUN([PKG_CHECK_EXISTS], [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl if test -n "$PKG_CONFIG" && \ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) + m4_default([$2], [:]) m4_ifvaln([$3], [else $3])dnl fi]) - # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) # --------------------------------------------- m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + else + pkg_failed=untried fi[]dnl ])# _PKG_CONFIG @@ -797,16 +798,17 @@ See the pkg-config man page for more details.]) if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) _PKG_SHORT_ERRORS_SUPPORTED if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1` else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - ifelse([$4], , [AC_MSG_ERROR(dnl + m4_default([$4], [AC_MSG_ERROR( [Package requirements ($2) were not met: $$1_PKG_ERRORS @@ -814,25 +816,24 @@ Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) +_PKG_TEXT])[]dnl + ]) elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( [The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. _PKG_TEXT -To get pkg-config, see .])], - [$4]) +To get pkg-config, see .])[]dnl + ]) else $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS $1[]_LIBS=$pkg_cv_[]$1[]_LIBS AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) + $3 fi[]dnl ])# PKG_CHECK_MODULES @@ -1698,6 +1699,33 @@ fi AC_MSG_RESULT(yes)]) +# Copyright (C) 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 1 + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`yes' being less verbose, `no' or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -Nru lxinput-0.3.0/configure lxinput-0.3.1/configure --- lxinput-0.3.0/configure 2010-08-03 09:05:48.000000000 +0000 +++ lxinput-0.3.1/configure 2011-07-29 13:11:49.000000000 +0000 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65. +# Generated by GNU Autoconf 2.68. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -89,6 +89,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -214,11 +215,18 @@ # 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. + # Preserve -v and -x to the replacement shell. 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+"$@"} + case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; + esac + exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} fi if test x$as_have_required = xno; then : @@ -316,7 +324,7 @@ 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" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -356,19 +364,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS 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. +# 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 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -530,7 +538,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -601,10 +609,13 @@ XML_CATALOG_FILE XSLTPROC GETTEXT_PACKAGE +ADDITIONAL_FLAGS XLIB_LIBS XLIB_CFLAGS GTK_LIBS GTK_CFLAGS +PKG_CONFIG_LIBDIR +PKG_CONFIG_PATH PKG_CONFIG ALL_LINGUAS INTLTOOL_PERL @@ -669,6 +680,8 @@ MAINT MAINTAINER_MODE_FALSE MAINTAINER_MODE_TRUE +AM_BACKSLASH +AM_DEFAULT_VERBOSITY am__untar am__tar AMTAR @@ -733,10 +746,13 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +enable_silent_rules enable_maintainer_mode enable_dependency_tracking enable_nls enable_man +enable_more_warnings +enable_gtk3 with_xml_catalog ' ac_precious_vars='build_alias @@ -749,6 +765,8 @@ CPPFLAGS CPP PKG_CONFIG +PKG_CONFIG_PATH +PKG_CONFIG_LIBDIR GTK_CFLAGS GTK_LIBS XLIB_CFLAGS @@ -815,8 +833,9 @@ fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -861,7 +880,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_fn_error "invalid feature name: $ac_useropt" + 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 @@ -887,7 +906,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_fn_error "invalid feature name: $ac_useropt" + 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 @@ -1091,7 +1110,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_fn_error "invalid package name: $ac_useropt" + 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 @@ -1107,7 +1126,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_fn_error "invalid package name: $ac_useropt" + 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 @@ -1137,8 +1156,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1146,7 +1165,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1156,7 +1175,7 @@ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}" ;; esac @@ -1164,13 +1183,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1193,7 +1212,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + 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' @@ -1207,8 +1226,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1223,9 +1242,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1264,11 +1283,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + 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_fn_error "$ac_msg" + 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 @@ -1308,7 +1327,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1366,12 +1385,16 @@ --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0') --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-nls do not use Native Language Support --enable-man regenerate roff man pages from Docbook [default=no] + --enable-more-warnings Add more warnings [default=no] + --enable-gtk3 enable to use gtk-3.0 instead of gtk-2.0 Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1389,6 +1412,10 @@ you have headers in a nonstandard directory CPP C preprocessor PKG_CONFIG path to pkg-config utility + PKG_CONFIG_PATH + directories to add to pkg-config's search path + PKG_CONFIG_LIBDIR + path overriding pkg-config's built-in search path GTK_CFLAGS C compiler flags for GTK, overriding pkg-config GTK_LIBS linker flags for GTK, overriding pkg-config XLIB_CFLAGS C compiler flags for XLIB, overriding pkg-config @@ -1461,9 +1488,9 @@ if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.65 +generated by GNU Autoconf 2.68 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1507,7 +1534,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -1553,7 +1580,7 @@ # 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;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -1579,7 +1606,7 @@ mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -1590,7 +1617,7 @@ ac_retval=1 fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -1632,7 +1659,7 @@ 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;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -1645,10 +1672,10 @@ 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 : + if eval \${$3+:} false; 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 : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -1684,7 +1711,7 @@ else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -1711,7 +1738,7 @@ 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 : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -1720,7 +1747,7 @@ { $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;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_mongrel @@ -1733,7 +1760,7 @@ 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 : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1751,7 +1778,7 @@ 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;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_header_compile @@ -1763,7 +1790,7 @@ 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 : +if eval \${$3+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1818,7 +1845,7 @@ 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;} + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno } # ac_fn_c_check_func cat >config.log <<_ACEOF @@ -1826,7 +1853,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -1936,11 +1963,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -1974,11 +1999,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -1991,11 +2014,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2009,11 +2030,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2068,7 +2087,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2083,7 +2107,11 @@ { $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" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -2159,7 +2187,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $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_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2176,16 +2204,22 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - 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 + 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 done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + 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, @@ -2214,7 +2248,7 @@ { $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 ${ac_cv_path_install+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2301,11 +2335,11 @@ ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + 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;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2327,7 +2361,7 @@ # 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_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2337,7 +2371,7 @@ # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2391,7 +2425,7 @@ 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 : +if ${ac_cv_prog_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$STRIP"; then @@ -2431,7 +2465,7 @@ 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 : +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_STRIP"; then @@ -2484,7 +2518,7 @@ { $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 : + if ${ac_cv_path_mkdir+:} false; then : $as_echo_n "(cached) " >&6 else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -2535,7 +2569,7 @@ set dummy $ac_prog; 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_AWK+set}" = set; then : +if ${ac_cv_prog_AWK+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$AWK"; then @@ -2575,7 +2609,7 @@ $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 eval \${ac_cv_prog_make_${ac_make}_set+:} false; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2583,7 +2617,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -2617,7 +2651,7 @@ am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -2633,7 +2667,7 @@ # Define the identity of the package. PACKAGE=lxinput - VERSION=0.3.0 + VERSION=0.3.1 cat >>confdefs.h <<_ACEOF @@ -2675,6 +2709,21 @@ ac_config_headers="$ac_config_headers config.h" +# Support silent build rules. Disable by either passing --disable-silent-rules +# to configure or passing V=1 to make +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=0;; +esac +AM_BACKSLASH='\' + + { $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; } @@ -2771,7 +2820,7 @@ set dummy ${ac_tool_prefix}gcc; 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_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2811,7 +2860,7 @@ set dummy gcc; 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_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -2864,7 +2913,7 @@ set dummy ${ac_tool_prefix}cc; 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_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2904,7 +2953,7 @@ set dummy cc; 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_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -2963,7 +3012,7 @@ set dummy $ac_tool_prefix$ac_prog; 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_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3007,7 +3056,7 @@ set dummy $ac_prog; 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_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3061,8 +3110,8 @@ 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_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +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:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3176,9 +3225,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "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; } @@ -3220,8 +3268,8 @@ 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 compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3278,9 +3326,9 @@ 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. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -3291,7 +3339,7 @@ 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 ${ac_cv_objext+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3331,8 +3379,8 @@ { { $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 compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +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 @@ -3342,7 +3390,7 @@ ac_objext=$OBJEXT { $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 ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -3379,7 +3427,7 @@ ac_save_CFLAGS=$CFLAGS { $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 ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -3457,7 +3505,7 @@ fi { $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 ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -3556,7 +3604,7 @@ { $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 ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -3682,7 +3730,7 @@ { $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 ${ac_cv_search_strerror+:} false; then : $as_echo_n "(cached) " >&6 else ac_func_search_save_LIBS=$LIBS @@ -3716,11 +3764,11 @@ fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext - if test "${ac_cv_search_strerror+set}" = set; then : + if ${ac_cv_search_strerror+:} false; then : break fi done -if test "${ac_cv_search_strerror+set}" = set; then : +if ${ac_cv_search_strerror+:} false; then : else ac_cv_search_strerror=no @@ -3746,7 +3794,7 @@ set dummy ${ac_tool_prefix}gcc; 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_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3786,7 +3834,7 @@ set dummy gcc; 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_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -3839,7 +3887,7 @@ set dummy ${ac_tool_prefix}cc; 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_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3879,7 +3927,7 @@ set dummy cc; 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_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3938,7 +3986,7 @@ set dummy $ac_tool_prefix$ac_prog; 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_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -3982,7 +4030,7 @@ set dummy $ac_prog; 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_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4036,8 +4084,8 @@ 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_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +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:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4066,7 +4114,7 @@ { $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 ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4103,7 +4151,7 @@ ac_save_CFLAGS=$CFLAGS { $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 ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -4181,7 +4229,7 @@ fi { $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 ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -4280,7 +4328,7 @@ { $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 ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -4413,7 +4461,7 @@ set dummy ${ac_tool_prefix}gcc; 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_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4453,7 +4501,7 @@ set dummy gcc; 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_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4506,7 +4554,7 @@ set dummy ${ac_tool_prefix}cc; 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_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4546,7 +4594,7 @@ set dummy cc; 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_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4605,7 +4653,7 @@ set dummy $ac_tool_prefix$ac_prog; 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_CC+set}" = set; then : +if ${ac_cv_prog_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$CC"; then @@ -4649,7 +4697,7 @@ set dummy $ac_prog; 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_CC+set}" = set; then : +if ${ac_cv_prog_ac_ct_CC+:} false; then : $as_echo_n "(cached) " >&6 else if test -n "$ac_ct_CC"; then @@ -4703,8 +4751,8 @@ 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_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +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:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4733,7 +4781,7 @@ { $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 ${ac_cv_c_compiler_gnu+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -4770,7 +4818,7 @@ ac_save_CFLAGS=$CFLAGS { $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 ${ac_cv_prog_cc_g+:} false; then : $as_echo_n "(cached) " >&6 else ac_save_c_werror_flag=$ac_c_werror_flag @@ -4848,7 +4896,7 @@ fi { $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 ${ac_cv_prog_cc_c89+:} false; then : $as_echo_n "(cached) " >&6 else ac_cv_prog_cc_c89=no @@ -4947,7 +4995,7 @@ { $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 ${am_cv_CC_dependencies_compiler_type+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then @@ -5085,7 +5133,7 @@ CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : + if ${ac_cv_prog_CPP+:} false; then : $as_echo_n "(cached) " >&6 else # Double quotes because CPP needs to be expanded @@ -5115,7 +5163,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -5131,11 +5179,11 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -5174,7 +5222,7 @@ # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -5190,18 +5238,18 @@ ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : 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 "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -5213,7 +5261,7 @@ { $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 ${ac_cv_path_GREP+:} false; then : $as_echo_n "(cached) " >&6 else if test -z "$GREP"; then @@ -5262,7 +5310,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + 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 @@ -5276,7 +5324,7 @@ { $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 ${ac_cv_path_EGREP+:} false; then : $as_echo_n "(cached) " >&6 else if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 @@ -5328,7 +5376,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + 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 @@ -5343,7 +5391,7 @@ { $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 ${ac_cv_header_stdc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5461,8 +5509,7 @@ 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 : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -5476,7 +5523,7 @@ 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 : +if test "x$ac_cv_header_locale_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LOCALE_H 1 _ACEOF @@ -5488,7 +5535,7 @@ if test $ac_cv_header_locale_h = yes; then { $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 ${am_cv_val_LC_MESSAGES+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5528,7 +5575,7 @@ INTLLIBS= 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 : +if test "x$ac_cv_header_libintl_h" = xyes; then : gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" @@ -5537,7 +5584,7 @@ # { $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 ${gt_cv_func_ngettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5568,7 +5615,7 @@ if test "$gt_cv_func_ngettext_libc" = "yes" ; then { $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 ${gt_cv_func_dgettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -5601,7 +5648,7 @@ 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 : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF @@ -5620,7 +5667,7 @@ { $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 ${ac_cv_lib_intl_bindtextdomain+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5654,10 +5701,10 @@ fi { $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 : +if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; 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 ${ac_cv_lib_intl_ngettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5691,10 +5738,10 @@ fi { $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 : +if test "x$ac_cv_lib_intl_ngettext" = xyes; 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 ${ac_cv_lib_intl_dgettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5728,7 +5775,7 @@ fi { $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" = xyes; then : gt_cv_func_dgettext_libintl=yes fi @@ -5744,7 +5791,7 @@ $as_echo "" >&6; } { $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 ${ac_cv_lib_intl_ngettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5778,10 +5825,10 @@ fi { $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 : +if test "x$ac_cv_lib_intl_ngettext" = xyes; 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 ${ac_cv_lib_intl_dcgettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -5815,7 +5862,7 @@ fi { $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" = xyes; then : gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else @@ -5840,7 +5887,7 @@ 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 : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF @@ -5878,7 +5925,7 @@ set dummy msgfmt; 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_path_MSGFMT+set}" = set; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGFMT" in @@ -5915,7 +5962,7 @@ 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 : +if test "x$ac_cv_func_dcgettext" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DCGETTEXT 1 _ACEOF @@ -5956,7 +6003,7 @@ set dummy gmsgfmt; 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_path_GMSGFMT+set}" = set; then : +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -5997,7 +6044,7 @@ set dummy xgettext; 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_path_XGETTEXT+set}" = set; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in @@ -6048,7 +6095,7 @@ 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 : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : CATOBJEXT=.gmo DATADIRNAME=share else @@ -6194,7 +6241,7 @@ case "$am__api_version" in 1.01234) - as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; @@ -6211,14 +6258,14 @@ { $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_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5 + as_fn_error $? "Your intltool is too old. You need intltool 0.40.0 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:${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 ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_UPDATE in @@ -6258,7 +6305,7 @@ set dummy intltool-merge; 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_path_INTLTOOL_MERGE+set}" = set; then : +if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_MERGE in @@ -6298,7 +6345,7 @@ set dummy intltool-extract; 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_path_INTLTOOL_EXTRACT+set}" = set; then : +if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_EXTRACT in @@ -6335,7 +6382,7 @@ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 + 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 $< $@' @@ -6459,7 +6506,7 @@ set dummy xgettext; 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_path_XGETTEXT+set}" = set; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case $XGETTEXT in @@ -6499,7 +6546,7 @@ set dummy msgmerge; 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_path_MSGMERGE+set}" = set; then : +if ${ac_cv_path_MSGMERGE+:} false; then : $as_echo_n "(cached) " >&6 else case $MSGMERGE in @@ -6539,7 +6586,7 @@ set dummy msgfmt; 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_path_MSGFMT+set}" = set; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $MSGFMT in @@ -6579,7 +6626,7 @@ set dummy gmsgfmt; 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_path_GMSGFMT+set}" = set; then : +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -6617,20 +6664,20 @@ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + 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_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + 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:${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 ${ac_cv_path_INTLTOOL_PERL+:} false; then : $as_echo_n "(cached) " >&6 else case $INTLTOOL_PERL in @@ -6667,13 +6714,13 @@ if test -z "$INTLTOOL_PERL"; then - as_fn_error "perl not found" "$LINENO" 5 + as_fn_error $? "perl not found" "$LINENO" 5 fi { $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_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 + 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:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 @@ -6686,7 +6733,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 + as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 fi fi @@ -6714,7 +6761,7 @@ 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 : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : DATADIRNAME=share else DATADIRNAME=lib @@ -6735,7 +6782,45 @@ -pkg_modules="gtk+-2.0 >= 2.12.0 gthread-2.0" +# Check whether --enable-man was given. +if test "${enable_man+set}" = set; then : + enableval=$enable_man; enable_man="${enableval}" +else + enable_man=no + +fi + + +# Check whether --enable-more_warnings was given. +if test "${enable_more_warnings+set}" = set; then : + enableval=$enable_more_warnings; enable_more_warnings="${enableval}" +else + enable_more_warnings=no + +fi + + +# Check whether --enable-gtk3 was given. +if test "${enable_gtk3+set}" = set; then : + enableval=$enable_gtk3; case "${enableval}" in + yes) enable_gtk3=yes ;; + no) enable_gtk3=no ;; + *) as_fn_error $? "bad value \"${enableval}\" for --enable-gtk3, use \"yes\" (default) or \"no\"." "$LINENO" 5 ;; +esac +fi + + +# Checks for libraries. +if test "x$enable_gtk3" = "xyes" ; then + CFLAGS="$CFLAGS -DENABLE_GTK3" + gtk_modules="gtk+-3.0 >= 3.0.0" +else + gtk_modules="gtk+-2.0 >= 2.12.0" +fi + + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then @@ -6744,7 +6829,7 @@ set dummy ${ac_tool_prefix}pkg-config; 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_path_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $PKG_CONFIG in @@ -6787,7 +6872,7 @@ set dummy pkg-config; 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_path_ac_pt_PKG_CONFIG+set}" = set; then : +if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : $as_echo_n "(cached) " >&6 else case $ac_pt_PKG_CONFIG in @@ -6850,53 +6935,50 @@ $as_echo "no" >&6; } PKG_CONFIG="" fi - fi pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5 $as_echo_n "checking for GTK... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$GTK_CFLAGS"; then - pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5 +if test -n "$GTK_CFLAGS"; then + pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_modules\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gtk_modules") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules" 2>/dev/null` + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "$gtk_modules" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$GTK_LIBS"; then - pkg_cv_GTK_LIBS="$GTK_LIBS" - else - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_modules\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$pkg_modules") 2>&5 +if test -n "$GTK_LIBS"; then + pkg_cv_GTK_LIBS="$GTK_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$gtk_modules\""; } >&5 + ($PKG_CONFIG --exists --print-errors "$gtk_modules") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "$pkg_modules" 2>/dev/null` + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "$gtk_modules" 2>/dev/null` else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -6904,14 +6986,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$pkg_modules"` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$gtk_modules" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$pkg_modules"` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "$gtk_modules" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - as_fn_error "Package requirements ($pkg_modules) were not met: + as_fn_error $? "Package requirements ($gtk_modules) were not met: $GTK_PKG_ERRORS @@ -6920,12 +7002,13 @@ Alternatively, you may set the environment variables GTK_CFLAGS and GTK_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +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. @@ -6934,13 +7017,13 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } else GTK_CFLAGS=$pkg_cv_GTK_CFLAGS GTK_LIBS=$pkg_cv_GTK_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : + fi @@ -6950,11 +7033,10 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XLIB" >&5 $as_echo_n "checking for XLIB... " >&6; } -if test -n "$PKG_CONFIG"; then - if test -n "$XLIB_CFLAGS"; then - pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$XLIB_CFLAGS"; then + pkg_cv_XLIB_CFLAGS="$XLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"x11\"\""; } >&5 ($PKG_CONFIG --exists --print-errors ""x11"") 2>&5 ac_status=$? @@ -6964,15 +7046,13 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi -if test -n "$PKG_CONFIG"; then - if test -n "$XLIB_LIBS"; then - pkg_cv_XLIB_LIBS="$XLIB_LIBS" - else - if test -n "$PKG_CONFIG" && \ +if test -n "$XLIB_LIBS"; then + pkg_cv_XLIB_LIBS="$XLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"x11\"\""; } >&5 ($PKG_CONFIG --exists --print-errors ""x11"") 2>&5 ac_status=$? @@ -6982,14 +7062,15 @@ else pkg_failed=yes fi - fi -else - pkg_failed=untried + else + pkg_failed=untried fi if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then _pkg_short_errors_supported=yes @@ -6997,14 +7078,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors ""x11""` + XLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors ""x11"" 2>&1` else - XLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors ""x11""` + XLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors ""x11"" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$XLIB_PKG_ERRORS" >&5 - as_fn_error "Package requirements (\"x11\") were not met: + as_fn_error $? "Package requirements (\"x11\") were not met: $XLIB_PKG_ERRORS @@ -7013,12 +7094,13 @@ Alternatively, you may set the environment variables XLIB_CFLAGS and XLIB_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" "$LINENO" 5 +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +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. @@ -7027,23 +7109,19 @@ See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } else XLIB_CFLAGS=$pkg_cv_XLIB_CFLAGS XLIB_LIBS=$pkg_cv_XLIB_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - : -fi +fi -# Check whether --enable-man was given. -if test "${enable_man+set}" = set; then : - enableval=$enable_man; enable_man="${enableval}" -else - enable_man=no +if test x"$enable_more_warnings" = x"yes"; then + ADDITIONAL_FLAGS="-Wall -Werror=all -Werror=format -Werror=implicit-function-declaration -Werror=implicit-int -Werror=missing-braces -Werror=parentheses -Werror=return-type -Werror=strict-aliasing -Werror=switch -Wuninitialized -Werror=unused-label -Werror=unused-value -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Werror=missing-declarations -Wredundant-decls -Wmissing-noreturn -Wpointer-arith -Wcast-align -Wwrite-strings -Werror=inline -Werror=format-nonliteral -Wformat-nonliteral -Werror=format-security -Wformat-security -Winit-self -Werror=missing-include-dirs -Werror=undef -Werror=aggregate-return -Wmissing-format-attribute -Werror=nested-externs -fno-strict-aliasing -fmessage-length=0 -Wp,-D_FORTIFY_SOURCE=2 -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES" fi @@ -7063,7 +7141,7 @@ 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 : +if test "x$ac_cv_header_locale_h" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LOCALE_H 1 _ACEOF @@ -7075,7 +7153,7 @@ if test $ac_cv_header_locale_h = yes; then { $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 ${am_cv_val_LC_MESSAGES+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7115,7 +7193,7 @@ INTLLIBS= 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 : +if test "x$ac_cv_header_libintl_h" = xyes; then : gt_cv_func_dgettext_libintl="no" libintl_extra_libs="" @@ -7124,7 +7202,7 @@ # { $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 ${gt_cv_func_ngettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7155,7 +7233,7 @@ if test "$gt_cv_func_ngettext_libc" = "yes" ; then { $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 ${gt_cv_func_dgettext_libc+:} false; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -7188,7 +7266,7 @@ 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 : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF @@ -7207,7 +7285,7 @@ { $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 ${ac_cv_lib_intl_bindtextdomain+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7241,10 +7319,10 @@ fi { $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 : +if test "x$ac_cv_lib_intl_bindtextdomain" = xyes; 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 ${ac_cv_lib_intl_ngettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7278,10 +7356,10 @@ fi { $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 : +if test "x$ac_cv_lib_intl_ngettext" = xyes; 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 ${ac_cv_lib_intl_dgettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7315,7 +7393,7 @@ fi { $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" = xyes; then : gt_cv_func_dgettext_libintl=yes fi @@ -7331,7 +7409,7 @@ $as_echo "" >&6; } { $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 ${ac_cv_lib_intl_ngettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7365,10 +7443,10 @@ fi { $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 : +if test "x$ac_cv_lib_intl_ngettext" = xyes; 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 ${ac_cv_lib_intl_dcgettext+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -7402,7 +7480,7 @@ fi { $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" = xyes; then : gt_cv_func_dgettext_libintl=yes libintl_extra_libs=-liconv else @@ -7427,7 +7505,7 @@ 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 : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_BIND_TEXTDOMAIN_CODESET 1 _ACEOF @@ -7465,7 +7543,7 @@ set dummy msgfmt; 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_path_MSGFMT+set}" = set; then : +if ${ac_cv_path_MSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case "$MSGFMT" in @@ -7502,7 +7580,7 @@ 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 : +if test "x$ac_cv_func_dcgettext" = xyes; then : cat >>confdefs.h <<_ACEOF #define HAVE_DCGETTEXT 1 _ACEOF @@ -7543,7 +7621,7 @@ set dummy gmsgfmt; 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_path_GMSGFMT+set}" = set; then : +if ${ac_cv_path_GMSGFMT+:} false; then : $as_echo_n "(cached) " >&6 else case $GMSGFMT in @@ -7584,7 +7662,7 @@ set dummy xgettext; 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_path_XGETTEXT+set}" = set; then : +if ${ac_cv_path_XGETTEXT+:} false; then : $as_echo_n "(cached) " >&6 else case "$XGETTEXT" in @@ -7635,7 +7713,7 @@ 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 : +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : CATOBJEXT=.gmo DATADIRNAME=share else @@ -7774,7 +7852,7 @@ set dummy xsltproc; 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_path_XSLTPROC+set}" = set; then : +if ${ac_cv_path_XSLTPROC+:} false; then : $as_echo_n "(cached) " >&6 else case $XSLTPROC in @@ -7843,7 +7921,7 @@ set dummy xmlcatalog; 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_path_XMLCATALOG+set}" = set; then : +if ${ac_cv_path_XMLCATALOG+:} false; then : $as_echo_n "(cached) " >&6 else case $XMLCATALOG in @@ -8001,10 +8079,21 @@ :end' >>confcache if diff "$cache_file" confcache >/dev/null 2>&1; then :; else if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && + if test "x$cache_file" != "x/dev/null"; then { $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 + if test ! -f "$cache_file" || test -h "$cache_file"; then + cat confcache >"$cache_file" + else + case $cache_file in #( + */* | ?:*) + mv -f confcache "$cache_file"$$ && + mv -f "$cache_file"$$ "$cache_file" ;; #( + *) + mv -f confcache "$cache_file" ;; + esac + fi + fi else { $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;} @@ -8020,6 +8109,7 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -8043,23 +8133,23 @@ fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. + 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_fn_error "conditional \"AMDEP\" was never defined. + 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_fn_error "conditional \"am__fastdepCC\" was never defined. + 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_fn_error "conditional \"am__fastdepCC\" was never defined. + 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_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -8067,11 +8157,11 @@ if test -z "${ENABLE_REGENERATE_MAN_TRUE}" && test -z "${ENABLE_REGENERATE_MAN_FALSE}"; then - as_fn_error "conditional \"ENABLE_REGENERATE_MAN\" was never defined. + 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} +: "${CONFIG_STATUS=./config.status}" ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" @@ -8172,6 +8262,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. +as_myself= case $0 in #(( *[\\/]* ) as_myself=$0 ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -8217,19 +8308,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS 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. +# 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 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -8425,7 +8516,7 @@ 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" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -8479,7 +8570,7 @@ # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -8545,10 +8636,10 @@ 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.65, +configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -8566,11 +8657,16 @@ while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -8592,6 +8688,7 @@ $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -8604,7 +8701,7 @@ ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -8613,7 +8710,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -8679,7 +8776,7 @@ "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -8702,9 +8799,10 @@ # after its creation but before its name has been assigned to `$tmp'. $debug || { - tmp= + tmp= ac_tmp= trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status + : "${ac_tmp:=$tmp}" + { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status ' 0 trap 'as_fn_exit 1' 1 2 13 15 } @@ -8712,12 +8810,13 @@ { tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" + test -d "$tmp" } || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 +ac_tmp=$tmp # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -8734,12 +8833,12 @@ 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 -echo 'BEGIN {' >"$tmp/subs1.awk" && +echo 'BEGIN {' >"$ac_tmp/subs1.awk" && _ACEOF @@ -8748,18 +8847,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + 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_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + 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_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -8767,7 +8866,7 @@ rm -f conf$$subs.sh cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK && _ACEOF sed -n ' h @@ -8815,7 +8914,7 @@ rm -f conf$$subs.awk cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && +cat >>"\$ac_tmp/subs1.awk" <<_ACAWK && for (key in S) S_is_set[key] = 1 FS = "" @@ -8847,21 +8946,29 @@ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" else cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 +fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \ + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -8873,7 +8980,7 @@ # No need to generate them if there are no CONFIG_HEADERS. # This happens for instance with `./config.status Makefile'. if test -n "$CONFIG_HEADERS"; then -cat >"$tmp/defines.awk" <<\_ACAWK || +cat >"$ac_tmp/defines.awk" <<\_ACAWK || BEGIN { _ACEOF @@ -8885,11 +8992,11 @@ # handling of long lines. ac_delim='%!_!# ' for ac_last_try in false false :; do - ac_t=`sed -n "/$ac_delim/p" confdefs.h` - if test -z "$ac_t"; then + ac_tt=`sed -n "/$ac_delim/p" confdefs.h` + if test -z "$ac_tt"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -8974,7 +9081,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -8987,7 +9094,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -9006,7 +9113,7 @@ for ac_f do case $ac_f in - -) ac_f="$tmp/stdin";; + -) ac_f="$ac_tmp/stdin";; *) # Look for the file first in the build tree, then in the source tree # (if the path is not absolute). The absolute path cannot be DOS-style, # because $ac_f cannot contain `:'. @@ -9015,7 +9122,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -9041,8 +9148,8 @@ esac case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + *:-:* | *:-) cat >"$ac_tmp/stdin" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -9178,23 +9285,24 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 +eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \ + >$ac_tmp/out || 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"; } && + { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' \ + "$ac_tmp/out"`; test -z "$ac_out"; } && { $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 +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;} +which seems to be undefined. Please make sure it is defined" >&2;} - rm -f "$tmp/stdin" + rm -f "$ac_tmp/stdin" case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; + -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";; + *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -9203,21 +9311,21 @@ if test x"$ac_file" != x-; then { $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" - } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $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_fn_error "could not create $ac_file" "$LINENO" 5 + mv "$ac_tmp/config.h" "$ac_file" \ + || 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_fn_error "could not create -" "$LINENO" 5 + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -9365,7 +9473,7 @@ esac ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 + 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" @@ -9393,7 +9501,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -9414,7 +9522,7 @@ 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 || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff -Nru lxinput-0.3.0/configure.in lxinput-0.3.1/configure.in --- lxinput-0.3.0/configure.in 2010-08-03 09:07:30.000000000 +0000 +++ lxinput-0.3.1/configure.in 2011-07-29 13:10:22.000000000 +0000 @@ -1,8 +1,12 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.in) -AM_INIT_AUTOMAKE(lxinput, 0.3.0) +AM_INIT_AUTOMAKE(lxinput, 0.3.1) AM_CONFIG_HEADER(config.h) +# Support silent build rules. Disable by either passing --disable-silent-rules +# to configure or passing V=1 to make +AM_SILENT_RULES([yes]) + AM_MAINTAINER_MODE AC_ISC_POSIX @@ -13,8 +17,36 @@ AM_GLIB_GNU_GETTEXT IT_PROG_INTLTOOL([0.40.0]) -pkg_modules="gtk+-2.0 >= 2.12.0 gthread-2.0" -PKG_CHECK_MODULES(GTK, [$pkg_modules]) +AC_ARG_ENABLE(man, + [AC_HELP_STRING([--enable-man], + [regenerate roff man pages from Docbook @<:@default=no@:>@])], + [enable_man="${enableval}"], + [enable_man=no] +) + +AC_ARG_ENABLE(more_warnings, + [AC_HELP_STRING([--enable-more-warnings], + [Add more warnings @<:@default=no@:>@])], + [enable_more_warnings="${enableval}"], + [enable_more_warnings=no] +) + +AC_ARG_ENABLE(gtk3, +AC_HELP_STRING([--enable-gtk3],[enable to use gtk-3.0 instead of gtk-2.0]), +[case "${enableval}" in + yes) enable_gtk3=yes ;; + no) enable_gtk3=no ;; + *) AC_MSG_ERROR([bad value "${enableval}" for --enable-gtk3, use "yes" (default) or "no".]) ;; +esac],[]) + +# Checks for libraries. +if test "x$enable_gtk3" = "xyes" ; then + CFLAGS="$CFLAGS -DENABLE_GTK3" + gtk_modules="gtk+-3.0 >= 3.0.0" +else + gtk_modules="gtk+-2.0 >= 2.12.0" +fi +PKG_CHECK_MODULES(GTK, [$gtk_modules]) AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) @@ -22,12 +54,10 @@ AC_SUBST(XLIB_CFLAGS) AC_SUBST(XLIB_LIBS) -AC_ARG_ENABLE(man, - [AC_HELP_STRING([--enable-man], - [regenerate roff man pages from Docbook @<:@default=no@:>@])], - [enable_man="${enableval}"], - [enable_man=no] -) +if test x"$enable_more_warnings" = x"yes"; then + ADDITIONAL_FLAGS="-Wall -Werror=all -Werror=format -Werror=implicit-function-declaration -Werror=implicit-int -Werror=missing-braces -Werror=parentheses -Werror=return-type -Werror=strict-aliasing -Werror=switch -Wuninitialized -Werror=unused-label -Werror=unused-value -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Werror=missing-declarations -Wredundant-decls -Wmissing-noreturn -Wpointer-arith -Wcast-align -Wwrite-strings -Werror=inline -Werror=format-nonliteral -Wformat-nonliteral -Werror=format-security -Wformat-security -Winit-self -Werror=missing-include-dirs -Werror=undef -Werror=aggregate-return -Wmissing-format-attribute -Werror=nested-externs -fno-strict-aliasing -fmessage-length=0 -Wp,-D_FORTIFY_SOURCE=2 -DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES" +fi +AC_SUBST(ADDITIONAL_FLAGS) # Generate po/LINGUAS on the fly rather than relying on translators # to maintain it manually. This also overcome the problem that Transifex diff -Nru lxinput-0.3.0/data/lxinput.desktop lxinput-0.3.1/data/lxinput.desktop --- lxinput-0.3.0/data/lxinput.desktop 2010-08-07 17:35:33.000000000 +0000 +++ lxinput-0.3.1/data/lxinput.desktop 2011-07-29 13:13:21.000000000 +0000 @@ -1,65 +1,98 @@ [Desktop Entry] Type=Application Name=Keyboard and Mouse +Name[af]=Sleutelbord en muis Name[ar]=لوحة المفاتيح والفأرة +Name[be]=Клавіятура і мыш Name[bg]=Клавиатура и мишка Name[bn]=কী-বোর্ড এবং মাউস +Name[bn_IN]=কী-বোর্ড এবং মাউস +Name[ca]=Teclat i ratolí +Name[cs]=Klávesnice a myš Name[da]=Tastatur og mus Name[de]=Tastatur und Maus Name[el]=Πληκτρολόγιο και ποντίκι Name[en_GB]=Keyboard and Mouse Name[es]=Teclado y ratón +Name[fa]=صفحه کلید و موشی +Name[fi]=Näppäinmistö ja hiiri Name[fo]=Knappaborð og mús Name[fr]=Clavier et souris +Name[gl]=Teclado e rato Name[he]=מקלדת ועכבר Name[hr]=Tipkovnica i miš Name[hu]=Billentyűzet és egér +Name[id]=Papan Ketik dan Tetikus Name[it]=Tastiera e Mouse Name[ja]=キーボードとマウス +Name[lg]=Mapeesa agawandisibwa n'akasongesebwa Name[lt]=Klaviatūra ir pelė +Name[nb]=Tastatur og mus +Name[nl]=Toetsenbord en Muis Name[pl]=Klawiatura i mysz -Name[pt]=Teclado e Rato +Name[pt]=Teclado e rato Name[pt_BR]=Teclado e mouse Name[ru]=Клавиатура и мышь +Name[si]=යතුරුපුවරුව සහ මවුසය Name[sk]=Klávesnica a myš Name[sl]=Tipkovnica in miška Name[sr]=Тастатура и миш Name[sr@latin]=Tastatura i miš Name[sv]=Tangentbord och mus +Name[te]=కీబోర్డు మరియు మౌస్ +Name[tr]=Klavye ve Fare +Name[tt_RU]=Төймә тактасы һәм тычканчык Name[uk]=Клавіатура і миша Name[vi]=Bàn phím và chuột +Name[zh_CN]=键盘和鼠标 Name[zh_TW]=鍵盤及滑鼠 Icon=input-keyboard Exec=lxinput Comment=Configure keyboard, mouse, and other input devices +Comment[af]=Stel sleutelbord, muis en ander toevertoestelle op Comment[ar]=اضبط لوحة المفاتيح، الفأرة وأجهزة الإدخال الأخرى -Comment[bg]=Настройка на клавиатурата, мишката идруги входящи устройства +Comment[be]=Наладзіць клавіятуру, мыш і іншыя прылады ўводу +Comment[bg]=Настройка на клавиатурата, мишката и други входни устройства Comment[bn]=কী-বোর্ড, মাউস এবং অন্যান্য ইনপুট ডিভাইস কনফিগার +Comment[bn_IN]=কী-বোর্ড, মাউস ও অন্যান্য ইনপুট ডিভাইস সঞ্চালন করুন +Comment[ca]=Configureu el teclat, ratolí i altres dispositius d'entrada +Comment[cs]=Nastavení klávesnice, myši a ostatních vstupních zařízení Comment[da]=Konfigurer tastatur, mus og andre inddataenheder Comment[de]=Maus, Tastatur und andere Eingabegeräte konfigurieren Comment[el]=Ρυθμίσεις πληκτρολογίου, ποντικιού και άλλων συσκευών εισόδου Comment[en_GB]=Configure keyboard, mouse, and other input devices Comment[es]=Configurar el teclado, ratón y otros dispositivos de entrada Comment[fa]=پیکربندی صفحه کلید، موشواره و دیگر دستگاه‌های ورودی +Comment[fi]=Muokkaa näppäinmistön, hiiren ja muiden syöttölaitteiden asetuksia Comment[fo]=Samanset knappaborð, mús, og arðar inntøkutóleindir Comment[fr]=Configure le clavier, la souris et d'autres périphériques d'entrée +Comment[gl]=Configurar o teclado, o rato e outros dispositivos de entrada Comment[he]=הגדרת המקלדת, העכבר והתקני קלט נוספים Comment[hr]=Konfiguriraj tipkovnicu, miš, i druge ulazne uređaje Comment[hu]=Billentyűzet, egér és egyéb beviteli eszközök beállítása +Comment[id]=Tata papan tik, tetikus, dan perangkat masukan lain Comment[it]=Configura tastiera, mouse, ed altri dispositivi di imput Comment[ja]=キーボードやマウス、その他の入力機器の設定 +Comment[lg]=Teekateeka enkola y'amapeesa agawandisibwa, akasongesebwa n'ebirala ebikozesebwa okuyingiza bintu mu kompyuta Comment[lt]=Konfigūruoti klaviatūrą, pelę ir kitus įvedimo įrenginius -Comment[pl]=Skonfiguruj klawiaturę, mysz i inne urządzenia wejściowe +Comment[nb]=Innstillinger for tastatur, mus og andre inndataenheter +Comment[nl]=Instellen van toetsenbord, muis, en andere invoerapparaten +Comment[pl]=Konfiguruje klawiaturę, mysz i inne urządzenia wejściowe Comment[pt]=Configurar teclado, rato e outros dispositivos -Comment[pt_BR]=Configurar teclado, mouse e outros dispositivos de entrada +Comment[pt_BR]=Configure o teclado, o mouse e outros dispositivos de entrada Comment[ru]=Настроить клавиатуру, мышь и другие устройства ввода +Comment[si]=යතුරුපුවරුව, මවුසය සහ වෙනත් ඇතුළත් කිරීමේ මෙවලම් සකසන්න Comment[sk]=Nastaviť klávesnicu, myš a ostatné vstupné zariadenia -Comment[sl]=Nastavitve tipkovnice, miške in drugih vhodnih enot +Comment[sl]=Nastavite tipkovnico, miško in druge vnosne naprave Comment[sr]=Подесите тастатуру, миш и друге улазне уређаје Comment[sr@latin]=Podesite tastaturu, miš i druge ulazne uređaje Comment[sv]=Inställningar för tangentbord, mus och andra inmatningsenheter +Comment[te]=కీబోర్డు, మౌస్, మరియు ఇన్‌పుట్ పరికరాలను స్వరూపించు +Comment[tr]=Klavye, fare ve diğer girdi aygıtlarını yapılandırın +Comment[tt_RU]=Төймә тактасын, тычканчыкны һәм башка кертү җайланмаларын көйләү Comment[uk]=Налаштування клавіатури, миші та інших вхідних пристроїв Comment[vi]=Cấu hình bàn phím, chuột, và các thiết bị đầu vào khác +Comment[zh_CN]=配置键盘、鼠标和其他输入设备 Comment[zh_TW]=設定鍵盤、滑鼠、及其他輸入裝置 StartupNotify=true Terminal=false diff -Nru lxinput-0.3.0/data/lxinput.ui lxinput-0.3.1/data/lxinput.ui --- lxinput-0.3.0/data/lxinput.ui 2010-08-03 09:05:56.000000000 +0000 +++ lxinput-0.3.1/data/lxinput.ui 2011-07-29 13:10:06.000000000 +0000 @@ -1 +1,668 @@ -12Input Device PreferencesFalsecenterinput-mousedialogFalseTrue2TrueTrueTrue106True0noneTrue12True102466True0Sensitivity:12GTK_FILLGTK_FILL100TrueTruediscontinuousmouse_accel_adj0right23GTK_FILL100TrueTruediscontinuousmouse_threshold_adj0right2312GTK_FILLTrueHigh3412GTK_FILLGTK_FILLTrueLow1212GTK_FILLGTK_FILLTrueFast34GTK_FILLGTK_FILLTrueSlow12GTK_FILLGTK_FILLTrue0Acceleration:GTK_FILLGTK_FILLTrue<b>Motion</b>TrueFalse0Left handed (Swap left and right mouse buttons)TrueTrueFalseTrueFalse1True6True16input-mouse0TrueMouse1FalseTrue106True0noneTrue12True106TrueDelay before each key starts repeating2466True0Repeat delay:GTK_FILLGTK_FILL100TrueTruediscontinuouskb_daley_adj0right23GTK_FILL100TrueTrueInterval between each key repeatdiscontinuouskb_interval_adj0right2312GTK_FILLTrueLong3412GTK_FILLGTK_FILLTrueShort1212GTK_FILLGTK_FILLTrueLong34GTK_FILLGTK_FILLTrueShort12GTK_FILLGTK_FILLTrue0Repeat interval:12GTK_FILLGTK_FILL0True0Type in the following box to test your keyboard settingsFalse1TrueTrueFalse2True<b>Character Repeat</b>TrueFalse0Beep when there is an error of keyboard inputTrueTrueFalseTrueFalse11True6True16input-keyboard0TrueKeyboard11False2TrueTouch Pad2False1Trueendgtk-cancelTrueTrueTrueTrueFalseFalse0gtk-okTrueTrueTrueTrueFalseFalse1Falseend0cancelok50010011001001001003010210101010100101101010102010110101010 + + + + + + False + 12 + Input Device Preferences + False + center + input-mouse + dialog + + + True + False + 2 + + + True + False + end + + + gtk-cancel + True + True + True + False + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + True + + + True + False + 10 + 6 + + + True + False + 0 + none + + + True + False + 12 + + + True + False + 10 + 2 + 4 + 6 + 6 + + + True + False + 0 + Sensitivity: + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + 100 + True + True + discontinuous + mouse_accel_adj + 0 + right + + + 2 + 3 + GTK_FILL + + + + + 100 + True + True + discontinuous + mouse_threshold_adj + 0 + right + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + True + False + High + + + 3 + 4 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + Low + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + Fast + + + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + False + Slow + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + Acceleration: + + + GTK_FILL + GTK_FILL + + + + + + + + + True + False + <b>Motion</b> + True + + + + + False + True + 0 + + + + + Left handed (Swap left and right mouse buttons) + True + True + False + False + True + + + False + True + 1 + + + + + + + True + False + 6 + + + True + False + Mouse + + + True + True + 1 + + + + + False + + + + + True + False + 10 + 6 + + + True + False + 0 + none + + + True + False + 12 + + + True + False + 10 + 6 + + + True + False + Delay before each key starts repeating + 2 + 4 + 6 + 6 + + + True + False + 0 + Repeat delay: + + + GTK_FILL + GTK_FILL + + + + + 100 + True + True + discontinuous + kb_daley_adj + 0 + right + + + 2 + 3 + GTK_FILL + + + + + 100 + True + True + Interval between each key repeat + discontinuous + kb_interval_adj + 0 + right + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + True + False + Long + + + 3 + 4 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + Short + + + 1 + 2 + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + Long + + + 3 + 4 + GTK_FILL + GTK_FILL + + + + + True + False + Short + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + Repeat interval: + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + True + True + 0 + + + + + True + False + 0 + Type in the following box to test your keyboard settings + + + False + True + 1 + + + + + True + True + False + False + True + True + + + False + True + 2 + + + + + + + + + True + False + <b>Character Repeat</b> + True + + + + + False + True + 0 + + + + + Beep when there is an error of keyboard input + True + True + False + False + True + + + False + True + 1 + + + + + True + False + + + + + + + + + False + False + 2 + + + + + True + False + 0 + none + + + True + False + 12 + + + True + False + + + True + True + True + False + right + + + False + True + end + 0 + + + + + + + + + True + False + <b>Keyboard layout</b> + True + + + + + True + True + 3 + + + + + 1 + + + + + True + False + 6 + + + True + False + 16 + input-keyboard + + + True + True + 0 + + + + + True + False + Keyboard + + + True + True + 1 + + + + + 1 + False + + + + + False + + + + + + 2 + + + + + True + False + Touch Pad + + + 2 + False + + + + + True + True + 1 + + + + + + cancel + ok + + + + True + False + input-keyboard + + + True + False + input-keyboard + + + 100 + 1100 + 500 + 100 + 100 + 100 + + + 10 + 210 + 30 + 10 + 10 + 10 + + + 10 + 110 + 20 + 10 + 10 + 10 + + + 10 + 110 + 100 + 10 + 10 + 10 + + diff -Nru lxinput-0.3.0/debian/apport/source_lxinput.py lxinput-0.3.1/debian/apport/source_lxinput.py --- lxinput-0.3.0/debian/apport/source_lxinput.py 2010-08-09 21:43:22.000000000 +0000 +++ lxinput-0.3.1/debian/apport/source_lxinput.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -""" - Copyright (c) 2010 Julien Lavergne - - 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. -""" - -import os -import apport.hookutils - -#Detect session -session = os.environ['DESKTOP_SESSION'] - -#If it's not a specific session, fallback to LXDE -if not session: - session = "LXDE" - -#Set location of various configuration files -system_conf = "/etc/xdg/lxsession/" -home_conf = os.path.expanduser("~/.config/lxsession/") - -#Set description for each file reported by apport -report_config_system = "Config_System_" + session -report_config_home = "Config_Home_" + session - -def add_info(report): - # If a config file exist in HOME, report it instead of the system one. - if os.path.exists(os.path.join(home_conf,session,"desktop.conf")): - report[report_config_home] = apport.hookutils.read_file(os.path.join(home_conf,session,"desktop.conf")) - else: - report[report_config_system] = apport.hookutils.read_file(os.path.join(system_conf,session,"desktop.conf")) diff -Nru lxinput-0.3.0/debian/changelog lxinput-0.3.1/debian/changelog --- lxinput-0.3.0/debian/changelog 2011-02-26 19:05:30.000000000 +0000 +++ lxinput-0.3.1/debian/changelog 2012-03-27 23:34:11.000000000 +0000 @@ -1,63 +1,51 @@ -lxinput (0.3.0-0ubuntu4~ppa1) natty; urgency=low +lxinput (0.3.1-1ubuntu1~ppa2) precise; urgency=low - * debian/patches - - 80_translations.patch: Update translations from git (2011-02-19) + * - -- Julien Lavergne Sat, 26 Feb 2011 20:05:21 +0100 + -- Julien Lavergne Wed, 28 Mar 2012 01:34:07 +0200 -lxinput (0.3.0-0ubuntu3) natty; urgency=low +lxinput (0.3.1-1) unstable; urgency=low - * debian/rules: - - Use --with autoreconf. - - Add flags to prepare GTK3 migration. - - Pass --as-needed for LDFLAGS. - - Install apport hook only on Ubuntu. - * debian/apport: - - Move apport hook in a subdirectory. - * debian/control: - - Build-depends on lsb-release, needed to detect the distribution. - - Wrap depends and build-depends. - - Build-depends on dh-autoreconf. - * debian/patches/ - - 01_layout_button.patch: Add a button to launch a program to change the - keyboard layout. Only lxkeymap supported so far. - - 02_build_system_clean.patch: Remove .glade to .ui convertion, and don't - clean .ui files. - - 03_gseal_enable_migration.patch: Fixes when gseal is available, to prepare - GTK3 migration. - - -- Julien Lavergne Tue, 22 Feb 2011 00:26:48 +0100 - -lxinput (0.3.0-0ubuntu2) maverick; urgency=low - - * debian/source_lxinput.py: - - Test the correct config file. - * debian/rules: - - Remove autoreconf call, not needed for stable release. - - -- Julien Lavergne Sat, 21 Aug 2010 19:11:52 +0200 - -lxinput (0.3.0-0ubuntu1) maverick; urgency=low - - [ Julien Lavergne ] - * Sync with Debian LXDE git. - * debian/source_lxinput.py - - Add apport hook for lxinput, to collect config file. - * debian/install - - Install apport hook. + [ Daniel Baumann ] + * Removing useless whitespaces at EOL and EOF. + * Updating to debhelper version 8. + * Sorting build-depends. + * Wrapping build-depends. + * Updating to standards version 3.9.2. + * Updating vcs fields. + * Sorting depends. + * Making versioned depends on lxsession unversioned as it's + already fulfiled in stable. + * Completing and rewriting copyright file in machine + interpretable format. + * Removing debhelper docs file. + * Compacting watch file. + * Compacting rules file. + * Merging upstream version 0.3.0. + * Removing patch and autoreconf, not needed for upstream + version 0.3.0 anymore. + * Removing unused debhelper dirs file. + * Sorting overrides in rules chronologically. + * Adding comment why dh_auto_test is disabled due to missing + lxinput.glade from upstream tarball. + * Adding apport hook for Ubuntu and Ubuntu derivatives from + Julien Lavergne . + * Avoid article in the beginning of the package short-description + to make lintian happy. [ Andrew Lee (李健秋) ] - * New upstream release - - Fixed incorrect path of config file - - Fixed wrongly transformed mouse threshold parameter - (LP: #563534) - - Fixed incorrect path of desktop entry file template - - Fixed broken translation in bg.po - - Fixed configure.in and Makefile.am to add proper xlib flags - (Closes: #555573) - - Translation updates + * Corrected reference to /usr/share/common-licenses/LGPL-3 file. + * Merging upstream version 0.3.1: (Cloese: #555573) + - Correct ids in .ui file + - Add an option to compile with gtk3 + - Add silent rules + - Add INSTALL file + - Use directly the .ui file + - Add optional entry when a program which change keymap is + installed (support only lxkeymap for now) + * Removing useless override_dh_auto_clean in rules file. - -- Julien Lavergne Mon, 09 Aug 2010 00:48:39 +0200 + -- Andrew Lee (李健秋) Sat, 30 Jul 2011 22:18:32 +0800 lxinput (0.1.1+git20100807-1) experimental; urgency=low @@ -96,7 +84,7 @@ * New upstream release - Reworked lxinput man page generation - Use Docbook-XML instead of SGML + Use Docbook-XML instead of SGML - Bring along own icons * debian/copyright - Update for new Icons diff -Nru lxinput-0.3.0/debian/compat lxinput-0.3.1/debian/compat --- lxinput-0.3.0/debian/compat 2010-08-09 20:39:26.000000000 +0000 +++ lxinput-0.3.1/debian/compat 2011-07-30 14:12:41.000000000 +0000 @@ -1 +1 @@ -7 +8 diff -Nru lxinput-0.3.0/debian/control lxinput-0.3.1/debian/control --- lxinput-0.3.0/debian/control 2011-02-21 22:48:39.000000000 +0000 +++ lxinput-0.3.1/debian/control 2012-03-23 22:36:17.000000000 +0000 @@ -4,29 +4,21 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian LXDE Packaging Team Uploaders: Andrew Lee (李健秋) -Build-Depends: debhelper (>= 7.0.50~), - autotools-dev, - libgtk2.0-dev (>=2.12), - intltool, - docbook-xsl, - libtool, - libltdl-dev, - lsb-release, - dh-autoreconf -Standards-Version: 3.9.1 +Build-Depends: + debhelper (>= 8), autotools-dev, docbook-xsl, intltool, + libgtk2.0-dev (>= 2.12), libltdl-dev, libtool +Standards-Version: 3.9.2 Homepage: http://lxde.org -Vcs-Git: git://git.debian.org/git/collab-maint/lxinput.git -Vcs-Browser: http://git.debian.org/?p=collab-maint/lxinput.git;a=summary +Vcs-Browser: http://git.debian.org/?p=pkg-lxde/lxinput.git +Vcs-Git: git://git.debian.org/git/pkg-lxde/lxinput.git Package: lxinput Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - lxsession (>= 0.4.4) -Description: a program to configure keyboard and mouse settings for LXDE +Depends: ${misc:Depends}, ${shlibs:Depends}, lxsession +Description: program to configure keyboard and mouse settings for LXDE LXInput is a program to configure keyboard and mouse settings for LXDE. Features: * Delay and Interval for character repeat * Enable/Disable beeps of keyboard input error - * Swap left and right mouse buttons + * Swap left and right mouse buttons * Mouse acceleration and sensitivity diff -Nru lxinput-0.3.0/debian/copyright lxinput-0.3.1/debian/copyright --- lxinput-0.3.0/debian/copyright 2010-08-09 20:39:26.000000000 +0000 +++ lxinput-0.3.1/debian/copyright 2011-07-30 14:12:41.000000000 +0000 @@ -1,46 +1,69 @@ -This package was debianized by: - - Andrew Lee on Thu, 28 May 2009 09:20:55 +0800 - -It was downloaded from: - - http://lxde.org - -Upstream Author: - - Hong Jen Yee (PCMan) +Files: * +Copyright: (C) 2009-2011 Hong Jen Yee (PCMan) +License: GPL-3+ +Files: data/*.png Copyright: - - Copyright (C) 2009 Hong Jen Yee (PCMan) - -License: - - * LXInput main program: - - 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 - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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, see . - - * Icons (In directory data/ ) - - Icons from http://www.oxygen-icons.org/ - Licensed under the GNU Lesser General Public License (LGPL) - -On Debian systems, the complete text of the GNU General -Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. - -The Debian packaging is: - - Copyright (C) 2009 Andrew Lee - -and is licensed under the GPL version 3, see above. + (C) 2007-2009 David Vignoni + (C) 2007-2009 Johann Ollivier Lapeyre + (C) 2007-2009 Kenneth Wimer + (C) 2007-2009 Nuno Fernades Pinheiro + (C) 2007-2009 Riccardo Iaconelli + (C) 2007-2009 David Miller +License: LGPL-3+ + Icons from http://www.oxygen-icons.org/. + +Files: debian/* +Copyright: (C) 2009-2011 Andrew Lee (李健秋) +License: GPL-3 + +License: GPL-3 + 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 + the Free Software Foundation, version 3 of the License. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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, see . + . + The complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-3 file. + +License: GPL-3+ + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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, see . + . + The complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-3 file. + +License: LGPL-3+ + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + . + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + . + The complete text of the GNU Lesser General Public License + can be found in /usr/share/common-licenses/LGPL-3 file. diff -Nru lxinput-0.3.0/debian/dirs lxinput-0.3.1/debian/dirs --- lxinput-0.3.0/debian/dirs 2010-08-09 20:39:26.000000000 +0000 +++ lxinput-0.3.1/debian/dirs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/bin -usr/sbin diff -Nru lxinput-0.3.0/debian/docs lxinput-0.3.1/debian/docs --- lxinput-0.3.0/debian/docs 2010-08-09 20:39:26.000000000 +0000 +++ lxinput-0.3.1/debian/docs 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -NEWS -README diff -Nru lxinput-0.3.0/debian/local/source_lxinput.py lxinput-0.3.1/debian/local/source_lxinput.py --- lxinput-0.3.0/debian/local/source_lxinput.py 1970-01-01 00:00:00.000000000 +0000 +++ lxinput-0.3.1/debian/local/source_lxinput.py 2011-07-30 14:12:41.000000000 +0000 @@ -0,0 +1,42 @@ +""" + Copyright (c) 2010 Julien Lavergne + + 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 + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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. +""" + +import os +import apport.hookutils + +#Detect session +session = os.environ['DESKTOP_SESSION'] + +#If it's not a specific session, fallback to LXDE +if not session: + session = "LXDE" + +#Set location of various configuration files +system_conf = "/etc/xdg/lxsession/" +home_conf = os.path.expanduser("~/.config/lxsession/") + +#Set description for each file reported by apport +report_config_system = "Config_System_" + session +report_config_home = "Config_Home_" + session + +def add_info(report): + # If a config file exist in HOME, report it instead of the system one. + if os.path.exists(os.path.join(home_conf,session,"desktop.conf")): + report[report_config_home] = apport.hookutils.read_file(os.path.join(home_conf,session,"desktop.conf")) + else: + report[report_config_system] = apport.hookutils.read_file(os.path.join(system_conf,session,"desktop.conf")) diff -Nru lxinput-0.3.0/debian/patches/01_fix_load_save_settings.patch lxinput-0.3.1/debian/patches/01_fix_load_save_settings.patch --- lxinput-0.3.0/debian/patches/01_fix_load_save_settings.patch 1970-01-01 00:00:00.000000000 +0000 +++ lxinput-0.3.1/debian/patches/01_fix_load_save_settings.patch 2012-03-27 23:34:25.000000000 +0000 @@ -0,0 +1,232 @@ +Description: + TODO: Put a short summary on the line above and replace this paragraph + with a longer explanation of this change. Complete the meta-information + with other relevant fields (see below for details). To make it easier, the + information below has been extracted from the changelog. Adjust it or drop + it. + . + lxinput (0.3.1-1) unstable; urgency=low + . + [ Daniel Baumann ] + * Removing useless whitespaces at EOL and EOF. + * Updating to debhelper version 8. + * Sorting build-depends. + * Wrapping build-depends. + * Updating to standards version 3.9.2. + * Updating vcs fields. + * Sorting depends. + * Making versioned depends on lxsession unversioned as it's + already fulfiled in stable. + * Completing and rewriting copyright file in machine + interpretable format. + * Removing debhelper docs file. + * Compacting watch file. + * Compacting rules file. + * Merging upstream version 0.3.0. + * Removing patch and autoreconf, not needed for upstream + version 0.3.0 anymore. + * Removing unused debhelper dirs file. + * Sorting overrides in rules chronologically. + * Adding comment why dh_auto_test is disabled due to missing + lxinput.glade from upstream tarball. + * Adding apport hook for Ubuntu and Ubuntu derivatives from + Julien Lavergne . + * Avoid article in the beginning of the package short-description + to make lintian happy. + . + [ Andrew Lee (李健秋) ] + * Corrected reference to /usr/share/common-licenses/LGPL-3 file. + * Merging upstream version 0.3.1: (Cloese: #555573) + - Correct ids in .ui file + - Add an option to compile with gtk3 + - Add silent rules + - Add INSTALL file + - Use directly the .ui file + - Add optional entry when a program which change keymap is + installed (support only lxkeymap for now) + * Removing useless override_dh_auto_clean in rules file. +Author: Andrew Lee (李健秋) + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +Index: lxinput-0.3.1/src/lxinput.c +=================================================================== +--- lxinput-0.3.1.orig/src/lxinput.c 2012-03-23 23:35:31.000000000 +0100 ++++ lxinput-0.3.1/src/lxinput.c 2012-03-28 01:34:20.000000000 +0200 +@@ -33,7 +33,7 @@ + #include + + static char* file = NULL; +-static GKeyFile* kf; ++//static GKeyFile* kf; + + static GtkWidget *dlg; + static GtkRange *mouse_accel; +@@ -174,37 +174,48 @@ + + static void load_settings() + { +- gboolean ret; + const char* session_name = g_getenv("DESKTOP_SESSION"); + /* load settings from current session config files */ + if(!session_name) + session_name = "LXDE"; +- file = g_build_filename( g_get_user_config_dir(), "lxsession", session_name, "desktop.conf", NULL ); +- ret = g_key_file_load_from_file( kf, file, 0, NULL ); + +- if( ret ) +- { +- int val; +- val = g_key_file_get_integer(kf, "Mouse", "AccFactor", NULL); +- if( val > 0) +- old_accel = accel = val; +- +- val = g_key_file_get_integer(kf, "Mouse", "AccThreshold", NULL); +- if( val > 0) +- old_threshold = threshold = val; +- +- old_left_handed = left_handed = g_key_file_get_boolean(kf, "Mouse", "LeftHanded", NULL); +- +- val = g_key_file_get_integer(kf, "Keyboard", "Delay", NULL); +- if(val > 0) +- old_delay = delay = val; +- val = g_key_file_get_integer(kf, "Keyboard", "Interval", NULL); +- if(val > 0) +- old_interval = interval = val; ++ char* rel_path = g_strconcat("lxsession/", session_name, "/desktop.conf", NULL); ++ char* user_config_file = g_build_filename(g_get_user_config_dir(), rel_path, NULL); ++ GKeyFile* kf = g_key_file_new(); + +- if( g_key_file_has_key(kf, "Keyboard", "Beep", NULL ) ) +- old_beep = beep = g_key_file_get_boolean(kf, "Keyboard", "Beep", NULL); ++ if(!g_key_file_load_from_file(kf, user_config_file, G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, NULL)) ++ { ++ g_key_file_load_from_dirs(kf, rel_path, (const char**)g_get_system_config_dirs(), NULL, ++ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, NULL); + } ++ ++ g_free(rel_path); ++ ++ int val; ++ val = g_key_file_get_integer(kf, "Mouse", "AccFactor", NULL); ++ if( val > 0) ++ old_accel = accel = val; ++ ++ val = g_key_file_get_integer(kf, "Mouse", "AccThreshold", NULL); ++ if( val > 0) ++ old_threshold = threshold = val; ++ ++ old_left_handed = left_handed = g_key_file_get_boolean(kf, "Mouse", "LeftHanded", NULL); ++ ++ val = g_key_file_get_integer(kf, "Keyboard", "Delay", NULL); ++ if(val > 0) ++ old_delay = delay = val; ++ val = g_key_file_get_integer(kf, "Keyboard", "Interval", NULL); ++ if(val > 0) ++ old_interval = interval = val; ++ ++ if( g_key_file_has_key(kf, "Keyboard", "Beep", NULL ) ) ++ old_beep = beep = g_key_file_get_boolean(kf, "Keyboard", "Beep", NULL); ++ ++ g_key_file_free(kf); ++ ++ g_free(user_config_file); ++ + } + + int main(int argc, char** argv) +@@ -213,6 +224,15 @@ + GError* err = NULL; + char* str = NULL; + ++ GKeyFile* kf = g_key_file_new(); ++ const char* session_name = g_getenv("DESKTOP_SESSION"); ++ /* load settings from current session config files */ ++ if(!session_name) ++ session_name = "LXDE"; ++ ++ char* rel_path = g_strconcat("lxsession/", session_name, "/desktop.conf", NULL); ++ char* user_config_file = g_build_filename(g_get_user_config_dir(), rel_path, NULL); ++ + #ifdef ENABLE_NLS + bindtextdomain ( GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR ); + bind_textdomain_codeset ( GETTEXT_PACKAGE, "UTF-8" ); +@@ -256,7 +276,6 @@ + + + /* read the config flie */ +- kf = g_key_file_new(); + load_settings(); + + /* init the UI */ +@@ -284,6 +303,22 @@ + if( gtk_dialog_run( (GtkDialog*)dlg ) == GTK_RESPONSE_OK ) + { + gsize len; ++ char* buf; ++ ++ if(!g_key_file_load_from_file(kf, user_config_file, G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, NULL)) ++ { ++ /* the user config file doesn't exist, create its parent dir */ ++ len = strlen(user_config_file) - strlen("/desktop.conf"); ++ user_config_file[len] = '\0'; ++ g_debug("user_config_file = %s", user_config_file); ++ g_mkdir_with_parents(user_config_file, 0700); ++ user_config_file[len] = '/'; ++ ++ g_key_file_load_from_dirs(kf, rel_path, (const char**)g_get_system_config_dirs(), NULL, ++ G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, NULL); ++ } ++ ++ g_free(rel_path); + + g_key_file_set_integer(kf, "Mouse", "AccFactor", accel); + g_key_file_set_integer(kf, "Mouse", "AccThreshold", threshold); +@@ -293,20 +328,14 @@ + g_key_file_set_integer(kf, "Keyboard", "Interval", interval); + g_key_file_set_integer(kf, "Keyboard", "Beep", !!beep); + +- if( str = g_key_file_to_data( kf, &len, NULL ) ) +- { +- if( g_file_set_contents( file, str, len, &err ) ) +- { +- /* ask the settigns daemon to reload */ +- /* FIXME: is this needed? */ +- /* g_spawn_command_line_sync("lxde-settings-daemon reload", NULL, NULL, NULL, NULL); */ +- } +- else +- { +- g_error_free( err ); +- } +- g_free(str); +- } ++ str = g_key_file_to_data(kf, &len, NULL); ++ g_file_set_contents(user_config_file, str, len, NULL); ++ g_free(str); ++ ++ /* ask the settigns daemon to reload */ ++ /* FIXME: is this needed? */ ++ /* g_spawn_command_line_sync("lxde-settings-daemon reload", NULL, NULL, NULL, NULL); */ ++ + } + else + { +@@ -332,6 +361,7 @@ + + g_free( file ); + g_key_file_free( kf ); ++ g_free(user_config_file); + + return 0; + } diff -Nru lxinput-0.3.0/debian/patches/01_layout_button.patch lxinput-0.3.1/debian/patches/01_layout_button.patch --- lxinput-0.3.0/debian/patches/01_layout_button.patch 2010-10-27 18:17:07.000000000 +0000 +++ lxinput-0.3.1/debian/patches/01_layout_button.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,667 +0,0 @@ -Index: lxinput/data/lxinput.ui -=================================================================== ---- lxinput.orig/data/lxinput.ui -+++ lxinput/data/lxinput.ui -@@ -1 +1,583 @@ --12Input Device PreferencesFalsecenterinput-mousedialogFalseTrue2TrueTrueTrue106True0noneTrue12True102466True0Sensitivity:12GTK_FILLGTK_FILL100TrueTruediscontinuousmouse_accel_adj0right23GTK_FILL100TrueTruediscontinuousmouse_threshold_adj0right2312GTK_FILLTrueHigh3412GTK_FILLGTK_FILLTrueLow1212GTK_FILLGTK_FILLTrueFast34GTK_FILLGTK_FILLTrueSlow12GTK_FILLGTK_FILLTrue0Acceleration:GTK_FILLGTK_FILLTrue<b>Motion</b>TrueFalse0Left handed (Swap left and right mouse buttons)TrueTrueFalseTrueFalse1True6True16input-mouse0TrueMouse1FalseTrue106True0noneTrue12True106TrueDelay before each key starts repeating2466True0Repeat delay:GTK_FILLGTK_FILL100TrueTruediscontinuouskb_daley_adj0right23GTK_FILL100TrueTrueInterval between each key repeatdiscontinuouskb_interval_adj0right2312GTK_FILLTrueLong3412GTK_FILLGTK_FILLTrueShort1212GTK_FILLGTK_FILLTrueLong34GTK_FILLGTK_FILLTrueShort12GTK_FILLGTK_FILLTrue0Repeat interval:12GTK_FILLGTK_FILL0True0Type in the following box to test your keyboard settingsFalse1TrueTrueFalse2True<b>Character Repeat</b>TrueFalse0Beep when there is an error of keyboard inputTrueTrueFalseTrueFalse11True6True16input-keyboard0TrueKeyboard11False2TrueTouch Pad2False1Trueendgtk-cancelTrueTrueTrueTrueFalseFalse0gtk-okTrueTrueTrueTrueFalseFalse1Falseend0cancelok50010011001001001003010210101010100101101010102010110101010 -+ -+ -+ -+ -+ -+ 12 -+ Input Device Preferences -+ False -+ center -+ input-mouse -+ dialog -+ -+ -+ True -+ 2 -+ -+ -+ True -+ True -+ -+ -+ True -+ 10 -+ 6 -+ -+ -+ True -+ 0 -+ none -+ -+ -+ True -+ 12 -+ -+ -+ True -+ 10 -+ 2 -+ 4 -+ 6 -+ 6 -+ -+ -+ True -+ 0 -+ Sensitivity: -+ -+ -+ 1 -+ 2 -+ GTK_FILL -+ GTK_FILL -+ -+ -+ -+ -+ 100 -+ True -+ True -+ discontinuous -+ mouse_accel_adj -+ 0 -+ right -+ -+ -+ 2 -+ 3 -+ GTK_FILL -+ -+ -+ -+ -+ 100 -+ True -+ True -+ discontinuous -+ mouse_threshold_adj -+ 0 -+ right -+ -+ -+ 2 -+ 3 -+ 1 -+ 2 -+ GTK_FILL -+ -+ -+ -+ -+ True -+ High -+ -+ -+ 3 -+ 4 -+ 1 -+ 2 -+ GTK_FILL -+ GTK_FILL -+ -+ -+ -+ -+ True -+ Low -+ -+ -+ 1 -+ 2 -+ 1 -+ 2 -+ GTK_FILL -+ GTK_FILL -+ -+ -+ -+ -+ True -+ Fast -+ -+ -+ 3 -+ 4 -+ GTK_FILL -+ GTK_FILL -+ -+ -+ -+ -+ True -+ Slow -+ -+ -+ 1 -+ 2 -+ GTK_FILL -+ GTK_FILL -+ -+ -+ -+ -+ True -+ 0 -+ Acceleration: -+ -+ -+ GTK_FILL -+ GTK_FILL -+ -+ -+ -+ -+ -+ -+ -+ -+ True -+ <b>Motion</b> -+ True -+ -+ -+ -+ -+ False -+ 0 -+ -+ -+ -+ -+ Left handed (Swap left and right mouse buttons) -+ True -+ True -+ False -+ True -+ -+ -+ False -+ 1 -+ -+ -+ -+ -+ -+ -+ True -+ 6 -+ -+ -+ True -+ 16 -+ input-mouse -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ Mouse -+ -+ -+ 1 -+ -+ -+ -+ -+ False -+ -+ -+ -+ -+ True -+ 10 -+ 6 -+ -+ -+ True -+ 0 -+ none -+ -+ -+ True -+ 12 -+ -+ -+ True -+ 10 -+ 6 -+ -+ -+ True -+ Delay before each key starts repeating -+ 2 -+ 4 -+ 6 -+ 6 -+ -+ -+ True -+ 0 -+ Repeat delay: -+ -+ -+ GTK_FILL -+ GTK_FILL -+ -+ -+ -+ -+ 100 -+ True -+ True -+ discontinuous -+ kb_daley_adj -+ 0 -+ right -+ -+ -+ 2 -+ 3 -+ GTK_FILL -+ -+ -+ -+ -+ 100 -+ True -+ True -+ Interval between each key repeat -+ discontinuous -+ kb_interval_adj -+ 0 -+ right -+ -+ -+ 2 -+ 3 -+ 1 -+ 2 -+ GTK_FILL -+ -+ -+ -+ -+ True -+ Long -+ -+ -+ 3 -+ 4 -+ 1 -+ 2 -+ GTK_FILL -+ GTK_FILL -+ -+ -+ -+ -+ True -+ Short -+ -+ -+ 1 -+ 2 -+ 1 -+ 2 -+ GTK_FILL -+ GTK_FILL -+ -+ -+ -+ -+ True -+ Long -+ -+ -+ 3 -+ 4 -+ GTK_FILL -+ GTK_FILL -+ -+ -+ -+ -+ True -+ Short -+ -+ -+ 1 -+ 2 -+ GTK_FILL -+ GTK_FILL -+ -+ -+ -+ -+ True -+ 0 -+ Repeat interval: -+ -+ -+ 1 -+ 2 -+ GTK_FILL -+ GTK_FILL -+ -+ -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ 0 -+ Type in the following box to test your keyboard settings -+ -+ -+ False -+ 1 -+ -+ -+ -+ -+ True -+ True -+ -+ -+ False -+ 2 -+ -+ -+ -+ -+ -+ -+ -+ -+ True -+ <b>Character Repeat</b> -+ True -+ -+ -+ -+ -+ False -+ 0 -+ -+ -+ -+ -+ Beep when there is an error of keyboard input -+ True -+ True -+ False -+ True -+ -+ -+ False -+ 1 -+ -+ -+ -+ -+ True -+ -+ -+ True -+ Keyboard layout -+ right -+ -+ -+ False -+ end -+ 1 -+ -+ -+ -+ -+ True -+ True -+ True -+ image10 -+ right -+ -+ -+ False -+ end -+ 0 -+ -+ -+ -+ -+ False -+ False -+ 2 -+ -+ -+ -+ -+ 1 -+ -+ -+ -+ -+ True -+ 6 -+ -+ -+ True -+ 16 -+ input-keyboard -+ -+ -+ 0 -+ -+ -+ -+ -+ True -+ Keyboard -+ -+ -+ 1 -+ -+ -+ -+ -+ 1 -+ False -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ 2 -+ -+ -+ -+ -+ True -+ Touch Pad -+ -+ -+ 2 -+ False -+ -+ -+ -+ -+ 1 -+ -+ -+ -+ -+ True -+ end -+ -+ -+ gtk-cancel -+ True -+ True -+ True -+ True -+ -+ -+ False -+ False -+ 0 -+ -+ -+ -+ -+ gtk-ok -+ True -+ True -+ True -+ True -+ -+ -+ False -+ False -+ 1 -+ -+ -+ -+ -+ False -+ end -+ 0 -+ -+ -+ -+ -+ -+ cancel -+ ok -+ -+ -+ -+ 500 -+ 100 -+ 1100 -+ 100 -+ 100 -+ 100 -+ -+ -+ 30 -+ 10 -+ 210 -+ 10 -+ 10 -+ 10 -+ -+ -+ 100 -+ 10 -+ 110 -+ 10 -+ 10 -+ 10 -+ -+ -+ 20 -+ 10 -+ 110 -+ 10 -+ 10 -+ 10 -+ -+ -+ True -+ input-keyboard -+ -+ -Index: lxinput/src/lxinput.c -=================================================================== ---- lxinput.orig/src/lxinput.c -+++ lxinput/src/lxinput.c -@@ -42,6 +42,8 @@ static GtkToggleButton* mouse_left_hande - static GtkRange *kb_delay; - static GtkRange *kb_interval; - static GtkToggleButton* kb_beep; -+static GtkButton* kb_layout; -+static GtkLabel* kb_layout_label; - - static int accel = 20, old_accel = 20; - static int threshold = 10, old_threshold = 10; -@@ -128,6 +130,39 @@ static gboolean on_change_val(GtkRange * - return FALSE; - } - -+static const gchar* detect_keymap_program() -+{ -+ const gchar *program = NULL; -+ -+ /*find if lxkeymap is in the path*/ -+ program = "lxkeymap"; -+ if (g_find_program_in_path(program)) -+ { -+ return program; -+ } -+ /*TODO -+ Add other keymap executable*/ -+ else -+ { -+ return NULL; -+ } -+ -+} -+ -+static void on_kb_layout_clicked(GtkButton *button, gpointer user_data) -+{ -+ -+ int status; -+ char* output = NULL; -+ const gchar *program = detect_keymap_program(); -+ -+ if (program) -+ { -+ g_spawn_command_line_sync(program, &output, NULL, &status, NULL ); -+ } -+ -+} -+ - static void set_range_stops(GtkRange* range, int interval ) - { - /* -@@ -201,6 +236,16 @@ int main(int argc, char** argv) - kb_delay = (GtkRange*)gtk_builder_get_object(builder,"kb_delay"); - kb_interval = (GtkRange*)gtk_builder_get_object(builder,"kb_interval"); - kb_beep = (GtkToggleButton*)gtk_builder_get_object(builder,"beep"); -+ kb_layout = (GtkButton*)gtk_builder_get_object(builder,"keyboard_layout"); -+ -+ const gchar *program = detect_keymap_program(); -+ if (program == NULL) -+ { -+ /* Hide the button if there is no program to set keymap */ -+ kb_layout_label = (GtkLabel*)gtk_builder_get_object(builder,"keyboard_layout_label"); -+ gtk_widget_set_visible(kb_layout_label, FALSE); -+ gtk_widget_set_visible(kb_layout, FALSE); -+ } - - g_object_unref( builder ); - -@@ -229,6 +274,7 @@ int main(int argc, char** argv) - set_range_stops(kb_interval, 10); - g_signal_connect(kb_interval, "value-changed", G_CALLBACK(on_kb_range_changed), &kb_interval); - g_signal_connect(kb_beep, "toggled", G_CALLBACK(on_kb_beep_toggle), NULL); -+ g_signal_connect(kb_layout, "clicked", G_CALLBACK(on_kb_layout_clicked), NULL); - - if( gtk_dialog_run( (GtkDialog*)dlg ) == GTK_RESPONSE_OK ) - { diff -Nru lxinput-0.3.0/debian/patches/02_build_system_clean.patch lxinput-0.3.1/debian/patches/02_build_system_clean.patch --- lxinput-0.3.0/debian/patches/02_build_system_clean.patch 2010-10-27 16:28:10.000000000 +0000 +++ lxinput-0.3.1/debian/patches/02_build_system_clean.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +0,0 @@ -Index: lxinput/Makefile.am -=================================================================== ---- lxinput.orig/Makefile.am -+++ lxinput/Makefile.am -@@ -2,11 +2,8 @@ NULL= - - SUBDIRS = src po man - --ui_in_files= \ -- data/lxinput.glade \ -- $(NULL) --uidir=$(datadir)/lxinput --ui_DATA = $(ui_in_files:.glade=.ui) -+uidir = $(datadir)/lxinput -+ui_DATA = data/lxinput.ui - - desktopdir=$(datadir)/applications - desktop_in_files = \ -@@ -28,9 +25,4 @@ EXTRA_DIST = \ - $(NULL) - - CLEANFILES = \ -- $(ui_DATA) \ - $(NULL) -- --%.ui: %.glade -- cp $< $@ -- $(top_builddir)/src/xml-purge $@ diff -Nru lxinput-0.3.0/debian/patches/03_gseal_enable_migration.patch lxinput-0.3.1/debian/patches/03_gseal_enable_migration.patch --- lxinput-0.3.0/debian/patches/03_gseal_enable_migration.patch 2010-10-28 18:56:19.000000000 +0000 +++ lxinput-0.3.1/debian/patches/03_gseal_enable_migration.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,80 +0,0 @@ -Index: lxinput/src/lxinput.c -=================================================================== ---- lxinput.orig/src/lxinput.c -+++ lxinput/src/lxinput.c -@@ -57,7 +57,7 @@ static gboolean beep = TRUE, old_beep = - static void on_mouse_accel_changed(GtkRange* range, gpointer user_data) - { - accel = (int)gtk_range_get_value(range); -- XChangePointerControl(GDK_DISPLAY(), True, False, -+ XChangePointerControl(gdk_display_get_default(), True, False, - accel, 10, 0); - } - -@@ -65,7 +65,7 @@ static void on_mouse_threshold_changed(G - { - /* threshold = 110 - sensitivity. The lower the threshold, the higher the sensitivity */ - threshold = 110 - (int)gtk_range_get_value(range); -- XChangePointerControl(GDK_DISPLAY(), False, True, -+ XChangePointerControl(gdk_display_get_default(), False, True, - 0, 10, threshold); - } - -@@ -73,7 +73,7 @@ static void on_kb_range_changed(GtkRange - { - *val = (int)gtk_range_get_value(range); - /* apply keyboard values */ -- XkbSetAutoRepeatRate(GDK_DISPLAY(), XkbUseCoreKbd, delay, interval); -+ XkbSetAutoRepeatRate(gdk_display_get_default(), XkbUseCoreKbd, delay, interval); - } - - /* This function is taken from Gnome's control-center 2.6.0.3 (gnome-settings-mouse.c) and was modified*/ -@@ -85,11 +85,11 @@ static void set_left_handed_mouse() - gint idx_1 = 0, idx_3 = 1; - - buttons = g_alloca (DEFAULT_PTR_MAP_SIZE); -- n_buttons = XGetPointerMapping (GDK_DISPLAY(), buttons, DEFAULT_PTR_MAP_SIZE); -+ n_buttons = XGetPointerMapping (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), buttons, DEFAULT_PTR_MAP_SIZE); - if (n_buttons > DEFAULT_PTR_MAP_SIZE) - { - buttons = g_alloca (n_buttons); -- n_buttons = XGetPointerMapping (GDK_DISPLAY(), buttons, n_buttons); -+ n_buttons = XGetPointerMapping (gdk_display_get_default(), buttons, n_buttons); - } - - for (i = 0; i < n_buttons; i++) -@@ -105,7 +105,7 @@ static void set_left_handed_mouse() - { - buttons[idx_1] = ((n_buttons < 3) ? 2 : 3); - buttons[idx_3] = 1; -- XSetPointerMapping (GDK_DISPLAY(), buttons, n_buttons); -+ XSetPointerMapping (gdk_display_get_default(), buttons, n_buttons); - } - } - -@@ -120,7 +120,7 @@ static void on_kb_beep_toggle(GtkToggleB - XKeyboardControl values; - beep = gtk_toggle_button_get_active(btn); - values.bell_percent = beep ? -1 : 0; -- XChangeKeyboardControl(GDK_DISPLAY(), KBBellPercent, &values); -+ XChangeKeyboardControl(gdk_display_get_default(), KBBellPercent, &values); - } - - static gboolean on_change_val(GtkRange *range, GtkScrollType scroll, -@@ -311,14 +311,14 @@ int main(int argc, char** argv) - delay = old_delay; - interval = old_interval; - beep = old_beep; -- XkbSetAutoRepeatRate(GDK_DISPLAY(), XkbUseCoreKbd, delay, interval); -+ XkbSetAutoRepeatRate(gdk_display_get_default(), XkbUseCoreKbd, delay, interval); - /* FIXME: beep? */ - - /* mouse */ - accel = old_accel; - threshold = old_threshold; - left_handed = old_left_handed; -- XChangePointerControl(GDK_DISPLAY(), True, True, -+ XChangePointerControl(gdk_display_get_default(), True, True, - accel, 10, threshold); - set_left_handed_mouse(); - } diff -Nru lxinput-0.3.0/debian/patches/80_translations.patch lxinput-0.3.1/debian/patches/80_translations.patch --- lxinput-0.3.0/debian/patches/80_translations.patch 2011-02-26 19:04:12.000000000 +0000 +++ lxinput-0.3.1/debian/patches/80_translations.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,1593 +0,0 @@ -Description: Upstream changes introduced in version 0.3.0-0ubuntu4~ppa1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - lxinput (0.3.0-0ubuntu4~ppa1) UNRELEASED; urgency=low - . - * - . - The person named in the Author field signed this changelog entry. -Author: Julien Lavergne - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Bug-Ubuntu: https://launchpad.net/bugs/ -Forwarded: -Reviewed-By: -Last-Update: - ---- lxinput-0.3.0.orig/po/zh_CN.po -+++ lxinput-0.3.0/po/zh_CN.po -@@ -3,107 +3,109 @@ - # 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: 2010-05-24 01:27+0800\n" --"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" --"Last-Translator: FULL NAME \n" -+"PO-Revision-Date: 2010-10-15 13:42+0200\n" -+"Last-Translator: Yinghua_Wang \n" - "Language-Team: LANGUAGE \n" -+"Language: zh_CN\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=utf-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"Plural-Forms: nplurals=1; plural=0;\n" -+"X-Generator: Pootle 2.0.5\n" - - #: ../data/lxinput.glade.h:1 - msgid "Character Repeat" --msgstr "" -+msgstr "字符重复" - - #: ../data/lxinput.glade.h:2 - msgid "Motion" --msgstr "" -+msgstr "动作" - - #: ../data/lxinput.glade.h:3 - msgid "Acceleration:" --msgstr "" -+msgstr "加速：" - - #: ../data/lxinput.glade.h:4 - msgid "Beep when there is an error of keyboard input" --msgstr "" -+msgstr "在键盘输入有错误时发声" - - #: ../data/lxinput.glade.h:5 - msgid "Delay before each key starts repeating" --msgstr "" -+msgstr "在按键开始重复前的延时" - - #: ../data/lxinput.glade.h:6 - msgid "Fast" --msgstr "" -+msgstr "快" - - #: ../data/lxinput.glade.h:7 - msgid "High" --msgstr "" -+msgstr "高" - - #: ../data/lxinput.glade.h:8 - msgid "Input Device Preferences" --msgstr "" -+msgstr "输入设备偏好设置" - - #: ../data/lxinput.glade.h:9 - msgid "Interval between each key repeat" --msgstr "" -+msgstr "按键重复间隔" - - #: ../data/lxinput.glade.h:10 - msgid "Keyboard" --msgstr "" -+msgstr "键盘" - - #: ../data/lxinput.glade.h:11 - msgid "Left handed (Swap left and right mouse buttons)" --msgstr "" -+msgstr "左手习惯(切换左右鼠标键)" - - #: ../data/lxinput.glade.h:12 - msgid "Long" --msgstr "" -+msgstr "长" - - #: ../data/lxinput.glade.h:13 - msgid "Low" --msgstr "" -+msgstr "低" - - #: ../data/lxinput.glade.h:14 - msgid "Mouse" --msgstr "" -+msgstr "鼠标" - - #: ../data/lxinput.glade.h:15 - msgid "Repeat delay:" --msgstr "" -+msgstr "重复延迟：" - - #: ../data/lxinput.glade.h:16 - msgid "Repeat interval:" --msgstr "" -+msgstr "重复间隔：" - - #: ../data/lxinput.glade.h:17 - msgid "Sensitivity:" --msgstr "" -+msgstr "敏感度：" - - #: ../data/lxinput.glade.h:18 - msgid "Short" --msgstr "" -+msgstr "短" - - #: ../data/lxinput.glade.h:19 - msgid "Slow" --msgstr "" -+msgstr "慢" - - #: ../data/lxinput.glade.h:20 - msgid "Touch Pad" --msgstr "" -+msgstr "触摸板" - - #: ../data/lxinput.glade.h:21 - msgid "Type in the following box to test your keyboard settings" --msgstr "" -+msgstr "在下面的框中输入来测试您的键盘设置" - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" --msgstr "" -+msgstr "配置键盘、鼠标和其他输入设备" - - #: ../data/lxinput.desktop.in.h:2 - msgid "Keyboard and Mouse" --msgstr "" -+msgstr "键盘和鼠标" ---- lxinput-0.3.0.orig/po/tr.po -+++ lxinput-0.3.0/po/tr.po -@@ -7,9 +7,9 @@ msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2010-05-24 01:27+0800\n" --"PO-Revision-Date: 2010-01-26 04:19+0200\n" --"Last-Translator: Kılıç \n" -+"POT-Creation-Date: 2010-09-05 05:43+0000\n" -+"PO-Revision-Date: 2010-09-05 23:50+0200\n" -+"Last-Translator: Mehmet Gülmen \n" - "Language-Team: LANGUAGE \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=utf-8\n" -@@ -20,7 +20,7 @@ msgstr "" - - #: ../data/lxinput.glade.h:1 - msgid "Character Repeat" --msgstr "Birem Yineleme" -+msgstr "Karakter Yineleme" - - #: ../data/lxinput.glade.h:2 - msgid "Motion" -@@ -28,11 +28,11 @@ msgstr "Devinim" - - #: ../data/lxinput.glade.h:3 - msgid "Acceleration:" --msgstr "Hızlanma:" -+msgstr "Hız:" - - #: ../data/lxinput.glade.h:4 - msgid "Beep when there is an error of keyboard input" --msgstr "Tuştakımı girdisinde bir yanlışlık olduğunda sesle uyar" -+msgstr "Klavye girdisinde bir yanlışlık olduğunda sesle uyar" - - #: ../data/lxinput.glade.h:5 - msgid "Delay before each key starts repeating" -@@ -56,7 +56,7 @@ msgstr "Herbir tuş yinelemesi arasında - - #: ../data/lxinput.glade.h:10 - msgid "Keyboard" --msgstr "Tuştakımı" -+msgstr "Klavye" - - #: ../data/lxinput.glade.h:11 - msgid "Left handed (Swap left and right mouse buttons)" -@@ -96,21 +96,20 @@ msgstr "Yavaş" - - #: ../data/lxinput.glade.h:20 - msgid "Touch Pad" --msgstr "Dokunut" -+msgstr "Touchpad" - - #: ../data/lxinput.glade.h:21 - msgid "Type in the following box to test your keyboard settings" --msgstr "Tuştakımı ayarlarınızı sınamak için aşağıdaki kutuya birşeyler yazın" -+msgstr "Klavye ayarlarınızı sınamak için aşağıdaki kutuya birşeyler yazın" - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" --msgstr "" -+msgstr "Klavye, fare ve diğer girdi aygıtlarını yapılandırın" - - #: ../data/lxinput.desktop.in.h:2 --#, fuzzy - msgid "Keyboard and Mouse" --msgstr "Tuştakımı" -+msgstr "Klavye ve Fare" - --#, fuzzy - #~ msgid "input-keyboard" - #~ msgstr "Tuştakımı" -+ ---- lxinput-0.3.0.orig/po/fi.po -+++ lxinput-0.3.0/po/fi.po -@@ -2,13 +2,12 @@ - # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER - # 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: 2010-05-24 01:27+0800\n" -+"POT-Creation-Date: 2010-11-26 06:54+0000\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" - "Language-Team: LANGUAGE \n" -@@ -26,84 +25,86 @@ msgstr "" - - #: ../data/lxinput.glade.h:3 - msgid "Acceleration:" --msgstr "" -+msgstr "Kiihtyvyys:" - - #: ../data/lxinput.glade.h:4 - msgid "Beep when there is an error of keyboard input" --msgstr "" -+msgstr "Piippaa kun näppäinmistön näppäilyssä tapahtuu virhe" - - #: ../data/lxinput.glade.h:5 - msgid "Delay before each key starts repeating" --msgstr "" -+msgstr "Odota hetki ennen kuin näppäintä aletaan toistamaan" - - #: ../data/lxinput.glade.h:6 - msgid "Fast" --msgstr "" -+msgstr "Nopea" - - #: ../data/lxinput.glade.h:7 - msgid "High" --msgstr "" -+msgstr "Korkea" - - #: ../data/lxinput.glade.h:8 - msgid "Input Device Preferences" --msgstr "" -+msgstr "Syötelaitteen ominaisuudet" - - #: ../data/lxinput.glade.h:9 - msgid "Interval between each key repeat" --msgstr "" -+msgstr "Näppäimen toiston viive" - - #: ../data/lxinput.glade.h:10 - msgid "Keyboard" --msgstr "" -+msgstr "Näppäinmistö" - - #: ../data/lxinput.glade.h:11 - msgid "Left handed (Swap left and right mouse buttons)" --msgstr "" -+msgstr "Vasenkätinen (Vaihda oikean ja vesamman hiiren napin paikkoja)" - - #: ../data/lxinput.glade.h:12 - msgid "Long" --msgstr "" -+msgstr "Pitkä" - - #: ../data/lxinput.glade.h:13 - msgid "Low" --msgstr "" -+msgstr "Matala" - - #: ../data/lxinput.glade.h:14 - msgid "Mouse" --msgstr "" -+msgstr "Hiiri" - - #: ../data/lxinput.glade.h:15 -+#, fuzzy - msgid "Repeat delay:" --msgstr "" -+msgstr "Toiston aloituksen viive:" - - #: ../data/lxinput.glade.h:16 -+#, fuzzy - msgid "Repeat interval:" --msgstr "" -+msgstr "Toiston viive:" - - #: ../data/lxinput.glade.h:17 - msgid "Sensitivity:" --msgstr "" -+msgstr "Herkkyys:" - - #: ../data/lxinput.glade.h:18 - msgid "Short" --msgstr "" -+msgstr "Lyhyt" - - #: ../data/lxinput.glade.h:19 - msgid "Slow" --msgstr "" -+msgstr "Hidas" - - #: ../data/lxinput.glade.h:20 - msgid "Touch Pad" --msgstr "" -+msgstr "Kosketuslevy" - - #: ../data/lxinput.glade.h:21 - msgid "Type in the following box to test your keyboard settings" --msgstr "" -+msgstr "Voit kokeilla näppäinmistön asetuksia alla olevaan laatikkoon" - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" --msgstr "" -+msgstr "Muokkaa näppäinmistön, hiiren ja muiden syöttölaitteiden asetuksia" - - #: ../data/lxinput.desktop.in.h:2 - msgid "Keyboard and Mouse" --msgstr "" -+msgstr "Näppäinmistö ja hiiri" ---- lxinput-0.3.0.orig/po/sl.po -+++ lxinput-0.3.0/po/sl.po -@@ -8,20 +8,22 @@ msgstr "" - "Project-Id-Version: LXInput\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-07-03 07:38+0000\n" --"PO-Revision-Date: 2009-06-28 16:44+0100\n" --"Last-Translator: Matej Gačnik \n" -+"PO-Revision-Date: 2011-02-14 15:08+0200\n" -+"Last-Translator: Klemen \n" - "Language-Team: Slovenian \n" -+"Language: sl\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 2.0.5\n" - "X-Poedit-Language: slovenian\n" - "X-Poedit-Country: SLOVENIA\n" --"X-Generator: Pootle 1.1.0\n" - - #: ../data/lxinput.glade.h:1 - msgid "Character Repeat" --msgstr "Ponavljanje znaka" -+msgstr "Ponavljanje znakov" - - #: ../data/lxinput.glade.h:2 - msgid "Motion" -@@ -33,11 +35,11 @@ msgstr "Pospeševanje:" - - #: ../data/lxinput.glade.h:4 - msgid "Beep when there is an error of keyboard input" --msgstr "Sproži zvočno opozorilo, če pride do napake pri tipkovniškem vnosu" -+msgstr "Sproži zvočno opozorilo, ko pride do napake pri vnosu s tipkovnico" - - #: ../data/lxinput.glade.h:5 - msgid "Delay before each key starts repeating" --msgstr "Zakasnitev, po preteku katere se znaki začno ponavljati" -+msgstr "Zakasnitev, po preteku katere se tipke začno ponavljati" - - #: ../data/lxinput.glade.h:6 - msgid "Fast" -@@ -49,11 +51,11 @@ msgstr "Visoko" - - #: ../data/lxinput.glade.h:8 - msgid "Input Device Preferences" --msgstr "Nastavitve vhodne naprave" -+msgstr "Nastavitve vnosnih naprav" - - #: ../data/lxinput.glade.h:9 - msgid "Interval between each key repeat" --msgstr "Interval med vsako posamezno ponavitvijo znaka" -+msgstr "Časovni razmik med vsako posamezno ponovitvijo tipk" - - #: ../data/lxinput.glade.h:10 - msgid "Keyboard" -@@ -73,7 +75,7 @@ msgstr "Nizko" - - #: ../data/lxinput.glade.h:14 - msgid "Mouse" --msgstr "Miš" -+msgstr "Miška" - - #: ../data/lxinput.glade.h:15 - msgid "Repeat delay:" -@@ -81,7 +83,7 @@ msgstr "Zakasnitev ponavljanja:" - - #: ../data/lxinput.glade.h:16 - msgid "Repeat interval:" --msgstr "Interval ponavljanja:" -+msgstr "Hitrost ponavljanja:" - - #: ../data/lxinput.glade.h:17 - msgid "Sensitivity:" -@@ -101,11 +103,11 @@ msgstr "Sledilna ploščica" - - #: ../data/lxinput.glade.h:21 - msgid "Type in the following box to test your keyboard settings" --msgstr "Testiraj nastavitve tipkovnice tako, da vtipkaš besedilo v pričujoče besedilno polje" -+msgstr "Za preizkus nastavitev vtipkajte besedilo:" - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" --msgstr "Nastavitve tipkovnice, miške in drugih vhodnih enot" -+msgstr "Nastavite tipkovnico, miško in druge vnosne naprave" - - #: ../data/lxinput.desktop.in.h:2 - msgid "Keyboard and Mouse" ---- /dev/null -+++ lxinput-0.3.0/po/lg.po -@@ -0,0 +1,116 @@ -+# This is the Luganda translation of lxinput. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the lxinput package. -+# Kizito Birabwa , 2010. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2010-08-03 11:52+0200\n" -+"PO-Revision-Date: 2010-11-06 15:07+0000\n" -+"Last-Translator: kizito \n" -+"Language-Team: Luganda \n" -+"Language: lg\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 2.0.5\n" -+ -+#: ../data/lxinput.glade.h:1 -+msgid "Character Repeat" -+msgstr "Obwangu bw'enziriŋŋana y'okuteekawo bubonero" -+ -+#: ../data/lxinput.glade.h:2 -+msgid "Motion" -+msgstr "Entambula" -+ -+#: ../data/lxinput.glade.h:3 -+msgid "Acceleration:" -+msgstr "Enyanguwa y'akasonga:" -+ -+#: ../data/lxinput.glade.h:4 -+msgid "Beep when there is an error of keyboard input" -+msgstr "Akade kavuge nga wazzewo kiremya mu kuwandisa mapeesa" -+ -+#: ../data/lxinput.glade.h:5 -+msgid "Delay before each key starts repeating" -+msgstr "Akasirikiriro akabawo eppeesa liryoke liddemu akabonero" -+ -+#: ../data/lxinput.glade.h:6 -+msgid "Fast" -+msgstr "Mangu" -+ -+#: ../data/lxinput.glade.h:7 -+msgid "High" -+msgstr "Kungi" -+ -+#: ../data/lxinput.glade.h:8 -+msgid "Input Device Preferences" -+msgstr "Nteekateeka z'ebikozesebwa okuyingiza bintu mu kompyuta" -+ -+#: ../data/lxinput.glade.h:9 -+msgid "Interval between each key repeat" -+msgstr "" -+"Akaseera akayitawo eppeesa liryoke liddemu okussawo akabonero nga " -+"erinwyezezza wansi" -+ -+#: ../data/lxinput.glade.h:10 -+msgid "Keyboard" -+msgstr "Mapeesa agawandisibwa" -+ -+#: ../data/lxinput.glade.h:11 -+msgid "Left handed (Swap left and right mouse buttons)" -+msgstr "" -+"Nkozesa kkono (wanyisa enkola y'amapeesa g'akasongesebwa aga kkono ne ddyo)" -+ -+#: ../data/lxinput.glade.h:12 -+msgid "Long" -+msgstr "Kawanvu" -+ -+#: ../data/lxinput.glade.h:13 -+msgid "Low" -+msgstr "Kutono" -+ -+#: ../data/lxinput.glade.h:14 -+msgid "Mouse" -+msgstr "Akasongesebwa" -+ -+#: ../data/lxinput.glade.h:15 -+msgid "Repeat delay:" -+msgstr "Akasirikiriro:" -+ -+#: ../data/lxinput.glade.h:16 -+msgid "Repeat interval:" -+msgstr "Akaseera wakati w'enziriŋano:" -+ -+#: ../data/lxinput.glade.h:17 -+msgid "Sensitivity:" -+msgstr "Okuwulira kw'akasongesebwa:" -+ -+#: ../data/lxinput.glade.h:18 -+msgid "Short" -+msgstr "Kampi" -+ -+#: ../data/lxinput.glade.h:19 -+msgid "Slow" -+msgstr "Mpola" -+ -+#: ../data/lxinput.glade.h:20 -+msgid "Touch Pad" -+msgstr "Kasongesebwa k'osiisiriza" -+ -+#: ../data/lxinput.glade.h:21 -+msgid "Type in the following box to test your keyboard settings" -+msgstr "Wandika wano olabe by'otegese bwe bikola" -+ -+#: ../data/lxinput.desktop.in.h:1 -+msgid "Configure keyboard, mouse, and other input devices" -+msgstr "" -+"Teekateeka enkola y'amapeesa agawandisibwa, akasongesebwa n'ebirala " -+"ebikozesebwa okuyingiza bintu mu kompyuta" -+ -+#: ../data/lxinput.desktop.in.h:2 -+msgid "Keyboard and Mouse" -+msgstr "Mapeesa agawandisibwa n'akasongesebwa" ---- lxinput-0.3.0.orig/po/id.po -+++ lxinput-0.3.0/po/id.po -@@ -1,13 +1,13 @@ --# SOME DESCRIPTIVE TITLE. --# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER --# This file is distributed under the same license as the PACKAGE package. --# Rahman Yusri Aftian , 2009. --# -+# SOME DESCRIPTIVE TITLE. -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the PACKAGE package. -+# Rahman Yusri Aftian , 2009. -+# - msgid "" - msgstr "" - "Project-Id-Version: lxinput-id\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2010-05-24 01:27+0800\n" -+"POT-Creation-Date: 2010-08-25 05:40+0000\n" - "PO-Revision-Date: 2009-05-23 03:54+0200\n" - "Last-Translator: Rahman Yusri Aftian \n" - "Language-Team: LANGUAGE \n" -@@ -102,13 +102,11 @@ msgstr "Tipe yang berikut untuk menguji - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" --msgstr "" -+msgstr "Tata papan tik, tetikus, dan perangkat masukan lain" - - #: ../data/lxinput.desktop.in.h:2 --#, fuzzy - msgid "Keyboard and Mouse" --msgstr "Papan Ketik" -+msgstr "Papan Ketik dan Tetikus" - --#, fuzzy - #~ msgid "input-keyboard" - #~ msgstr "Papan Ketik" ---- lxinput-0.3.0.orig/po/nl.po -+++ lxinput-0.3.0/po/nl.po -@@ -8,13 +8,15 @@ msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-05-24 01:27+0800\n" --"PO-Revision-Date: 2009-12-05 14:29+0100\n" --"Last-Translator: Tim Van den Eynde \n" -+"PO-Revision-Date: 2010-08-30 11:11+0200\n" -+"Last-Translator: Sander \n" - "Language-Team: LANGUAGE \n" -+"Language: nl\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" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+"X-Generator: Pootle 2.0.5\n" - - #: ../data/lxinput.glade.h:1 - msgid "Character Repeat" -@@ -102,12 +104,11 @@ msgstr "Tiep in onderstaand kader om uw - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" --msgstr "" -+msgstr "Instellen van toetsenbord, muis, en andere invoerapparaten" - - #: ../data/lxinput.desktop.in.h:2 --#, fuzzy - msgid "Keyboard and Mouse" --msgstr "Toetsenbord" -+msgstr "Toetsenbord en Muis" - - #, fuzzy - #~ msgid "input-keyboard" ---- lxinput-0.3.0.orig/po/pt_BR.po -+++ lxinput-0.3.0/po/pt_BR.po -@@ -7,7 +7,7 @@ msgid "" - msgstr "" - "Project-Id-Version: lxinput\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2010-06-20 05:45+0000\n" -+"POT-Creation-Date: 2010-10-15 06:03+0000\n" - "PO-Revision-Date: 2009-05-14 12:42-0300\n" - "Last-Translator: Thiago Avelino \n" - "Language-Team: Brazilian Portuguese \n" -@@ -38,11 +38,11 @@ msgstr "Atraso antes que cada tecla come - - #: ../data/lxinput.glade.h:6 - msgid "Fast" --msgstr "Rápido" -+msgstr "Rápida" - - #: ../data/lxinput.glade.h:7 - msgid "High" --msgstr "Alto" -+msgstr "Alta" - - #: ../data/lxinput.glade.h:8 - msgid "Input Device Preferences" -@@ -66,7 +66,7 @@ msgstr "Longo" - - #: ../data/lxinput.glade.h:13 - msgid "Low" --msgstr "Baixo" -+msgstr "Baixa" - - #: ../data/lxinput.glade.h:14 - msgid "Mouse" -@@ -90,15 +90,15 @@ msgstr "Curto" - - #: ../data/lxinput.glade.h:19 - msgid "Slow" --msgstr "Lento" -+msgstr "Lenta" - - #: ../data/lxinput.glade.h:20 - msgid "Touch Pad" --msgstr "Touch Pad" -+msgstr "Touchpad" - - #: ../data/lxinput.glade.h:21 - msgid "Type in the following box to test your keyboard settings" --msgstr "Digite no seguinte campo para testar a configuração do teclado" -+msgstr "Digite no campo abaixo para testar a configuração do teclado" - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" ---- lxinput-0.3.0.orig/po/nb.po -+++ lxinput-0.3.0/po/nb.po -@@ -3,107 +3,109 @@ - # 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: 2010-05-24 01:27+0800\n" --"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" --"Last-Translator: FULL NAME \n" -+"PO-Revision-Date: 2010-12-10 07:27+0200\n" -+"Last-Translator: Sam \n" - "Language-Team: LANGUAGE \n" -+"Language: nb\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 2.0.5\n" - - #: ../data/lxinput.glade.h:1 - msgid "Character Repeat" --msgstr "" -+msgstr "Tegnrepetisjon" - - #: ../data/lxinput.glade.h:2 - msgid "Motion" --msgstr "" -+msgstr "Bevegelse" - - #: ../data/lxinput.glade.h:3 - msgid "Acceleration:" --msgstr "" -+msgstr "Akselerasjon:" - - #: ../data/lxinput.glade.h:4 - msgid "Beep when there is an error of keyboard input" --msgstr "" -+msgstr "Gi lydsignal ved feiltasting" - - #: ../data/lxinput.glade.h:5 - msgid "Delay before each key starts repeating" --msgstr "" -+msgstr "Forsinkelse før tastetrykk gjentar seg" - - #: ../data/lxinput.glade.h:6 - msgid "Fast" --msgstr "" -+msgstr "Rask" - - #: ../data/lxinput.glade.h:7 - msgid "High" --msgstr "" -+msgstr "Høy" - - #: ../data/lxinput.glade.h:8 - msgid "Input Device Preferences" --msgstr "" -+msgstr "Innstillinger for inndataenheter" - - #: ../data/lxinput.glade.h:9 - msgid "Interval between each key repeat" --msgstr "" -+msgstr "Intervall mellom hver tastegjentagelse" - - #: ../data/lxinput.glade.h:10 - msgid "Keyboard" --msgstr "" -+msgstr "Tastatur" - - #: ../data/lxinput.glade.h:11 - msgid "Left handed (Swap left and right mouse buttons)" --msgstr "" -+msgstr "Venstrehendt (bytter om venstre og høyre museknapp)" - - #: ../data/lxinput.glade.h:12 - msgid "Long" --msgstr "" -+msgstr "Lang" - - #: ../data/lxinput.glade.h:13 - msgid "Low" --msgstr "" -+msgstr "Lav" - - #: ../data/lxinput.glade.h:14 - msgid "Mouse" --msgstr "" -+msgstr "Mus" - - #: ../data/lxinput.glade.h:15 - msgid "Repeat delay:" --msgstr "" -+msgstr "Gjentagelsesforsinkelse:" - - #: ../data/lxinput.glade.h:16 - msgid "Repeat interval:" --msgstr "" -+msgstr "Gjentagelsesinterval:" - - #: ../data/lxinput.glade.h:17 - msgid "Sensitivity:" --msgstr "" -+msgstr "Følsomhet:" - - #: ../data/lxinput.glade.h:18 - msgid "Short" --msgstr "" -+msgstr "Kort" - - #: ../data/lxinput.glade.h:19 - msgid "Slow" --msgstr "" -+msgstr "Sakte" - - #: ../data/lxinput.glade.h:20 - msgid "Touch Pad" --msgstr "" -+msgstr "Styreplate" - - #: ../data/lxinput.glade.h:21 - msgid "Type in the following box to test your keyboard settings" --msgstr "" -+msgstr "Skriv her for å prøve tastaturinnstillingene" - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" --msgstr "" -+msgstr "Innstillinger for tastatur, mus og andre inndataenheter" - - #: ../data/lxinput.desktop.in.h:2 - msgid "Keyboard and Mouse" --msgstr "" -+msgstr "Tastatur og mus" ---- lxinput-0.3.0.orig/po/sr@latin.po -+++ lxinput-0.3.0/po/sr@latin.po -@@ -7,7 +7,7 @@ msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2010-05-28 04:53+0000\n" -+"POT-Creation-Date: 2010-08-17 05:38+0000\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" - "Language-Team: LANGUAGE \n" -@@ -32,9 +32,8 @@ msgid "Beep when there is an error of ke - msgstr "Pusti zvuk na greške kod unosa sa tatature" - - #: ../data/lxinput.glade.h:5 --#, fuzzy - msgid "Delay before each key starts repeating" --msgstr "Kašnjenje pre ponavljanja svakog tastera" -+msgstr "Kašnjenje pre početka ponavljanja svakog tastera" - - #: ../data/lxinput.glade.h:6 - msgid "Fast" ---- lxinput-0.3.0.orig/po/fa.po -+++ lxinput-0.3.0/po/fa.po -@@ -2,19 +2,19 @@ - # 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: 2010-05-24 01:27+0800\n" -+"POT-Creation-Date: 2010-08-16 05:41+0000\n" - "PO-Revision-Date: 2010-07-06 13:10+0200\n" - "Last-Translator: Hamidreza \n" - "Language-Team: LANGUAGE \n" --"Language: fa\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=utf-8\n" - "Content-Transfer-Encoding: 8bit\n" -+"Language: fa\n" - "Plural-Forms: nplurals=1; plural=0;\n" - "X-Generator: Pootle 2.0.1\n" - -@@ -107,10 +107,8 @@ msgid "Configure keyboard, mouse, and ot - msgstr "پیکربندی صفحه کلید، موشواره و دیگر دستگاه‌های ورودی" - - #: ../data/lxinput.desktop.in.h:2 --#, fuzzy - msgid "Keyboard and Mouse" --msgstr "صفحه کلید" -+msgstr "صفحه کلید و موشی" - --#, fuzzy - #~ msgid "input-keyboard" - #~ msgstr "صفحه کلید" ---- lxinput-0.3.0.orig/po/hr.po -+++ lxinput-0.3.0/po/hr.po -@@ -8,12 +8,16 @@ msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-05-27 04:20+0000\n" --"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" --"Last-Translator: FULL NAME \n" -+"PO-Revision-Date: 2010-12-30 23:43+0200\n" -+"Last-Translator: zvacet \n" - "Language-Team: LANGUAGE \n" -+"Language: hr\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" -+"X-Generator: Pootle 2.0.5\n" - - #: ../data/lxinput.glade.h:1 - msgid "Character Repeat" -@@ -49,7 +53,7 @@ msgstr "Postavke ulaznog uređaja" - - #: ../data/lxinput.glade.h:9 - msgid "Interval between each key repeat" --msgstr "Interval između ponavljanja svake tipke " -+msgstr "Interval između ponavljanja svake tipke" - - #: ../data/lxinput.glade.h:10 - msgid "Keyboard" ---- lxinput-0.3.0.orig/po/af.po -+++ lxinput-0.3.0/po/af.po -@@ -8,15 +8,15 @@ msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-05-24 01:27+0800\n" --"PO-Revision-Date: 2010-01-14 11:43+0200\n" --"Last-Translator: F Wolff \n" -+"PO-Revision-Date: 2010-09-01 23:39+0200\n" -+"Last-Translator: F \n" - "Language-Team: LANGUAGE \n" -+"Language: af\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=utf-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Language: af\n" - "Plural-Forms: nplurals=2; plural=(n != 1);\n" --"X-Generator: Pootle 2.0.0\n" -+"X-Generator: Pootle 2.0.5\n" - - #: ../data/lxinput.glade.h:1 - msgid "Character Repeat" -@@ -96,7 +96,7 @@ msgstr "Stadig" - - #: ../data/lxinput.glade.h:20 - msgid "Touch Pad" --msgstr "" -+msgstr "Raakblad" - - #: ../data/lxinput.glade.h:21 - msgid "Type in the following box to test your keyboard settings" -@@ -104,12 +104,11 @@ msgstr "Tik in die volgende boksie om di - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" --msgstr "" -+msgstr "Stel sleutelbord, muis en ander toevertoestelle op" - - #: ../data/lxinput.desktop.in.h:2 --#, fuzzy - msgid "Keyboard and Mouse" --msgstr "Sleutelbord" -+msgstr "Sleutelbord en muis" - - #, fuzzy - #~ msgid "input-keyboard" ---- lxinput-0.3.0.orig/po/lt.po -+++ lxinput-0.3.0/po/lt.po -@@ -8,13 +8,16 @@ msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-06-27 05:34+0000\n" --"PO-Revision-Date: 2009-05-21 18:12+0200\n" --"Last-Translator: Julius Vitkauskas \n" -+"PO-Revision-Date: 2011-01-04 23:12+0200\n" -+"Last-Translator: Julius \n" - "Language-Team: LANGUAGE \n" -+"Language: lt\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" -+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%" -+"100<10 || n%100>=20) ? 1 : 2);\n" -+"X-Generator: Pootle 2.0.5\n" - - #: ../data/lxinput.glade.h:1 - msgid "Character Repeat" -@@ -98,7 +101,7 @@ msgstr "Touchpad" - - #: ../data/lxinput.glade.h:21 - msgid "Type in the following box to test your keyboard settings" --msgstr "Čia galite įvesti tekstą ir taip išbandyti jūsų klaviatūros nustatymams:" -+msgstr "Čia galite įvesti tekstą ir taip išbandyti jūsų klaviatūros nustatymams" - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" ---- lxinput-0.3.0.orig/po/LINGUAS -+++ lxinput-0.3.0/po/LINGUAS -@@ -1,6 +1,7 @@ - af - ar - ast -+be - bg - bn - bn_IN -@@ -27,6 +28,7 @@ id - it - ja - ko -+lg - lt - ml - ms ---- lxinput-0.3.0.orig/po/pl.po -+++ lxinput-0.3.0/po/pl.po -@@ -1,24 +1,23 @@ --# translation of pl.po to Polish --# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER --# This file is distributed under the same license as the PACKAGE package. --# --# -+# Polish translation for lxinput package -+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -+# This file is distributed under the same license as the lxinput package. - # Artur Kruszewski , 2009. -+# Piotr Sokół , 2010, 2011. -+# - msgid "" - msgstr "" --"Project-Id-Version: PACKAGE VERSION\n" --"Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2010-05-24 01:27+0800\n" --"PO-Revision-Date: 2010-05-31 17:06+0200\n" --"Last-Translator: Artur \n" --"Language-Team: Artur Kruszewski \n" --"Language: pl\n" -+"Project-Id-Version: lxinput\n" -+"Report-Msgid-Bugs-To: http://sourceforge.net/projects/lxde/support\n" -+"POT-Creation-Date: 2010-11-26 06:54+0000\n" -+"PO-Revision-Date: 2011-02-19 20:08+0100\n" -+"Last-Translator: Piotr Sokół \n" -+"Language-Team: Polish <>\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==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " --"|| n%100>=20) ? 1 : 2);\n" --"X-Generator: Pootle 2.0.1\n" -+"Language: pl\n" -+"Plural-Forms: nplurals=3; plural=((n==1) ? 0 : ((n%10>=2 && n%10<=4 && (n" -+"%100<10 || n%100>=20)) ? 1 : 2));\n" - - #: ../data/lxinput.glade.h:1 - msgid "Character Repeat" -@@ -34,15 +33,15 @@ msgstr "Przyspieszenie:" - - #: ../data/lxinput.glade.h:4 - msgid "Beep when there is an error of keyboard input" --msgstr "Ostrzeż sygnałem dźwiękowym w przypadku błędu wejścia klawiatury" -+msgstr "Ostrzeganie sygnałem dźwiękowym w przypadku błędu wejścia klawiatury" - - #: ../data/lxinput.glade.h:5 - msgid "Delay before each key starts repeating" --msgstr "Czas opóźnienia przed rozpoczęciem powtarzania danego znaku" -+msgstr "Określa czas opóźnienia przed rozpoczęciem powtarzania danego znaku" - - #: ../data/lxinput.glade.h:6 - msgid "Fast" --msgstr "Szybko" -+msgstr "Duże" - - #: ../data/lxinput.glade.h:7 - msgid "High" -@@ -50,11 +49,11 @@ msgstr "Wysoka" - - #: ../data/lxinput.glade.h:8 - msgid "Input Device Preferences" --msgstr "Właściwości urządzeń wejściowych" -+msgstr "Urządzenia wejściowe" - - #: ../data/lxinput.glade.h:9 - msgid "Interval between each key repeat" --msgstr "Przerwa między kolejnymi powtórzeniami znaku" -+msgstr "Określa czas przerwy pomiędzy kolejnymi powtórzeniami znaku" - - #: ../data/lxinput.glade.h:10 - msgid "Keyboard" -@@ -62,8 +61,7 @@ msgstr "Klawiatura" - - #: ../data/lxinput.glade.h:11 - msgid "Left handed (Swap left and right mouse buttons)" --msgstr "" --"Tryb dla leworęcznych (Zamienia funkcje prawego i lewego przycisku myszy)" -+msgstr "Zamienienie funkcji prawego i lewego przycisku myszy" - - #: ../data/lxinput.glade.h:12 - msgid "Long" -@@ -95,24 +93,22 @@ msgstr "Krótki" - - #: ../data/lxinput.glade.h:19 - msgid "Slow" --msgstr "Wolno" -+msgstr "Małe" - - #: ../data/lxinput.glade.h:20 - msgid "Touch Pad" --msgstr "Panel dotykowy (touchpad)" -+msgstr "Gładzik" - - #: ../data/lxinput.glade.h:21 - msgid "Type in the following box to test your keyboard settings" --msgstr "Wpisz tekst w następujące pole aby przetestować ustawienia klawiatury" -+msgstr "" -+"Proszę wprowadzić tekst w poniższe pole, aby przetestować ustawienia " -+"klawiatury:" - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" --msgstr "Skonfiguruj klawiaturę, mysz i inne urządzenia wejściowe" -+msgstr "Konfiguruje klawiaturę, mysz i inne urządzenia wejściowe" - - #: ../data/lxinput.desktop.in.h:2 - msgid "Keyboard and Mouse" - msgstr "Klawiatura i mysz" -- --#, fuzzy --#~ msgid "input-keyboard" --#~ msgstr "Klawiatura" ---- lxinput-0.3.0.orig/po/pt.po -+++ lxinput-0.3.0/po/pt.po -@@ -1,15 +1,15 @@ - # Portuguese translation of lxinput - # Copyright (C) 2009, THE lxinput COPYRIGHT HOLDER - # This file is distributed under the same license as the lxinput package --# Sérgio Marques (smarquespt@gmail.com), 2009 --# -+# Sérgio Marques , 2009-2010. -+# Adaptado ao acordo ortográfico de 1990 - msgid "" - msgstr "" - "Project-Id-Version: lxinput\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-05-31 04:48+0000\n" --"PO-Revision-Date: 2010-02-13 19:31-0000\n" --"Last-Translator: Sergio Marques \n" -+"PO-Revision-Date: 2010-09-20 16:07-0000\n" -+"Last-Translator: Sérgio Marques \n" - "Language-Team: Portuguese\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=utf-8\n" -@@ -20,7 +20,7 @@ msgstr "" - - #: ../data/lxinput.glade.h:1 - msgid "Character Repeat" --msgstr "Repita Caractere" -+msgstr "Repita o caractere" - - #: ../data/lxinput.glade.h:2 - msgid "Motion" -@@ -48,7 +48,7 @@ msgstr "Alta" - - #: ../data/lxinput.glade.h:8 - msgid "Input Device Preferences" --msgstr "Preferências de Dispositivos" -+msgstr "Preferências de dispositivos" - - #: ../data/lxinput.glade.h:9 - msgid "Interval between each key repeat" -@@ -60,7 +60,7 @@ msgstr "Teclado" - - #: ../data/lxinput.glade.h:11 - msgid "Left handed (Swap left and right mouse buttons)" --msgstr "Canhoto (Trocar botões esquerdo e direito do rato)" -+msgstr "Canhoto (trocar botões esquerdo e direito do rato)" - - #: ../data/lxinput.glade.h:12 - msgid "Long" -@@ -96,7 +96,7 @@ msgstr "Lenta" - - #: ../data/lxinput.glade.h:20 - msgid "Touch Pad" --msgstr "Touch Pad" -+msgstr "Painel de toque" - - #: ../data/lxinput.glade.h:21 - msgid "Type in the following box to test your keyboard settings" -@@ -108,7 +108,5 @@ msgstr "Configurar teclado, rato e outro - - #: ../data/lxinput.desktop.in.h:2 - msgid "Keyboard and Mouse" --msgstr "Teclado e Rato" -+msgstr "Teclado e rato" - --#~ msgid "input-keyboard" --#~ msgstr "Teclado" ---- /dev/null -+++ lxinput-0.3.0/po/be.po -@@ -0,0 +1,112 @@ -+# 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: 2010-08-03 11:52+0200\n" -+"PO-Revision-Date: 2010-08-25 14:29+0200\n" -+"Last-Translator: Анік \n" -+"Language-Team: LANGUAGE \n" -+"Language: be\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" -+"X-Generator: Pootle 2.0.5\n" -+ -+#: ../data/lxinput.glade.h:1 -+msgid "Character Repeat" -+msgstr "Паўтарэнне сімвалаў" -+ -+#: ../data/lxinput.glade.h:2 -+msgid "Motion" -+msgstr "Рух" -+ -+#: ../data/lxinput.glade.h:3 -+msgid "Acceleration:" -+msgstr "Паскарэнне:" -+ -+#: ../data/lxinput.glade.h:4 -+msgid "Beep when there is an error of keyboard input" -+msgstr "Гукавы сігнал, калі ёсць памылкі ўводу даных з клавіятуры" -+ -+#: ../data/lxinput.glade.h:5 -+msgid "Delay before each key starts repeating" -+msgstr "Затрымка перад паўтарэннем кожнай клавішы" -+ -+#: ../data/lxinput.glade.h:6 -+msgid "Fast" -+msgstr "Хутка" -+ -+#: ../data/lxinput.glade.h:7 -+msgid "High" -+msgstr "Высока" -+ -+#: ../data/lxinput.glade.h:8 -+msgid "Input Device Preferences" -+msgstr "Налады прылады ўводу" -+ -+#: ../data/lxinput.glade.h:9 -+msgid "Interval between each key repeat" -+msgstr "Інтэрвал паміж паўтарэннем кожнай клавішы" -+ -+#: ../data/lxinput.glade.h:10 -+msgid "Keyboard" -+msgstr "Клавіятура" -+ -+#: ../data/lxinput.glade.h:11 -+msgid "Left handed (Swap left and right mouse buttons)" -+msgstr "Для ляўшэй (Змяніць дзеянні левай і правай кнопак мышы)" -+ -+#: ../data/lxinput.glade.h:12 -+msgid "Long" -+msgstr "Доўга" -+ -+#: ../data/lxinput.glade.h:13 -+msgid "Low" -+msgstr "Нізка" -+ -+#: ../data/lxinput.glade.h:14 -+msgid "Mouse" -+msgstr "Мыш" -+ -+#: ../data/lxinput.glade.h:15 -+msgid "Repeat delay:" -+msgstr "Затрымка паўтарэння:" -+ -+#: ../data/lxinput.glade.h:16 -+msgid "Repeat interval:" -+msgstr "Інтэрвал паўтарэння:" -+ -+#: ../data/lxinput.glade.h:17 -+msgid "Sensitivity:" -+msgstr "Адчувальнасць:" -+ -+#: ../data/lxinput.glade.h:18 -+msgid "Short" -+msgstr "Каратка" -+ -+#: ../data/lxinput.glade.h:19 -+msgid "Slow" -+msgstr "Павольна" -+ -+#: ../data/lxinput.glade.h:20 -+msgid "Touch Pad" -+msgstr "Тачпад" -+ -+#: ../data/lxinput.glade.h:21 -+msgid "Type in the following box to test your keyboard settings" -+msgstr "Увядзіце тэкст у гэтым полі для праверкі вашых налад клавіятуры" -+ -+#: ../data/lxinput.desktop.in.h:1 -+msgid "Configure keyboard, mouse, and other input devices" -+msgstr "Наладзіць клавіятуру, мыш і іншыя прылады ўводу" -+ -+#: ../data/lxinput.desktop.in.h:2 -+msgid "Keyboard and Mouse" -+msgstr "Клавіятура і мыш" ---- lxinput-0.3.0.orig/po/gl.po -+++ lxinput-0.3.0/po/gl.po -@@ -2,12 +2,12 @@ - # 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: 2010-05-24 01:27+0800\n" -+"POT-Creation-Date: 2010-09-03 05:42+0000\n" - "PO-Revision-Date: 2009-10-27 15:17+0100\n" - "Last-Translator: Indalecio Freiría Santos \n" - "Language-Team: Proxecto Trasno \n" -@@ -102,13 +102,11 @@ msgstr "Teclee no seguinte cadro para co - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" --msgstr "" -+msgstr "Configurar o teclado, o rato e outros dispositivos de entrada" - - #: ../data/lxinput.desktop.in.h:2 --#, fuzzy - msgid "Keyboard and Mouse" --msgstr "Teclado" -+msgstr "Teclado e rato" - --#, fuzzy - #~ msgid "input-keyboard" - #~ msgstr "Teclado" ---- lxinput-0.3.0.orig/po/cs.po -+++ lxinput-0.3.0/po/cs.po -@@ -2,12 +2,12 @@ - # 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: lxinput\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2010-05-24 01:27+0800\n" -+"POT-Creation-Date: 2010-11-01 10:38+0000\n" - "PO-Revision-Date: 2009-12-09 17:56+0100\n" - "Last-Translator: Michal Várady \n" - "Language-Team: \n" -@@ -15,8 +15,8 @@ msgstr "" - "Content-Type: text/plain; charset=utf-8\n" - "Content-Transfer-Encoding: 8bit\n" - "X-Poedit-Language: Czech\n" --"X-Poedit-Country: CZECH REPUBLIC\n" - "X-Poedit-SourceCharset: utf-8\n" -+"X-Poedit-Country: CZECH REPUBLIC\n" - - #: ../data/lxinput.glade.h:1 - msgid "Character Repeat" -@@ -104,13 +104,11 @@ msgstr "Nastavení klávesnice můžete - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" --msgstr "" -+msgstr "Nastavení klávesnice, myši a ostatních vstupních zařízení" - - #: ../data/lxinput.desktop.in.h:2 --#, fuzzy - msgid "Keyboard and Mouse" --msgstr "Klávesnice" -+msgstr "Klávesnice a myš" - --#, fuzzy - #~ msgid "input-keyboard" - #~ msgstr "Klávesnice" ---- lxinput-0.3.0.orig/po/sr.po -+++ lxinput-0.3.0/po/sr.po -@@ -7,7 +7,7 @@ msgid "" - msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2010-05-28 04:53+0000\n" -+"POT-Creation-Date: 2010-08-17 05:38+0000\n" - "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: FULL NAME \n" - "Language-Team: LANGUAGE \n" -@@ -32,9 +32,8 @@ msgid "Beep when there is an error of ke - msgstr "Пусти звук на грешке код уноса са тататуре" - - #: ../data/lxinput.glade.h:5 --#, fuzzy - msgid "Delay before each key starts repeating" --msgstr "Кашњење пре понављања сваког тастера" -+msgstr "Кашњење пре почетка понављања сваког тастера" - - #: ../data/lxinput.glade.h:6 - msgid "Fast" ---- lxinput-0.3.0.orig/po/bn_IN.po -+++ lxinput-0.3.0/po/bn_IN.po -@@ -8,13 +8,15 @@ msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-05-24 01:27+0800\n" --"PO-Revision-Date: 2009-07-27 12:28+0200\n" -+"PO-Revision-Date: 2010-09-02 05:27+0200\n" - "Last-Translator: Sankarshan \n" - "Language-Team: LANGUAGE \n" -+"Language: bn_IN\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" -+"Plural-Forms: nplurals=2; plural=(n != 1);\n" -+"X-Generator: Pootle 2.0.5\n" - - #: ../data/lxinput.glade.h:1 - msgid "Character Repeat" -@@ -58,7 +60,7 @@ msgstr "কী-বোর্ড" - - #: ../data/lxinput.glade.h:11 - msgid "Left handed (Swap left and right mouse buttons)" --msgstr "" -+msgstr "বাঁ হাতের জন্য (বাম ও ডান দিকের মাউস বোতাম পরিবর্তন করুন)" - - # বিরাম সম্পন্ন ? - #: ../data/lxinput.glade.h:12 -@@ -103,12 +105,11 @@ msgstr "কী-বোর্ড এর - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" --msgstr "" -+msgstr "কী-বোর্ড, মাউস ও অন্যান্য ইনপুট ডিভাইস সঞ্চালন করুন" - - #: ../data/lxinput.desktop.in.h:2 --#, fuzzy - msgid "Keyboard and Mouse" --msgstr "কী-বোর্ড" -+msgstr "কী-বোর্ড এবং মাউস" - - #, fuzzy - #~ msgid "input-keyboard" ---- lxinput-0.3.0.orig/po/ca.po -+++ lxinput-0.3.0/po/ca.po -@@ -8,12 +8,15 @@ msgstr "" - "Project-Id-Version: PACKAGE VERSION\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-05-24 01:27+0800\n" --"PO-Revision-Date: 2009-09-14 00:29+0100\n" --"Last-Translator: \n" -+"PO-Revision-Date: 2010-08-26 23:46+0200\n" -+"Last-Translator: Josep \n" - "Language-Team: LXDE Catalan translators group\n" -+"Language: ca\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 2.0.5\n" - - #: ../data/lxinput.glade.h:1 - msgid "Character Repeat" -@@ -102,12 +105,11 @@ msgstr "" - - #: ../data/lxinput.desktop.in.h:1 - msgid "Configure keyboard, mouse, and other input devices" --msgstr "" -+msgstr "Configureu el teclat, ratolí i altres dispositius d'entrada" - - #: ../data/lxinput.desktop.in.h:2 --#, fuzzy - msgid "Keyboard and Mouse" --msgstr "Teclat" -+msgstr "Teclat i ratolí" - - #, fuzzy - #~ msgid "input-keyboard" ---- lxinput-0.3.0.orig/data/lxinput.desktop -+++ lxinput-0.3.0/data/lxinput.desktop -@@ -1,24 +1,36 @@ - [Desktop Entry] - Type=Application - Name=Keyboard and Mouse -+Name[af]=Sleutelbord en muis - Name[ar]=لوحة المفاتيح والفأرة -+Name[be]=Клавіятура і мыш - Name[bg]=Клавиатура и мишка - Name[bn]=কী-বোর্ড এবং মাউস -+Name[bn_IN]=কী-বোর্ড এবং মাউস -+Name[ca]=Teclat i ratolí -+Name[cs]=Klávesnice a myš - Name[da]=Tastatur og mus - Name[de]=Tastatur und Maus - Name[el]=Πληκτρολόγιο και ποντίκι - Name[en_GB]=Keyboard and Mouse - Name[es]=Teclado y ratón -+Name[fa]=صفحه کلید و موشی -+Name[fi]=Näppäinmistö ja hiiri - Name[fo]=Knappaborð og mús - Name[fr]=Clavier et souris -+Name[gl]=Teclado e rato - Name[he]=מקלדת ועכבר - Name[hr]=Tipkovnica i miš - Name[hu]=Billentyűzet és egér -+Name[id]=Papan Ketik dan Tetikus - Name[it]=Tastiera e Mouse - Name[ja]=キーボードとマウス -+Name[lg]=Mapeesa agawandisibwa n'akasongesebwa - Name[lt]=Klaviatūra ir pelė -+Name[nb]=Tastatur og mus -+Name[nl]=Toetsenbord en Muis - Name[pl]=Klawiatura i mysz --Name[pt]=Teclado e Rato -+Name[pt]=Teclado e rato - Name[pt_BR]=Teclado e mouse - Name[ru]=Клавиатура и мышь - Name[sk]=Klávesnica a myš -@@ -26,40 +38,55 @@ Name[sl]=Tipkovnica in miška - Name[sr]=Тастатура и миш - Name[sr@latin]=Tastatura i miš - Name[sv]=Tangentbord och mus -+Name[tr]=Klavye ve Fare - Name[uk]=Клавіатура і миша - Name[vi]=Bàn phím và chuột -+Name[zh_CN]=键盘和鼠标 - Name[zh_TW]=鍵盤及滑鼠 - Icon=input-keyboard - Exec=lxinput - Comment=Configure keyboard, mouse, and other input devices -+Comment[af]=Stel sleutelbord, muis en ander toevertoestelle op - Comment[ar]=اضبط لوحة المفاتيح، الفأرة وأجهزة الإدخال الأخرى -+Comment[be]=Наладзіць клавіятуру, мыш і іншыя прылады ўводу - Comment[bg]=Настройка на клавиатурата, мишката идруги входящи устройства - Comment[bn]=কী-বোর্ড, মাউস এবং অন্যান্য ইনপুট ডিভাইস কনফিগার -+Comment[bn_IN]=কী-বোর্ড, মাউস ও অন্যান্য ইনপুট ডিভাইস সঞ্চালন করুন -+Comment[ca]=Configureu el teclat, ratolí i altres dispositius d'entrada -+Comment[cs]=Nastavení klávesnice, myši a ostatních vstupních zařízení - Comment[da]=Konfigurer tastatur, mus og andre inddataenheder - Comment[de]=Maus, Tastatur und andere Eingabegeräte konfigurieren - Comment[el]=Ρυθμίσεις πληκτρολογίου, ποντικιού και άλλων συσκευών εισόδου - Comment[en_GB]=Configure keyboard, mouse, and other input devices - Comment[es]=Configurar el teclado, ratón y otros dispositivos de entrada - Comment[fa]=پیکربندی صفحه کلید، موشواره و دیگر دستگاه‌های ورودی -+Comment[fi]=Muokkaa näppäinmistön, hiiren ja muiden syöttölaitteiden asetuksia - Comment[fo]=Samanset knappaborð, mús, og arðar inntøkutóleindir - Comment[fr]=Configure le clavier, la souris et d'autres périphériques d'entrée -+Comment[gl]=Configurar o teclado, o rato e outros dispositivos de entrada - Comment[he]=הגדרת המקלדת, העכבר והתקני קלט נוספים - Comment[hr]=Konfiguriraj tipkovnicu, miš, i druge ulazne uređaje - Comment[hu]=Billentyűzet, egér és egyéb beviteli eszközök beállítása -+Comment[id]=Tata papan tik, tetikus, dan perangkat masukan lain - Comment[it]=Configura tastiera, mouse, ed altri dispositivi di imput - Comment[ja]=キーボードやマウス、その他の入力機器の設定 -+Comment[lg]=Teekateeka enkola y'amapeesa agawandisibwa, akasongesebwa n'ebirala ebikozesebwa okuyingiza bintu mu kompyuta - Comment[lt]=Konfigūruoti klaviatūrą, pelę ir kitus įvedimo įrenginius --Comment[pl]=Skonfiguruj klawiaturę, mysz i inne urządzenia wejściowe -+Comment[nb]=Innstillinger for tastatur, mus og andre inndataenheter -+Comment[nl]=Instellen van toetsenbord, muis, en andere invoerapparaten -+Comment[pl]=Konfiguruje klawiaturę, mysz i inne urządzenia wejściowe - Comment[pt]=Configurar teclado, rato e outros dispositivos - Comment[pt_BR]=Configurar teclado, mouse e outros dispositivos de entrada - Comment[ru]=Настроить клавиатуру, мышь и другие устройства ввода - Comment[sk]=Nastaviť klávesnicu, myš a ostatné vstupné zariadenia --Comment[sl]=Nastavitve tipkovnice, miške in drugih vhodnih enot -+Comment[sl]=Nastavite tipkovnico, miško in druge vnosne naprave - Comment[sr]=Подесите тастатуру, миш и друге улазне уређаје - Comment[sr@latin]=Podesite tastaturu, miš i druge ulazne uređaje - Comment[sv]=Inställningar för tangentbord, mus och andra inmatningsenheter -+Comment[tr]=Klavye, fare ve diğer girdi aygıtlarını yapılandırın - Comment[uk]=Налаштування клавіатури, миші та інших вхідних пристроїв - Comment[vi]=Cấu hình bàn phím, chuột, và các thiết bị đầu vào khác -+Comment[zh_CN]=配置键盘、鼠标和其他输入设备 - Comment[zh_TW]=設定鍵盤、滑鼠、及其他輸入裝置 - StartupNotify=true - Terminal=false diff -Nru lxinput-0.3.0/debian/patches/series lxinput-0.3.1/debian/patches/series --- lxinput-0.3.0/debian/patches/series 2011-02-26 19:04:44.000000000 +0000 +++ lxinput-0.3.1/debian/patches/series 2012-03-23 22:35:31.000000000 +0000 @@ -1,4 +1 @@ -01_layout_button.patch -02_build_system_clean.patch -03_gseal_enable_migration.patch -80_translations.patch +01_fix_load_save_settings.patch diff -Nru lxinput-0.3.0/debian/rules lxinput-0.3.1/debian/rules --- lxinput-0.3.0/debian/rules 2011-02-21 22:45:48.000000000 +0000 +++ lxinput-0.3.1/debian/rules 2011-07-30 14:17:42.000000000 +0000 @@ -1,51 +1,17 @@ #!/usr/bin/make -f -# -*- mode: makefile; coding: utf-8 -*- -# Copyright (C) 2009-2010 Andrew Lee (李健秋) -# Description: Main Debian packaging script for morituri -# -# 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 the Free Software Foundation; either version 2, or (at -# your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 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, see . -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 -DISTRO = "$(shell lsb_release -si)" - -# GTK3 migration -CFLAGS+=-DGTK_DISABLE_SINGLE_INCLUDES -CFLAGS+=-DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -CFLAGS+=-DGSEAL_ENABLE -CFLAGS+=-DGDK_PIXBUF_DISABLE_DEPRECATED -CFLAGS+=-DG_DISABLE_DEPRECATED - -LDFLAGS+=-Wl,-z,defs -Wl,--as-needed +UBUNTU = $(shell dpkg-vendor --derives-from Ubuntu && echo yes) %: - dh --with autoreconf $@ + dh $@ override_dh_auto_configure: - dh_auto_configure -- --enable-man + dh_auto_configure -- --enable-man -override_dh_auto_clean: - rm -f man/lxpanel.1 man/lxpanelctl.1 - dh_auto_clean +override_dh_auto_test: + # disabled (missing lxinput.glade from upstream tarball) +ifeq ($(UBUNTU),yes) override_dh_install: - dh_install - #Install apport hook only on Ubuntu -ifeq ($(DISTRO),"Ubuntu") - dh_install -plxinput debian/apport/source_lxinput.py usr/share/apport/package-hooks + dh_install -plxinput debian/local/source_lxinput.py usr/share/apport/package-hooks endif - -override_dh_auto_test: - : - diff -Nru lxinput-0.3.0/debian/watch lxinput-0.3.1/debian/watch --- lxinput-0.3.0/debian/watch 2010-08-09 20:39:26.000000000 +0000 +++ lxinput-0.3.1/debian/watch 2011-07-30 14:12:41.000000000 +0000 @@ -1,11 +1,2 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format - -# Compulsory line, this is a version 3 file version=3 - -# Uncomment to find new files on sourceforge, for devscripts >= 2.9 http://sf.net/lxde/lxinput-(.*)\.tar\.gz - diff -Nru lxinput-0.3.0/ltmain.sh lxinput-0.3.1/ltmain.sh --- lxinput-0.3.0/ltmain.sh 2010-08-03 09:05:46.000000000 +0000 +++ lxinput-0.3.1/ltmain.sh 2011-07-29 13:11:47.000000000 +0000 @@ -1,9 +1,9 @@ -# Generated from ltmain.m4sh. -# ltmain.sh (GNU libtool) 2.2.6b +# libtool (GNU libtool) 2.4 # Written by Gordon Matzigkeit , 1996 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, +# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -32,50 +32,56 @@ # # Provide generalized library-building support services. # -# --config show all configuration variables -# --debug enable verbose shell tracing -# -n, --dry-run display commands without modifying any files -# --features display basic configuration information and exit -# --mode=MODE use operation mode MODE -# --preserve-dup-deps don't remove duplicate dependency libraries -# --quiet, --silent don't print informational messages -# --tag=TAG use configuration variables from tag TAG -# -v, --verbose print informational messages (default) -# --version print version information -# -h, --help print short or long help message +# --config show all configuration variables +# --debug enable verbose shell tracing +# -n, --dry-run display commands without modifying any files +# --features display basic configuration information and exit +# --mode=MODE use operation mode MODE +# --preserve-dup-deps don't remove duplicate dependency libraries +# --quiet, --silent don't print informational messages +# --no-quiet, --no-silent +# print informational messages (default) +# --tag=TAG use configuration variables from tag TAG +# -v, --verbose print more informational messages than default +# --no-verbose don't print the extra informational messages +# --version print version information +# -h, --help, --help-all print short, long, or detailed help message # # MODE must be one of the following: # -# clean remove files from the build directory -# compile compile a source file into a libtool object -# execute automatically set library path, then run a program -# finish complete the installation of libtool libraries -# install install libraries or executables -# link create a library or an executable -# uninstall remove libraries from an installed directory +# clean remove files from the build directory +# compile compile a source file into a libtool object +# execute automatically set library path, then run a program +# finish complete the installation of libtool libraries +# install install libraries or executables +# link create a library or an executable +# uninstall remove libraries from an installed directory # -# MODE-ARGS vary depending on the MODE. +# MODE-ARGS vary depending on the MODE. When passed as first option, +# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that. # Try `$progname --help --mode=MODE' for a more detailed description of MODE. # # When reporting a bug, please describe a test case to reproduce it and # include the following information: # -# host-triplet: $host -# shell: $SHELL -# compiler: $LTCC -# compiler flags: $LTCFLAGS -# linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1 -# automake: $automake_version -# autoconf: $autoconf_version +# host-triplet: $host +# shell: $SHELL +# compiler: $LTCC +# compiler flags: $LTCFLAGS +# linker: $LD (gnu? $with_gnu_ld) +# $progname: (GNU libtool) 2.4 Debian-2.4-2 +# automake: $automake_version +# autoconf: $autoconf_version # # Report bugs to . +# GNU libtool home page: . +# General help using GNU software: . -PROGRAM=ltmain.sh +PROGRAM=libtool PACKAGE=libtool -VERSION="2.2.6b Debian-2.2.6b-2ubuntu1" +VERSION="2.4 Debian-2.4-2" TIMESTAMP="" -package_revision=1.3017 +package_revision=1.3293 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -91,10 +97,15 @@ BIN_SH=xpg4; export BIN_SH # for Tru64 DUALCASE=1; export DUALCASE # for MKS sh +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +$1 +_LTECHO_EOF' +} + # NLS nuisances: We save the old values to restore during execute mode. -# Only set LANG and LC_ALL to C if already set. -# These must not be set unconditionally because not all systems understand -# e.g. LANG=C (notably SCO). lt_user_locale= lt_safe_locale= for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES @@ -107,15 +118,24 @@ lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\" fi" done +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL $lt_unset CDPATH +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" : ${CP="cp -f"} -: ${ECHO="echo"} +test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} : ${EGREP="/bin/grep -E"} : ${FGREP="/bin/grep -F"} : ${GREP="/bin/grep"} @@ -144,6 +164,27 @@ dirname="s,/[^/]*$,," basename="s,^.*/,," +# func_dirname file append nondir_replacement +# Compute the dirname of FILE. If nonempty, add APPEND to the result, +# otherwise set result to NONDIR_REPLACEMENT. +func_dirname () +{ + func_dirname_result=`$ECHO "${1}" | $SED "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi +} # func_dirname may be replaced by extended shell implementation + + +# func_basename file +func_basename () +{ + func_basename_result=`$ECHO "${1}" | $SED "$basename"` +} # func_basename may be replaced by extended shell implementation + + # func_dirname_and_basename file append nondir_replacement # perform func_basename and func_dirname in a single function # call: @@ -158,33 +199,183 @@ # those functions but instead duplicate the functionality here. func_dirname_and_basename () { - # Extract subdirectory from the argument. - func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` - if test "X$func_dirname_result" = "X${1}"; then - func_dirname_result="${3}" - else - func_dirname_result="$func_dirname_result${2}" - fi - func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` + # Extract subdirectory from the argument. + func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"` + if test "X$func_dirname_result" = "X${1}"; then + func_dirname_result="${3}" + else + func_dirname_result="$func_dirname_result${2}" + fi + func_basename_result=`$ECHO "${1}" | $SED -e "$basename"` +} # func_dirname_and_basename may be replaced by extended shell implementation + + +# func_stripname prefix suffix name +# strip PREFIX and SUFFIX off of NAME. +# PREFIX and SUFFIX must not contain globbing or regex special +# characters, hashes, percent signs, but SUFFIX may contain a leading +# dot (in which case that matches only a dot). +# func_strip_suffix prefix name +func_stripname () +{ + case ${2} in + .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;; + *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;; + esac +} # func_stripname may be replaced by extended shell implementation + + +# These SED scripts presuppose an absolute path with a trailing slash. +pathcar='s,^/\([^/]*\).*$,\1,' +pathcdr='s,^/[^/]*,,' +removedotparts=':dotsl + s@/\./@/@g + t dotsl + s,/\.$,/,' +collapseslashes='s@/\{1,\}@/@g' +finalslash='s,/*$,/,' + +# func_normal_abspath PATH +# Remove doubled-up and trailing slashes, "." path components, +# and cancel out any ".." path components in PATH after making +# it an absolute path. +# value returned in "$func_normal_abspath_result" +func_normal_abspath () +{ + # Start from root dir and reassemble the path. + func_normal_abspath_result= + func_normal_abspath_tpath=$1 + func_normal_abspath_altnamespace= + case $func_normal_abspath_tpath in + "") + # Empty path, that just means $cwd. + func_stripname '' '/' "`pwd`" + func_normal_abspath_result=$func_stripname_result + return + ;; + # The next three entries are used to spot a run of precisely + # two leading slashes without using negated character classes; + # we take advantage of case's first-match behaviour. + ///*) + # Unusual form of absolute path, do nothing. + ;; + //*) + # Not necessarily an ordinary path; POSIX reserves leading '//' + # and for example Cygwin uses it to access remote file shares + # over CIFS/SMB, so we conserve a leading double slash if found. + func_normal_abspath_altnamespace=/ + ;; + /*) + # Absolute path, do nothing. + ;; + *) + # Relative path, prepend $cwd. + func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath + ;; + esac + # Cancel out all the simple stuff to save iterations. We also want + # the path to end with a slash for ease of parsing, so make sure + # there is one (and only one) here. + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"` + while :; do + # Processed it all yet? + if test "$func_normal_abspath_tpath" = / ; then + # If we ascended to the root using ".." the result may be empty now. + if test -z "$func_normal_abspath_result" ; then + func_normal_abspath_result=/ + fi + break + fi + func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcar"` + func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \ + -e "$pathcdr"` + # Figure out what to do with it + case $func_normal_abspath_tcomponent in + "") + # Trailing empty path component, ignore it. + ;; + ..) + # Parent dir; strip last assembled component from result. + func_dirname "$func_normal_abspath_result" + func_normal_abspath_result=$func_dirname_result + ;; + *) + # Actual path component, append it. + func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent + ;; + esac + done + # Restore leading double-slash if one was found on entry. + func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result } -# Generated shell functions inserted here. +# func_relative_path SRCDIR DSTDIR +# generates a relative path from SRCDIR to DSTDIR, with a trailing +# slash if non-empty, suitable for immediately appending a filename +# without needing to append a separator. +# value returned in "$func_relative_path_result" +func_relative_path () +{ + func_relative_path_result= + func_normal_abspath "$1" + func_relative_path_tlibdir=$func_normal_abspath_result + func_normal_abspath "$2" + func_relative_path_tbindir=$func_normal_abspath_result + + # Ascend the tree starting from libdir + while :; do + # check if we have found a prefix of bindir + case $func_relative_path_tbindir in + $func_relative_path_tlibdir) + # found an exact match + func_relative_path_tcancelled= + break + ;; + $func_relative_path_tlibdir*) + # found a matching prefix + func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir" + func_relative_path_tcancelled=$func_stripname_result + if test -z "$func_relative_path_result"; then + func_relative_path_result=. + fi + break + ;; + *) + func_dirname $func_relative_path_tlibdir + func_relative_path_tlibdir=${func_dirname_result} + if test "x$func_relative_path_tlibdir" = x ; then + # Have to descend all the way to the root! + func_relative_path_result=../$func_relative_path_result + func_relative_path_tcancelled=$func_relative_path_tbindir + break + fi + func_relative_path_result=../$func_relative_path_result + ;; + esac + done + + # Now calculate path; take care to avoid doubling-up slashes. + func_stripname '' '/' "$func_relative_path_result" + func_relative_path_result=$func_stripname_result + func_stripname '/' '/' "$func_relative_path_tcancelled" + if test "x$func_stripname_result" != x ; then + func_relative_path_result=${func_relative_path_result}/${func_stripname_result} + fi -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" + # Normalisation. If bindir is libdir, return empty string, + # else relative path ending with a slash; either way, target + # file name can be directly appended. + if test ! -z "$func_relative_path_result"; then + func_stripname './' '' "$func_relative_path_result/" + func_relative_path_result=$func_stripname_result + fi +} # The name of this program: -# In the unlikely event $progname began with a '-', it would play havoc with -# func_echo (imagine progname=-n), so we prepend ./ in that case: func_dirname_and_basename "$progpath" progname=$func_basename_result -case $progname in - -*) progname=./$progname ;; -esac # Make sure we have an absolute path for reexecution: case $progpath in @@ -215,6 +406,15 @@ # Same as above, but do not quote variable references. double_quote_subst='s/\(["`\\]\)/\\\1/g' +# Sed substitution that turns a string into a regex matching for the +# string literally. +sed_make_literal_regex='s,[].[^$\\*\/],\\&,g' + +# Sed substitution that converts a w32 file name or path +# which contains forward slashes, into one that contains +# (escaped) backslashes. A very naive implementation. +lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' + # Re-`\' parameter expansions in output of double_quote_subst that were # `\'-ed in input to the same. If an odd number of `\' preceded a '$' # in input to double_quote_subst, that '$' was protected from expansion. @@ -243,7 +443,7 @@ # name if it has been set yet. func_echo () { - $ECHO "$progname${mode+: }$mode: $*" + $ECHO "$progname: ${opt_mode+$opt_mode: }$*" } # func_verbose arg... @@ -258,18 +458,25 @@ : } +# func_echo_all arg... +# Invoke $ECHO with all args, space-separated. +func_echo_all () +{ + $ECHO "$*" +} + # func_error arg... # Echo program name prefixed message to standard error. func_error () { - $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2 + $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2 } # func_warning arg... # Echo program name prefixed warning message to standard error. func_warning () { - $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2 + $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2 # bash bug again: : @@ -326,9 +533,9 @@ case $my_directory_path in */*) ;; *) break ;; esac # ...otherwise throw away the child directory and loop - my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"` + my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"` done - my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'` + my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'` save_mkdir_p_IFS="$IFS"; IFS=':' for my_dir in $my_dir_list; do @@ -378,7 +585,7 @@ func_fatal_error "cannot create temporary directory \`$my_tmpdir'" fi - $ECHO "X$my_tmpdir" | $Xsed + $ECHO "$my_tmpdir" } @@ -392,7 +599,7 @@ { case $1 in *[\\\`\"\$]*) - func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;; + func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;; *) func_quote_for_eval_unquoted_result="$1" ;; esac @@ -419,7 +626,7 @@ { case $1 in *[\\\`\"]*) - my_arg=`$ECHO "X$1" | $Xsed \ + my_arg=`$ECHO "$1" | $SED \ -e "$double_quote_subst" -e "$sed_double_backslash"` ;; *) my_arg="$1" ;; @@ -488,15 +695,39 @@ fi } - - +# func_tr_sh +# Turn $1 into a string suitable for a shell variable name. +# Result is stored in $func_tr_sh_result. All characters +# not in the set a-zA-Z0-9_ are replaced with '_'. Further, +# if $1 begins with a digit, a '_' is prepended as well. +func_tr_sh () +{ + case $1 in + [0-9]* | *[!a-zA-Z0-9_]*) + func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'` + ;; + * ) + func_tr_sh_result=$1 + ;; + esac +} # func_version # Echo version message to standard output and exit. func_version () { - $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / { + $opt_debug + + $SED -n '/(C)/!b go + :more + /\./!{ + N + s/\n# / / + b more + } + :go + /^# '$PROGRAM' (GNU /,/# warranty; / { s/^# // s/^# *$// s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/ @@ -509,22 +740,28 @@ # Echo short help message to standard output and exit. func_usage () { - $SED -n '/^# Usage:/,/# -h/ { + $opt_debug + + $SED -n '/^# Usage:/,/^# *.*--help/ { s/^# // s/^# *$// s/\$progname/'$progname'/ p }' < "$progpath" - $ECHO + echo $ECHO "run \`$progname --help | more' for full usage" exit $? } -# func_help -# Echo long help message to standard output and exit. +# func_help [NOEXIT] +# Echo long help message to standard output and exit, +# unless 'noexit' is passed as argument. func_help () { + $opt_debug + $SED -n '/^# Usage:/,/# Report bugs to/ { + :print s/^# // s/^# *$// s*\$progname*'$progname'* @@ -537,8 +774,15 @@ s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ p - }' < "$progpath" - exit $? + d + } + /^# .* home page:/b print + /^# General help using/b print + ' < "$progpath" + ret=$? + if test -z "$1"; then + exit $ret + fi } # func_missing_arg argname @@ -546,63 +790,106 @@ # exit_cmd. func_missing_arg () { - func_error "missing argument for $1" + $opt_debug + + func_error "missing argument for $1." exit_cmd=exit } -exit_cmd=: +# func_split_short_opt shortopt +# Set func_split_short_opt_name and func_split_short_opt_arg shell +# variables after splitting SHORTOPT after the 2nd character. +func_split_short_opt () +{ + my_sed_short_opt='1s/^\(..\).*$/\1/;q' + my_sed_short_rest='1s/^..\(.*\)$/\1/;q' + + func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"` + func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"` +} # func_split_short_opt may be replaced by extended shell implementation + + +# func_split_long_opt longopt +# Set func_split_long_opt_name and func_split_long_opt_arg shell +# variables after splitting LONGOPT at the `=' sign. +func_split_long_opt () +{ + my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q' + my_sed_long_arg='1s/^--[^=]*=//' + + func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"` + func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"` +} # func_split_long_opt may be replaced by extended shell implementation +exit_cmd=: -# Check that we have a working $ECHO. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then - # Yippee, $ECHO works! - : -else - # Restart under the correct shell, and then maybe $ECHO will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null || echo $max_cmd_len` +} # func_len may be replaced by extended shell implementation + + +# func_lo2o object +func_lo2o () +{ + func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"` +} # func_lo2o may be replaced by extended shell implementation + + +# func_xform libobj-or-source +func_xform () +{ + func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'` +} # func_xform may be replaced by extended shell implementation + + # func_fatal_configuration arg... # Echo program name prefixed message to standard error, followed by # a configuration failure hint, and exit. @@ -636,16 +923,16 @@ # Display the features supported by this script. func_features () { - $ECHO "host: $host" + echo "host: $host" if test "$build_libtool_libs" = yes; then - $ECHO "enable shared libraries" + echo "enable shared libraries" else - $ECHO "disable shared libraries" + echo "disable shared libraries" fi if test "$build_old_libs" = yes; then - $ECHO "enable static libraries" + echo "enable static libraries" else - $ECHO "disable static libraries" + echo "disable static libraries" fi exit $? @@ -692,117 +979,204 @@ esac } -# Parse options once, thoroughly. This comes as soon as possible in -# the script to make things like `libtool --version' happen quickly. +# func_check_version_match +# Ensure that we are using m4 macros, and libtool script from the same +# release of libtool. +func_check_version_match () { + if test "$package_revision" != "$macro_revision"; then + if test "$VERSION" != "$macro_version"; then + if test -z "$macro_version"; then + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from an older release. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, but the +$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. +$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION +$progname: and run autoconf again. +_LT_EOF + fi + else + cat >&2 <<_LT_EOF +$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, +$progname: but the definition of this LT_INIT comes from revision $macro_revision. +$progname: You should recreate aclocal.m4 with macros from revision $package_revision +$progname: of $PACKAGE $VERSION and run autoconf again. +_LT_EOF + fi + + exit $EXIT_MISMATCH + fi +} + + +# Shorthand for --mode=foo, only valid as the first argument +case $1 in +clean|clea|cle|cl) + shift; set dummy --mode clean ${1+"$@"}; shift + ;; +compile|compil|compi|comp|com|co|c) + shift; set dummy --mode compile ${1+"$@"}; shift + ;; +execute|execut|execu|exec|exe|ex|e) + shift; set dummy --mode execute ${1+"$@"}; shift + ;; +finish|finis|fini|fin|fi|f) + shift; set dummy --mode finish ${1+"$@"}; shift + ;; +install|instal|insta|inst|ins|in|i) + shift; set dummy --mode install ${1+"$@"}; shift + ;; +link|lin|li|l) + shift; set dummy --mode link ${1+"$@"}; shift + ;; +uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) + shift; set dummy --mode uninstall ${1+"$@"}; shift + ;; +esac - # Shorthand for --mode=foo, only valid as the first argument - case $1 in - clean|clea|cle|cl) - shift; set dummy --mode clean ${1+"$@"}; shift - ;; - compile|compil|compi|comp|com|co|c) - shift; set dummy --mode compile ${1+"$@"}; shift - ;; - execute|execut|execu|exec|exe|ex|e) - shift; set dummy --mode execute ${1+"$@"}; shift - ;; - finish|finis|fini|fin|fi|f) - shift; set dummy --mode finish ${1+"$@"}; shift - ;; - install|instal|insta|inst|ins|in|i) - shift; set dummy --mode install ${1+"$@"}; shift - ;; - link|lin|li|l) - shift; set dummy --mode link ${1+"$@"}; shift - ;; - uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u) - shift; set dummy --mode uninstall ${1+"$@"}; shift - ;; - esac - # Parse non-mode specific arguments: - while test "$#" -gt 0; do + +# Option defaults: +opt_debug=: +opt_dry_run=false +opt_config=false +opt_preserve_dup_deps=false +opt_features=false +opt_finish=false +opt_help=false +opt_help_all=false +opt_silent=: +opt_verbose=: +opt_silent=false +opt_verbose=false + + +# Parse options once, thoroughly. This comes as soon as possible in the +# script to make things like `--version' happen as quickly as we can. +{ + # this just eases exit handling + while test $# -gt 0; do opt="$1" shift - case $opt in - --config) func_config ;; - - --debug) preserve_args="$preserve_args $opt" + --debug|-x) opt_debug='set -x' func_echo "enabling shell trace mode" - opt_debug='set -x' $opt_debug ;; - - -dlopen) test "$#" -eq 0 && func_missing_arg "$opt" && break - execute_dlfiles="$execute_dlfiles $1" - shift + --dry-run|--dryrun|-n) + opt_dry_run=: ;; - - --dry-run | -n) opt_dry_run=: ;; - --features) func_features ;; - --finish) mode="finish" ;; - - --mode) test "$#" -eq 0 && func_missing_arg "$opt" && break - case $1 in - # Valid mode arguments: - clean) ;; - compile) ;; - execute) ;; - finish) ;; - install) ;; - link) ;; - relink) ;; - uninstall) ;; - - # Catch anything else as an error - *) func_error "invalid argument for $opt" - exit_cmd=exit - break - ;; - esac - - mode="$1" + --config) + opt_config=: +func_config + ;; + --dlopen|-dlopen) + optarg="$1" + opt_dlopen="${opt_dlopen+$opt_dlopen +}$optarg" shift ;; - --preserve-dup-deps) - opt_duplicate_deps=: ;; - - --quiet|--silent) preserve_args="$preserve_args $opt" - opt_silent=: + opt_preserve_dup_deps=: ;; - - --verbose| -v) preserve_args="$preserve_args $opt" + --features) + opt_features=: +func_features + ;; + --finish) + opt_finish=: +set dummy --mode finish ${1+"$@"}; shift + ;; + --help) + opt_help=: + ;; + --help-all) + opt_help_all=: +opt_help=': help-all' + ;; + --mode) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_mode="$optarg" +case $optarg in + # Valid mode arguments: + clean|compile|execute|finish|install|link|relink|uninstall) ;; + + # Catch anything else as an error + *) func_error "invalid argument for $opt" + exit_cmd=exit + break + ;; +esac + shift + ;; + --no-silent|--no-quiet) opt_silent=false +func_append preserve_args " $opt" ;; - - --tag) test "$#" -eq 0 && func_missing_arg "$opt" && break - preserve_args="$preserve_args $opt $1" - func_enable_tag "$1" # tagname is set here + --no-verbose) + opt_verbose=false +func_append preserve_args " $opt" + ;; + --silent|--quiet) + opt_silent=: +func_append preserve_args " $opt" + opt_verbose=false + ;; + --verbose|-v) + opt_verbose=: +func_append preserve_args " $opt" +opt_silent=false + ;; + --tag) + test $# = 0 && func_missing_arg $opt && break + optarg="$1" + opt_tag="$optarg" +func_append preserve_args " $opt $optarg" +func_enable_tag "$optarg" shift ;; + -\?|-h) func_usage ;; + --help) func_help ;; + --version) func_version ;; + # Separate optargs to long options: - -dlopen=*|--mode=*|--tag=*) - func_opt_split "$opt" - set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"} + --*=*) + func_split_long_opt "$opt" + set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"} shift ;; - -\?|-h) func_usage ;; - --help) opt_help=: ;; - --version) func_version ;; - - -*) func_fatal_help "unrecognized option \`$opt'" ;; - - *) nonopt="$opt" - break + # Separate non-argument short options: + -\?*|-h*|-n*|-v*) + func_split_short_opt "$opt" + set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"} + shift ;; + + --) break ;; + -*) func_fatal_help "unrecognized option \`$opt'" ;; + *) set dummy "$opt" ${1+"$@"}; shift; break ;; esac done + # Validate options: + + # save first non-option argument + if test "$#" -gt 0; then + nonopt="$opt" + shift + fi + + # preserve --debug + test "$opt_debug" = : || func_append preserve_args " --debug" case $host in *cygwin* | *mingw* | *pw32* | *cegcc*) @@ -810,82 +1184,44 @@ opt_duplicate_compiler_generated_deps=: ;; *) - opt_duplicate_compiler_generated_deps=$opt_duplicate_deps + opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps ;; esac - # Having warned about all mis-specified options, bail out if - # anything was wrong. - $exit_cmd $EXIT_FAILURE -} + $opt_help || { + # Sanity checks first: + func_check_version_match -# func_check_version_match -# Ensure that we are using m4 macros, and libtool script from the same -# release of libtool. -func_check_version_match () -{ - if test "$package_revision" != "$macro_revision"; then - if test "$VERSION" != "$macro_version"; then - if test -z "$macro_version"; then - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from an older release. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, but the -$progname: definition of this LT_INIT comes from $PACKAGE $macro_version. -$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION -$progname: and run autoconf again. -_LT_EOF - fi - else - cat >&2 <<_LT_EOF -$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision, -$progname: but the definition of this LT_INIT comes from revision $macro_revision. -$progname: You should recreate aclocal.m4 with macros from revision $package_revision -$progname: of $PACKAGE $VERSION and run autoconf again. -_LT_EOF + if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then + func_fatal_configuration "not configured to build any kind of library" fi - exit $EXIT_MISMATCH - fi -} - + # Darwin sucks + eval std_shrext=\"$shrext_cmds\" -## ----------- ## -## Main. ## -## ----------- ## - -$opt_help || { - # Sanity checks first: - func_check_version_match - - if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then - func_fatal_configuration "not configured to build any kind of library" - fi + # Only execute mode is allowed to have -dlopen flags. + if test -n "$opt_dlopen" && test "$opt_mode" != execute; then + func_error "unrecognized option \`-dlopen'" + $ECHO "$help" 1>&2 + exit $EXIT_FAILURE + fi - test -z "$mode" && func_fatal_error "error: you must specify a MODE." + # Change the help message to a mode-specific one. + generic_help="$help" + help="Try \`$progname --help --mode=$opt_mode' for more information." + } - # Darwin sucks - eval std_shrext=\"$shrext_cmds\" + # Bail if the options were screwed + $exit_cmd $EXIT_FAILURE +} - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - func_error "unrecognized option \`-dlopen'" - $ECHO "$help" 1>&2 - exit $EXIT_FAILURE - fi - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$progname --help --mode=$mode' for more information." -} +## ----------- ## +## Main. ## +## ----------- ## # func_lalib_p file # True iff FILE is a libtool `.la' library or `.lo' object file. @@ -950,12 +1286,9 @@ # temporary ltwrapper_script. func_ltwrapper_scriptname () { - func_ltwrapper_scriptname_result="" - if func_ltwrapper_executable_p "$1"; then - func_dirname_and_basename "$1" "" "." - func_stripname '' '.exe' "$func_basename_result" - func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" - fi + func_dirname_and_basename "$1" "" "." + func_stripname '' '.exe' "$func_basename_result" + func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper" } # func_ltwrapper_p file @@ -1001,6 +1334,37 @@ } +# func_resolve_sysroot PATH +# Replace a leading = in PATH with a sysroot. Store the result into +# func_resolve_sysroot_result +func_resolve_sysroot () +{ + func_resolve_sysroot_result=$1 + case $func_resolve_sysroot_result in + =*) + func_stripname '=' '' "$func_resolve_sysroot_result" + func_resolve_sysroot_result=$lt_sysroot$func_stripname_result + ;; + esac +} + +# func_replace_sysroot PATH +# If PATH begins with the sysroot, replace it with = and +# store the result into func_replace_sysroot_result. +func_replace_sysroot () +{ + case "$lt_sysroot:$1" in + ?*:"$lt_sysroot"*) + func_stripname "$lt_sysroot" '' "$1" + func_replace_sysroot_result="=$func_stripname_result" + ;; + *) + # Including no sysroot. + func_replace_sysroot_result=$1 + ;; + esac +} + # func_infer_tag arg # Infer tagged configuration to use if any are available and # if one wasn't chosen via the "--tag" command line option. @@ -1013,13 +1377,15 @@ if test -n "$available_tags" && test -z "$tagname"; then CC_quoted= for arg in $CC; do - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` case $@ in # Blanks in the command may have been stripped by the calling shell, # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;; + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;; # Blanks at the start of $base_compile will cause this to fail # if we don't check for them as well. *) @@ -1030,11 +1396,13 @@ CC_quoted= for arg in $CC; do # Double-quote args containing other shell metacharacters. - func_quote_for_eval "$arg" - CC_quoted="$CC_quoted $func_quote_for_eval_result" + func_append_quoted CC_quoted "$arg" done + CC_expanded=`func_echo_all $CC` + CC_quoted_expanded=`func_echo_all $CC_quoted` case "$@ " in - " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) + " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \ + " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) # The compiler in the base compile command matches # the one in the tagged configuration. # Assume this is the tagged configuration we want. @@ -1097,6 +1465,486 @@ } } + +################################################## +# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS # +################################################## + +# func_convert_core_file_wine_to_w32 ARG +# Helper function used by file name conversion functions when $build is *nix, +# and $host is mingw, cygwin, or some other w32 environment. Relies on a +# correctly configured wine environment available, with the winepath program +# in $build's $PATH. +# +# ARG is the $build file name to be converted to w32 format. +# Result is available in $func_convert_core_file_wine_to_w32_result, and will +# be empty on error (or when ARG is empty) +func_convert_core_file_wine_to_w32 () +{ + $opt_debug + func_convert_core_file_wine_to_w32_result="$1" + if test -n "$1"; then + # Unfortunately, winepath does not exit with a non-zero error code, so we + # are forced to check the contents of stdout. On the other hand, if the + # command is not found, the shell will set an exit code of 127 and print + # *an error message* to stdout. So we must check for both error code of + # zero AND non-empty stdout, which explains the odd construction: + func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null` + if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then + func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" | + $SED -e "$lt_sed_naive_backslashify"` + else + func_convert_core_file_wine_to_w32_result= + fi + fi +} +# end: func_convert_core_file_wine_to_w32 + + +# func_convert_core_path_wine_to_w32 ARG +# Helper function used by path conversion functions when $build is *nix, and +# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly +# configured wine environment available, with the winepath program in $build's +# $PATH. Assumes ARG has no leading or trailing path separator characters. +# +# ARG is path to be converted from $build format to win32. +# Result is available in $func_convert_core_path_wine_to_w32_result. +# Unconvertible file (directory) names in ARG are skipped; if no directory names +# are convertible, then the result may be empty. +func_convert_core_path_wine_to_w32 () +{ + $opt_debug + # unfortunately, winepath doesn't convert paths, only file names + func_convert_core_path_wine_to_w32_result="" + if test -n "$1"; then + oldIFS=$IFS + IFS=: + for func_convert_core_path_wine_to_w32_f in $1; do + IFS=$oldIFS + func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f" + if test -n "$func_convert_core_file_wine_to_w32_result" ; then + if test -z "$func_convert_core_path_wine_to_w32_result"; then + func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result" + else + func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result" + fi + fi + done + IFS=$oldIFS + fi +} +# end: func_convert_core_path_wine_to_w32 + + +# func_cygpath ARGS... +# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when +# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2) +# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or +# (2), returns the Cygwin file name or path in func_cygpath_result (input +# file name or path is assumed to be in w32 format, as previously converted +# from $build's *nix or MSYS format). In case (3), returns the w32 file name +# or path in func_cygpath_result (input file name or path is assumed to be in +# Cygwin format). Returns an empty string on error. +# +# ARGS are passed to cygpath, with the last one being the file name or path to +# be converted. +# +# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH +# environment variable; do not put it in $PATH. +func_cygpath () +{ + $opt_debug + if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then + func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null` + if test "$?" -ne 0; then + # on failure, ensure result is empty + func_cygpath_result= + fi + else + func_cygpath_result= + func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'" + fi +} +#end: func_cygpath + + +# func_convert_core_msys_to_w32 ARG +# Convert file name or path ARG from MSYS format to w32 format. Return +# result in func_convert_core_msys_to_w32_result. +func_convert_core_msys_to_w32 () +{ + $opt_debug + # awkward: cmd appends spaces to result + func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null | + $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"` +} +#end: func_convert_core_msys_to_w32 + + +# func_convert_file_check ARG1 ARG2 +# Verify that ARG1 (a file name in $build format) was converted to $host +# format in ARG2. Otherwise, emit an error message, but continue (resetting +# func_to_host_file_result to ARG1). +func_convert_file_check () +{ + $opt_debug + if test -z "$2" && test -n "$1" ; then + func_error "Could not determine host file name corresponding to" + func_error " \`$1'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback: + func_to_host_file_result="$1" + fi +} +# end func_convert_file_check + + +# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH +# Verify that FROM_PATH (a path in $build format) was converted to $host +# format in TO_PATH. Otherwise, emit an error message, but continue, resetting +# func_to_host_file_result to a simplistic fallback value (see below). +func_convert_path_check () +{ + $opt_debug + if test -z "$4" && test -n "$3"; then + func_error "Could not determine the host path corresponding to" + func_error " \`$3'" + func_error "Continuing, but uninstalled executables may not work." + # Fallback. This is a deliberately simplistic "conversion" and + # should not be "improved". See libtool.info. + if test "x$1" != "x$2"; then + lt_replace_pathsep_chars="s|$1|$2|g" + func_to_host_path_result=`echo "$3" | + $SED -e "$lt_replace_pathsep_chars"` + else + func_to_host_path_result="$3" + fi + fi +} +# end func_convert_path_check + + +# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG +# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT +# and appending REPL if ORIG matches BACKPAT. +func_convert_path_front_back_pathsep () +{ + $opt_debug + case $4 in + $1 ) func_to_host_path_result="$3$func_to_host_path_result" + ;; + esac + case $4 in + $2 ) func_append func_to_host_path_result "$3" + ;; + esac +} +# end func_convert_path_front_back_pathsep + + +################################################## +# $build to $host FILE NAME CONVERSION FUNCTIONS # +################################################## +# invoked via `$to_host_file_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# Result will be available in $func_to_host_file_result. + + +# func_to_host_file ARG +# Converts the file name ARG from $build format to $host format. Return result +# in func_to_host_file_result. +func_to_host_file () +{ + $opt_debug + $to_host_file_cmd "$1" +} +# end func_to_host_file + + +# func_to_tool_file ARG LAZY +# converts the file name ARG from $build format to toolchain format. Return +# result in func_to_tool_file_result. If the conversion in use is listed +# in (the comma separated) LAZY, no conversion takes place. +func_to_tool_file () +{ + $opt_debug + case ,$2, in + *,"$to_tool_file_cmd",*) + func_to_tool_file_result=$1 + ;; + *) + $to_tool_file_cmd "$1" + func_to_tool_file_result=$func_to_host_file_result + ;; + esac +} +# end func_to_tool_file + + +# func_convert_file_noop ARG +# Copy ARG to func_to_host_file_result. +func_convert_file_noop () +{ + func_to_host_file_result="$1" +} +# end func_convert_file_noop + + +# func_convert_file_msys_to_w32 ARG +# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_file_result. +func_convert_file_msys_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_to_host_file_result="$func_convert_core_msys_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_w32 + + +# func_convert_file_cygwin_to_w32 ARG +# Convert file name ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_file_cygwin_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # because $build is cygwin, we call "the" cygpath in $PATH; no need to use + # LT_CYGPATH in this case. + func_to_host_file_result=`cygpath -m "$1"` + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_cygwin_to_w32 + + +# func_convert_file_nix_to_w32 ARG +# Convert file name ARG from *nix to w32 format. Requires a wine environment +# and a working winepath. Returns result in func_to_host_file_result. +func_convert_file_nix_to_w32 () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_file_wine_to_w32 "$1" + func_to_host_file_result="$func_convert_core_file_wine_to_w32_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_w32 + + +# func_convert_file_msys_to_cygwin ARG +# Convert file name ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_file_msys_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + func_convert_core_msys_to_w32 "$1" + func_cygpath -u "$func_convert_core_msys_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_msys_to_cygwin + + +# func_convert_file_nix_to_cygwin ARG +# Convert file name ARG from *nix to Cygwin format. Requires Cygwin installed +# in a wine environment, working winepath, and LT_CYGPATH set. Returns result +# in func_to_host_file_result. +func_convert_file_nix_to_cygwin () +{ + $opt_debug + func_to_host_file_result="$1" + if test -n "$1"; then + # convert from *nix to w32, then use cygpath to convert from w32 to cygwin. + func_convert_core_file_wine_to_w32 "$1" + func_cygpath -u "$func_convert_core_file_wine_to_w32_result" + func_to_host_file_result="$func_cygpath_result" + fi + func_convert_file_check "$1" "$func_to_host_file_result" +} +# end func_convert_file_nix_to_cygwin + + +############################################# +# $build to $host PATH CONVERSION FUNCTIONS # +############################################# +# invoked via `$to_host_path_cmd ARG' +# +# In each case, ARG is the path to be converted from $build to $host format. +# The result will be available in $func_to_host_path_result. +# +# Path separators are also converted from $build format to $host format. If +# ARG begins or ends with a path separator character, it is preserved (but +# converted to $host format) on output. +# +# All path conversion functions are named using the following convention: +# file name conversion function : func_convert_file_X_to_Y () +# path conversion function : func_convert_path_X_to_Y () +# where, for any given $build/$host combination the 'X_to_Y' value is the +# same. If conversion functions are added for new $build/$host combinations, +# the two new functions must follow this pattern, or func_init_to_host_path_cmd +# will break. + + +# func_init_to_host_path_cmd +# Ensures that function "pointer" variable $to_host_path_cmd is set to the +# appropriate value, based on the value of $to_host_file_cmd. +to_host_path_cmd= +func_init_to_host_path_cmd () +{ + $opt_debug + if test -z "$to_host_path_cmd"; then + func_stripname 'func_convert_file_' '' "$to_host_file_cmd" + to_host_path_cmd="func_convert_path_${func_stripname_result}" + fi +} + + +# func_to_host_path ARG +# Converts the path ARG from $build format to $host format. Return result +# in func_to_host_path_result. +func_to_host_path () +{ + $opt_debug + func_init_to_host_path_cmd + $to_host_path_cmd "$1" +} +# end func_to_host_path + + +# func_convert_path_noop ARG +# Copy ARG to func_to_host_path_result. +func_convert_path_noop () +{ + func_to_host_path_result="$1" +} +# end func_convert_path_noop + + +# func_convert_path_msys_to_w32 ARG +# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic +# conversion to w32 is not available inside the cwrapper. Returns result in +# func_to_host_path_result. +func_convert_path_msys_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from ARG. MSYS + # behavior is inconsistent here; cygpath turns them into '.;' and ';.'; + # and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_msys_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_msys_to_w32 + + +# func_convert_path_cygwin_to_w32 ARG +# Convert path ARG from Cygwin to w32 format. Returns result in +# func_to_host_file_result. +func_convert_path_cygwin_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"` + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_cygwin_to_w32 + + +# func_convert_path_nix_to_w32 ARG +# Convert path ARG from *nix to w32 format. Requires a wine environment and +# a working winepath. Returns result in func_to_host_file_result. +func_convert_path_nix_to_w32 () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_to_host_path_result="$func_convert_core_path_wine_to_w32_result" + func_convert_path_check : ";" \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" ";" "$1" + fi +} +# end func_convert_path_nix_to_w32 + + +# func_convert_path_msys_to_cygwin ARG +# Convert path ARG from MSYS to Cygwin format. Requires LT_CYGPATH set. +# Returns result in func_to_host_file_result. +func_convert_path_msys_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # See func_convert_path_msys_to_w32: + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_msys_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_msys_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_msys_to_cygwin + + +# func_convert_path_nix_to_cygwin ARG +# Convert path ARG from *nix to Cygwin format. Requires Cygwin installed in a +# a wine environment, working winepath, and LT_CYGPATH set. Returns result in +# func_to_host_file_result. +func_convert_path_nix_to_cygwin () +{ + $opt_debug + func_to_host_path_result="$1" + if test -n "$1"; then + # Remove leading and trailing path separator characters from + # ARG. msys behavior is inconsistent here, cygpath turns them + # into '.;' and ';.', and winepath ignores them completely. + func_stripname : : "$1" + func_to_host_path_tmp1=$func_stripname_result + func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1" + func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result" + func_to_host_path_result="$func_cygpath_result" + func_convert_path_check : : \ + "$func_to_host_path_tmp1" "$func_to_host_path_result" + func_convert_path_front_back_pathsep ":*" "*:" : "$1" + fi +} +# end func_convert_path_nix_to_cygwin + + # func_mode_compile arg... func_mode_compile () { @@ -1137,12 +1985,12 @@ ;; -pie | -fpie | -fPIE) - pie_flag="$pie_flag $arg" + func_append pie_flag " $arg" continue ;; -shared | -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" + func_append later " $arg" continue ;; @@ -1163,15 +2011,14 @@ save_ifs="$IFS"; IFS=',' for arg in $args; do IFS="$save_ifs" - func_quote_for_eval "$arg" - lastarg="$lastarg $func_quote_for_eval_result" + func_append_quoted lastarg "$arg" done IFS="$save_ifs" func_stripname ' ' '' "$lastarg" lastarg=$func_stripname_result # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" + func_append base_compile " $lastarg" continue ;; @@ -1187,8 +2034,7 @@ esac # case $arg_mode # Aesthetically quote the previous argument. - func_quote_for_eval "$lastarg" - base_compile="$base_compile $func_quote_for_eval_result" + func_append_quoted base_compile "$lastarg" done # for arg case $arg_mode in @@ -1213,7 +2059,7 @@ *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx) + *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -1288,7 +2134,7 @@ # Calculate the filename of the output object if compiler does # not support -o with -c if test "$compiler_c_o" = no; then - output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} + output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" else output_obj= @@ -1319,17 +2165,16 @@ $opt_dry_run || $RM $removelist exit $EXIT_FAILURE fi - removelist="$removelist $output_obj" + func_append removelist " $output_obj" $ECHO "$srcfile" > "$lockfile" fi $opt_dry_run || $RM $removelist - removelist="$removelist $lockfile" + func_append removelist " $lockfile" trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15 - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi + func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 + srcfile=$func_to_tool_file_result func_quote_for_eval "$srcfile" qsrcfile=$func_quote_for_eval_result @@ -1349,7 +2194,7 @@ if test -z "$output_obj"; then # Place PIC objects in $objdir - command="$command -o $lobj" + func_append command " -o $lobj" fi func_show_eval_locale "$command" \ @@ -1396,11 +2241,11 @@ command="$base_compile $qsrcfile $pic_flag" fi if test "$compiler_c_o" = yes; then - command="$command -o $obj" + func_append command " -o $obj" fi # Suppress compiler output if we already did a PIC compilation. - command="$command$suppress_output" + func_append command "$suppress_output" func_show_eval_locale "$command" \ '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' @@ -1445,13 +2290,13 @@ } $opt_help || { -test "$mode" = compile && func_mode_compile ${1+"$@"} + test "$opt_mode" = compile && func_mode_compile ${1+"$@"} } func_mode_help () { # We need to display help for each of the modes. - case $mode in + case $opt_mode in "") # Generic help is extracted from the usage comments # at the start of this file. @@ -1482,10 +2327,11 @@ -o OUTPUT-FILE set the output file name to OUTPUT-FILE -no-suppress do not suppress compiler output for multiple passes - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only + -prefer-pic try to build PIC objects only + -prefer-non-pic try to build non-PIC objects only -shared do not build a \`.o' file suitable for static linking -static only build a \`.o' file suitable for static linking + -Wc,FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a \`standard' object file from the given SOURCEFILE. @@ -1538,7 +2384,7 @@ The following components of INSTALL-COMMAND are treated specially: - -inst-prefix PREFIX-DIR Use PREFIX-DIR as a staging area for installation + -inst-prefix-dir PREFIX-DIR Use PREFIX-DIR as a staging area for installation The rest of the components are interpreted as arguments to that command (only BSD-compatible install options are recognized)." @@ -1558,6 +2404,8 @@ -all-static do not do any dynamic linking at all -avoid-version do not add a version suffix if possible + -bindir BINDIR specify path to binaries directory (for systems where + libraries must be found in the PATH setting at runtime) -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) @@ -1586,6 +2434,11 @@ -version-info CURRENT[:REVISION[:AGE]] specify library version info [each variable defaults to 0] -weak LIBNAME declare that the target provides the LIBNAME interface + -Wc,FLAG + -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wl,FLAG + -Xlinker FLAG pass linker-specific FLAG directly to the linker + -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) All other options (arguments beginning with \`-') are ignored. @@ -1619,18 +2472,44 @@ ;; *) - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" ;; esac - $ECHO + echo $ECHO "Try \`$progname --help' for more information about other modes." - - exit $? } - # Now that we've collected a possible --mode arg, show help if necessary - $opt_help && func_mode_help +# Now that we've collected a possible --mode arg, show help if necessary +if $opt_help; then + if test "$opt_help" = :; then + func_mode_help + else + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + func_mode_help + done + } | sed -n '1p; 2,$s/^Usage:/ or: /p' + { + func_help noexit + for opt_mode in compile link execute install finish uninstall clean; do + echo + func_mode_help + done + } | + sed '1d + /^When reporting/,/^Report/{ + H + d + } + $x + /information about other modes/d + /more detailed .*MODE/d + s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/' + fi + exit $? +fi # func_mode_execute arg... @@ -1643,13 +2522,16 @@ func_fatal_help "you must specify a COMMAND" # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do + for file in $opt_dlopen; do test -f "$file" \ || func_fatal_help "\`$file' is not a file" dir= case $file in *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$lib' is not a valid libtool archive" @@ -1671,7 +2553,7 @@ dir="$func_dirname_result" if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" + func_append dir "/$objdir" else if test ! -f "$dir/$dlname"; then func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" @@ -1712,7 +2594,7 @@ for file do case $file in - -*) ;; + -* | *.la | *.lo ) ;; *) # Do a test to see if this is really a libtool program. if func_ltwrapper_script_p "$file"; then @@ -1728,8 +2610,7 @@ ;; esac # Quote arguments (to preserve shell metacharacters). - func_quote_for_eval "$file" - args="$args $func_quote_for_eval_result" + func_append_quoted args "$file" done if test "X$opt_dry_run" = Xfalse; then @@ -1754,29 +2635,66 @@ # Display what would be done. if test -n "$shlibpath_var"; then eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\"" - $ECHO "export $shlibpath_var" + echo "export $shlibpath_var" fi $ECHO "$cmd$args" exit $EXIT_SUCCESS fi } -test "$mode" = execute && func_mode_execute ${1+"$@"} +test "$opt_mode" = execute && func_mode_execute ${1+"$@"} + + +# func_mode_finish arg... +func_mode_finish () +{ + $opt_debug + libs= + libdirs= + admincmds= + + for opt in "$nonopt" ${1+"$@"} + do + if test -d "$opt"; then + func_append libdirs " $opt" + + elif test -f "$opt"; then + if func_lalib_unsafe_p "$opt"; then + func_append libs " $opt" + else + func_warning "\`$opt' is not a valid libtool archive" + fi + + else + func_fatal_error "invalid argument \`$opt'" + fi + done + if test -n "$libs"; then + if test -n "$lt_sysroot"; then + sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"` + sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;" + else + sysroot_cmd= + fi -# func_mode_finish arg... -func_mode_finish () -{ - $opt_debug - libdirs="$nonopt" - admincmds= + # Remove sysroot references + if $opt_dry_run; then + for lib in $libs; do + echo "removing references to $lt_sysroot and \`=' prefixes from $lib" + done + else + tmpdir=`func_mktempdir` + for lib in $libs; do + sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \ + > $tmpdir/tmp-la + mv -f $tmpdir/tmp-la $lib + done + ${RM}r "$tmpdir" + fi + fi if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done - for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. @@ -1786,7 +2704,7 @@ if test -n "$finish_eval"; then # Do the single finish_eval. eval cmds=\"$finish_eval\" - $opt_dry_run || eval "$cmds" || admincmds="$admincmds + $opt_dry_run || eval "$cmds" || func_append admincmds " $cmds" fi done @@ -1795,53 +2713,55 @@ # Exit here if they wanted silent mode. $opt_silent && exit $EXIT_SUCCESS - $ECHO "X----------------------------------------------------------------------" | $Xsed - $ECHO "Libraries have been installed in:" - for libdir in $libdirs; do - $ECHO " $libdir" - done - $ECHO - $ECHO "If you ever happen to want to link against installed libraries" - $ECHO "in a given directory, LIBDIR, you must either use libtool, and" - $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'" - $ECHO "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - $ECHO " - add LIBDIR to the \`$shlibpath_var' environment variable" - $ECHO " during execution" - fi - if test -n "$runpath_var"; then - $ECHO " - add LIBDIR to the \`$runpath_var' environment variable" - $ECHO " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" + if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then + echo "----------------------------------------------------------------------" + echo "Libraries have been installed in:" + for libdir in $libdirs; do + $ECHO " $libdir" + done + echo + echo "If you ever happen to want to link against installed libraries" + echo "in a given directory, LIBDIR, you must either use libtool, and" + echo "specify the full pathname of the library, or use the \`-LLIBDIR'" + echo "flag during linking and do at least one of the following:" + if test -n "$shlibpath_var"; then + echo " - add LIBDIR to the \`$shlibpath_var' environment variable" + echo " during execution" + fi + if test -n "$runpath_var"; then + echo " - add LIBDIR to the \`$runpath_var' environment variable" + echo " during linking" + fi + if test -n "$hardcode_libdir_flag_spec"; then + libdir=LIBDIR + eval flag=\"$hardcode_libdir_flag_spec\" - $ECHO " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $ECHO " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - $ECHO " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - $ECHO + $ECHO " - use the \`$flag' linker flag" + fi + if test -n "$admincmds"; then + $ECHO " - have your system administrator run these commands:$admincmds" + fi + if test -f /etc/ld.so.conf; then + echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" + fi + echo - $ECHO "See any operating system documentation about shared libraries for" - case $host in - solaris2.[6789]|solaris2.1[0-9]) - $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual" - $ECHO "pages." - ;; - *) - $ECHO "more information, such as the ld(1) and ld.so(8) manual pages." - ;; - esac - $ECHO "X----------------------------------------------------------------------" | $Xsed + echo "See any operating system documentation about shared libraries for" + case $host in + solaris2.[6789]|solaris2.1[0-9]) + echo "more information, such as the ld(1), crle(1) and ld.so(8) manual" + echo "pages." + ;; + *) + echo "more information, such as the ld(1) and ld.so(8) manual pages." + ;; + esac + echo "----------------------------------------------------------------------" + fi exit $EXIT_SUCCESS } -test "$mode" = finish && func_mode_finish ${1+"$@"} +test "$opt_mode" = finish && func_mode_finish ${1+"$@"} # func_mode_install arg... @@ -1852,7 +2772,7 @@ # install_prog (especially on Windows NT). if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || # Allow the use of GNU shtool's install command. - $ECHO "X$nonopt" | $GREP shtool >/dev/null; then + case $nonopt in *shtool*) :;; *) false;; esac; then # Aesthetically quote it. func_quote_for_eval "$nonopt" install_prog="$func_quote_for_eval_result " @@ -1866,7 +2786,12 @@ # The real first argument should be the name of the installation program. # Aesthetically quote it. func_quote_for_eval "$arg" - install_prog="$install_prog$func_quote_for_eval_result" + func_append install_prog "$func_quote_for_eval_result" + install_shared_prog=$install_prog + case " $install_prog " in + *[\\\ /]cp\ *) install_cp=: ;; + *) install_cp=false ;; + esac # We need to accept at least all the BSD install flags. dest= @@ -1876,10 +2801,12 @@ install_type= isdir=no stripme= + no_mode=: for arg do + arg2= if test -n "$dest"; then - files="$files $dest" + func_append files " $dest" dest=$arg continue fi @@ -1887,10 +2814,9 @@ case $arg in -d) isdir=yes ;; -f) - case " $install_prog " in - *[\\\ /]cp\ *) ;; - *) prev=$arg ;; - esac + if $install_cp; then :; else + prev=$arg + fi ;; -g | -m | -o) prev=$arg @@ -1904,6 +2830,10 @@ *) # If the previous option needed an argument, then skip it. if test -n "$prev"; then + if test "x$prev" = x-m && test -n "$install_override_mode"; then + arg2=$install_override_mode + no_mode=false + fi prev= else dest=$arg @@ -1914,7 +2844,11 @@ # Aesthetically quote the argument. func_quote_for_eval "$arg" - install_prog="$install_prog $func_quote_for_eval_result" + func_append install_prog " $func_quote_for_eval_result" + if test -n "$arg2"; then + func_quote_for_eval "$arg2" + fi + func_append install_shared_prog " $func_quote_for_eval_result" done test -z "$install_prog" && \ @@ -1923,6 +2857,13 @@ test -n "$prev" && \ func_fatal_help "the \`$prev' option requires an argument" + if test -n "$install_override_mode" && $no_mode; then + if $install_cp; then :; else + func_quote_for_eval "$install_override_mode" + func_append install_shared_prog " -m $func_quote_for_eval_result" + fi + fi + if test -z "$files"; then if test -z "$dest"; then func_fatal_help "no file or destination specified" @@ -1977,10 +2918,13 @@ case $file in *.$libext) # Do the static libraries later. - staticlibs="$staticlibs $file" + func_append staticlibs " $file" ;; *.la) + func_resolve_sysroot "$file" + file=$func_resolve_sysroot_result + # Check to see that this really is a libtool archive. func_lalib_unsafe_p "$file" \ || func_fatal_help "\`$file' is not a valid libtool archive" @@ -1994,23 +2938,23 @@ if test "X$destdir" = "X$libdir"; then case "$current_libdirs " in *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; + *) func_append current_libdirs " $libdir" ;; esac else # Note the libdir as a future libdir. case "$future_libdirs " in *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; + *) func_append future_libdirs " $libdir" ;; esac fi func_dirname "$file" "/" "" dir="$func_dirname_result" - dir="$dir$objdir" + func_append dir "$objdir" if test -n "$relink_command"; then # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"` + inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"` # Don't allow the user to place us outside of our expected # location b/c this prevents finding dependent libraries that @@ -2023,9 +2967,9 @@ if test -n "$inst_prefix_dir"; then # Stick the inst_prefix_dir data into the link command. - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` else - relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"` + relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"` fi func_warning "relinking \`$file'" @@ -2043,7 +2987,7 @@ test -n "$relink_command" && srcname="$realname"T # Install the shared library and build the symlinks. - func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \ + func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \ 'exit $?' tstripme="$stripme" case $host_os in @@ -2083,7 +3027,7 @@ func_show_eval "$install_prog $instname $destdir/$name" 'exit $?' # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" + test -n "$old_library" && func_append staticlibs " $dir/$old_library" ;; *.lo) @@ -2183,7 +3127,7 @@ if test -f "$lib"; then func_source "$lib" fi - libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test + libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test if test -n "$libdir" && test ! -f "$libfile"; then func_warning "\`$lib' has not been installed in \`$libdir'" finalize=no @@ -2202,7 +3146,7 @@ file="$func_basename_result" outputname="$tmpdir/$file" # Replace the output file specification. - relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` + relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_silent || { func_quote_for_expand "$relink_command" @@ -2221,7 +3165,7 @@ } else # Install the binary that we compiled earlier. - file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` + file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"` fi fi @@ -2280,7 +3224,7 @@ fi } -test "$mode" = install && func_mode_install ${1+"$@"} +test "$opt_mode" = install && func_mode_install ${1+"$@"} # func_generate_dlsyms outputname originator pic_p @@ -2323,6 +3267,22 @@ extern \"C\" { #endif +#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4)) +#pragma GCC diagnostic ignored \"-Wstrict-prototypes\" +#endif + +/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */ +#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE) +/* DATA imports from DLLs on WIN32 con't be const, because runtime + relocations are performed -- see ld's documentation on pseudo-relocs. */ +# define LT_DLSYM_CONST +#elif defined(__osf__) +/* This system does not cope well with relocations in const data. */ +# define LT_DLSYM_CONST +#else +# define LT_DLSYM_CONST const +#endif + /* External symbol declarations for the compiler. */\ " @@ -2332,10 +3292,11 @@ $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist" # Add our own program objects to the symbol list. - progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP` for progfile in $progfiles; do - func_verbose "extracting global C symbols from \`$progfile'" - $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'" + func_to_tool_file "$progfile" func_convert_file_msys_to_w32 + func_verbose "extracting global C symbols from \`$func_to_tool_file_result'" + $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'" done if test -n "$exclude_expsyms"; then @@ -2371,7 +3332,7 @@ eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T' eval '$MV "$nlist"T "$nlist"' case $host in - *cygwin | *mingw* | *cegcc* ) + *cygwin* | *mingw* | *cegcc* ) eval "echo EXPORTS "'> "$output_objdir/$outputname.def"' eval 'cat "$nlist" >> "$output_objdir/$outputname.def"' ;; @@ -2384,10 +3345,52 @@ func_verbose "extracting global C symbols from \`$dlprefile'" func_basename "$dlprefile" name="$func_basename_result" - $opt_dry_run || { - eval '$ECHO ": $name " >> "$nlist"' - eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'" - } + case $host in + *cygwin* | *mingw* | *cegcc* ) + # if an import library, we need to obtain dlname + if func_win32_import_lib_p "$dlprefile"; then + func_tr_sh "$dlprefile" + eval "curr_lafile=\$libfile_$func_tr_sh_result" + dlprefile_dlbasename="" + if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then + # Use subshell, to avoid clobbering current variable values + dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"` + if test -n "$dlprefile_dlname" ; then + func_basename "$dlprefile_dlname" + dlprefile_dlbasename="$func_basename_result" + else + # no lafile. user explicitly requested -dlpreopen . + $sharedlib_from_linklib_cmd "$dlprefile" + dlprefile_dlbasename=$sharedlib_from_linklib_result + fi + fi + $opt_dry_run || { + if test -n "$dlprefile_dlbasename" ; then + eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"' + else + func_warning "Could not compute DLL name from $name" + eval '$ECHO ": $name " >> "$nlist"' + fi + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe | + $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'" + } + else # not an import lib + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + fi + ;; + *) + $opt_dry_run || { + eval '$ECHO ": $name " >> "$nlist"' + func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32 + eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'" + } + ;; + esac done $opt_dry_run || { @@ -2415,36 +3418,19 @@ if test -f "$nlist"S; then eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"' else - $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms" + echo '/* NONE */' >> "$output_objdir/$my_dlsyms" fi - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ /* The mapping between symbol names and symbols. */ typedef struct { const char *name; void *address; } lt_dlsymlist; -" - case $host in - *cygwin* | *mingw* | *cegcc* ) - $ECHO >> "$output_objdir/$my_dlsyms" "\ -/* DATA imports from DLLs on WIN32 con't be const, because - runtime relocations are performed -- see ld's documentation - on pseudo-relocs. */" - lt_dlsym_const= ;; - *osf5*) - echo >> "$output_objdir/$my_dlsyms" "\ -/* This system does not cope well with relocations in const data */" - lt_dlsym_const= ;; - *) - lt_dlsym_const=const ;; - esac - - $ECHO >> "$output_objdir/$my_dlsyms" "\ -extern $lt_dlsym_const lt_dlsymlist +extern LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[]; -$lt_dlsym_const lt_dlsymlist +LT_DLSYM_CONST lt_dlsymlist lt_${my_prefix}_LTX_preloaded_symbols[] = {\ { \"$my_originator\", (void *) 0 }," @@ -2457,7 +3443,7 @@ eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms" ;; esac - $ECHO >> "$output_objdir/$my_dlsyms" "\ + echo >> "$output_objdir/$my_dlsyms" "\ {0, (void *) 0} }; @@ -2500,7 +3486,7 @@ for arg in $LTCFLAGS; do case $arg in -pie | -fpie | -fPIE) ;; - *) symtab_cflags="$symtab_cflags $arg" ;; + *) func_append symtab_cflags " $arg" ;; esac done @@ -2515,16 +3501,16 @@ case $host in *cygwin* | *mingw* | *cegcc* ) if test -f "$output_objdir/$my_outputname.def"; then - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"` else - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` fi ;; *) - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"` + compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"` ;; esac ;; @@ -2538,8 +3524,8 @@ # really was required. # Nullify the symbol file. - compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` + compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"` + finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"` fi } @@ -2549,6 +3535,7 @@ # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. +# Despite the name, also deal with 64 bit binaries. func_win32_libid () { $opt_debug @@ -2559,9 +3546,11 @@ win32_libid_type="x86 archive import" ;; *ar\ archive*) # could be an import, or static + # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD. if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | - $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | + $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then + func_to_tool_file "$1" func_convert_file_msys_to_w32 + win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" | $SED -n -e ' 1,100{ / I /{ @@ -2590,6 +3579,131 @@ $ECHO "$win32_libid_type" } +# func_cygming_dll_for_implib ARG +# +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib () +{ + $opt_debug + sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"` +} + +# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs +# +# The is the core of a fallback implementation of a +# platform-specific function to extract the name of the +# DLL associated with the specified import library LIBNAME. +# +# SECTION_NAME is either .idata$6 or .idata$7, depending +# on the platform and compiler that created the implib. +# +# Echos the name of the DLL associated with the +# specified import library. +func_cygming_dll_for_implib_fallback_core () +{ + $opt_debug + match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"` + $OBJDUMP -s --section "$1" "$2" 2>/dev/null | + $SED '/^Contents of section '"$match_literal"':/{ + # Place marker at beginning of archive member dllname section + s/.*/====MARK====/ + p + d + } + # These lines can sometimes be longer than 43 characters, but + # are always uninteresting + /:[ ]*file format pe[i]\{,1\}-/d + /^In archive [^:]*:/d + # Ensure marker is printed + /^====MARK====/p + # Remove all lines with less than 43 characters + /^.\{43\}/!d + # From remaining lines, remove first 43 characters + s/^.\{43\}//' | + $SED -n ' + # Join marker and all lines until next marker into a single line + /^====MARK====/ b para + H + $ b para + b + :para + x + s/\n//g + # Remove the marker + s/^====MARK====// + # Remove trailing dots and whitespace + s/[\. \t]*$// + # Print + /./p' | + # we now have a list, one entry per line, of the stringified + # contents of the appropriate section of all members of the + # archive which possess that section. Heuristic: eliminate + # all those which have a first or second character that is + # a '.' (that is, objdump's representation of an unprintable + # character.) This should work for all archives with less than + # 0x302f exports -- but will fail for DLLs whose name actually + # begins with a literal '.' or a single character followed by + # a '.'. + # + # Of those that remain, print the first one. + $SED -e '/^\./d;/^.\./d;q' +} + +# func_cygming_gnu_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is a GNU/binutils-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_gnu_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'` + test -n "$func_cygming_gnu_implib_tmp" +} + +# func_cygming_ms_implib_p ARG +# This predicate returns with zero status (TRUE) if +# ARG is an MS-style import library. Returns +# with nonzero status (FALSE) otherwise. +func_cygming_ms_implib_p () +{ + $opt_debug + func_to_tool_file "$1" func_convert_file_msys_to_w32 + func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'` + test -n "$func_cygming_ms_implib_tmp" +} + +# func_cygming_dll_for_implib_fallback ARG +# Platform-specific function to extract the +# name of the DLL associated with the specified +# import library ARG. +# +# This fallback implementation is for use when $DLLTOOL +# does not support the --identify-strict option. +# Invoked by eval'ing the libtool variable +# $sharedlib_from_linklib_cmd +# Result is available in the variable +# $sharedlib_from_linklib_result +func_cygming_dll_for_implib_fallback () +{ + $opt_debug + if func_cygming_gnu_implib_p "$1" ; then + # binutils import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"` + elif func_cygming_ms_implib_p "$1" ; then + # ms-generated import library + sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"` + else + # unknown + sharedlib_from_linklib_result="" + fi +} # func_extract_an_archive dir oldlib @@ -2598,7 +3712,18 @@ $opt_debug f_ex_an_ar_dir="$1"; shift f_ex_an_ar_oldlib="$1" - func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?' + if test "$lock_old_archive_extraction" = yes; then + lockfile=$f_ex_an_ar_oldlib.lock + until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do + func_echo "Waiting for $lockfile to be removed" + sleep 2 + done + fi + func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \ + 'stat=$?; rm -f "$lockfile"; exit $stat' + if test "$lock_old_archive_extraction" = yes; then + $opt_dry_run || rm -f "$lockfile" + fi if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then : else @@ -2669,7 +3794,7 @@ darwin_file= darwin_files= for darwin_file in $darwin_filelist; do - darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP` + darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP` $LIPO -create -output "$darwin_file" $darwin_files done # $darwin_filelist $RM -rf unfat-$$ @@ -2684,25 +3809,30 @@ func_extract_an_archive "$my_xdir" "$my_xabs" ;; esac - my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP` + my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP` done func_extract_archives_result="$my_oldobjs" } - -# func_emit_wrapper_part1 [arg=no] +# func_emit_wrapper [arg=no] # -# Emit the first part of a libtool wrapper script on stdout. -# For more information, see the description associated with -# func_emit_wrapper(), below. -func_emit_wrapper_part1 () -{ - func_emit_wrapper_part1_arg1=no - if test -n "$1" ; then - func_emit_wrapper_part1_arg1=$1 - fi +# Emit a libtool wrapper script on stdout. +# Don't directly open a file because we may want to +# incorporate the script contents within a cygwin/mingw +# wrapper executable. Must ONLY be called from within +# func_mode_link because it depends on a number of variables +# set therein. +# +# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR +# variable will take. If 'yes', then the emitted script +# will assume that the directory in which it is stored is +# the $objdir directory. This is a cygwin/mingw-specific +# behavior. +func_emit_wrapper () +{ + func_emit_wrapper_arg1=${1-no} $ECHO "\ #! $SHELL @@ -2718,7 +3848,6 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' sed_quote_subst='$sed_quote_subst' # Be Bourne compatible @@ -2749,31 +3878,132 @@ else # When we are sourced in execute mode, \$file and \$ECHO are already set. if test \"\$libtool_execute_magic\" != \"$magic\"; then - ECHO=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$ECHO works! - : - else - # Restart under the correct shell, and then maybe \$ECHO will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ + file=\"\$0\"" + + qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + $ECHO "\ + +# A function that is used when there is no print builtin or printf. +func_fallback_echo () +{ + eval 'cat <<_LTECHO_EOF +\$1 +_LTECHO_EOF' +} + ECHO=\"$qECHO\" + fi + +# Very basic option parsing. These options are (a) specific to +# the libtool wrapper, (b) are identical between the wrapper +# /script/ and the wrapper /executable/ which is used only on +# windows platforms, and (c) all begin with the string "--lt-" +# (application programs are unlikely to have options which match +# this pattern). +# +# There are only two supported options: --lt-debug and +# --lt-dump-script. There is, deliberately, no --lt-help. +# +# The first argument to this parsing function should be the +# script's $0 value, followed by "$@". +lt_option_debug= +func_parse_lt_options () +{ + lt_script_arg0=\$0 + shift + for lt_opt + do + case \"\$lt_opt\" in + --lt-debug) lt_option_debug=1 ;; + --lt-dump-script) + lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\` + test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=. + lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\` + cat \"\$lt_dump_D/\$lt_dump_F\" + exit 0 + ;; + --lt-*) + \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2 + exit 1 + ;; + esac + done + + # Print the debug banner immediately: + if test -n \"\$lt_option_debug\"; then + echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2 + fi +} + +# Used when --lt-debug. Prints its arguments to stdout +# (redirection is the responsibility of the caller) +func_lt_dump_args () +{ + lt_dump_args_N=1; + for lt_arg + do + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\" + lt_dump_args_N=\`expr \$lt_dump_args_N + 1\` + done +} + +# Core function for launching the target application +func_exec_program_core () +{ " - $ECHO "\ + case $host in + # Backslashes separate directories on plain windows + *-*-mingw | *-*-os2* | *-cegcc*) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} +" + ;; + + *) + $ECHO "\ + if test -n \"\$lt_option_debug\"; then + \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2 + func_lt_dump_args \${1+\"\$@\"} 1>&2 + fi + exec \"\$progdir/\$program\" \${1+\"\$@\"} +" + ;; + esac + $ECHO "\ + \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 + exit 1 +} + +# A function to encapsulate launching the target application +# Strips options in the --lt-* namespace from \$@ and +# launches target application with the remaining arguments. +func_exec_program () +{ + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done + func_exec_program_core \${1+\"\$@\"} +} + + # Parse options + func_parse_lt_options \"\$0\" \${1+\"\$@\"} # Find the directory that this script lives in. - thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` + thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\` test \"x\$thisdir\" = \"x\$file\" && thisdir=. # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` + file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\` while test -n \"\$file\"; do - destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` + destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\` # If there was a directory component, then change thisdir. if test \"x\$destdir\" != \"x\$file\"; then @@ -2783,30 +4013,13 @@ esac fi - file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` + file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\` + file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\` done -" -} -# end: func_emit_wrapper_part1 - -# func_emit_wrapper_part2 [arg=no] -# -# Emit the second part of a libtool wrapper script on stdout. -# For more information, see the description associated with -# func_emit_wrapper(), below. -func_emit_wrapper_part2 () -{ - func_emit_wrapper_part2_arg1=no - if test -n "$1" ; then - func_emit_wrapper_part2_arg1=$1 - fi - - $ECHO "\ # Usually 'no', except on cygwin/mingw when embedded into # the cwrapper. - WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1 + WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1 if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then # special case for '.' if test \"\$thisdir\" = \".\"; then @@ -2814,7 +4027,7 @@ fi # remove .libs from thisdir case \"\$thisdir\" in - *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;; + *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;; $objdir ) thisdir=. ;; esac fi @@ -2869,6 +4082,18 @@ if test -f \"\$progdir/\$program\"; then" + # fixup the dll searchpath if we need to. + # + # Fix the DLL searchpath if we need to. Do this before prepending + # to shlibpath, because on Windows, both are PATH and uninstalled + # libraries must come first. + if test -n "$dllsearchpath"; then + $ECHO "\ + # Add the dll search path components to the executable PATH + PATH=$dllsearchpath:\$PATH +" + fi + # Export our shlibpath_var if we have one. if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then $ECHO "\ @@ -2877,253 +4102,28 @@ # Some systems cannot cope with colon-terminated $shlibpath_var # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` + $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\` export $shlibpath_var " fi - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $ECHO "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - $ECHO "\ if test \"\$libtool_execute_magic\" != \"$magic\"; then # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2* | *-cegcc*) - $ECHO "\ - exec \"\$progdir\\\\\$program\" \${1+\"\$@\"} -" - ;; - - *) - $ECHO "\ - exec \"\$progdir/\$program\" \${1+\"\$@\"} -" - ;; - esac - $ECHO "\ - \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2 - exit 1 + func_exec_program \${1+\"\$@\"} fi else # The program doesn't exist. \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2 \$ECHO \"This script is just a wrapper for \$program.\" 1>&2 - $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 - fi -fi\ -" -} -# end: func_emit_wrapper_part2 - - -# func_emit_wrapper [arg=no] -# -# Emit a libtool wrapper script on stdout. -# Don't directly open a file because we may want to -# incorporate the script contents within a cygwin/mingw -# wrapper executable. Must ONLY be called from within -# func_mode_link because it depends on a number of variables -# set therein. -# -# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR -# variable will take. If 'yes', then the emitted script -# will assume that the directory in which it is stored is -# the $objdir directory. This is a cygwin/mingw-specific -# behavior. -func_emit_wrapper () -{ - func_emit_wrapper_arg1=no - if test -n "$1" ; then - func_emit_wrapper_arg1=$1 - fi - - # split this up so that func_emit_cwrapperexe_src - # can call each part independently. - func_emit_wrapper_part1 "${func_emit_wrapper_arg1}" - func_emit_wrapper_part2 "${func_emit_wrapper_arg1}" -} - - -# func_to_host_path arg -# -# Convert paths to host format when used with build tools. -# Intended for use with "native" mingw (where libtool itself -# is running under the msys shell), or in the following cross- -# build environments: -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# where wine is equipped with the `winepath' executable. -# In the native mingw case, the (msys) shell automatically -# converts paths for any non-msys applications it launches, -# but that facility isn't available from inside the cwrapper. -# Similar accommodations are necessary for $host mingw and -# $build cygwin. Calling this function does no harm for other -# $host/$build combinations not listed above. -# -# ARG is the path (on $build) that should be converted to -# the proper representation for $host. The result is stored -# in $func_to_host_path_result. -func_to_host_path () -{ - func_to_host_path_result="$1" - if test -n "$1" ; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - case $build in - *mingw* ) # actually, msys - # awkward: cmd appends spaces to result - lt_sed_strip_trailing_spaces="s/[ ]*\$//" - func_to_host_path_tmp1=`( cmd //c echo "$1" |\ - $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_path_tmp1=`cygpath -w "$1"` - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # Unfortunately, winepath does not exit with a non-zero - # error code, so we are forced to check the contents of - # stdout. On the other hand, if the command is not - # found, the shell will set an exit code of 127 and print - # *an error message* to stdout. So we must check for both - # error code of zero AND non-empty stdout, which explains - # the odd construction: - func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null` - if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then - func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\ - $SED -e "$lt_sed_naive_backslashify"` - else - # Allow warning below. - func_to_host_path_result="" - fi - ;; - esac - if test -z "$func_to_host_path_result" ; then - func_error "Could not determine host path corresponding to" - func_error " '$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback: - func_to_host_path_result="$1" - fi - ;; - esac - fi -} -# end: func_to_host_path - -# func_to_host_pathlist arg -# -# Convert pathlists to host format when used with build tools. -# See func_to_host_path(), above. This function supports the -# following $build/$host combinations (but does no harm for -# combinations not listed here): -# $build $host -# mingw (msys) mingw [e.g. native] -# cygwin mingw -# *nix + wine mingw -# -# Path separators are also converted from $build format to -# $host format. If ARG begins or ends with a path separator -# character, it is preserved (but converted to $host format) -# on output. -# -# ARG is a pathlist (on $build) that should be converted to -# the proper representation on $host. The result is stored -# in $func_to_host_pathlist_result. -func_to_host_pathlist () -{ - func_to_host_pathlist_result="$1" - if test -n "$1" ; then - case $host in - *mingw* ) - lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g' - # Remove leading and trailing path separator characters from - # ARG. msys behavior is inconsistent here, cygpath turns them - # into '.;' and ';.', and winepath ignores them completely. - func_to_host_pathlist_tmp2="$1" - # Once set for this call, this variable should not be - # reassigned. It is used in tha fallback case. - func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e 's|^:*||' -e 's|:*$||'` - case $build in - *mingw* ) # Actually, msys. - # Awkward: cmd appends spaces to result. - lt_sed_strip_trailing_spaces="s/[ ]*\$//" - func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - *cygwin* ) - func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"` - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\ - $SED -e "$lt_sed_naive_backslashify"` - ;; - * ) - # unfortunately, winepath doesn't convert pathlists - func_to_host_pathlist_result="" - func_to_host_pathlist_oldIFS=$IFS - IFS=: - for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do - IFS=$func_to_host_pathlist_oldIFS - if test -n "$func_to_host_pathlist_f" ; then - func_to_host_path "$func_to_host_pathlist_f" - if test -n "$func_to_host_path_result" ; then - if test -z "$func_to_host_pathlist_result" ; then - func_to_host_pathlist_result="$func_to_host_path_result" - else - func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result" - fi - fi - fi - IFS=: - done - IFS=$func_to_host_pathlist_oldIFS - ;; - esac - if test -z "$func_to_host_pathlist_result" ; then - func_error "Could not determine the host path(s) corresponding to" - func_error " '$1'" - func_error "Continuing, but uninstalled executables may not work." - # Fallback. This may break if $1 contains DOS-style drive - # specifications. The fix is not to complicate the expression - # below, but for the user to provide a working wine installation - # with winepath so that path translation in the cross-to-mingw - # case works properly. - lt_replace_pathsep_nix_to_dos="s|:|;|g" - func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\ - $SED -e "$lt_replace_pathsep_nix_to_dos"` - fi - # Now, add the leading and trailing path separators back - case "$1" in - :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result" - ;; - esac - case "$1" in - *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;" - ;; - esac - ;; - esac + \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2 + exit 1 fi +fi\ +" } -# end: func_to_host_pathlist + # func_emit_cwrapperexe_src # emit the source code for a wrapper executable on stdout @@ -3141,31 +4141,23 @@ This wrapper executable should never be moved out of the build directory. If it is, it will not operate correctly. - - Currently, it simply execs the wrapper *script* "$SHELL $output", - but could eventually absorb all of the scripts functionality and - exec $objdir/$outputname directly. */ EOF cat <<"EOF" +#ifdef _MSC_VER +# define _CRT_SECURE_NO_DEPRECATE 1 +#endif #include #include #ifdef _MSC_VER # include # include # include -# define setmode _setmode #else # include # include # ifdef __CYGWIN__ # include -# define HAVE_SETENV -# ifdef __STRICT_ANSI__ -char *realpath (const char *, char *); -int putenv (char *); -int setenv (const char *, const char *, int); -# endif # endif #endif #include @@ -3177,6 +4169,44 @@ #include #include +/* declarations of non-ANSI functions */ +#if defined(__MINGW32__) +# ifdef __STRICT_ANSI__ +int _putenv (const char *); +# endif +#elif defined(__CYGWIN__) +# ifdef __STRICT_ANSI__ +char *realpath (const char *, char *); +int putenv (char *); +int setenv (const char *, const char *, int); +# endif +/* #elif defined (other platforms) ... */ +#endif + +/* portability defines, excluding path handling macros */ +#if defined(_MSC_VER) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +# define S_IXUSR _S_IEXEC +# ifndef _INTPTR_T_DEFINED +# define _INTPTR_T_DEFINED +# define intptr_t int +# endif +#elif defined(__MINGW32__) +# define setmode _setmode +# define stat _stat +# define chmod _chmod +# define getcwd _getcwd +# define putenv _putenv +#elif defined(__CYGWIN__) +# define HAVE_SETENV +# define FOPEN_WB "wb" +/* #elif defined (other platforms) ... */ +#endif + #if defined(PATH_MAX) # define LT_PATHMAX PATH_MAX #elif defined(MAXPATHLEN) @@ -3192,14 +4222,7 @@ # define S_IXGRP 0 #endif -#ifdef _MSC_VER -# define S_IXUSR _S_IEXEC -# define stat _stat -# ifndef _INTPTR_T_DEFINED -# define intptr_t int -# endif -#endif - +/* path handling portability macros */ #ifndef DIR_SEPARATOR # define DIR_SEPARATOR '/' # define PATH_SEPARATOR ':' @@ -3230,10 +4253,6 @@ # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2) #endif /* PATH_SEPARATOR_2 */ -#ifdef __CYGWIN__ -# define FOPEN_WB "wb" -#endif - #ifndef FOPEN_WB # define FOPEN_WB "w" #endif @@ -3246,22 +4265,13 @@ if (stale) { free ((void *) stale); stale = 0; } \ } while (0) -#undef LTWRAPPER_DEBUGPRINTF -#if defined DEBUGWRAPPER -# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args -static void -ltwrapper_debugprintf (const char *fmt, ...) -{ - va_list args; - va_start (args, fmt); - (void) vfprintf (stderr, fmt, args); - va_end (args); -} +#if defined(LT_DEBUGWRAPPER) +static int lt_debug = 1; #else -# define LTWRAPPER_DEBUGPRINTF(args) +static int lt_debug = 0; #endif -const char *program_name = NULL; +const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */ void *xmalloc (size_t num); char *xstrdup (const char *string); @@ -3271,41 +4281,27 @@ int make_executable (const char *path); int check_executable (const char *path); char *strendzap (char *str, const char *pat); -void lt_fatal (const char *message, ...); +void lt_debugprintf (const char *file, int line, const char *fmt, ...); +void lt_fatal (const char *file, int line, const char *message, ...); +static const char *nonnull (const char *s); +static const char *nonempty (const char *s); void lt_setenv (const char *name, const char *value); char *lt_extend_str (const char *orig_value, const char *add, int to_end); -void lt_opt_process_env_set (const char *arg); -void lt_opt_process_env_prepend (const char *arg); -void lt_opt_process_env_append (const char *arg); -int lt_split_name_value (const char *arg, char** name, char** value); void lt_update_exe_path (const char *name, const char *value); void lt_update_lib_path (const char *name, const char *value); - -static const char *script_text_part1 = -EOF - - func_emit_wrapper_part1 yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ "/' -e 's/$/\\n"/' - echo ";" - cat <"))); + lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n", + nonnull (lt_argv_zero)); for (i = 0; i < newargc; i++) { - LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d] : %s\n", i, (newargz[i] ? newargz[i] : ""))); + lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n", + i, nonnull (newargz[i])); } EOF @@ -3560,11 +4517,14 @@ mingw*) cat <<"EOF" /* execv doesn't actually work on mingw as expected on unix */ + newargz = prepare_spawn (newargz); rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz); if (rval == -1) { /* failed to start process */ - LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno)); + lt_debugprintf (__FILE__, __LINE__, + "(main) failed to launch target \"%s\": %s\n", + lt_argv_zero, nonnull (strerror (errno))); return 127; } return rval; @@ -3586,7 +4546,7 @@ { void *p = (void *) malloc (num); if (!p) - lt_fatal ("Memory exhausted"); + lt_fatal (__FILE__, __LINE__, "memory exhausted"); return p; } @@ -3620,8 +4580,8 @@ { struct stat st; - LTWRAPPER_DEBUGPRINTF (("(check_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n", + nonempty (path)); if ((!path) || (!*path)) return 0; @@ -3638,8 +4598,8 @@ int rval = 0; struct stat st; - LTWRAPPER_DEBUGPRINTF (("(make_executable) : %s\n", - path ? (*path ? path : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n", + nonempty (path)); if ((!path) || (!*path)) return 0; @@ -3665,8 +4625,8 @@ int tmp_len; char *concat_name; - LTWRAPPER_DEBUGPRINTF (("(find_executable) : %s\n", - wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!")); + lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n", + nonempty (wrapper)); if ((wrapper == NULL) || (*wrapper == '\0')) return NULL; @@ -3719,7 +4679,8 @@ { /* empty path: current directory */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); @@ -3744,7 +4705,8 @@ } /* Relative path | not found in path: prepend cwd */ if (getcwd (tmp, LT_PATHMAX) == NULL) - lt_fatal ("getcwd failed"); + lt_fatal (__FILE__, __LINE__, "getcwd failed: %s", + nonnull (strerror (errno))); tmp_len = strlen (tmp); concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1); memcpy (concat_name, tmp, tmp_len); @@ -3770,8 +4732,9 @@ int has_symlinks = 0; while (strlen (tmp_pathspec) && !has_symlinks) { - LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n", - tmp_pathspec)); + lt_debugprintf (__FILE__, __LINE__, + "checking path component for symlinks: %s\n", + tmp_pathspec); if (lstat (tmp_pathspec, &s) == 0) { if (S_ISLNK (s.st_mode) != 0) @@ -3793,8 +4756,9 @@ } else { - char *errstr = strerror (errno); - lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr); + lt_fatal (__FILE__, __LINE__, + "error accessing file \"%s\": %s", + tmp_pathspec, nonnull (strerror (errno))); } } XFREE (tmp_pathspec); @@ -3807,7 +4771,8 @@ tmp_pathspec = realpath (pathspec, buf); if (tmp_pathspec == 0) { - lt_fatal ("Could not follow symlinks for %s", pathspec); + lt_fatal (__FILE__, __LINE__, + "could not follow symlinks for %s", pathspec); } return xstrdup (tmp_pathspec); #endif @@ -3833,11 +4798,25 @@ return str; } +void +lt_debugprintf (const char *file, int line, const char *fmt, ...) +{ + va_list args; + if (lt_debug) + { + (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line); + va_start (args, fmt); + (void) vfprintf (stderr, fmt, args); + va_end (args); + } +} + static void -lt_error_core (int exit_status, const char *mode, +lt_error_core (int exit_status, const char *file, + int line, const char *mode, const char *message, va_list ap) { - fprintf (stderr, "%s: %s: ", program_name, mode); + fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode); vfprintf (stderr, message, ap); fprintf (stderr, ".\n"); @@ -3846,20 +4825,32 @@ } void -lt_fatal (const char *message, ...) +lt_fatal (const char *file, int line, const char *message, ...) { va_list ap; va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); + lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap); va_end (ap); } +static const char * +nonnull (const char *s) +{ + return s ? s : "(null)"; +} + +static const char * +nonempty (const char *s) +{ + return (s && !*s) ? "(empty)" : nonnull (s); +} + void lt_setenv (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n", - (name ? name : ""), - (value ? value : ""))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_setenv) setting '%s' to '%s'\n", + nonnull (name), nonnull (value)); { #ifdef HAVE_SETENV /* always make a copy, for consistency with !HAVE_SETENV */ @@ -3904,95 +4895,12 @@ return new_value; } -int -lt_split_name_value (const char *arg, char** name, char** value) -{ - const char *p; - int len; - if (!arg || !*arg) - return 1; - - p = strchr (arg, (int)'='); - - if (!p) - return 1; - - *value = xstrdup (++p); - - len = strlen (arg) - strlen (*value); - *name = XMALLOC (char, len); - strncpy (*name, arg, len-1); - (*name)[len - 1] = '\0'; - - return 0; -} - -void -lt_opt_process_env_set (const char *arg) -{ - char *name = NULL; - char *value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg); - } - - lt_setenv (name, value); - XFREE (name); - XFREE (value); -} - -void -lt_opt_process_env_prepend (const char *arg) -{ - char *name = NULL; - char *value = NULL; - char *new_value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg); - } - - new_value = lt_extend_str (getenv (name), value, 0); - lt_setenv (name, new_value); - XFREE (new_value); - XFREE (name); - XFREE (value); -} - -void -lt_opt_process_env_append (const char *arg) -{ - char *name = NULL; - char *value = NULL; - char *new_value = NULL; - - if (lt_split_name_value (arg, &name, &value) != 0) - { - XFREE (name); - XFREE (value); - lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg); - } - - new_value = lt_extend_str (getenv (name), value, 1); - lt_setenv (name, new_value); - XFREE (new_value); - XFREE (name); - XFREE (value); -} - void lt_update_exe_path (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n", - (name ? name : ""), - (value ? value : ""))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_exe_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); if (name && *name && value && *value) { @@ -4011,9 +4919,9 @@ void lt_update_lib_path (const char *name, const char *value) { - LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n", - (name ? name : ""), - (value ? value : ""))); + lt_debugprintf (__FILE__, __LINE__, + "(lt_update_lib_path) modifying '%s' by prepending '%s'\n", + nonnull (name), nonnull (value)); if (name && *name && value && *value) { @@ -4023,11 +4931,152 @@ } } +EOF + case $host_os in + mingw*) + cat <<"EOF" + +/* Prepares an argument vector before calling spawn(). + Note that spawn() does not by itself call the command interpreter + (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") : + ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); + GetVersionEx(&v); + v.dwPlatformId == VER_PLATFORM_WIN32_NT; + }) ? "cmd.exe" : "command.com"). + Instead it simply concatenates the arguments, separated by ' ', and calls + CreateProcess(). We must quote the arguments since Win32 CreateProcess() + interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a + special way: + - Space and tab are interpreted as delimiters. They are not treated as + delimiters if they are surrounded by double quotes: "...". + - Unescaped double quotes are removed from the input. Their only effect is + that within double quotes, space and tab are treated like normal + characters. + - Backslashes not followed by double quotes are not special. + - But 2*n+1 backslashes followed by a double quote become + n backslashes followed by a double quote (n >= 0): + \" -> " + \\\" -> \" + \\\\\" -> \\" + */ +#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037" +char ** +prepare_spawn (char **argv) +{ + size_t argc; + char **new_argv; + size_t i; + + /* Count number of arguments. */ + for (argc = 0; argv[argc] != NULL; argc++) + ; + + /* Allocate new argument vector. */ + new_argv = XMALLOC (char *, argc + 1); + + /* Put quoted arguments into the new argument vector. */ + for (i = 0; i < argc; i++) + { + const char *string = argv[i]; + + if (string[0] == '\0') + new_argv[i] = xstrdup ("\"\""); + else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL) + { + int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL); + size_t length; + unsigned int backslashes; + const char *s; + char *quoted_string; + char *p; + + length = 0; + backslashes = 0; + if (quote_around) + length++; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + length += backslashes + 1; + length++; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + length += backslashes + 1; + + quoted_string = XMALLOC (char, length + 1); + + p = quoted_string; + backslashes = 0; + if (quote_around) + *p++ = '"'; + for (s = string; *s != '\0'; s++) + { + char c = *s; + if (c == '"') + { + unsigned int j; + for (j = backslashes + 1; j > 0; j--) + *p++ = '\\'; + } + *p++ = c; + if (c == '\\') + backslashes++; + else + backslashes = 0; + } + if (quote_around) + { + unsigned int j; + for (j = backslashes; j > 0; j--) + *p++ = '\\'; + *p++ = '"'; + } + *p = '\0'; + + new_argv[i] = quoted_string; + } + else + new_argv[i] = (char *) string; + } + new_argv[argc] = NULL; + + return new_argv; +} +EOF + ;; + esac + + cat <<"EOF" +void lt_dump_script (FILE* f) +{ +EOF + func_emit_wrapper yes | + $SED -e 's/\([\\"]\)/\\\1/g' \ + -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' + cat <<"EOF" +} EOF } # end: func_emit_cwrapperexe_src +# func_win32_import_lib_p ARG +# True if ARG is an import lib, as indicated by $file_magic_cmd +func_win32_import_lib_p () +{ + $opt_debug + case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in + *import*) : ;; + *) false ;; + esac +} + # func_mode_link arg... func_mode_link () { @@ -4072,6 +5121,7 @@ new_inherited_linker_flags= avoid_version=no + bindir= dlfiles= dlprefiles= dlself=no @@ -4164,6 +5214,11 @@ esac case $prev in + bindir) + bindir="$arg" + prev= + continue + ;; dlfiles|dlprefiles) if test "$preload" = no; then # Add the symbol object into the linking commands. @@ -4195,9 +5250,9 @@ ;; *) if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" + func_append dlfiles " $arg" else - dlprefiles="$dlprefiles $arg" + func_append dlprefiles " $arg" fi prev= continue @@ -4221,7 +5276,7 @@ *-*-darwin*) case "$deplibs " in *" $qarg.ltframework "*) ;; - *) deplibs="$deplibs $qarg.ltframework" # this is fixed later + *) func_append deplibs " $qarg.ltframework" # this is fixed later ;; esac ;; @@ -4240,7 +5295,7 @@ moreargs= for fil in `cat "$save_arg"` do -# moreargs="$moreargs $fil" +# func_append moreargs " $fil" arg=$fil # A libtool-controlled object. @@ -4269,7 +5324,7 @@ if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" + func_append dlfiles " $pic_object" prev= continue else @@ -4281,7 +5336,7 @@ # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" + func_append dlprefiles " $pic_object" prev= fi @@ -4351,12 +5406,12 @@ if test "$prev" = rpath; then case "$rpath " in *" $arg "*) ;; - *) rpath="$rpath $arg" ;; + *) func_append rpath " $arg" ;; esac else case "$xrpath " in *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; + *) func_append xrpath " $arg" ;; esac fi prev= @@ -4368,28 +5423,28 @@ continue ;; weak) - weak_libs="$weak_libs $arg" + func_append weak_libs " $arg" prev= continue ;; xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" + func_append linker_flags " $qarg" + func_append compiler_flags " $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xcompiler) - compiler_flags="$compiler_flags $qarg" + func_append compiler_flags " $qarg" prev= func_append compile_command " $qarg" func_append finalize_command " $qarg" continue ;; xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" + func_append linker_flags " $qarg" + func_append compiler_flags " $wl$qarg" prev= func_append compile_command " $wl$qarg" func_append finalize_command " $wl$qarg" @@ -4425,6 +5480,11 @@ continue ;; + -bindir) + prev=bindir + continue + ;; + -dlopen) prev=dlfiles continue @@ -4475,15 +5535,16 @@ ;; -L*) - func_stripname '-L' '' "$arg" - dir=$func_stripname_result - if test -z "$dir"; then + func_stripname "-L" '' "$arg" + if test -z "$func_stripname_result"; then if test "$#" -gt 0; then func_fatal_error "require no space between \`-L' and \`$1'" else func_fatal_error "need path for \`-L' option" fi fi + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; @@ -4495,24 +5556,30 @@ ;; esac case "$deplibs " in - *" -L$dir "*) ;; + *" -L$dir "* | *" $arg "*) + # Will only happen for absolute or sysroot arguments + ;; *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" + # Preserve sysroot, but never include relative directories + case $dir in + [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;; + *) func_append deplibs " -L$dir" ;; + esac + func_append lib_search_path " $dir" ;; esac case $host in *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*) - testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'` + testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'` case :$dllsearchpath: in *":$dir:"*) ;; ::) dllsearchpath=$dir;; - *) dllsearchpath="$dllsearchpath:$dir";; + *) func_append dllsearchpath ":$dir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -4522,7 +5589,7 @@ -l*) if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*) # These systems don't actually have a C or math library (as such) continue ;; @@ -4536,7 +5603,7 @@ ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs System.ltframework" + func_append deplibs " System.ltframework" continue ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -4556,7 +5623,7 @@ ;; esac fi - deplibs="$deplibs $arg" + func_append deplibs " $arg" continue ;; @@ -4568,8 +5635,8 @@ # Tru64 UNIX uses -model [arg] to determine the layout of C++ # classes, name mangling, and exception handling. # Darwin uses the -arch flag to determine output architecture. - -model|-arch|-isysroot) - compiler_flags="$compiler_flags $arg" + -model|-arch|-isysroot|--sysroot) + func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" prev=xcompiler @@ -4577,12 +5644,12 @@ ;; -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) - compiler_flags="$compiler_flags $arg" + func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" case "$new_inherited_linker_flags " in *" $arg "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;; + * ) func_append new_inherited_linker_flags " $arg" ;; esac continue ;; @@ -4649,13 +5716,17 @@ # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) ;; + =*) + func_stripname '=' '' "$dir" + dir=$lt_sysroot$func_stripname_result + ;; *) func_fatal_error "only absolute run-paths are allowed" ;; esac case "$xrpath " in *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; + *) func_append xrpath " $dir" ;; esac continue ;; @@ -4708,8 +5779,8 @@ for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" - compiler_flags="$compiler_flags $func_quote_for_eval_result" + func_append arg " $func_quote_for_eval_result" + func_append compiler_flags " $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -4724,9 +5795,9 @@ for flag in $args; do IFS="$save_ifs" func_quote_for_eval "$flag" - arg="$arg $wl$func_quote_for_eval_result" - compiler_flags="$compiler_flags $wl$func_quote_for_eval_result" - linker_flags="$linker_flags $func_quote_for_eval_result" + func_append arg " $wl$func_quote_for_eval_result" + func_append compiler_flags " $wl$func_quote_for_eval_result" + func_append linker_flags " $func_quote_for_eval_result" done IFS="$save_ifs" func_stripname ' ' '' "$arg" @@ -4754,23 +5825,27 @@ arg="$func_quote_for_eval_result" ;; - # -64, -mips[0-9] enable 64-bit mode on the SGI compiler - # -r[0-9][0-9]* specifies the processor on the SGI compiler - # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler - # +DA*, +DD* enable 64-bit mode on the HP compiler - # -q* pass through compiler args for the IBM compiler - # -m*, -t[45]*, -txscale* pass through architecture-specific - # compiler args for GCC - # -F/path gives path to uninstalled frameworks, gcc on darwin - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files + # Flags to be passed through unchanged, with rationale: + # -64, -mips[0-9] enable 64-bit mode for the SGI compiler + # -r[0-9][0-9]* specify processor for the SGI compiler + # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler + # +DA*, +DD* enable 64-bit mode for the HP compiler + # -q* compiler args for the IBM compiler + # -m*, -t[45]*, -txscale* architecture-specific flags for GCC + # -F/path path to uninstalled frameworks, gcc on darwin + # -p, -pg, --coverage, -fprofile-* profiling flags for GCC + # @file GCC response files + # -tp=* Portland pgcc target processor selection + # --sysroot=* for sysroot support + # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) + -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ + -O*|-flto*|-fwhopr*|-fuse-linker-plugin) func_quote_for_eval "$arg" arg="$func_quote_for_eval_result" func_append compile_command " $arg" func_append finalize_command " $arg" - compiler_flags="$compiler_flags $arg" + func_append compiler_flags " $arg" continue ;; @@ -4782,7 +5857,7 @@ *.$objext) # A standard object. - objs="$objs $arg" + func_append objs " $arg" ;; *.lo) @@ -4813,7 +5888,7 @@ if test "$prev" = dlfiles; then if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" + func_append dlfiles " $pic_object" prev= continue else @@ -4825,7 +5900,7 @@ # CHECK ME: I think I busted this. -Ossama if test "$prev" = dlprefiles; then # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" + func_append dlprefiles " $pic_object" prev= fi @@ -4870,24 +5945,25 @@ *.$libext) # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" + func_append deplibs " $arg" + func_append old_deplibs " $arg" continue ;; *.la) # A libtool-controlled library. + func_resolve_sysroot "$arg" if test "$prev" = dlfiles; then # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" + func_append dlfiles " $func_resolve_sysroot_result" prev= elif test "$prev" = dlprefiles; then # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" + func_append dlprefiles " $func_resolve_sysroot_result" prev= else - deplibs="$deplibs $arg" + func_append deplibs " $func_resolve_sysroot_result" fi continue ;; @@ -4925,7 +6001,7 @@ if test -n "$shlibpath_var"; then # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` + eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\` else shlib_search_path= fi @@ -4934,6 +6010,8 @@ func_dirname "$output" "/" "" output_objdir="$func_dirname_result$objdir" + func_to_tool_file "$output_objdir/" + tool_output_objdir=$func_to_tool_file_result # Create the object directory. func_mkdir_p "$output_objdir" @@ -4954,12 +6032,12 @@ # Find all interdependent deplibs by searching for libraries # that are linked more than once (e.g. -la -lb -la) for deplib in $deplibs; do - if $opt_duplicate_deps ; then + if $opt_preserve_dup_deps ; then case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - libs="$libs $deplib" + func_append libs " $deplib" done if test "$linkmode" = lib; then @@ -4972,9 +6050,9 @@ if $opt_duplicate_compiler_generated_deps; then for pre_post_dep in $predeps $postdeps; do case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; + *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;; esac - pre_post_deps="$pre_post_deps $pre_post_dep" + func_append pre_post_deps " $pre_post_dep" done fi pre_post_deps= @@ -5044,17 +6122,19 @@ for lib in $dlprefiles; do # Ignore non-libtool-libs dependency_libs= + func_resolve_sysroot "$lib" case $lib in - *.la) func_source "$lib" ;; + *.la) func_source "$func_resolve_sysroot_result" ;; esac # Collect preopened libtool deplibs, except any this library # has declared as weak libs for deplib in $dependency_libs; do - deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"` + func_basename "$deplib" + deplib_base=$func_basename_result case " $weak_libs " in *" $deplib_base "*) ;; - *) deplibs="$deplibs $deplib" ;; + *) func_append deplibs " $deplib" ;; esac done done @@ -5075,11 +6155,11 @@ compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - compiler_flags="$compiler_flags $deplib" + func_append compiler_flags " $deplib" if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; esac fi fi @@ -5164,7 +6244,7 @@ if test "$linkmode" = lib ; then case "$new_inherited_linker_flags " in *" $deplib "*) ;; - * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;; + * ) func_append new_inherited_linker_flags " $deplib" ;; esac fi fi @@ -5177,7 +6257,8 @@ test "$pass" = conv && continue newdependency_libs="$deplib $newdependency_libs" func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; prog) if test "$pass" = conv; then @@ -5191,7 +6272,8 @@ finalize_deplibs="$deplib $finalize_deplibs" fi func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; *) func_warning "\`-L' is ignored for archives/objects" @@ -5202,17 +6284,21 @@ -R*) if test "$pass" = link; then func_stripname '-R' '' "$deplib" - dir=$func_stripname_result + func_resolve_sysroot "$func_stripname_result" + dir=$func_resolve_sysroot_result # Make sure the xrpath contains only unique directories. case "$xrpath " in *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; + *) func_append xrpath " $dir" ;; esac fi deplibs="$deplib $deplibs" continue ;; - *.la) lib="$deplib" ;; + *.la) + func_resolve_sysroot "$deplib" + lib=$func_resolve_sysroot_result + ;; *.$libext) if test "$pass" = conv; then deplibs="$deplib $deplibs" @@ -5230,7 +6316,7 @@ match_pattern*) set dummy $deplibs_check_method; shift match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"` - if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \ + if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \ | $EGREP "$match_pattern_regex" > /dev/null; then valid_a_lib=yes fi @@ -5240,15 +6326,15 @@ ;; esac if test "$valid_a_lib" != yes; then - $ECHO + echo $ECHO "*** Warning: Trying to link with static lib archive $deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because the file extensions .$libext of this argument makes me believe" - $ECHO "*** that it is just a static archive that I should not use here." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because the file extensions .$libext of this argument makes me believe" + echo "*** that it is just a static archive that I should not use here." else - $ECHO + echo $ECHO "*** Warning: Linking the shared library $output against the" $ECHO "*** static library $deplib is not portable!" deplibs="$deplib $deplibs" @@ -5275,11 +6361,11 @@ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then # If there is no dlopen support or we're linking statically, # we need to preload. - newdlprefiles="$newdlprefiles $deplib" + func_append newdlprefiles " $deplib" compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" else - newdlfiles="$newdlfiles $deplib" + func_append newdlfiles " $deplib" fi fi continue @@ -5321,20 +6407,20 @@ # Convert "-framework foo" to "foo.ltframework" if test -n "$inherited_linker_flags"; then - tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'` + tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'` for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do case " $new_inherited_linker_flags " in *" $tmp_inherited_linker_flag "*) ;; - *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";; + *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";; esac done fi - dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` if test "$linkmode,$pass" = "lib,link" || test "$linkmode,$pass" = "prog,scan" || { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" + test -n "$dlopen" && func_append dlfiles " $dlopen" + test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen" fi if test "$pass" = conv; then @@ -5345,17 +6431,17 @@ func_fatal_error "cannot find name of link library for \`$lib'" fi # 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" + func_append convenience " $ladir/$objdir/$old_library" + func_append old_convenience " $ladir/$objdir/$old_library" tmp_libs= for deplib in $dependency_libs; do deplibs="$deplib $deplibs" - if $opt_duplicate_deps ; then + if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - tmp_libs="$tmp_libs $deplib" + func_append tmp_libs " $deplib" done elif test "$linkmode" != prog && test "$linkmode" != lib; then func_fatal_error "\`$lib' is not a convenience library" @@ -5366,9 +6452,15 @@ # Get the name of the library we link against. linklib= - for l in $old_library $library_names; do - linklib="$l" - done + if test -n "$old_library" && + { test "$prefer_static_libs" = yes || + test "$prefer_static_libs,$installed" = "built,no"; }; then + linklib=$old_library + else + for l in $old_library $library_names; do + linklib="$l" + done + fi if test -z "$linklib"; then func_fatal_error "cannot find name of link library for \`$lib'" fi @@ -5385,9 +6477,9 @@ # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't # bomb out in the load deplibs phase. - dlprefiles="$dlprefiles $lib $dependency_libs" + func_append dlprefiles " $lib $dependency_libs" else - newdlfiles="$newdlfiles $lib" + func_append newdlfiles " $lib" fi continue fi # $pass = dlopen @@ -5409,14 +6501,14 @@ # Find the relevant object directory and library name. if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then + if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then func_warning "library \`$lib' was moved." dir="$ladir" absdir="$abs_ladir" libdir="$abs_ladir" else - dir="$libdir" - absdir="$libdir" + dir="$lt_sysroot$libdir" + absdir="$lt_sysroot$libdir" fi test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes else @@ -5424,12 +6516,12 @@ dir="$ladir" absdir="$abs_ladir" # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + func_append notinst_path " $abs_ladir" else dir="$ladir/$objdir" absdir="$abs_ladir/$objdir" # Remove this search path later - notinst_path="$notinst_path $abs_ladir" + func_append notinst_path " $abs_ladir" fi fi # $installed = yes func_stripname 'lib' '.la' "$laname" @@ -5440,20 +6532,46 @@ if test -z "$libdir" && test "$linkmode" = prog; then func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'" fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" - # Keep a list of preopened convenience libraries to check - # that they are being used correctly in the link pass. - test -z "$libdir" && \ - dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" - else - newdlprefiles="$newdlprefiles $dir/$linklib" - fi + case "$host" in + # special handling for platforms with PE-DLLs. + *cygwin* | *mingw* | *cegcc* ) + # Linker will automatically link against shared library if both + # static and shared are present. Therefore, ensure we extract + # symbols from the import library if a shared library is present + # (otherwise, the dlopen module name will be incorrect). We do + # this by putting the import library name into $newdlprefiles. + # We recover the dlopen module name by 'saving' the la file + # name in a special purpose variable, and (later) extracting the + # dlname from the la file. + if test -n "$dlname"; then + func_tr_sh "$dir/$linklib" + eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname" + func_append newdlprefiles " $dir/$linklib" + else + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + fi + ;; + * ) + # Prefer using a static library (so that no silly _DYNAMIC symbols + # are required to link). + if test -n "$old_library"; then + func_append newdlprefiles " $dir/$old_library" + # Keep a list of preopened convenience libraries to check + # that they are being used correctly in the link pass. + test -z "$libdir" && \ + func_append dlpreconveniencelibs " $dir/$old_library" + # Otherwise, use the dlname, so that lt_dlopen finds it. + elif test -n "$dlname"; then + func_append newdlprefiles " $dir/$dlname" + else + func_append newdlprefiles " $dir/$linklib" + fi + ;; + esac fi # $pass = dlpreopen if test -z "$libdir"; then @@ -5471,7 +6589,7 @@ if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" + func_append newlib_search_path " $ladir" deplibs="$lib $deplibs" linkalldeplibs=no @@ -5484,7 +6602,8 @@ for deplib in $dependency_libs; do case $deplib in -L*) func_stripname '-L' '' "$deplib" - newlib_search_path="$newlib_search_path $func_stripname_result" + func_resolve_sysroot "$func_stripname_result" + func_append newlib_search_path " $func_resolve_sysroot_result" ;; esac # Need to link against all dependency_libs? @@ -5495,12 +6614,12 @@ # or/and link against static libraries newdependency_libs="$deplib $newdependency_libs" fi - if $opt_duplicate_deps ; then + if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $deplib "*) func_append specialdeplibs " $deplib" ;; esac fi - tmp_libs="$tmp_libs $deplib" + func_append tmp_libs " $deplib" done # for deplib continue fi # $linkmode = prog... @@ -5515,7 +6634,7 @@ # Make sure the rpath contains only unique directories. case "$temp_rpath:" in *"$absdir:"*) ;; - *) temp_rpath="$temp_rpath$absdir:" ;; + *) func_append temp_rpath "$absdir:" ;; esac fi @@ -5527,7 +6646,7 @@ *) case "$compile_rpath " in *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" + *) func_append compile_rpath " $absdir" ;; esac ;; esac @@ -5536,7 +6655,7 @@ *) case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" + *) func_append finalize_rpath " $libdir" ;; esac ;; esac @@ -5561,12 +6680,12 @@ case $host in *cygwin* | *mingw* | *cegcc*) # No point in relinking DLLs because paths are not encoded - notinst_deplibs="$notinst_deplibs $lib" + func_append notinst_deplibs " $lib" need_relink=no ;; *) if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" + func_append notinst_deplibs " $lib" need_relink=yes fi ;; @@ -5583,7 +6702,7 @@ fi done if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then - $ECHO + echo if test "$linkmode" = prog; then $ECHO "*** Warning: Linking the executable $output against the loadable module" else @@ -5601,7 +6720,7 @@ *) case "$compile_rpath " in *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" + *) func_append compile_rpath " $absdir" ;; esac ;; esac @@ -5610,7 +6729,7 @@ *) case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" + *) func_append finalize_rpath " $libdir" ;; esac ;; esac @@ -5664,7 +6783,7 @@ linklib=$newlib fi # test -n "$old_archive_from_expsyms_cmds" - if test "$linkmode" = prog || test "$mode" != relink; then + if test "$linkmode" = prog || test "$opt_mode" != relink; then add_shlibpath= add_dir= add= @@ -5686,9 +6805,9 @@ if test "X$dlopenmodule" != "X$lib"; then $ECHO "*** Warning: lib $linklib is a module, not a shared library" if test -z "$old_library" ; then - $ECHO - $ECHO "*** And there doesn't seem to be a static archive available" - $ECHO "*** The link will probably fail, sorry" + echo + echo "*** And there doesn't seem to be a static archive available" + echo "*** The link will probably fail, sorry" else add="$dir/$old_library" fi @@ -5720,7 +6839,7 @@ if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" + func_append add_dir " -L$inst_prefix_dir$libdir" ;; esac fi @@ -5742,7 +6861,7 @@ if test -n "$add_shlibpath"; then case :$compile_shlibpath: in *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; + *) func_append compile_shlibpath "$add_shlibpath:" ;; esac fi if test "$linkmode" = prog; then @@ -5756,13 +6875,13 @@ test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + *) func_append finalize_shlibpath "$libdir:" ;; esac fi fi fi - if test "$linkmode" = prog || test "$mode" = relink; then + if test "$linkmode" = prog || test "$opt_mode" = relink; then add_shlibpath= add_dir= add= @@ -5776,7 +6895,7 @@ elif test "$hardcode_shlibpath_var" = yes; then case :$finalize_shlibpath: in *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; + *) func_append finalize_shlibpath "$libdir:" ;; esac add="-l$name" elif test "$hardcode_automatic" = yes; then @@ -5793,7 +6912,7 @@ if test -n "$inst_prefix_dir"; then case $libdir in [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" + func_append add_dir " -L$inst_prefix_dir$libdir" ;; esac fi @@ -5828,21 +6947,21 @@ # Just print a warning and add the library to dependency_libs so # that the program can be linked against the static library. - $ECHO + echo $ECHO "*** Warning: This system can not link to static lib archive $lib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have." if test "$module" = yes; then - $ECHO "*** But as you try to build a module library, libtool will still create " - $ECHO "*** a static module, that should work as long as the dlopening application" - $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime." + echo "*** But as you try to build a module library, libtool will still create " + echo "*** a static module, that should work as long as the dlopening application" + echo "*** is linked with the -dlopen flag to resolve symbols at runtime." if test -z "$global_symbol_pipe"; then - $ECHO - $ECHO "*** However, this would only work if libtool was able to extract symbol" - $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" - $ECHO "*** not find such a program. So, this module is probably useless." - $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then build_libtool_libs=module @@ -5870,27 +6989,33 @@ temp_xrpath=$func_stripname_result case " $xrpath " in *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; + *) func_append xrpath " $temp_xrpath";; esac;; - *) temp_deplibs="$temp_deplibs $libdir";; + *) func_append temp_deplibs " $libdir";; esac done dependency_libs="$temp_deplibs" fi - newlib_search_path="$newlib_search_path $absdir" + func_append newlib_search_path " $absdir" # Link against this library test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" # ... and its dependency_libs tmp_libs= for deplib in $dependency_libs; do newdependency_libs="$deplib $newdependency_libs" - if $opt_duplicate_deps ; then + case $deplib in + -L*) func_stripname '-L' '' "$deplib" + func_resolve_sysroot "$func_stripname_result";; + *) func_resolve_sysroot "$deplib" ;; + esac + if $opt_preserve_dup_deps ; then case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; + *" $func_resolve_sysroot_result "*) + func_append specialdeplibs " $func_resolve_sysroot_result" ;; esac fi - tmp_libs="$tmp_libs $deplib" + func_append tmp_libs " $func_resolve_sysroot_result" done if test "$link_all_deplibs" != no; then @@ -5900,8 +7025,10 @@ case $deplib in -L*) path="$deplib" ;; *.la) + func_resolve_sysroot "$deplib" + deplib=$func_resolve_sysroot_result func_dirname "$deplib" "" "." - dir="$func_dirname_result" + dir=$func_dirname_result # We need an absolute path. case $dir in [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; @@ -5928,8 +7055,8 @@ if test -z "$darwin_install_name"; then darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'` fi - compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" - linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}" + func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}" + func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}" path= fi fi @@ -5962,7 +7089,7 @@ compile_deplibs="$new_inherited_linker_flags $compile_deplibs" finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs" else - compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` fi fi dependency_libs="$newdependency_libs" @@ -5979,7 +7106,7 @@ for dir in $newlib_search_path; do case "$lib_search_path " in *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; + *) func_append lib_search_path " $dir" ;; esac done newlib_search_path= @@ -6037,10 +7164,10 @@ -L*) case " $tmp_libs " in *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; + *) func_append tmp_libs " $deplib" ;; esac ;; - *) tmp_libs="$tmp_libs $deplib" ;; + *) func_append tmp_libs " $deplib" ;; esac done eval $var=\"$tmp_libs\" @@ -6056,7 +7183,7 @@ ;; esac if test -n "$i" ; then - tmp_libs="$tmp_libs $i" + func_append tmp_libs " $i" fi done dependency_libs=$tmp_libs @@ -6097,7 +7224,7 @@ # Now set the variables for building old libraries. build_libtool_libs=no oldlibs="$output" - objs="$objs$old_deplibs" + func_append objs "$old_deplibs" ;; lib) @@ -6130,10 +7257,10 @@ if test "$deplibs_check_method" != pass_all; then func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs" else - $ECHO + echo $ECHO "*** Warning: Linking the shared library $output against the non-libtool" $ECHO "*** objects $objs is not portable!" - libobjs="$libobjs $objs" + func_append libobjs " $objs" fi fi @@ -6198,7 +7325,7 @@ age="$number_minor" revision="$number_revision" ;; - freebsd-aout|freebsd-elf|sunos) + freebsd-aout|freebsd-elf|qnx|sunos) current="$number_major" revision="$number_minor" age="0" @@ -6334,7 +7461,7 @@ done # Make executables depend on our current version. - verstring="$verstring:${current}.0" + func_append verstring ":${current}.0" ;; qnx) @@ -6402,10 +7529,10 @@ fi func_generate_dlsyms "$libname" "$libname" "yes" - libobjs="$libobjs $symfileobj" + func_append libobjs " $symfileobj" test "X$libobjs" = "X " && libobjs= - if test "$mode" != relink; then + if test "$opt_mode" != relink; then # Remove our outputs, but don't remove object files since they # may have been created when compiling PIC objects. removelist= @@ -6421,7 +7548,7 @@ continue fi fi - removelist="$removelist $p" + func_append removelist " $p" ;; *) ;; esac @@ -6432,27 +7559,28 @@ # Now set the variables for building old libraries. if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - oldlibs="$oldlibs $output_objdir/$libname.$libext" + func_append oldlibs " $output_objdir/$libname.$libext" # Transform .lo files to .o files. - oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` + oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP` fi # Eliminate all temporary directories. #for path in $notinst_path; do - # lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"` - # deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"` - # dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"` + # lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"` + # deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"` + # dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"` #done if test -n "$xrpath"; then # If the user specified any rpath flags, then add them. temp_xrpath= for libdir in $xrpath; do - temp_xrpath="$temp_xrpath -R$libdir" + func_replace_sysroot "$libdir" + func_append temp_xrpath " -R$func_replace_sysroot_result" case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then @@ -6466,7 +7594,7 @@ for lib in $old_dlfiles; do case " $dlprefiles $dlfiles " in *" $lib "*) ;; - *) dlfiles="$dlfiles $lib" ;; + *) func_append dlfiles " $lib" ;; esac done @@ -6476,19 +7604,19 @@ for lib in $old_dlprefiles; do case "$dlprefiles " in *" $lib "*) ;; - *) dlprefiles="$dlprefiles $lib" ;; + *) func_append dlprefiles " $lib" ;; esac done if test "$build_libtool_libs" = yes; then if test -n "$rpath"; then case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*) + *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*) # these systems don't actually have a c library (as such)! ;; *-*-rhapsody* | *-*-darwin1.[012]) # Rhapsody C library is in the System framework - deplibs="$deplibs System.ltframework" + func_append deplibs " System.ltframework" ;; *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. @@ -6505,7 +7633,7 @@ *) # Add libc to deplibs on all other systems if necessary. if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" + func_append deplibs " -lc" fi ;; esac @@ -6554,7 +7682,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" i="" ;; esac @@ -6565,21 +7693,21 @@ set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: dynamic linker does not accept needed library $i." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which I believe you do not have" - $ECHO "*** because a test_compile did reveal that the linker did not use it for" - $ECHO "*** its dynamic dependency list that programs get resolved with at runtime." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which I believe you do not have" + echo "*** because a test_compile did reveal that the linker did not use it for" + echo "*** its dynamic dependency list that programs get resolved with at runtime." fi fi ;; *) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" ;; esac done @@ -6597,7 +7725,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $i "*) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" i="" ;; esac @@ -6608,29 +7736,29 @@ set dummy $deplib_matches; shift deplib_match=$1 if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: dynamic linker does not accept needed library $i." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because a test_compile did reveal that the linker did not use this one" - $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime." + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because a test_compile did reveal that the linker did not use this one" + echo "*** as a dynamic dependency that programs can get resolved with at runtime." fi fi else droppeddeps=yes - $ECHO + echo $ECHO "*** Warning! Library $i is needed by this library but I was not able to" - $ECHO "*** make it link in! You will probably need to install it or some" - $ECHO "*** library that it depends on before this library will be fully" - $ECHO "*** functional. Installing it before continuing would be even better." + echo "*** make it link in! You will probably need to install it or some" + echo "*** library that it depends on before this library will be fully" + echo "*** functional. Installing it before continuing would be even better." fi ;; *) - newdeplibs="$newdeplibs $i" + func_append newdeplibs " $i" ;; esac done @@ -6647,15 +7775,27 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac fi if test -n "$a_deplib" ; then libname=`eval "\\$ECHO \"$libname_spec\""` + if test -n "$file_magic_glob"; then + libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob` + else + libnameglob=$libname + fi + test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob` for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` + if test "$want_nocaseglob" = yes; then + shopt -s nocaseglob + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + $nocaseglob + else + potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null` + fi for potent_lib in $potential_libs; do # Follow soft links. if ls -lLd "$potent_lib" 2>/dev/null | @@ -6672,13 +7812,13 @@ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` case $potliblink in [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; + *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";; esac done if eval $file_magic_cmd \"\$potlib\" 2>/dev/null | $SED -e 10q | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -6687,12 +7827,12 @@ fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because I did check the linker path looking for a file starting" + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for file magic test)" else @@ -6703,7 +7843,7 @@ ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. @@ -6719,7 +7859,7 @@ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then case " $predeps $postdeps " in *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" ;; esac @@ -6730,9 +7870,9 @@ potential_libs=`ls $i/$libname[.-]* 2>/dev/null` for potent_lib in $potential_libs; do potlib="$potent_lib" # see symlink-check above in file_magic test - if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \ + if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \ $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" a_deplib="" break 2 fi @@ -6741,12 +7881,12 @@ fi if test -n "$a_deplib" ; then droppeddeps=yes - $ECHO + echo $ECHO "*** Warning: linker path does not have real file for library $a_deplib." - $ECHO "*** I have the capability to make that library automatically link in when" - $ECHO "*** you link to this library. But I can only do this if you have a" - $ECHO "*** shared version of the library, which you do not appear to have" - $ECHO "*** because I did check the linker path looking for a file starting" + echo "*** I have the capability to make that library automatically link in when" + echo "*** you link to this library. But I can only do this if you have a" + echo "*** shared version of the library, which you do not appear to have" + echo "*** because I did check the linker path looking for a file starting" if test -z "$potlib" ; then $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)" else @@ -6757,32 +7897,32 @@ ;; *) # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" + func_append newdeplibs " $a_deplib" ;; esac done # Gone through all deplibs. ;; none | unknown | *) newdeplibs="" - tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \ - -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'` + tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'` if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then for i in $predeps $postdeps ; do # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"` + tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"` done fi - if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' | - $GREP . >/dev/null; then - $ECHO + case $tmp_deplibs in + *[!\ \ ]*) + echo if test "X$deplibs_check_method" = "Xnone"; then - $ECHO "*** Warning: inter-library dependencies are not supported in this platform." + echo "*** Warning: inter-library dependencies are not supported in this platform." else - $ECHO "*** Warning: inter-library dependencies are not known to be supported." + echo "*** Warning: inter-library dependencies are not known to be supported." fi - $ECHO "*** All declared inter-library dependencies are being dropped." + echo "*** All declared inter-library dependencies are being dropped." droppeddeps=yes - fi + ;; + esac ;; esac versuffix=$versuffix_save @@ -6794,23 +7934,23 @@ case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library with the System framework - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac if test "$droppeddeps" = yes; then if test "$module" = yes; then - $ECHO - $ECHO "*** Warning: libtool could not satisfy all declared inter-library" + echo + echo "*** Warning: libtool could not satisfy all declared inter-library" $ECHO "*** dependencies of module $libname. Therefore, libtool will create" - $ECHO "*** a static module, that should work as long as the dlopening" - $ECHO "*** application is linked with the -dlopen flag." + echo "*** a static module, that should work as long as the dlopening" + echo "*** application is linked with the -dlopen flag." if test -z "$global_symbol_pipe"; then - $ECHO - $ECHO "*** However, this would only work if libtool was able to extract symbol" - $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could" - $ECHO "*** not find such a program. So, this module is probably useless." - $ECHO "*** \`nm' from GNU binutils and a full rebuild may help." + echo + echo "*** However, this would only work if libtool was able to extract symbol" + echo "*** lists from a program, using \`nm' or equivalent, but libtool could" + echo "*** not find such a program. So, this module is probably useless." + echo "*** \`nm' from GNU binutils and a full rebuild may help." fi if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" @@ -6820,16 +7960,16 @@ build_libtool_libs=no fi else - $ECHO "*** The inter-library dependencies that have been dropped here will be" - $ECHO "*** automatically added whenever a program is linked with this library" - $ECHO "*** or is declared to -dlopen it." + echo "*** The inter-library dependencies that have been dropped here will be" + echo "*** automatically added whenever a program is linked with this library" + echo "*** or is declared to -dlopen it." if test "$allow_undefined" = no; then - $ECHO - $ECHO "*** Since this library must not contain undefined symbols," - $ECHO "*** because either the platform does not support them or" - $ECHO "*** it was explicitly requested with -no-undefined," - $ECHO "*** libtool will only create a static version of it." + echo + echo "*** Since this library must not contain undefined symbols," + echo "*** because either the platform does not support them or" + echo "*** it was explicitly requested with -no-undefined," + echo "*** libtool will only create a static version of it." if test "$build_old_libs" = no; then oldlibs="$output_objdir/$libname.$libext" build_libtool_libs=module @@ -6846,9 +7986,9 @@ # Time to change all our "foo.ltframework" stuff back to "-framework foo" case $host in *-*-darwin*) - newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -6861,7 +8001,7 @@ *) case " $deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -6871,10 +8011,10 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done deplibs="$new_libs" @@ -6891,10 +8031,12 @@ hardcode_libdirs= dep_rpath= rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" + test "$opt_mode" != relink && rpath="$compile_rpath$rpath" for libdir in $rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then + func_replace_sysroot "$libdir" + libdir=$func_replace_sysroot_result if test -z "$hardcode_libdirs"; then hardcode_libdirs="$libdir" else @@ -6903,18 +8045,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" + func_append dep_rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_apped perm_rpath " $libdir" ;; esac fi done @@ -6932,7 +8074,7 @@ # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" fi @@ -6940,7 +8082,7 @@ fi shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" + test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath" if test -n "$shlibpath"; then eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" fi @@ -6966,18 +8108,18 @@ linknames= for link do - linknames="$linknames $link" + func_append linknames " $link" done # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP` test "X$libobjs" = "X " && libobjs= delfiles= if test -n "$export_symbols" && test -n "$include_expsyms"; then $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp" export_symbols="$output_objdir/$libname.uexp" - delfiles="$delfiles $export_symbols" + func_append delfiles " $export_symbols" fi orig_export_symbols= @@ -7008,13 +8150,45 @@ $opt_dry_run || $RM $export_symbols cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do + for cmd1 in $cmds; do IFS="$save_ifs" - eval cmd=\"$cmd\" - func_len " $cmd" - len=$func_len_result - if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then + # Take the normal branch if the nm_file_list_spec branch + # doesn't work or if tool conversion is not needed. + case $nm_file_list_spec~$to_tool_file_cmd in + *~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*) + try_normal_branch=yes + eval cmd=\"$cmd1\" + func_len " $cmd" + len=$func_len_result + ;; + *) + try_normal_branch=no + ;; + esac + if test "$try_normal_branch" = yes \ + && { test "$len" -lt "$max_cmd_len" \ + || test "$max_cmd_len" -le -1; } + then + func_show_eval "$cmd" 'exit $?' + skipped_export=false + elif test -n "$nm_file_list_spec"; then + func_basename "$output" + output_la=$func_basename_result + save_libobjs=$libobjs + save_output=$output + output=${output_objdir}/${output_la}.nm + func_to_tool_file "$output" + libobjs=$nm_file_list_spec$func_to_tool_file_result + func_append delfiles " $output" + func_verbose "creating $NM input file list: $output" + for obj in $save_libobjs; do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > "$output" + eval cmd=\"$cmd1\" func_show_eval "$cmd" 'exit $?' + output=$save_output + libobjs=$save_libobjs skipped_export=false else # The command line is too long to execute in one step. @@ -7036,7 +8210,7 @@ if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then @@ -7048,7 +8222,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7058,7 +8232,7 @@ case " $convenience " in *" $test_deplib "*) ;; *) - tmp_deplibs="$tmp_deplibs $test_deplib" + func_append tmp_deplibs " $test_deplib" ;; esac done @@ -7078,21 +8252,21 @@ test "X$libobjs" = "X " && libobjs= else gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi fi if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" + func_append linker_flags " $flag" fi # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $? fi @@ -7137,7 +8311,8 @@ save_libobjs=$libobjs fi save_output=$output - output_la=`$ECHO "X$output" | $Xsed -e "$basename"` + func_basename "$output" + output_la=$func_basename_result # Clear the reloadable object creation command queue and # initialize k to one. @@ -7150,13 +8325,16 @@ if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then output=${output_objdir}/${output_la}.lnkscript func_verbose "creating GNU ld script: $output" - $ECHO 'INPUT (' > $output + echo 'INPUT (' > $output for obj in $save_libobjs do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done - $ECHO ')' >> $output - delfiles="$delfiles $output" + echo ')' >> $output + func_append delfiles " $output" + func_to_tool_file "$output" + output=$func_to_tool_file_result elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then output=${output_objdir}/${output_la}.lnk func_verbose "creating linker input file list: $output" @@ -7170,10 +8348,12 @@ fi for obj do - $ECHO "$obj" >> $output + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" >> $output done - delfiles="$delfiles $output" - output=$firstobj\"$file_list_spec$output\" + func_append delfiles " $output" + func_to_tool_file "$output" + output=$firstobj\"$file_list_spec$func_to_tool_file_result\" else if test -n "$save_libobjs"; then func_verbose "creating reloadable object files..." @@ -7197,17 +8377,19 @@ # command to the queue. if test "$k" -eq 1 ; then # The first file doesn't have a previous command to add. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" + reload_objs=$objlist + eval concat_cmds=\"$reload_cmds\" else # All subsequent reloadable object files will link in # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\" + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\" fi last_robj=$output_objdir/$output_la-${k}.$objext func_arith $k + 1 k=$func_arith_result output=$output_objdir/$output_la-${k}.$objext - objlist=$obj + objlist=" $obj" func_len " $last_robj" func_arith $len0 + $func_len_result len=$func_arith_result @@ -7217,11 +8399,12 @@ # reloadable object file. All subsequent reloadable object # files will link in the last one created. test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" + reload_objs="$objlist $last_robj" + eval concat_cmds=\"\${concat_cmds}$reload_cmds\" if test -n "$last_robj"; then eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\" fi - delfiles="$delfiles $output" + func_append delfiles " $output" else output= @@ -7255,7 +8438,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7276,7 +8459,7 @@ if test -n "$export_symbols" && test -n "$include_expsyms"; then tmp_export_symbols="$export_symbols" test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols" - $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"' + $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"' fi if test -n "$orig_export_symbols"; then @@ -7288,7 +8471,7 @@ # global variables. join(1) would be nice here, but unfortunately # isn't a blessed tool. $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter - delfiles="$delfiles $export_symbols $output_objdir/$libname.filter" + func_append delfiles " $export_symbols $output_objdir/$libname.filter" export_symbols=$output_objdir/$libname.def $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols fi @@ -7329,10 +8512,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - libobjs="$libobjs $func_extract_archives_result" + func_append libobjs " $func_extract_archives_result" test "X$libobjs" = "X " && libobjs= fi @@ -7348,7 +8531,7 @@ lt_exit=$? # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then ( cd "$output_objdir" && \ $RM "${realname}T" && \ $MV "${realname}U" "$realname" ) @@ -7360,7 +8543,7 @@ IFS="$save_ifs" # Restore the uninstalled library and exit - if test "$mode" = relink; then + if test "$opt_mode" = relink; then $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $? if test -n "$convenience"; then @@ -7441,18 +8624,21 @@ if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\" - reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'` + reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'` else gentop="$output_objdir/${obj}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $convenience reload_conv_objs="$reload_objs $func_extract_archives_result" fi fi + # If we're not building shared, we need to use non_pic_objs + test "$build_libtool_libs" != yes && libobjs="$non_pic_objects" + # Create the old-style object. - reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test + reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test output="$obj" func_execute_cmds "$reload_cmds" 'exit $?' @@ -7512,8 +8698,8 @@ case $host in *-*-rhapsody* | *-*-darwin1.[012]) # On Rhapsody replace the C library is the System framework - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'` ;; esac @@ -7524,14 +8710,14 @@ if test "$tagname" = CXX ; then case ${MACOSX_DEPLOYMENT_TARGET-10.0} in 10.[0123]) - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" + func_append compile_command " ${wl}-bind_at_load" + func_append finalize_command " ${wl}-bind_at_load" ;; esac fi # Time to change all our "foo.ltframework" stuff back to "-framework foo" - compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` - finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'` + compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` + finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'` ;; esac @@ -7545,7 +8731,7 @@ *) case " $compile_deplibs " in *" -L$path/$objdir "*) - new_libs="$new_libs -L$path/$objdir" ;; + func_append new_libs " -L$path/$objdir" ;; esac ;; esac @@ -7555,17 +8741,17 @@ -L*) case " $new_libs " in *" $deplib "*) ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac ;; - *) new_libs="$new_libs $deplib" ;; + *) func_append new_libs " $deplib" ;; esac done compile_deplibs="$new_libs" - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" + func_append compile_command " $compile_deplibs" + func_append finalize_command " $finalize_deplibs" if test -n "$rpath$xrpath"; then # If the user specified any rpath flags, then add them. @@ -7573,7 +8759,7 @@ # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) func_append finalize_rpath " $libdir" ;; esac done fi @@ -7592,18 +8778,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi case $host in @@ -7612,12 +8798,12 @@ case :$dllsearchpath: in *":$libdir:"*) ;; ::) dllsearchpath=$libdir;; - *) dllsearchpath="$dllsearchpath:$libdir";; + *) func_append dllsearchpath ":$libdir";; esac case :$dllsearchpath: in *":$testbindir:"*) ;; ::) dllsearchpath=$testbindir;; - *) dllsearchpath="$dllsearchpath:$testbindir";; + *) func_append dllsearchpath ":$testbindir";; esac ;; esac @@ -7643,18 +8829,18 @@ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) ;; *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" + func_append hardcode_libdirs "$hardcode_libdir_separator$libdir" ;; esac fi else eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" + func_append rpath " $flag" fi elif test -n "$runpath_var"; then case "$finalize_perm_rpath " in *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; + *) func_append finalize_perm_rpath " $libdir" ;; esac fi done @@ -7668,8 +8854,8 @@ if test -n "$libobjs" && test "$build_old_libs" = yes; then # Transform all the library objects into standard objects. - compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` + compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP` + finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP` fi func_generate_dlsyms "$outputname" "@PROGRAM@" "no" @@ -7681,15 +8867,15 @@ wrappers_required=yes case $host in + *cegcc* | *mingw32ce*) + # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway. + wrappers_required=no + ;; *cygwin* | *mingw* ) if test "$build_libtool_libs" != yes; then wrappers_required=no fi ;; - *cegcc) - # Disable wrappers for cegcc, we are cross compiling anyway. - wrappers_required=no - ;; *) if test "$need_relink" = no || test "$build_libtool_libs" != yes; then wrappers_required=no @@ -7698,13 +8884,19 @@ esac if test "$wrappers_required" = no; then # Replace the output file specification. - compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'` link_command="$compile_command$compile_rpath" # We have no uninstalled library dependencies, so finalize right now. exit_status=0 func_show_eval "$link_command" 'exit_status=$?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Delete the generated files. if test -f "$output_objdir/${outputname}S.${objext}"; then func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"' @@ -7727,7 +8919,7 @@ # We should set the runpath_var. rpath= for dir in $perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done compile_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -7735,7 +8927,7 @@ # We should set the runpath_var. rpath= for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" + func_append rpath "$dir:" done finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " fi @@ -7745,11 +8937,18 @@ # We don't need to create a wrapper script. link_command="$compile_var$compile_command$compile_rpath" # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'` # Delete the old output file. $opt_dry_run || $RM $output # Link the executable and exit func_show_eval "$link_command" 'exit $?' + + if test -n "$postlink_cmds"; then + func_to_tool_file "$output" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + exit $EXIT_SUCCESS fi @@ -7764,7 +8963,7 @@ if test "$fast_install" != no; then link_command="$finalize_var$compile_command$finalize_rpath" if test "$fast_install" = yes; then - relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` + relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'` else # fast_install is set to needless relink_command= @@ -7776,13 +8975,19 @@ fi # Replace the output file specification. - link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` + link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` # Delete the old output files. $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname func_show_eval "$link_command" 'exit $?' + if test -n "$postlink_cmds"; then + func_to_tool_file "$output_objdir/$outputname" + postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'` + func_execute_cmds "$postlink_cmds" 'exit $?' + fi + # Now create the wrapper script. func_verbose "creating $output" @@ -7800,18 +9005,7 @@ fi done relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` - fi - - # Quote $ECHO for shipping. - if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` fi # Only actually do things if not in dry run mode. @@ -7891,7 +9085,7 @@ else oldobjs="$old_deplibs $non_pic_objects" if test "$preload" = yes && test -f "$symfileobj"; then - oldobjs="$oldobjs $symfileobj" + func_append oldobjs " $symfileobj" fi fi addlibs="$old_convenience" @@ -7899,10 +9093,10 @@ if test -n "$addlibs"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $addlibs - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # Do each command in the archive commands. @@ -7913,10 +9107,10 @@ # Add any objects from preloaded convenience libraries if test -n "$dlprefiles"; then gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_extract_archives $gentop $dlprefiles - oldobjs="$oldobjs $func_extract_archives_result" + func_append oldobjs " $func_extract_archives_result" fi # POSIX demands no paths to be encoded in archives. We have @@ -7932,9 +9126,9 @@ done | sort | sort -uc >/dev/null 2>&1); then : else - $ECHO "copying selected object files to avoid basename conflicts..." + echo "copying selected object files to avoid basename conflicts..." gentop="$output_objdir/${outputname}x" - generated="$generated $gentop" + func_append generated " $gentop" func_mkdir_p "$gentop" save_oldobjs=$oldobjs oldobjs= @@ -7958,9 +9152,9 @@ esac done func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj" - oldobjs="$oldobjs $gentop/$newobj" + func_append oldobjs " $gentop/$newobj" ;; - *) oldobjs="$oldobjs $obj" ;; + *) func_append oldobjs " $obj" ;; esac done fi @@ -7970,6 +9164,16 @@ len=$func_len_result if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then cmds=$old_archive_cmds + elif test -n "$archiver_list_spec"; then + func_verbose "using command file archive linking..." + for obj in $oldobjs + do + func_to_tool_file "$obj" + $ECHO "$func_to_tool_file_result" + done > $output_objdir/$libname.libcmd + func_to_tool_file "$output_objdir/$libname.libcmd" + oldobjs=" $archiver_list_spec$func_to_tool_file_result" + cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts func_verbose "using piecewise archive linking..." @@ -8043,7 +9247,7 @@ done # Quote the link command for shipping. relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"` + relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` if test "$hardcode_automatic" = yes ; then relink_command= fi @@ -8066,9 +9270,19 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" - newdependency_libs="$newdependency_libs $libdir/$name" + func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" + ;; + -L*) + func_stripname -L '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -L$func_replace_sysroot_result" ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; + -R*) + func_stripname -R '' "$deplib" + func_replace_sysroot "$func_stripname_result" + func_append newdependency_libs " -R$func_replace_sysroot_result" + ;; + *) func_append newdependency_libs " $deplib" ;; esac done dependency_libs="$newdependency_libs" @@ -8082,9 +9296,9 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlfiles="$newdlfiles $libdir/$name" + func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name" ;; - *) newdlfiles="$newdlfiles $lib" ;; + *) func_append newdlfiles " $lib" ;; esac done dlfiles="$newdlfiles" @@ -8101,7 +9315,7 @@ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` test -z "$libdir" && \ func_fatal_error "\`$lib' is not a valid libtool archive" - newdlprefiles="$newdlprefiles $libdir/$name" + func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name" ;; esac done @@ -8113,7 +9327,7 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlfiles="$newdlfiles $abs" + func_append newdlfiles " $abs" done dlfiles="$newdlfiles" newdlprefiles= @@ -8122,15 +9336,33 @@ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; *) abs=`pwd`"/$lib" ;; esac - newdlprefiles="$newdlprefiles $abs" + func_append newdlprefiles " $abs" done dlprefiles="$newdlprefiles" fi $RM $output # place dlname in correct position for cygwin + # In fact, it would be nice if we could use this code for all target + # systems that can't hard-code library paths into their executables + # and that have no shared library path variable independent of PATH, + # but it turns out we can't easily determine that from inspecting + # libtool variables, so we have to hard-code the OSs to which it + # applies here; at the moment, that means platforms that use the PE + # object format with DLL files. See the long comment at the top of + # tests/bindir.at for full details. tdlname=$dlname case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; + *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) + # If a -bindir argument was supplied, place the dll there. + if test "x$bindir" != x ; + then + func_relative_path "$install_libdir" "$bindir" + tdlname=$func_relative_path_result$dlname + else + # Otherwise fall back on heuristic. + tdlname=../bin/$dlname + fi + ;; esac $ECHO > $output "\ # $outputname - a libtool library file @@ -8189,7 +9421,7 @@ exit $EXIT_SUCCESS } -{ test "$mode" = link || test "$mode" = relink; } && +{ test "$opt_mode" = link || test "$opt_mode" = relink; } && func_mode_link ${1+"$@"} @@ -8209,9 +9441,9 @@ for arg do case $arg in - -f) RM="$RM $arg"; rmforce=yes ;; - -*) RM="$RM $arg" ;; - *) files="$files $arg" ;; + -f) func_append RM " $arg"; rmforce=yes ;; + -*) func_append RM " $arg" ;; + *) func_append files " $arg" ;; esac done @@ -8220,24 +9452,23 @@ rmdirs= - origobjdir="$objdir" for file in $files; do func_dirname "$file" "" "." dir="$func_dirname_result" if test "X$dir" = X.; then - objdir="$origobjdir" + odir="$objdir" else - objdir="$dir/$origobjdir" + odir="$dir/$objdir" fi func_basename "$file" name="$func_basename_result" - test "$mode" = uninstall && objdir="$dir" + test "$opt_mode" = uninstall && odir="$dir" - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then + # Remember odir for removal later, being careful to avoid duplicates + if test "$opt_mode" = clean; then case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; + *" $odir "*) ;; + *) func_append rmdirs " $odir" ;; esac fi @@ -8263,18 +9494,17 @@ # Delete the libtool libraries and symlinks. for n in $library_names; do - rmfiles="$rmfiles $objdir/$n" + func_append rmfiles " $odir/$n" done - test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library" + test -n "$old_library" && func_append rmfiles " $odir/$old_library" - case "$mode" in + case "$opt_mode" in clean) - case " $library_names " in - # " " in the beginning catches empty $dlname + case " $library_names " in *" $dlname "*) ;; - *) rmfiles="$rmfiles $objdir/$dlname" ;; + *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;; esac - test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i" + test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i" ;; uninstall) if test -n "$library_names"; then @@ -8302,19 +9532,19 @@ # Add PIC object to the list of files to remove. if test -n "$pic_object" && test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" + func_append rmfiles " $dir/$pic_object" fi # Add non-PIC object to the list of files to remove. if test -n "$non_pic_object" && test "$non_pic_object" != none; then - rmfiles="$rmfiles $dir/$non_pic_object" + func_append rmfiles " $dir/$non_pic_object" fi fi ;; *) - if test "$mode" = clean ; then + if test "$opt_mode" = clean ; then noexename=$name case $file in *.exe) @@ -8324,7 +9554,7 @@ noexename=$func_stripname_result # $file with .exe has already been added to rmfiles, # add $file without .exe - rmfiles="$rmfiles $file" + func_append rmfiles " $file" ;; esac # Do a test to see if this is a libtool program. @@ -8333,7 +9563,7 @@ func_ltwrapper_scriptname "$file" relink_command= func_source $func_ltwrapper_scriptname_result - rmfiles="$rmfiles $func_ltwrapper_scriptname_result" + func_append rmfiles " $func_ltwrapper_scriptname_result" else relink_command= func_source $dir/$noexename @@ -8341,12 +9571,12 @@ # note $name still contains .exe if it was in $file originally # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" + func_append rmfiles " $odir/$name $odir/${name}S.${objext}" if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" + func_append rmfiles " $odir/lt-$name" fi if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" + func_append rmfiles " $odir/lt-${noexename}.c" fi fi fi @@ -8354,7 +9584,6 @@ esac func_show_eval "$RM $rmfiles" 'exit_status=1' done - objdir="$origobjdir" # Try to remove the ${objdir}s in the directories where we deleted files for dir in $rmdirs; do @@ -8366,16 +9595,16 @@ exit $exit_status } -{ test "$mode" = uninstall || test "$mode" = clean; } && +{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } && func_mode_uninstall ${1+"$@"} -test -z "$mode" && { +test -z "$opt_mode" && { help="$generic_help" func_fatal_help "you must specify a MODE" } test -z "$exec_cmd" && \ - func_fatal_help "invalid operation mode \`$mode'" + func_fatal_help "invalid operation mode \`$opt_mode'" if test -n "$exec_cmd"; then eval exec "$exec_cmd" diff -Nru lxinput-0.3.0/man/Makefile.in lxinput-0.3.1/man/Makefile.in --- lxinput-0.3.0/man/Makefile.in 2010-08-03 09:05:47.000000000 +0000 +++ lxinput-0.3.1/man/Makefile.in 2011-07-29 13:11:48.000000000 +0000 @@ -42,6 +42,12 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -71,8 +77,10 @@ MANS = $(man_MANS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ADDITIONAL_FLAGS = @ADDITIONAL_FLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -131,6 +139,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ diff -Nru lxinput-0.3.0/po/LINGUAS lxinput-0.3.1/po/LINGUAS --- lxinput-0.3.0/po/LINGUAS 2010-08-03 09:05:53.000000000 +0000 +++ lxinput-0.3.1/po/LINGUAS 2011-07-29 13:12:58.000000000 +0000 @@ -1,6 +1,7 @@ af ar ast +be bg bn bn_IN @@ -27,6 +28,7 @@ it ja ko +lg lt ml ms @@ -39,13 +41,16 @@ pt_BR ro ru +si sk sl sr sr@latin sv +te th tr +tt_RU uk ur ur_PK diff -Nru lxinput-0.3.0/po/POTFILES.in lxinput-0.3.1/po/POTFILES.in --- lxinput-0.3.0/po/POTFILES.in 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/POTFILES.in 2011-07-29 13:10:06.000000000 +0000 @@ -1,4 +1,4 @@ src/lxinput.c -data/lxinput.glade +[type: gettext/glade]data/lxinput.ui data/lxinput.desktop.in diff -Nru lxinput-0.3.0/po/af.po lxinput-0.3.1/po/af.po --- lxinput-0.3.0/po/af.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/af.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,109 +7,113 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: 2010-01-14 11:43+0200\n" -"Last-Translator: F Wolff \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2010-09-01 23:39+0200\n" +"Last-Translator: F \n" "Language-Team: LANGUAGE \n" +"Language: af\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: af\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.0\n" +"X-Generator: Pootle 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Karakterherhaling" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Sleutelbord en muis" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Beweging" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Versnelling:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Biep as daar fout is met die sleutelbordtoevoer" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Wagtydperk voordat 'n sleutel begin herhaal" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Vinnig" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Hoog" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Voorkeure vir toevoertoestel" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Interval tussen elke sleutelherhaling" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Sleutelbord" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Linkshandig (ruil linker- en regtermuisknoppies)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Lank" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Laag" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Muis" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Herhalingvertraging:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Herhalinginterval:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Sensitiwiteit:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Kort" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Stadig" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" -msgstr "" +msgstr "Raakblad" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Tik in die volgende boksie om die sleutelbordinstellings te toets" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "" +msgstr "Stel sleutelbord, muis en ander toevertoestelle op" #: ../data/lxinput.desktop.in.h:2 -#, fuzzy msgid "Keyboard and Mouse" -msgstr "Sleutelbord" +msgstr "Sleutelbord en muis" #, fuzzy #~ msgid "input-keyboard" diff -Nru lxinput-0.3.0/po/ar.po lxinput-0.3.1/po/ar.po --- lxinput-0.3.0/po/ar.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/ar.po 2011-07-29 13:10:06.000000000 +0000 @@ -8,96 +8,102 @@ msgstr "" "Project-Id-Version: lxde.lxinput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-10 05:29+0000\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2010-07-11 01:18+0300\n" "Last-Translator: Tareq Al Jurf \n" "Language-Team: Arabic \n" +"Language: ar\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" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "تكرار المحارف" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "لوحة المفاتيح والفأرة" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "الحركة" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "التسارع:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "أصدر صفارة عند حدوث خطأ متعلق بالإدخال من لوحة المفاتيح" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "مدة الانتظار قبل تكرار الحرف" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "سريع" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "عالية" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "تفضيلات أجهزة الإدخال" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "الفاصل بين كل تكرار والذي يليه" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "لوحة المفاتيح" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "فأرة عسراء (تبديل زري الفأرة الأيمن والأيسر)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "طويلة" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "منخفضة" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "الفأرة" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "زمن تأخير التكرار:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "المسافة بين التكرار:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "الحساسية:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "قصيرة" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "بطئ" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "لوحة اللمس" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "اكتب في الصندوق التالي لتختبر إعدادات لوحة المفاتيح" diff -Nru lxinput-0.3.0/po/ast.po lxinput-0.3.1/po/ast.po --- lxinput-0.3.0/po/ast.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/ast.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: lxinput.ast\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2010-05-08 16:12+0100\n" "Last-Translator: astur \n" "Language-Team: asturian \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,87 +19,92 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Poedit-Language: asturian\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Repetición de carauteres" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Tecláu" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Movimientu" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Aceleración:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Pitar cuando heba un fallu d'entrada pol tecláu" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Allanciu enantes de que cada tecla entame a repetise" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Rápidu" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Altu" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Preferencies del preséu d'entrada" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Intervalu ente cada repetición d'una tecla" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Tecláu" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Maniegu (intercamudar botones esquierdu y drechu del mur)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Llargu" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Baxu" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Mur" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Allanciu de la repetición:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Intervalu de la repetición:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Sensibilidá:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Curtiu" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Sele" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Panel táctil" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Escribi na siguiente caxa pa comprobar la configuración del tecláu" diff -Nru lxinput-0.3.0/po/be.po lxinput-0.3.1/po/be.po --- lxinput-0.3.0/po/be.po 1970-01-01 00:00:00.000000000 +0000 +++ lxinput-0.3.1/po/be.po 2011-07-29 13:10:06.000000000 +0000 @@ -0,0 +1,116 @@ +# 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: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-07-26 21:44+0200\n" +"Last-Translator: Мікалай \n" +"Language-Team: LANGUAGE \n" +"Language: be\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" +"X-Generator: Pootle 2.0.5\n" + +#: ../data/lxinput.ui.h:1 +msgid "Character Repeat" +msgstr "Паўтарэнне сімвалаў" + +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Раскладка клавіятуры" + +#: ../data/lxinput.ui.h:3 +msgid "Motion" +msgstr "Рух" + +#: ../data/lxinput.ui.h:4 +msgid "Acceleration:" +msgstr "Паскарэнне:" + +#: ../data/lxinput.ui.h:5 +msgid "Beep when there is an error of keyboard input" +msgstr "Гукавы сігнал, калі ёсць памылкі ўводу даных з клавіятуры" + +#: ../data/lxinput.ui.h:6 +msgid "Delay before each key starts repeating" +msgstr "Затрымка перад паўтарэннем кожнай клавішы" + +#: ../data/lxinput.ui.h:7 +msgid "Fast" +msgstr "Хутка" + +#: ../data/lxinput.ui.h:8 +msgid "High" +msgstr "Высока" + +#: ../data/lxinput.ui.h:9 +msgid "Input Device Preferences" +msgstr "Налады прылады ўводу" + +#: ../data/lxinput.ui.h:10 +msgid "Interval between each key repeat" +msgstr "Інтэрвал паміж паўтарэннем кожнай клавішы" + +#: ../data/lxinput.ui.h:11 +msgid "Keyboard" +msgstr "Клавіятура" + +#: ../data/lxinput.ui.h:12 +msgid "Left handed (Swap left and right mouse buttons)" +msgstr "Для ляўшэй (Змяніць дзеянні левай і правай кнопак мышы)" + +#: ../data/lxinput.ui.h:13 +msgid "Long" +msgstr "Доўга" + +#: ../data/lxinput.ui.h:14 +msgid "Low" +msgstr "Нізка" + +#: ../data/lxinput.ui.h:15 +msgid "Mouse" +msgstr "Мыш" + +#: ../data/lxinput.ui.h:16 +msgid "Repeat delay:" +msgstr "Затрымка паўтарэння:" + +#: ../data/lxinput.ui.h:17 +msgid "Repeat interval:" +msgstr "Інтэрвал паўтарэння:" + +#: ../data/lxinput.ui.h:18 +msgid "Sensitivity:" +msgstr "Адчувальнасць:" + +#: ../data/lxinput.ui.h:19 +msgid "Short" +msgstr "Каратка" + +#: ../data/lxinput.ui.h:20 +msgid "Slow" +msgstr "Павольна" + +#: ../data/lxinput.ui.h:21 +msgid "Touch Pad" +msgstr "Тачпад" + +#: ../data/lxinput.ui.h:22 +msgid "Type in the following box to test your keyboard settings" +msgstr "Увядзіце тэкст у гэтым полі для праверкі вашых налад клавіятуры" + +#: ../data/lxinput.desktop.in.h:1 +msgid "Configure keyboard, mouse, and other input devices" +msgstr "Наладзіць клавіятуру, мыш і іншыя прылады ўводу" + +#: ../data/lxinput.desktop.in.h:2 +msgid "Keyboard and Mouse" +msgstr "Клавіятура і мыш" diff -Nru lxinput-0.3.0/po/bg.po lxinput-0.3.1/po/bg.po --- lxinput-0.3.0/po/bg.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/bg.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: lxinput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: 2010-05-31 09:30+0200\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-06-20 16:09+0200\n" "Last-Translator: Радослав \n" "Language-Team: MIME-Version: 1.0\n" "Language: bg\n" @@ -16,97 +16,101 @@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" "X-Poedit-Language: Bulgarian\n" "X-Poedit-Country: BULGARIA\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Символно повтаряне" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Клавиатурна подредба" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Движение" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Ускорение:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Бипни, когато има проблем с клавиатурния вход" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" -msgstr "Забавяне преди да започне повторението на клавишите" +msgstr "Забавяне до повторно въвеждане" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Бърза" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Висока" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Свойства на входно устройство" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Интервал между повторението на клавишите" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Клавиатура" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" -msgstr "Лява ръка (Разменя ляв и десен бутон)" +msgstr "Лява ръка (Размяна на ляв и десен бутон)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Дълга" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Ниска" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Мишка" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" -msgstr "Задържане на повторението:" +msgstr "Забавяне на повторението:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Период на повтаряне:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Чувствителност:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Къса" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Бавна" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" -msgstr "Посочващо устройство" +msgstr "Тъчпад" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" -msgstr "Пишете в следващата кутия, за да тествате настройките на клавиатурата" +msgstr "Пишете в следното поле, за да тествате настройките на клавиатурата" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "Настройка на клавиатурата, мишката идруги входящи устройства" +msgstr "Настройка на клавиатурата, мишката и други входни устройства" #: ../data/lxinput.desktop.in.h:2 msgid "Keyboard and Mouse" diff -Nru lxinput-0.3.0/po/bn.po lxinput-0.3.1/po/bn.po --- lxinput-0.3.0/po/bn.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/bn.po 2011-07-29 13:10:06.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: bn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2010-05-30 12:57+0200\n" "Last-Translator: Jamil \n" "Language-Team: Bengali \n" @@ -19,88 +19,93 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "অক্ষর পুনরাবৃত্তি" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "কী-বোর্ড এবং মাউস" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "চালনা" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "গতিবেগ:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "কীবোর্ড ইনপুটে ত্রুটিতে আওয়াজ করা হবে" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "প্রতি কী-এর পুনরাবৃত্তির পূর্বে যতক্ষণ দেরী হবে" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "দ্রুত" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "উচুঁ" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "ইনপুট ডিভাইসের পছন্দসমূহ" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "প্রতি কী-এর মধ্যবর্তী বিরতি" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "কী-বোর্ড" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "বামহাতী (বাম এবং ডান মাউস বোতামের মাঝে সোয়াপ করে)" # বিরাম সম্পন্ন ? -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "দীর্ঘ" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "নীচের" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "মাউস" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "পুনরাবৃত্তির বিরাম:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "পুনরাবৃত্তির বিরতি:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "স্পর্শকাতরতা:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "ছোট" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "ধীরে" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "টাচ-প্যাড" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "কী-বোর্ড এর সেটিং পরীক্ষা করার জন্য নিচের বাক্সে এইটি টাইপ করুন" diff -Nru lxinput-0.3.0/po/bn_IN.po lxinput-0.3.1/po/bn_IN.po --- lxinput-0.3.0/po/bn_IN.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/bn_IN.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,108 +7,114 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: 2009-07-27 12:28+0200\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-04-11 15:14+0200\n" "Last-Translator: Sankarshan \n" "Language-Team: LANGUAGE \n" +"Language: bn_IN\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" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "অক্ষর পুনরাবৃত্তি" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "কী-বোর্ড এবং মাউস" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "চালনা" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "গতিবেগ:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "কীবোর্ড ইনপুটে ত্রুটিতে আওয়াজ করা হবে" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "প্রতি কী-এর পুনরাবৃত্তির পূর্বে একটি দেরী হবে" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "দ্রুত" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "উচুঁ" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "ইনপুট যন্ত্রের বিশেষ বৈশিষ্ট্য" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "প্রতি কী-এর মধ্যবর্তী বিরাম" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "কী-বোর্ড" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" -msgstr "" +msgstr "বাঁ হাতের জন্য (বাম ও ডান দিকের মাউস বোতাম পরিবর্তন করুন)" # বিরাম সম্পন্ন ? -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "লম্বা" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "নীচের" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "মাউস" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "পুনরাবৃত্তির বিরাম:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "পুনরাবৃত্তির সময়সীমা:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" -msgstr "" +msgstr "সংবেদনশিলতা" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "ছোট" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "ধীরে" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "টাচ-প্যাড" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "কী-বোর্ড এর সেটিং পরীক্ষা করার জন্য এইটি টাইপ করুন" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "" +msgstr "কী-বোর্ড, মাউস ও অন্যান্য ইনপুট ডিভাইস সঞ্চালন করুন" #: ../data/lxinput.desktop.in.h:2 -#, fuzzy msgid "Keyboard and Mouse" -msgstr "কী-বোর্ড" +msgstr "কী-বোর্ড এবং মাউস" #, fuzzy #~ msgid "input-keyboard" diff -Nru lxinput-0.3.0/po/ca.po lxinput-0.3.1/po/ca.po --- lxinput-0.3.0/po/ca.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/ca.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,107 +7,114 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: 2009-09-14 00:29+0100\n" -"Last-Translator: \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2010-08-26 23:46+0200\n" +"Last-Translator: Josep \n" "Language-Team: LXDE Catalan translators group\n" +"Language: ca\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 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Repetició de caràcters" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Teclat i ratolí" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Moviment" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Acceleració" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Pita quan es detecti un error en l'entrada de teclat" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Demora abans de començar a repetir les tecles" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Ràpid" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Alt" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Preferències del dispositiu d'entrada" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Intèrval entre la repetició de tecles" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Teclat" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Esquerrà (intercanvia els botons dret i esquerra del ratolí)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Llarg" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Baix" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Ratolí" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Repeteix la demora:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Repeteix l'interval:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Sensibilitat:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Curt" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Lent" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Touchpad" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "" "Introduïu text a la següent caixa per verificar els paràmetres de teclat" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "" +msgstr "Configureu el teclat, ratolí i altres dispositius d'entrada" #: ../data/lxinput.desktop.in.h:2 -#, fuzzy msgid "Keyboard and Mouse" -msgstr "Teclat" +msgstr "Teclat i ratolí" #, fuzzy #~ msgid "input-keyboard" diff -Nru lxinput-0.3.0/po/cs.po lxinput-0.3.1/po/cs.po --- lxinput-0.3.0/po/cs.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/cs.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,110 +7,114 @@ msgstr "" "Project-Id-Version: lxinput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2009-12-09 17:56+0100\n" "Last-Translator: Michal Várady \n" "Language-Team: \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Czech\n" -"X-Poedit-Country: CZECH REPUBLIC\n" "X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-Country: CZECH REPUBLIC\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Opakování kláves" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Klávesnice a myš" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Pohyb" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Akcelerace:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Zvukový signál při chybě vstupu z klávesnice" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Prodleva před zahájením opakování stisknuté klávesy" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Rychlá" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Vysoká" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Předvolby vstupního zařízení" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Interval mezi opakováním kláves" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Klávesnice" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Pro leváka (Zamění levé a pravé tlačítko myši)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Dlouhá" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Nizká" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Myš" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Prodleva před opakováním:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Interval opakování:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Citlivost:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Krátká" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Pomalá" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Touchpad" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Nastavení klávesnice můžete ověřit psaním do tohoto pole" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "" +msgstr "Nastavení klávesnice, myši a ostatních vstupních zařízení" #: ../data/lxinput.desktop.in.h:2 -#, fuzzy msgid "Keyboard and Mouse" -msgstr "Klávesnice" +msgstr "Klávesnice a myš" -#, fuzzy #~ msgid "input-keyboard" #~ msgstr "Klávesnice" diff -Nru lxinput-0.3.0/po/da.po lxinput-0.3.1/po/da.po --- lxinput-0.3.0/po/da.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/da.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,95 +7,102 @@ msgstr "" "Project-Id-Version: LXInput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 04:46+0000\n" -"PO-Revision-Date: 2010-05-24 11:00+0000\n" -"Last-Translator: Joe Hansen \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-06-27 16:19+0200\n" +"Last-Translator: Kristian \n" "Language-Team: Danish \n" +"Language: da\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 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Gentagelse af tegn" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Tastaturlayout" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Bevægelse" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Acceleration:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Bip ved fejlindtastning fra tastaturet" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Forsinkelse før tast starter med at gentages" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Hurtig" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Høj" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Indstillinger for enhed til indtastning" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Interval mellem hver gentagelse af tast" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Tastatur" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Venstrehåndet (skift venstre og højre museknapper)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Lang" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Lav" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Mus" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Gentagelsesforsinkelse:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Gentag interval:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Følsomhed:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Kort" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Langsom" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Pegeplade" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Skriv i feltet for at teste din tastaturopsætning" @@ -106,5 +113,3 @@ #: ../data/lxinput.desktop.in.h:2 msgid "Keyboard and Mouse" msgstr "Tastatur og mus" - - diff -Nru lxinput-0.3.0/po/de.po lxinput-0.3.1/po/de.po --- lxinput-0.3.0/po/de.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/de.po 2011-07-29 13:10:06.000000000 +0000 @@ -2,104 +2,110 @@ # 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: 2010-08-02 05:38+0000\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2009-04-30 00:51+0200\n" "Last-Translator: Christoph Wickert \n" "Language-Team: LANGUAGE \n" +"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" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Tastendruckwiederholung" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Tastatur und Maus" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Bewegung" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Beschleunigung:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Bei Fehlern der Tastatureingabe einen Ton ausgeben" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Verzögerung nach der eine Taste wiederholt wird" # Beschleunigung ist hoch, nicht schnell -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Hoch" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Hoch" # Eingabegeräteeinstellungen? -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Einstellungen der Eingabegeräte" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Pause zwischen den Wiederholungen eines Tastendrucks" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Tastatur" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Linkshändisch (Linke und rechte Maustaste vertauschen)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Lang" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Gering" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Maus" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Verzögerung:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Intervall:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Empfindlichkeit:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Kurz" # Beschleunigung ist gering/niedrig, nicht langsam -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Gering" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Touchpad" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Zum Testen der Tastatureinstellungen in dem Feld tippen" diff -Nru lxinput-0.3.0/po/el.po lxinput-0.3.1/po/el.po --- lxinput-0.3.0/po/el.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/el.po 2011-07-29 13:10:06.000000000 +0000 @@ -2,107 +2,112 @@ # 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: lxinput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 04:46+0000\n" -"PO-Revision-Date: 2010-04-08 22:38+0200\n" -"Last-Translator: \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-06-17 11:39+0200\n" +"Last-Translator: George \n" "Language-Team: Greek \n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.5\n" "X-Poedit-Language: Greek\n" "X-Poedit-Country: GREECE\n" -"X-Generator: Pootle 2.0.1\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Επανάληψη χαρακτήρα" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Διάταξη πληκτρολογίου" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Κίνηση" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Επιτάχυνση:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Κουδούνισμα σε περίπτωση σφάλματος κατά την πληκτρολόγηση" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Καθυστέριση πριν την επανάληψη του πλήκτρου" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Γρήγορα" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" -msgstr "Υψηλά" +msgstr "Υψηλή" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Ιδιότητες συσκευής εισόδου" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Διάστημα μεταξύ επανάληψης πλήκτρου" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Πληκτρολόγιο" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Αριστερόχειρας (Εναλλαγή αριστερού και δεξιού κουμπιού του ποντικιού)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" -msgstr "Μακριά" +msgstr "Μεγάλο" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" -msgstr "Χαμηλά" +msgstr "Χαμηλή" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Ποντίκι" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Καθυστέρηση επανάληψης:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Διάστημα επανάληψης:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Ευαισθησία:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" -msgstr "Κοντά" +msgstr "Μικρό" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Αργά" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Touch Pad" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" -msgstr "Πληκτρολογίστε στο παρόν κουτάκι για να δοκιμάστε τις ρυθμίσεις πληκτρολογίου" +msgstr "" +"Πληκτρολογίστε στο παρόν κουτάκι για να δοκιμάστε τις ρυθμίσεις πληκτρολογίου" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" diff -Nru lxinput-0.3.0/po/en_GB.po lxinput-0.3.1/po/en_GB.po --- lxinput-0.3.0/po/en_GB.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/en_GB.po 2011-07-29 13:10:06.000000000 +0000 @@ -2,100 +2,107 @@ # 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: 2010-07-06 08:47+0000\n" -"PO-Revision-Date: 2010-03-28 17:45+0100\n" -"Last-Translator: Steve Cook (Yorvyk) \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-06-12 15:44+0200\n" +"Last-Translator: Steve \n" "Language-Team: English UK en_GB\n" +"Language: en_GB\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 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Character Repeat" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Keyboard layout" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Motion" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Acceleration:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Beep when there is a keyboard input error" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Delay before each key starts repeating" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Fast" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "High" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Input Device Preferences" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Interval between each key repeat" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Keyboard" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Left handed (Swap left and right mouse buttons)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Long" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Low" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Mouse" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Repeat delay:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Repeat interval:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Sensitivity:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Short" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Slow" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Touch Pad" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Type in the following box to test your keyboard settings" diff -Nru lxinput-0.3.0/po/es.po lxinput-0.3.1/po/es.po --- lxinput-0.3.0/po/es.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/es.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,100 +7,106 @@ msgstr "" "Project-Id-Version: lxinput 0.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-27 04:20+0000\n" -"PO-Revision-Date: 2010-05-27 10:00-0500\n" -"Last-Translator: Hugo Florentino \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-05-19 01:12+0200\n" +"Last-Translator: Hugo \n" "Language-Team: Spanish\n" +"Language: es\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" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.5\n" "X-Poedit-Language: Spanish\n" -"X-Generator: Pootle 1.1.0\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Repetición de caracteres" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Distribución del teclado" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Movimiento" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Aceleración:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Pitar cuando haya un error de entrada por el teclado" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Retardo antes de que cada tecla comience a repetirse" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Rápido" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Alto" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Preferencias del dispositivo de entrada" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Intervalo entre cada repetición de una tecla" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Teclado" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Zurdo (intercambiar botones izquierdo y derecho del ratón)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Largo" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Bajo" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Ratón" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Retardo de la repetición:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Intervalo de la repetición:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Sensibilidad:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Corto" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Lento" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Panel táctil" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" -msgstr "Teclee en el siguiente cuadro para comprobar la configuración de su teclado" +msgstr "" +"Teclee en el siguiente cuadro para comprobar la configuración de su teclado" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" @@ -113,4 +119,3 @@ #, fuzzy #~ msgid "input-keyboard" #~ msgstr "Teclado" - diff -Nru lxinput-0.3.0/po/es_VE.po lxinput-0.3.1/po/es_VE.po --- lxinput-0.3.0/po/es_VE.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/es_VE.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,96 +7,102 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2009-05-03 02:53+0200\n" "Last-Translator: Guillermo Iguaran \n" "Language-Team: LANGUAGE \n" +"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" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Repetición de caracteres" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Teclado" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Movimiento" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Aceleración:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Pitar cuando haya un error de entrada por el teclado" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Retardo antes de que cada tecla comience a repetirse" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Rápido" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Alto" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Preferencias del dispositivo de entrada" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Intervalo entre cada repetición de una tecla" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Teclado" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Zurdo (intercambiar botones izquierdo y derecho del ratón)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Largo" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Bajo" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Ratón" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Retardo de la repetición:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Intervalo de la repetición:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Sensibilidad:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Corto" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Lento" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Panel táctil" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "" "Teclee en el siguiente cuadro para comprobar la configuración de su teclado" diff -Nru lxinput-0.3.0/po/et.po lxinput-0.3.1/po/et.po --- lxinput-0.3.0/po/et.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/et.po 2011-07-29 13:10:06.000000000 +0000 @@ -8,96 +8,102 @@ msgstr "" "Project-Id-Version: lxinput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2009-08-23 17:38+0300\n" "Last-Translator: Mattias Põldaru \n" "Language-Team: Gnome Estonian Translation Team \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Estonian\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Märgikordus" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Klaviatuur" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Liikumine" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Kiirendus:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Piiks klaviatuurisisendi vea korral" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Viivitus enne klahvi kordumise algust" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Kiire" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Kõrge" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Sisendseadme eelistused" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Vahemik klahvikorduste vahel" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Klaviatuur" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Vasakukäeline (vasak ja parem hiireklahv on vahetuses)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Pikk" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Madal" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Hiir" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Korduse viivitus:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Korduse intervall:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Tundlikkus:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Lühike" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Aeglane" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Puuteplaat" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Klaviatuurisätete proovimiseks võid siia tekstikasti trükkida" diff -Nru lxinput-0.3.0/po/eu.po lxinput-0.3.1/po/eu.po --- lxinput-0.3.0/po/eu.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/eu.po 2011-07-29 13:10:06.000000000 +0000 @@ -8,95 +8,100 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "" diff -Nru lxinput-0.3.0/po/fa.po lxinput-0.3.1/po/fa.po --- lxinput-0.3.0/po/fa.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/fa.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2010-07-06 13:10+0200\n" "Last-Translator: Hamidreza \n" "Language-Team: LANGUAGE \n" @@ -18,87 +18,92 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "تکرار شخصیت" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "صفحه کلید و موشی" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "حرکت" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "شتاب:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "هنگام خطا در ورودی صفحه کلید بوق بزن" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "پیش از شروع تکرار هر کلید وقفه بینداز" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "سریع" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "زیاد" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "ترجیحات دستگاه ورودی" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "بین تکرار هر کلید فاصله بینداز" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "صفحه کلید" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "چپ دست (تعویض کلیدهای چپ و راست موشواره)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "طولانی" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "اندک" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "موشواره" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "تاخیر تکرار:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "فاصله تکرار:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "حساسیت:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "کوتاه" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "کم" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "صفحه لمسی" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "برای امتحان تنظیمات صفحه کلید در کادر زیر تایپ کنید" @@ -107,10 +112,8 @@ msgstr "پیکربندی صفحه کلید، موشواره و دیگر دستگاه‌های ورودی" #: ../data/lxinput.desktop.in.h:2 -#, fuzzy msgid "Keyboard and Mouse" -msgstr "صفحه کلید" +msgstr "صفحه کلید و موشی" -#, fuzzy #~ msgid "input-keyboard" #~ msgstr "صفحه کلید" diff -Nru lxinput-0.3.0/po/fi.po lxinput-0.3.1/po/fi.po --- lxinput-0.3.0/po/fi.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/fi.po 2011-07-29 13:10:06.000000000 +0000 @@ -3,107 +3,114 @@ # 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: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Näppäinmistö ja hiiri" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" -msgstr "" +msgstr "Kiihtyvyys:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" -msgstr "" +msgstr "Piippaa kun näppäinmistön näppäilyssä tapahtuu virhe" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" -msgstr "" +msgstr "Odota hetki ennen kuin näppäintä aletaan toistamaan" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" -msgstr "" +msgstr "Nopea" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" -msgstr "" +msgstr "Korkea" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" -msgstr "" +msgstr "Syötelaitteen ominaisuudet" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" -msgstr "" +msgstr "Näppäimen toiston viive" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" -msgstr "" +msgstr "Näppäinmistö" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" -msgstr "" +msgstr "Vasenkätinen (Vaihda oikean ja vesamman hiiren napin paikkoja)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" -msgstr "" +msgstr "Pitkä" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" -msgstr "" +msgstr "Matala" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" -msgstr "" +msgstr "Hiiri" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 +#, fuzzy msgid "Repeat delay:" -msgstr "" +msgstr "Toiston aloituksen viive:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 +#, fuzzy msgid "Repeat interval:" -msgstr "" +msgstr "Toiston viive:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" -msgstr "" +msgstr "Herkkyys:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" -msgstr "" +msgstr "Lyhyt" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" -msgstr "" +msgstr "Hidas" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" -msgstr "" +msgstr "Kosketuslevy" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" -msgstr "" +msgstr "Voit kokeilla näppäinmistön asetuksia alla olevaan laatikkoon" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "" +msgstr "Muokkaa näppäinmistön, hiiren ja muiden syöttölaitteiden asetuksia" #: ../data/lxinput.desktop.in.h:2 msgid "Keyboard and Mouse" -msgstr "" +msgstr "Näppäinmistö ja hiiri" diff -Nru lxinput-0.3.0/po/fo.po lxinput-0.3.1/po/fo.po --- lxinput-0.3.0/po/fo.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/fo.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2010-06-08 17:54+0200\n" "Last-Translator: Gunleif \n" "Language-Team: LANGUAGE \n" @@ -18,87 +18,92 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Pootle 2.0.1\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Stava endurtøka" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Knappaborð og mús" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Rørsla" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Ferðøking:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Bippa tá ið gali verður trýst á knappaborðið" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Drála áðrenn knappur byrjar endurtøku" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Skjótt" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Høgt" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Innstillingar fyri innskrivingar-tóleind" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Tíðarbil ímillum hvørja knappa-endurtøku" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Knappaborð" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Vinstrahanda (skift vinstru og høgru músaknappar)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Langur" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Lágur" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Mús" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Endurtøkudrál:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Endurtøku tíðarbil:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Viðkvæmi:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Stutt" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Spakuliga" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Peikipláta" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Skriva í kassan, fyri at royna knappaborðs-setingina" diff -Nru lxinput-0.3.0/po/fr.po lxinput-0.3.1/po/fr.po --- lxinput-0.3.0/po/fr.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/fr.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: 2010-08-02 19:52+0200\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-07-28 09:36+0200\n" "Last-Translator: Cilyan \n" "Language-Team: LANGUAGE \n" "Language: fr\n" @@ -18,87 +18,91 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Pootle 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Répétition des caractères" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Disposition du clavier" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Mouvement" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Accélération :" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Émettre un son lors d'une erreur d'entrée sur le clavier" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Délai avant que le caractère ne soit répété" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Rapide" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Forte" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Préférences des périphériques d'entrée" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Intervalle entre chaque répétition de caractère" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Clavier" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Gaucher (Inverse les boutons droit et gauche de la souris)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Long" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Faible" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Souris" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Délai avant répétition :" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Intervalle de répétition :" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Sensibilité :" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Court" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Lente" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Touchpad" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Tapez dans le champ ci-dessous pour tester vos paramètres clavier" diff -Nru lxinput-0.3.0/po/frp.po lxinput-0.3.1/po/frp.po --- lxinput-0.3.0/po/frp.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/frp.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,96 +7,102 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2009-10-21 15:32+0200\n" "Last-Translator: alexandre raymond \n" "Language-Team: LANGUAGE \n" +"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" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Repeticion do Charactéro" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Clavèr" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Mocion" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Acceleracion:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Bip quand i at n'erór d'entrâ do clavèr" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Temps per la repeticion do clavèr" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Rapido" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Yaut" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Preferences d'entrâ dos aparelys" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Interval de repeticion do clavèr" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Clavèr" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Gauchèr (chanje los botos de dreti et de gauchi de la rata)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Lonj" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Bas" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Rata" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Temps de repecicion:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Interval de repeticion:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Sensibilitâ:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Cort" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Plan" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Carro de déyt (Touch Pad)" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Carro per fâre de test da configuracion do clavèr" diff -Nru lxinput-0.3.0/po/gl.po lxinput-0.3.1/po/gl.po --- lxinput-0.3.0/po/gl.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/gl.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,108 +7,112 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: 2009-10-27 15:17+0100\n" -"Last-Translator: Indalecio Freiría Santos \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-05-25 11:49+0200\n" +"Last-Translator: mbouzada \n" "Language-Team: Proxecto Trasno \n" +"Language: gl\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" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Repetición de caracteres" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Disposición do teclado" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Movemento" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Aceleración:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Emitir un ton de aviso cando haxa un erro de entrada polo teclado" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Retardo antes de que cada tecla comece a repetirse" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Rápido" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Alto" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Preferencias do dispositivo de entrada" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Intervalo entre cada repetición dunha tecla" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Teclado" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Zurdo (intercambiar botóns esquerdo e dereito do rato)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Longo" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Baixo" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Rato" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Retardo da repetición:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Intervalo da repetición:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Sensibilidade:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Curto" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Lento" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Panel táctil" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Teclee no seguinte cadro para comprobar a configuración do seu teclado" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "" +msgstr "Configurar o teclado, o rato e outros dispositivos de entrada" #: ../data/lxinput.desktop.in.h:2 -#, fuzzy msgid "Keyboard and Mouse" -msgstr "Teclado" +msgstr "Teclado e rato" -#, fuzzy #~ msgid "input-keyboard" #~ msgstr "Teclado" diff -Nru lxinput-0.3.0/po/he.po lxinput-0.3.1/po/he.po --- lxinput-0.3.0/po/he.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/he.po 2011-07-29 13:10:06.000000000 +0000 @@ -2,101 +2,107 @@ # 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: 2010-05-25 04:46+0000\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2009-09-21 08:53+0200\n" "Last-Translator: Yaron Shahrbani \n" "Language-Team: LANGUAGE \n" +"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" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "חזרה על התווים" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "מקלדת ועכבר" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "תנועה" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "האצה:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "ישמע צפצוף כאשר מתרחשת שגיאה בקלט המקלדת" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "השהיה בטרם החזרה לאחר לחיצה על תו" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "מהירה" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "גבוהה" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "העדפות התקן קלט" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "משך ההשהיה עד לחזרה לאחר לחיצה על תו" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "מקלדת" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "מותאם לשמאליים (החלפה בין הלחצן השמאלי לימני בעכבר)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "ארוכה" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "נמוכה" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "עכבר" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "השהיה עד לחזרה:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "משך ההמתנה בין החזרות:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "רגישות:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "קצרה" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "איטית" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "משטח מגע" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "ניתן להקליד את בתיבת הטקסט שלהלן כדי לבדוק את הגדרות המקלדת שלך" diff -Nru lxinput-0.3.0/po/hr.po lxinput-0.3.1/po/hr.po --- lxinput-0.3.0/po/hr.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/hr.po 2011-07-29 13:10:06.000000000 +0000 @@ -2,100 +2,108 @@ # 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: 2010-05-27 04:20+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-06-22 14:34+0200\n" +"Last-Translator: zvacet \n" "Language-Team: LANGUAGE \n" +"Language: hr\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" +"X-Generator: Pootle 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Ponavljanje znakova" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Rapored tipkovnice" + +#: ../data/lxinput.ui.h:3 msgid "Motion" -msgstr "Pokret" +msgstr "Pokret" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" -msgstr "Ubrzanje" +msgstr "Ubrzanje:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Odgoda prije početka ponavljanja svake tipke" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Brzo" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Visoko" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Postavke ulaznog uređaja" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" -msgstr "Interval između ponavljanja svake tipke " +msgstr "Interval između ponavljanja svake tipke" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Tipkovnica" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" -msgstr "Ljevoruki (zamjeni lijevo i desno dugme miša" +msgstr "Ljevoruki (zamjeni lijevo i desno dugme miša)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Dugo" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Nisko" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Miš" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" -msgstr "Odgoda ponavljanja" +msgstr "Odgoda ponavljanja:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" -msgstr "Interval ponavljanja" +msgstr "Interval ponavljanja:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" -msgstr "Osjetljivost" +msgstr "Osjetljivost:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Kratko" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Sporo" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Pišite u okvir za testiranje postavki tipkovnice" diff -Nru lxinput-0.3.0/po/hu.po lxinput-0.3.1/po/hu.po --- lxinput-0.3.0/po/hu.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/hu.po 2011-07-29 13:10:06.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: lxinput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-08-05 05:43+0000\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2010-08-05 17:17+0200\n" "Last-Translator: Laszlo Dvornik \n" "Language-Team: Hungarian \n" @@ -17,87 +17,92 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Karakterismétlés" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Billentyűzet és egér" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Mozgás" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Gyorsítás:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Csippanás a billentyűzetről való bevitel hibájakor" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Késleltetés az ismétlés előtt" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Gyors" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Magas" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Beviteli eszköz beállításai" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Időköz az ismétlések között" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Billentyűzet" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Balkezes (a bal és jobb egérgombok cseréje)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Hosszú" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Alacsony" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Egér" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Ismétlés késleltetése:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Ismétlés időköze:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Érzékenység:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Rövid" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Lassú" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Tapipad" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Gépelj az alábbi dobozba a billentyűzet beállítások kipróbálásához" diff -Nru lxinput-0.3.0/po/id.po lxinput-0.3.1/po/id.po --- lxinput-0.3.0/po/id.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/id.po 2011-07-29 13:10:06.000000000 +0000 @@ -1,114 +1,118 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# Rahman Yusri Aftian , 2009. -# +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# Rahman Yusri Aftian , 2009. +# msgid "" msgstr "" "Project-Id-Version: lxinput-id\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: 2009-05-23 03:54+0200\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-07-06 19:25+0200\n" "Last-Translator: Rahman Yusri Aftian \n" "Language-Team: LANGUAGE \n" +"Language: id\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" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Pootle 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Karakter Repeat" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Letak Papak Ketik" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Motion" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Akselerasi:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Bunyi Sekali apabila terjadi galat pada masukan papan ketik" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Penundaan sebelum masing-masing kunci mengulangi" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Cepat" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Tinggi" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Masukkan Prefensi Alat" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Interval antara masing-masing kunci pengulangan" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Papan Ketik" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Tangan Kiri (Menukar tombol mouse benar dan ditinggalkan)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Panjang" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Lemah" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Mouse" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Pengulangan Penundaan:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Pengulangan Interval:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Tingkat Sensitif:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Pendek:" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Lambat" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Touch Pad" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Tipe yang berikut untuk menguji papan tombol mu menentukan" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "" +msgstr "Tata papan tik, tetikus, dan perangkat masukan lain" #: ../data/lxinput.desktop.in.h:2 -#, fuzzy msgid "Keyboard and Mouse" -msgstr "Papan Ketik" +msgstr "Papan Ketik dan Tetikus" -#, fuzzy #~ msgid "input-keyboard" #~ msgstr "Papan Ketik" diff -Nru lxinput-0.3.0/po/it.po lxinput-0.3.1/po/it.po --- lxinput-0.3.0/po/it.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/it.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,96 +7,102 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: 2010-05-23 20:34+0100\n" -"Last-Translator: Andrea Florio \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-05-25 19:47+0200\n" +"Last-Translator: Alessandro \n" "Language-Team: LANGUAGE \n" +"Language: it\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" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Ripetizione Caratteri" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Disposizone tastiera" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Movimento" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Accelerazione:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Emetti un beep per gli errori di input da tastiera" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Attesa prima della ripetizione di ogni tasto" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Veloce" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Alto" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Impostazioni Dispositivi di Input" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Intervallo per la ripetizione di ogni tasto" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Tastiera" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Mancino (inverti tasto destro e sinistro del mouse)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Lungo" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Basso" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Mouse" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Attesa ripetizione:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Intervallo ripetizione:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Sensibilità:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Corto" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Lento" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Touch Pad" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Scrivi in questo box per provare le impostazioni di tastiera" @@ -111,4 +117,3 @@ #, fuzzy #~ msgid "input-keyboard" #~ msgstr "Tastiera" - diff -Nru lxinput-0.3.0/po/ja.po lxinput-0.3.1/po/ja.po --- lxinput-0.3.0/po/ja.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/ja.po 2011-07-29 13:10:06.000000000 +0000 @@ -8,95 +8,101 @@ msgstr "" "Project-Id-Version: lxinput 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2010-05-24 01:27+0800\n" "Last-Translator: Hong Jen Yee (PCMan) \n" "Language-Team: ja_JP \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "文字リピート" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "キーボードとマウス" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "モーション" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "加速:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "キーボードからの入力にエラーがあったときビープ音を出す" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "キーリピートを開始するまでの遅延" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "速い" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "高い" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "入力デバイスの設定" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "キーリピートの間隔" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "キーボード" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "左利き (マウスの左右ボタンを交換する)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "長い" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "低い" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "マウス" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "リピートの遅延:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "リピートの間隔:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "感度:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "短い" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "遅い" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "タッチパッド" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "キーボードの設定を試すためにこのボックスに入力してみてください" diff -Nru lxinput-0.3.0/po/ko.po lxinput-0.3.1/po/ko.po --- lxinput-0.3.0/po/ko.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/ko.po 2011-07-29 13:10:06.000000000 +0000 @@ -8,95 +8,100 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "" diff -Nru lxinput-0.3.0/po/lg.po lxinput-0.3.1/po/lg.po --- lxinput-0.3.0/po/lg.po 1970-01-01 00:00:00.000000000 +0000 +++ lxinput-0.3.1/po/lg.po 2011-07-29 13:10:06.000000000 +0000 @@ -0,0 +1,120 @@ +# This is the Luganda translation of lxinput. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the lxinput package. +# Kizito Birabwa , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-05-18 22:50+0200\n" +"Last-Translator: kizito \n" +"Language-Team: Luganda \n" +"Language: lg\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 2.0.5\n" + +#: ../data/lxinput.ui.h:1 +msgid "Character Repeat" +msgstr "Obwangu bw'enziriŋŋana y'okuteekawo bubonero" + +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Entegeka y'amapeesa agawandisibwa" + +#: ../data/lxinput.ui.h:3 +msgid "Motion" +msgstr "Entambula" + +#: ../data/lxinput.ui.h:4 +msgid "Acceleration:" +msgstr "Enyanguwa y'akasonga:" + +#: ../data/lxinput.ui.h:5 +msgid "Beep when there is an error of keyboard input" +msgstr "Akade kavuge nga wazzewo kiremya mu kuwandisa mapeesa" + +#: ../data/lxinput.ui.h:6 +msgid "Delay before each key starts repeating" +msgstr "Akasirikiriro akabawo eppeesa liryoke liddemu akabonero" + +#: ../data/lxinput.ui.h:7 +msgid "Fast" +msgstr "Mangu" + +#: ../data/lxinput.ui.h:8 +msgid "High" +msgstr "Kungi" + +#: ../data/lxinput.ui.h:9 +msgid "Input Device Preferences" +msgstr "Nteekateeka z'ebikozesebwa okuyingiza bintu mu kompyuta" + +#: ../data/lxinput.ui.h:10 +msgid "Interval between each key repeat" +msgstr "" +"Akaseera akayitawo eppeesa liryoke liddemu okussawo akabonero nga " +"erinwyezezza wansi" + +#: ../data/lxinput.ui.h:11 +msgid "Keyboard" +msgstr "Mapeesa agawandisibwa" + +#: ../data/lxinput.ui.h:12 +msgid "Left handed (Swap left and right mouse buttons)" +msgstr "" +"Nkozesa kkono (wanyisa enkola y'amapeesa g'akasongesebwa aga kkono ne ddyo)" + +#: ../data/lxinput.ui.h:13 +msgid "Long" +msgstr "Kawanvu" + +#: ../data/lxinput.ui.h:14 +msgid "Low" +msgstr "Kutono" + +#: ../data/lxinput.ui.h:15 +msgid "Mouse" +msgstr "Akasongesebwa" + +#: ../data/lxinput.ui.h:16 +msgid "Repeat delay:" +msgstr "Akasirikiriro:" + +#: ../data/lxinput.ui.h:17 +msgid "Repeat interval:" +msgstr "Akaseera wakati w'enziriŋano:" + +#: ../data/lxinput.ui.h:18 +msgid "Sensitivity:" +msgstr "Okuwulira kw'akasongesebwa:" + +#: ../data/lxinput.ui.h:19 +msgid "Short" +msgstr "Kampi" + +#: ../data/lxinput.ui.h:20 +msgid "Slow" +msgstr "Mpola" + +#: ../data/lxinput.ui.h:21 +msgid "Touch Pad" +msgstr "Kasongesebwa k'osiisiriza" + +#: ../data/lxinput.ui.h:22 +msgid "Type in the following box to test your keyboard settings" +msgstr "Wandika wano olabe by'otegese bwe bikola" + +#: ../data/lxinput.desktop.in.h:1 +msgid "Configure keyboard, mouse, and other input devices" +msgstr "" +"Teekateeka enkola y'amapeesa agawandisibwa, akasongesebwa n'ebirala " +"ebikozesebwa okuyingiza bintu mu kompyuta" + +#: ../data/lxinput.desktop.in.h:2 +msgid "Keyboard and Mouse" +msgstr "Mapeesa agawandisibwa n'akasongesebwa" diff -Nru lxinput-0.3.0/po/lt.po lxinput-0.3.1/po/lt.po --- lxinput-0.3.0/po/lt.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/lt.po 2011-07-29 13:10:06.000000000 +0000 @@ -2,103 +2,112 @@ # 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: 2010-06-27 05:34+0000\n" -"PO-Revision-Date: 2009-05-21 18:12+0200\n" -"Last-Translator: Julius Vitkauskas \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-06-11 23:45+0200\n" +"Last-Translator: Julius \n" "Language-Team: LANGUAGE \n" +"Language: lt\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" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" +"%100<10 || n%100>=20) ? 1 : 2);\n" +"X-Generator: Pootle 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Simbolių kartojimas" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Klaviatūros išdėstymas" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Judesys" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Akseleracija:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Supypsėti įvykus klaviatūros įvesties klaidai" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Uždelsimas prieš kartojant klavišus" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Greita" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Didelis" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Įvesties įrenginio parinktys" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Intervalas prieš klavišų pakartojimą" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Klaviatūra" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" -msgstr "Sukeisti kairiojo ir dešiniojo pelės mygtuko funkcijas (kairiarankiams)" +msgstr "" +"Sukeisti kairiojo ir dešiniojo pelės mygtuko funkcijas (kairiarankiams)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Ilgas" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Mažas" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Pelė" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Pakartojimo užlaikymas:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Pakartojimo intervalas:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Jautrumas:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Trumpas" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Lėta" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Touchpad" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" -msgstr "Čia galite įvesti tekstą ir taip išbandyti jūsų klaviatūros nustatymams:" +msgstr "" +"Čia galite įvesti tekstą ir taip išbandyti jūsų klaviatūros nustatymams" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" diff -Nru lxinput-0.3.0/po/ml.po lxinput-0.3.1/po/ml.po --- lxinput-0.3.0/po/ml.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/ml.po 2011-07-29 13:10:06.000000000 +0000 @@ -8,95 +8,100 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "" diff -Nru lxinput-0.3.0/po/ms.po lxinput-0.3.1/po/ms.po --- lxinput-0.3.0/po/ms.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/ms.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,108 +7,115 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2009-06-09 02:57+0200\n" "Last-Translator: Payne Samad Loh \n" "Language-Team: LANGUAGE \n" +"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" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Karekter Berulang" -#: ../data/lxinput.glade.h:2 +# by Phyz +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Papan Kunci" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Mosi" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Akselerasi:" # by phyz -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Bunyi Beep bila ada ralat pada input papan kekunci" # by Phyz -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Sela masa sebelum setiap kekunci bermula berulang-ulang" # by Phyz -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Pantas" # by Phyz -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Tinggi" # by phyz -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Input Peranti Kesukaan" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Ulangan interval antara setiap kunci" # by Phyz -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Papan Kunci" # by Phyz -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Tangan kidal (Tukarkan kiri dan kanan butang tetikus)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Panjang" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Rendah" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Tetikus" # by Phyz -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Ulang Sela:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Ulang Interval:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Kepekaan:" # by Phyz -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Pendek" # by Phyz -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Perlahan" # by Phyz -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Pad Sesentuh" # by Phyz -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Taip di dalam petak yang tersedia untuk menguji tetapan papan kekunci" diff -Nru lxinput-0.3.0/po/nb.po lxinput-0.3.1/po/nb.po --- lxinput-0.3.0/po/nb.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/nb.po 2011-07-29 13:10:06.000000000 +0000 @@ -3,107 +3,114 @@ # 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: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2010-12-10 07:27+0200\n" +"Last-Translator: Sam \n" "Language-Team: LANGUAGE \n" +"Language: nb\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 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" -msgstr "" +msgstr "Tegnrepetisjon" + +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Tastatur og mus" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:3 msgid "Motion" -msgstr "" +msgstr "Bevegelse" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" -msgstr "" +msgstr "Akselerasjon:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" -msgstr "" +msgstr "Gi lydsignal ved feiltasting" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" -msgstr "" +msgstr "Forsinkelse før tastetrykk gjentar seg" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" -msgstr "" +msgstr "Rask" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" -msgstr "" +msgstr "Høy" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" -msgstr "" +msgstr "Innstillinger for inndataenheter" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" -msgstr "" +msgstr "Intervall mellom hver tastegjentagelse" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" -msgstr "" +msgstr "Tastatur" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" -msgstr "" +msgstr "Venstrehendt (bytter om venstre og høyre museknapp)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" -msgstr "" +msgstr "Lang" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" -msgstr "" +msgstr "Lav" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" -msgstr "" +msgstr "Mus" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" -msgstr "" +msgstr "Gjentagelsesforsinkelse:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" -msgstr "" +msgstr "Gjentagelsesinterval:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" -msgstr "" +msgstr "Følsomhet:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" -msgstr "" +msgstr "Kort" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" -msgstr "" +msgstr "Sakte" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" -msgstr "" +msgstr "Styreplate" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" -msgstr "" +msgstr "Skriv her for å prøve tastaturinnstillingene" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "" +msgstr "Innstillinger for tastatur, mus og andre inndataenheter" #: ../data/lxinput.desktop.in.h:2 msgid "Keyboard and Mouse" -msgstr "" +msgstr "Tastatur og mus" diff -Nru lxinput-0.3.0/po/nl.po lxinput-0.3.1/po/nl.po --- lxinput-0.3.0/po/nl.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/nl.po 2011-07-29 13:10:06.000000000 +0000 @@ -1,114 +1,119 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Dutch translation for the lxinput package. +# Copyright (C) the author of the lxinput package. +# This file is distributed under the same license as the +# lxinput package. +# Pjotr, 2011. # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: lxinput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: 2009-12-05 14:29+0100\n" -"Last-Translator: Tim Van den Eynde \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-06-13 11:34+0200\n" +"Last-Translator: Pjotr\n" +"Language-Team: Dutch\n" +"Language: nl (Dutch)\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Pootle 1.1.0\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" -msgstr "Karakter herhaling" +msgstr "Tekenherhaling" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Toetsenbordindeling" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Beweging" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" -msgstr "Acceleratie:" +msgstr "Versnelling:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" -msgstr "Bieptoon bij verkeerde toetsenbordinput" +msgstr "Piep bij verkeerde toetsenbordinvoer" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" -msgstr "Pauze voor een toets zich herhaalt" +msgstr "Vertraging voordat een toets begint met herhalen" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Snel" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Hoog" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Voorkeuren Invoerapparaten" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" -msgstr "Interval tussen herhaling van elke toets" +msgstr "Interval tussen elke toetsherhaling" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Toetsenbord" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" -msgstr "Linkshandig (Wissel linker- en rechtermuisklik)" +msgstr "Linkshandig (Wissel linker- en rechtermuisknop om)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Lang" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Laag" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Muis" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" -msgstr "Herhalingspauze" +msgstr "Vertraging voor herhaling:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" -msgstr "Herhalingsinterval" +msgstr "Herhalingsinterval:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" -msgstr "Gevoeligheid" +msgstr "Gevoeligheid:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Kort" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Traag" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" -msgstr "Touchpad" +msgstr "Aanraakveld" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" -msgstr "Tiep in onderstaand kader om uw toetsenbordinstellingen te testen" +msgstr "" +"Tik iets in onderstaand kader om uw toetsenbordinstellingen uit te proberen" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "" +msgstr "Instellen van toetsenbord, muis, en andere invoerapparaten" #: ../data/lxinput.desktop.in.h:2 -#, fuzzy msgid "Keyboard and Mouse" -msgstr "Toetsenbord" +msgstr "Toetsenbord en Muis" -#, fuzzy #~ msgid "input-keyboard" -#~ msgstr "Toetsenbord" +#~ msgstr "invoer-toetsenbord" diff -Nru lxinput-0.3.0/po/nn.po lxinput-0.3.1/po/nn.po --- lxinput-0.3.0/po/nn.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/nn.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,97 +7,103 @@ msgstr "" "Project-Id-Version: lxinput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2009-07-27 19:46+0200\n" "Last-Translator: Karl Ove Hufthammer \n" "Language-Team: Norwegian Nynorsk \n" +"Language: nn\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 0.3\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Teikngjentaking" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Tastatur" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Rørsle" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Akselerasjon:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Pip ved feiltasting" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Pause før gjentaking av tastetrykk" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Rask" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Høg" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Innstillingar for inneingar" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Intervall mellom kvar tastegjentaking" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Tastatur" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Venstrehendt (byter om venstre og høgre museknapp)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Lang" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Låg" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Mus" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Pause før gjentaking:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Gjentakingsintervall:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Følsemd:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Kort" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Sakte" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Styrepute" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Skriv noko her for å prøva tastaturinnstillingane" diff -Nru lxinput-0.3.0/po/pl.po lxinput-0.3.1/po/pl.po --- lxinput-0.3.0/po/pl.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/pl.po 2011-07-29 13:10:06.000000000 +0000 @@ -1,118 +1,119 @@ -# translation of pl.po to Polish -# Copyright (C) 2009 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# -# +# Polish translation for lxinput package +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the lxinput package. # Artur Kruszewski , 2009. +# Piotr Sokół , 2010, 2011. +# msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: lxinput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: 2010-05-31 17:06+0200\n" -"Last-Translator: Artur \n" -"Language-Team: Artur Kruszewski \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-07-13 02:08+0200\n" +"Last-Translator: Piotr \n" +"Language-Team: Polish <>\n" "Language: pl\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==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Powtarzanie znaków" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Układ klawiatury" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Ruch" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Przyspieszenie:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" -msgstr "Ostrzeż sygnałem dźwiękowym w przypadku błędu wejścia klawiatury" +msgstr "Ostrzeganie sygnałem dźwiękowym w przypadku błędu wejścia klawiatury" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" -msgstr "Czas opóźnienia przed rozpoczęciem powtarzania danego znaku" +msgstr "Określa czas opóźnienia przed rozpoczęciem powtarzania danego znaku" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" -msgstr "Szybko" +msgstr "Duże" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Wysoka" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" -msgstr "Właściwości urządzeń wejściowych" +msgstr "Urządzenia wejściowe" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" -msgstr "Przerwa między kolejnymi powtórzeniami znaku" +msgstr "Określa czas przerwy pomiędzy kolejnymi powtórzeniami znaku" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Klawiatura" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" -msgstr "" -"Tryb dla leworęcznych (Zamienia funkcje prawego i lewego przycisku myszy)" +msgstr "Zamienienie funkcji prawego i lewego przycisku myszy" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Długi" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Niska" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Mysz" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Czas opóźnienia przed powtórzeniem:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Czas pomiędzy powtórzeniami:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Czułość:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Krótki" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" -msgstr "Wolno" +msgstr "Małe" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" -msgstr "Panel dotykowy (touchpad)" +msgstr "Panel dotykowy" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" -msgstr "Wpisz tekst w następujące pole aby przetestować ustawienia klawiatury" +msgstr "" +"Proszę wprowadzić tekst w poniższe pole, aby przetestować ustawienia " +"klawiatury:" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "Skonfiguruj klawiaturę, mysz i inne urządzenia wejściowe" +msgstr "Konfiguruje klawiaturę, mysz i inne urządzenia wejściowe" #: ../data/lxinput.desktop.in.h:2 msgid "Keyboard and Mouse" msgstr "Klawiatura i mysz" - -#, fuzzy -#~ msgid "input-keyboard" -#~ msgstr "Klawiatura" diff -Nru lxinput-0.3.0/po/ps.po lxinput-0.3.1/po/ps.po --- lxinput-0.3.0/po/ps.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/ps.po 2011-07-29 13:10:06.000000000 +0000 @@ -8,95 +8,100 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "" diff -Nru lxinput-0.3.0/po/pt.po lxinput-0.3.1/po/pt.po --- lxinput-0.3.0/po/pt.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/pt.po 2011-07-29 13:10:06.000000000 +0000 @@ -1,104 +1,110 @@ # Portuguese translation of lxinput # Copyright (C) 2009, THE lxinput COPYRIGHT HOLDER # This file is distributed under the same license as the lxinput package -# Sérgio Marques (smarquespt@gmail.com), 2009 -# +# Sérgio Marques , 2009-2010. +# Adaptado ao acordo ortográfico de 1990 msgid "" msgstr "" "Project-Id-Version: lxinput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-31 04:48+0000\n" -"PO-Revision-Date: 2010-02-13 19:31-0000\n" -"Last-Translator: Sergio Marques \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-07-08 11:06+0200\n" +"Last-Translator: Sérgio \n" "Language-Team: Portuguese\n" +"Language: 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 2.0.5\n" "X-Poedit-Language: Portuguese\n" "X-Poedit-Country: PORTUGAL\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" -msgstr "Repita Caractere" +msgstr "Carácter de repetição" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Esquema do teclado" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Acção" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Aceleração:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Sinalizar quando existir um erro no teclado" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Atraso antes de cada repetição de teclas" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Rápida" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Alta" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" -msgstr "Preferências de Dispositivos" +msgstr "Preferências de dispositivos" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Intervalo entre repetições de teclas" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Teclado" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" -msgstr "Canhoto (Trocar botões esquerdo e direito do rato)" +msgstr "Canhoto (trocar botões esquerdo e direito do rato)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Longa" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Baixa" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Rato" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Atraso de repetição:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Intervalo de repetição:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Sensibilidade:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Curta" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Lenta" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" -msgstr "Touch Pad" +msgstr "Painel de toque" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Digite os caracteres na caixa seguinte para testar o teclado" @@ -108,7 +114,4 @@ #: ../data/lxinput.desktop.in.h:2 msgid "Keyboard and Mouse" -msgstr "Teclado e Rato" - -#~ msgid "input-keyboard" -#~ msgstr "Teclado" +msgstr "Teclado e rato" diff -Nru lxinput-0.3.0/po/pt_BR.po lxinput-0.3.1/po/pt_BR.po --- lxinput-0.3.0/po/pt_BR.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/pt_BR.po 2011-07-29 13:10:06.000000000 +0000 @@ -1,108 +1,114 @@ -# Brazilian Portuguese translation of lxpanel package. +# Brazilian Portuguese translation of lxinput package. # Copyright (C) 2009 The LXDE Team. # This file is distributed under the same license as the lxinput package. # Thiago Avelino , 2009. -# +# Sérgio Cipolla , 2010, 2011. +# msgid "" msgstr "" "Project-Id-Version: lxinput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-06-20 05:45+0000\n" -"PO-Revision-Date: 2009-05-14 12:42-0300\n" -"Last-Translator: Thiago Avelino \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-05-18 07:45-0300\n" +"Last-Translator: Sérgio Cipolla \n" "Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" -msgstr "Repetir caractere" +msgstr "Repetição de caractere" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Disposição do teclado" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Movimento" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Aceleração:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Bipar quando houver um erro de entrada do teclado" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" -msgstr "Atraso antes que cada tecla comece a repetir" +msgstr "Atraso antes que a tecla comece a repetir" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" -msgstr "Rápido" +msgstr "Rápida" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" -msgstr "Alto" +msgstr "Alta" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" -msgstr "Preferências de dispositivo de entrada" +msgstr "Preferências dos dispositivos de entrada" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" -msgstr "Intervalo entre cada repetição de tecla" +msgstr "Intervalo entre cada repetição da tecla" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Teclado" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Canhoto (alterna o botão esquerdo e direito do mouse)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Longo" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" -msgstr "Baixo" +msgstr "Baixa" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Mouse" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Atraso de repetição:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Intervalo de repetição:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Sensibilidade:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Curto" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" -msgstr "Lento" +msgstr "Lenta" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" -msgstr "Touch Pad" +msgstr "Touchpad" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" -msgstr "Digite no seguinte campo para testar a configuração do teclado" +msgstr "Digite no campo abaixo para testar a configuração do teclado" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "Configurar teclado, mouse e outros dispositivos de entrada" +msgstr "Configure o teclado, o mouse e outros dispositivos de entrada" #: ../data/lxinput.desktop.in.h:2 msgid "Keyboard and Mouse" diff -Nru lxinput-0.3.0/po/ro.po lxinput-0.3.1/po/ro.po --- lxinput-0.3.0/po/ro.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/ro.po 2011-07-29 13:10:06.000000000 +0000 @@ -2,10 +2,11 @@ msgstr "" "Project-Id-Version: LXDE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2010-01-24 11:10-0800\n" "Last-Translator: alexxed \n" "Language-Team: Romanian \n" +"Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -13,87 +14,92 @@ "20)) ? 1 : 2;\n" "X-Generator: Narro 0.9.4 on http://tradu.softwareliber.ro\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Repetiția caracterelor" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Tastatură" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Mișcare" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Accelerație:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Bip când există o eroare de intrare de la tastatură" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Timp în care o tastă apăsată nu se repetă" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Rapid" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Foarte rapid" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Preferințe pentru dispozitivele de intrare" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Interval între repetările tastei apăsate" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Tastatură" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Stângaci (inversează între ele butonul stâng și drept al mausului)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Lung" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Încet" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Maus" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Întârziere repetare:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Interval de repetare:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Sensibilitate:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Scurt" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Încet" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Suprafață tactilă" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Tastați în caseta de text pentru a testa setările tastaturii" diff -Nru lxinput-0.3.0/po/ru.po lxinput-0.3.1/po/ru.po --- lxinput-0.3.0/po/ru.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/ru.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2010-05-25 17:52+0200\n" "Last-Translator: Max \n" "Language-Team: LANGUAGE \n" @@ -15,91 +15,95 @@ "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" "X-Generator: Pootle 2.0.1\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Автоповтор символов" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Раскладка клавиатуры" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Движение" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Ускорение:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Звуковой сигнал при ошибках ввода с клавиатуры" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Задержка старта автоповтора" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Быстрое" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Высокая" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Настройки устройств ввода" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Интервал автоповтора" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Клавиатура" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Для левшей (поменять действия для левой и правой кнопок мыши)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Длиннее" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Низкая" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Мышь" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Задержка при автоповторе:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Шаг автоповтора:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Чувствительность:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Короче" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Медленное" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Тачпад" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Наберите текст в этом поле для проверки ваших настроек клавиатуры" diff -Nru lxinput-0.3.0/po/si.po lxinput-0.3.1/po/si.po --- lxinput-0.3.0/po/si.po 1970-01-01 00:00:00.000000000 +0000 +++ lxinput-0.3.1/po/si.po 2011-07-29 13:10:06.000000000 +0000 @@ -0,0 +1,116 @@ +# 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: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-02-27 08:33+0200\n" +"Last-Translator: Danishka \n" +"Language-Team: LANGUAGE \n" +"Language: si\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 2.0.5\n" + +#: ../data/lxinput.ui.h:1 +msgid "Character Repeat" +msgstr "" + +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "යතුරුපුවරුව සහ මවුසය" + +#: ../data/lxinput.ui.h:3 +msgid "Motion" +msgstr "චලනය" + +#: ../data/lxinput.ui.h:4 +msgid "Acceleration:" +msgstr "ත්වරණය:" + +#: ../data/lxinput.ui.h:5 +msgid "Beep when there is an error of keyboard input" +msgstr "යතුරුපුවරුවේ ප්‍රදාන දෝෂයක් ඇති විට බීබ් හඬක් දෙන්න" + +#: ../data/lxinput.ui.h:6 +msgid "Delay before each key starts repeating" +msgstr "" + +#: ../data/lxinput.ui.h:7 +msgid "Fast" +msgstr "වේගවත්" + +#: ../data/lxinput.ui.h:8 +msgid "High" +msgstr "වැඩි" + +#: ../data/lxinput.ui.h:9 +msgid "Input Device Preferences" +msgstr "ඇතුලත් කිරිමේ මෙවලම් අභිරුචි" + +#: ../data/lxinput.ui.h:10 +msgid "Interval between each key repeat" +msgstr "" + +#: ../data/lxinput.ui.h:11 +msgid "Keyboard" +msgstr "යතුරුපුවරුව" + +#: ../data/lxinput.ui.h:12 +msgid "Left handed (Swap left and right mouse buttons)" +msgstr "වමත් (වම් සහ දකුණු මවුසයේ බොත්තම් සීරුමාරු කරන්න)" + +#: ../data/lxinput.ui.h:13 +msgid "Long" +msgstr "දිගු" + +#: ../data/lxinput.ui.h:14 +msgid "Low" +msgstr "අඩු" + +#: ../data/lxinput.ui.h:15 +msgid "Mouse" +msgstr "මවුසය" + +#: ../data/lxinput.ui.h:16 +msgid "Repeat delay:" +msgstr "" + +#: ../data/lxinput.ui.h:17 +msgid "Repeat interval:" +msgstr "" + +#: ../data/lxinput.ui.h:18 +msgid "Sensitivity:" +msgstr "සංවේදීතාව" + +#: ../data/lxinput.ui.h:19 +msgid "Short" +msgstr "කෙටි" + +#: ../data/lxinput.ui.h:20 +msgid "Slow" +msgstr "සෙමින්" + +#: ../data/lxinput.ui.h:21 +msgid "Touch Pad" +msgstr "" + +#: ../data/lxinput.ui.h:22 +msgid "Type in the following box to test your keyboard settings" +msgstr "" + +#: ../data/lxinput.desktop.in.h:1 +msgid "Configure keyboard, mouse, and other input devices" +msgstr "යතුරුපුවරුව, මවුසය සහ වෙනත් ඇතුළත් කිරීමේ මෙවලම් සකසන්න" + +#: ../data/lxinput.desktop.in.h:2 +msgid "Keyboard and Mouse" +msgstr "යතුරුපුවරුව සහ මවුසය" diff -Nru lxinput-0.3.0/po/sk.po lxinput-0.3.1/po/sk.po --- lxinput-0.3.0/po/sk.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/sk.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,97 +7,104 @@ msgstr "" "Project-Id-Version: lxinput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-06 08:47+0000\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2010-07-06 12:17+0100\n" "Last-Translator: Ivan Masár \n" "Language-Team: Slovak \n" +"Language: sk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Opakovanie znakov" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Klávesnica a myš" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Pohyb" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Zrýchľovanie:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Pípnutie pri chybe vstupu z klávesnice" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Oneskorenie pred začatím opakovania klávesu" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Rýchle" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Vysoké" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Nastavenia vstupného zariadenia" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Interval medzi jednotlivými opakovaniami klávesu" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Klávesnica" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Pre ľaváka (vymeniť pravé a ľavé tlačilo myši)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Dlhé" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Nízke" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Myš" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Oneskorenie opakovania:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Interval opakovania:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Citlivosť:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Krátke" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Pomalé" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Touchpad" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" -msgstr "Ak chcete otestovať svoje nastavenia klávesnice, píšte do nasledovného poľa" +msgstr "" +"Ak chcete otestovať svoje nastavenia klávesnice, píšte do nasledovného poľa" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" diff -Nru lxinput-0.3.0/po/sl.po lxinput-0.3.1/po/sl.po --- lxinput-0.3.0/po/sl.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/sl.po 2011-07-29 13:10:06.000000000 +0000 @@ -2,110 +2,116 @@ # 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: LXInput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-07-03 07:38+0000\n" -"PO-Revision-Date: 2009-06-28 16:44+0100\n" -"Last-Translator: Matej Gačnik \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-05-18 21:58+0200\n" +"Last-Translator: Klemen \n" "Language-Team: Slovenian \n" +"Language: sl\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 ? 1 : n%100==2 ? 2 : n%100==3 || n" +"%100==4 ? 3 : 0);\n" +"X-Generator: Pootle 2.0.5\n" "X-Poedit-Language: slovenian\n" "X-Poedit-Country: SLOVENIA\n" -"X-Generator: Pootle 1.1.0\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" -msgstr "Ponavljanje znaka" +msgstr "Ponavljanje znakov" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Razporeditev tipk" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Premikanje" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Pospeševanje:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" -msgstr "Sproži zvočno opozorilo, če pride do napake pri tipkovniškem vnosu" +msgstr "Sproži zvočno opozorilo, ko pride do napake pri vnosu s tipkovnico" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" -msgstr "Zakasnitev, po preteku katere se znaki začno ponavljati" +msgstr "Zakasnitev, po preteku katere se tipke začno ponavljati" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Hitro" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Visoko" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" -msgstr "Nastavitve vhodne naprave" +msgstr "Nastavitve vnosnih naprav" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" -msgstr "Interval med vsako posamezno ponavitvijo znaka" +msgstr "Časovni razmik med vsako posamezno ponovitvijo tipk" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Tipkovnica" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Levoročno (zamenjaj levi in desni miškin gumb)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Dolgo" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Nizko" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" -msgstr "Miš" +msgstr "Miška" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Zakasnitev ponavljanja:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" -msgstr "Interval ponavljanja:" +msgstr "Hitrost ponavljanja:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Občutljivost:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Kratko" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Počasno" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Sledilna ploščica" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" -msgstr "Testiraj nastavitve tipkovnice tako, da vtipkaš besedilo v pričujoče besedilno polje" +msgstr "Za preizkus nastavitev vtipkajte besedilo:" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "Nastavitve tipkovnice, miške in drugih vhodnih enot" +msgstr "Nastavite tipkovnico, miško in druge vnosne naprave" #: ../data/lxinput.desktop.in.h:2 msgid "Keyboard and Mouse" diff -Nru lxinput-0.3.0/po/sr.po lxinput-0.3.1/po/sr.po --- lxinput-0.3.0/po/sr.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/sr.po 2011-07-29 13:10:06.000000000 +0000 @@ -2,101 +2,106 @@ # 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: 2010-05-28 04:53+0000\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Понављање карактера" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Тастатура и миш" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Кретање" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Убрзање:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Пусти звук на грешке код уноса са тататуре" -#: ../data/lxinput.glade.h:5 -#, fuzzy +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" -msgstr "Кашњење пре понављања сваког тастера" +msgstr "Кашњење пре почетка понављања сваког тастера" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Брзо" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Високо" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Подешавања улазног уређаја" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Интервал између сваког поновљеног тастера" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Тастатура" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Леворуки (Замени лево и десно дугме миша)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Дуго" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Ниско" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Миш" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Кашњење код понављања:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Интервал понављања:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Осетљивост:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Кратко" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Споро" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Табла за контролу додиром" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "За проверу распореда ваше тастатуре куцајте у ово поље" diff -Nru lxinput-0.3.0/po/sr@latin.po lxinput-0.3.1/po/sr@latin.po --- lxinput-0.3.0/po/sr@latin.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/sr@latin.po 2011-07-29 13:10:06.000000000 +0000 @@ -2,101 +2,106 @@ # 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: 2010-05-28 04:53+0000\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Ponavljanje karaktera" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "Tastatura i miš" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Kretanje" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Ubrzanje:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Pusti zvuk na greške kod unosa sa tatature" -#: ../data/lxinput.glade.h:5 -#, fuzzy +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" -msgstr "Kašnjenje pre ponavljanja svakog tastera" +msgstr "Kašnjenje pre početka ponavljanja svakog tastera" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Brzo" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Visoko" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Podešavanja ulaznog uređaja" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Interval između svakog ponovljenog tastera" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Tastatura" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Levoruki (Zameni levo i desno dugme miša)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Dugo" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Nisko" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Miš" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Kašnjenje kod ponavljanja:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Interval ponavljanja:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Osetljivost:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Kratko" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Sporo" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Tabla za kontrolu dodirom" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Za proveru rasporeda vaše tastature kucajte u ovo polje" diff -Nru lxinput-0.3.0/po/sv.po lxinput-0.3.1/po/sv.po --- lxinput-0.3.0/po/sv.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/sv.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: 2010-05-24 06:30+0200\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-06-08 12:47+0200\n" "Last-Translator: Martin \n" "Language-Team: LANGUAGE \n" "Language: sv\n" @@ -16,89 +16,93 @@ "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Teckenupprepning" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Tangentbordsupplägg" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Förflyttning" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Acceleration:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Avge ett pip när ett fel uppstår vid tangentbordsinmatning" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Tid innan varje tangent repeteras" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Snabb" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Hög" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Egenskaper för inmatningsenhet" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Intervall mellan upprening av tangenter" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Tangentbord" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Vänsterhänt (byt funktioner för vänster och höger musknapp)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Lång" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Låg" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Mus" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Tid innan upprepning:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Tid mellan upprepningar:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Känslighet:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Kort" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Långsam" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Pekplatta" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "För att pröva dina inställningar kan du skriva i följande ruta" diff -Nru lxinput-0.3.0/po/te.po lxinput-0.3.1/po/te.po --- lxinput-0.3.0/po/te.po 1970-01-01 00:00:00.000000000 +0000 +++ lxinput-0.3.1/po/te.po 2011-07-29 13:10:06.000000000 +0000 @@ -0,0 +1,115 @@ +# 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: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-05-19 15:55+0200\n" +"Last-Translator: PraveenIlla \n" +"Language-Team: LANGUAGE \n" +"Language: te\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 2.0.5\n" + +#: ../data/lxinput.ui.h:1 +msgid "Character Repeat" +msgstr "అక్షర పునరావృతం" + +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "కీబోర్డు నమూనా" + +#: ../data/lxinput.ui.h:3 +msgid "Motion" +msgstr "చలనం" + +#: ../data/lxinput.ui.h:4 +msgid "Acceleration:" +msgstr "త్వరణం:" + +#: ../data/lxinput.ui.h:5 +msgid "Beep when there is an error of keyboard input" +msgstr "కీబోర్డు ఇన్‌పుట్ నందు దోషము ఉన్నట్టయితే బీప్ వినిపించు" + +#: ../data/lxinput.ui.h:6 +msgid "Delay before each key starts repeating" +msgstr "ప్రతీ కీ పునరావృతము ప్రారంభమవుటకు ముందు వ్యవధి" + +#: ../data/lxinput.ui.h:7 +msgid "Fast" +msgstr "వేగముగా" + +#: ../data/lxinput.ui.h:8 +msgid "High" +msgstr "అధిక" + +#: ../data/lxinput.ui.h:9 +msgid "Input Device Preferences" +msgstr "ఇన్‌పుట్ పరికరం ప్రాధాన్యతలు" + +#: ../data/lxinput.ui.h:10 +msgid "Interval between each key repeat" +msgstr "ప్రతీ కీ పునరావృతమునకు మధ్య విరామం" + +#: ../data/lxinput.ui.h:11 +msgid "Keyboard" +msgstr "కీబోర్డు" + +#: ../data/lxinput.ui.h:12 +msgid "Left handed (Swap left and right mouse buttons)" +msgstr "ఎడమ చేతివాటం (ఎడమ మరియు కుడి మౌస్ బటన్లను మార్చు)" + +#: ../data/lxinput.ui.h:13 +msgid "Long" +msgstr "దీర్ఘ" + +#: ../data/lxinput.ui.h:14 +msgid "Low" +msgstr "తక్కువ" + +#: ../data/lxinput.ui.h:15 +msgid "Mouse" +msgstr "మౌస్" + +#: ../data/lxinput.ui.h:16 +msgid "Repeat delay:" +msgstr "పునరావృత ఆలస్యం:" + +#: ../data/lxinput.ui.h:17 +msgid "Repeat interval:" +msgstr "పునరావృత విరామం:" + +#: ../data/lxinput.ui.h:18 +msgid "Sensitivity:" +msgstr "సూక్ష్మగ్రాహ్యత:" + +#: ../data/lxinput.ui.h:19 +msgid "Short" +msgstr "పొట్టి" + +#: ../data/lxinput.ui.h:20 +msgid "Slow" +msgstr "మెల్లగా" + +#: ../data/lxinput.ui.h:21 +msgid "Touch Pad" +msgstr "టచ్ ప్యాడ్" + +#: ../data/lxinput.ui.h:22 +msgid "Type in the following box to test your keyboard settings" +msgstr "మీ కీబోర్డు అమరికలను పరీక్షించుటకు కింది పేటికలో టైపు చేయండి" + +#: ../data/lxinput.desktop.in.h:1 +msgid "Configure keyboard, mouse, and other input devices" +msgstr "కీబోర్డు, మౌస్, మరియు ఇన్‌పుట్ పరికరాలను స్వరూపించు" + +#: ../data/lxinput.desktop.in.h:2 +msgid "Keyboard and Mouse" +msgstr "కీబోర్డు మరియు మౌస్" diff -Nru lxinput-0.3.0/po/th.po lxinput-0.3.1/po/th.po --- lxinput-0.3.0/po/th.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/th.po 2011-07-29 13:10:06.000000000 +0000 @@ -8,95 +8,100 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "" diff -Nru lxinput-0.3.0/po/tr.po lxinput-0.3.1/po/tr.po --- lxinput-0.3.0/po/tr.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/tr.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,110 +7,112 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: 2010-01-26 04:19+0200\n" -"Last-Translator: Kılıç \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-06-18 16:18+0200\n" +"Last-Translator: Necdet \n" "Language-Team: LANGUAGE \n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Pootle 2.0.1\n" +"X-Generator: Pootle 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" -msgstr "Birem Yineleme" +msgstr "Karakter Yineleme" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Klavye yerleşimi" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Devinim" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" -msgstr "Hızlanma:" +msgstr "Hız:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" -msgstr "Tuştakımı girdisinde bir yanlışlık olduğunda sesle uyar" +msgstr "Klavye girdisinde bir yanlışlık olduğunda sesle uyar" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Herbir tuş yinelemeye başlamadan önceki gecikme" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Hızlı" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Yüksek" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Girdi Aygıtı Yeğlenenleri" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Herbir tuş yinelemesi arasındaki süre" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" -msgstr "Tuştakımı" +msgstr "Klavye" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Solak (Sol ve sağ fare düğmelerini değiştir)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Uzun" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Alçak" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Fare" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Yineleme gecikmesi:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Yineleme aralığı:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Duyarlılık:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Kısa" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Yavaş" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" -msgstr "Dokunut" +msgstr "Touchpad" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" -msgstr "Tuştakımı ayarlarınızı sınamak için aşağıdaki kutuya birşeyler yazın" +msgstr "Klavye ayarlarınızı sınamak için aşağıdaki kutuya birşeyler yazın" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "" +msgstr "Klavye, fare ve diğer girdi aygıtlarını yapılandırın" #: ../data/lxinput.desktop.in.h:2 -#, fuzzy msgid "Keyboard and Mouse" -msgstr "Tuştakımı" +msgstr "Klavye ve Fare" -#, fuzzy #~ msgid "input-keyboard" #~ msgstr "Tuştakımı" diff -Nru lxinput-0.3.0/po/tt_RU.po lxinput-0.3.1/po/tt_RU.po --- lxinput-0.3.0/po/tt_RU.po 1970-01-01 00:00:00.000000000 +0000 +++ lxinput-0.3.1/po/tt_RU.po 2011-07-29 13:10:06.000000000 +0000 @@ -0,0 +1,115 @@ +# 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: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-07-22 07:09+0200\n" +"Last-Translator: Ainur \n" +"Language-Team: LANGUAGE \n" +"Language: tt_RU\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Pootle 2.0.5\n" + +#: ../data/lxinput.ui.h:1 +msgid "Character Repeat" +msgstr "Тамгаларны автоматик кабатлау" + +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Төймә тактасының тамга тәртибе" + +#: ../data/lxinput.ui.h:3 +msgid "Motion" +msgstr "Хәрәкәт" + +#: ../data/lxinput.ui.h:4 +msgid "Acceleration:" +msgstr "Тизләнеш:" + +#: ../data/lxinput.ui.h:5 +msgid "Beep when there is an error of keyboard input" +msgstr "Төймә тактасыннан керткән вакытта хата булса, тавыш бирергә" + +#: ../data/lxinput.ui.h:6 +msgid "Delay before each key starts repeating" +msgstr "Тамгаларны кабатлау алдыннан тоткарлану" + +#: ../data/lxinput.ui.h:7 +msgid "Fast" +msgstr "Тиз" + +#: ../data/lxinput.ui.h:8 +msgid "High" +msgstr "Биек" + +#: ../data/lxinput.ui.h:9 +msgid "Input Device Preferences" +msgstr "Кертү җайланмаларның көйләүләре" + +#: ../data/lxinput.ui.h:10 +msgid "Interval between each key repeat" +msgstr "Тамга кабатлауның вакыт арасы" + +#: ../data/lxinput.ui.h:11 +msgid "Keyboard" +msgstr "Төймә тактасы" + +#: ../data/lxinput.ui.h:12 +msgid "Left handed (Swap left and right mouse buttons)" +msgstr "Сулагайлар өчен (сул һәм уң төймә эшләре алмашына)" + +#: ../data/lxinput.ui.h:13 +msgid "Long" +msgstr "Озын" + +#: ../data/lxinput.ui.h:14 +msgid "Low" +msgstr "Түбән" + +#: ../data/lxinput.ui.h:15 +msgid "Mouse" +msgstr "Тычканчык" + +#: ../data/lxinput.ui.h:16 +msgid "Repeat delay:" +msgstr "Кабатлау вакытында тоткарлану:" + +#: ../data/lxinput.ui.h:17 +msgid "Repeat interval:" +msgstr "Кабатлауның вакыт арасы:" + +#: ../data/lxinput.ui.h:18 +msgid "Sensitivity:" +msgstr "Сизгерлек:" + +#: ../data/lxinput.ui.h:19 +msgid "Short" +msgstr "Кыска" + +#: ../data/lxinput.ui.h:20 +msgid "Slow" +msgstr "Акрын" + +#: ../data/lxinput.ui.h:21 +msgid "Touch Pad" +msgstr "Тачпад" + +#: ../data/lxinput.ui.h:22 +msgid "Type in the following box to test your keyboard settings" +msgstr "Бу кырга төймә тактасының көйләвен тикшерү өчен текст языгыз" + +#: ../data/lxinput.desktop.in.h:1 +msgid "Configure keyboard, mouse, and other input devices" +msgstr "Төймә тактасын, тычканчыкны һәм башка кертү җайланмаларын көйләү" + +#: ../data/lxinput.desktop.in.h:2 +msgid "Keyboard and Mouse" +msgstr "Төймә тактасы һәм тычканчык" diff -Nru lxinput-0.3.0/po/uk.po lxinput-0.3.1/po/uk.po --- lxinput-0.3.0/po/uk.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/uk.po 2011-07-29 13:10:06.000000000 +0000 @@ -2,101 +2,108 @@ # 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: 2010-05-31 04:48+0000\n" -"PO-Revision-Date: 2009-05-16 12:37+0200\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-05-18 09:25+0200\n" "Last-Translator: Y P \n" "Language-Team: LANGUAGE \n" +"Language: uk\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" +"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" +"X-Generator: Pootle 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Повторення символів" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Розкладка клавіатури" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Рух" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Прискорення:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Пищати, коли натиснена неправильна клавіша" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Затримка перед повторенням кожної клавіші" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Швидко" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Високо" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Налаштування пристрою вводу" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Інтервал між повторенням кожної клавіші" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Клавіатура" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Для шульги (Поміняти ліву та праву кнопки миші)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Довго" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Низько" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Миша" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Затримка повторення:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Інтервал повторення:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Чутливість:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Коротко" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Повільно" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Сенсорна панель" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Надрукуйте в цьому полі для перевірки налаштувань клавіатури" diff -Nru lxinput-0.3.0/po/ur.po lxinput-0.3.1/po/ur.po --- lxinput-0.3.0/po/ur.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/ur.po 2011-07-29 13:10:06.000000000 +0000 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: lxinput 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2009-05-12 04:08+0500\n" "Last-Translator: Muhammad Ali Makki \n" "Language-Team: Urdu \n" +"Language: ur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,87 +21,92 @@ "X-Poedit-Country: PAKISTAN\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "حروف کا دہراؤ" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "کیبورڈ" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "حرکت" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "مسرع:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "کیبورد کے ماداخل میں غلطی پر بیپ دیں" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "ہر کلید کا دہراؤ شروع کرنے سے پہلے وقفہ" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "تیز" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "اونچا" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "ماداخل ڈیوائس ترجیحات" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "ہر کلید کے دہراؤ کے درمیان وقفہ" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "کیبورڈ" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "بایاں بازو (بائیں اور دائیں ماؤس بٹن میں ادل بدل)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "طویل" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "کم" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "ماؤس" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "دہراؤ تاخیر:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "دہراؤ وقفہ:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "حساسیت:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "قصیر" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "آہستہ" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "ٹچ پیڈ" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "اپنے کیبورد کی ترتیبات دیکھنے کے لیے ذیل کے بکس میں لکھیں" diff -Nru lxinput-0.3.0/po/ur_PK.po lxinput-0.3.1/po/ur_PK.po --- lxinput-0.3.0/po/ur_PK.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/ur_PK.po 2011-07-29 13:10:06.000000000 +0000 @@ -8,10 +8,11 @@ msgstr "" "Project-Id-Version: lxinput 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2009-05-12 04:08+0500\n" "Last-Translator: Muhammad Ali Makki \n" "Language-Team: Urdu \n" +"Language: ur\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -20,87 +21,92 @@ "X-Poedit-Country: PAKISTAN\n" "X-Poedit-SourceCharset: utf-8\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "حروف کا دہراؤ" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "کیبورڈ" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "حرکت" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "مسرع:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "کیبورد کے ماداخل میں غلطی پر بیپ دیں" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "ہر کلید کا دہراؤ شروع کرنے سے پہلے وقفہ" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "تیز" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "اونچا" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "ماداخل ڈیوائس ترجیحات" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "ہر کلید کے دہراؤ کے درمیان وقفہ" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "کیبورڈ" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "بایاں بازو (بائیں اور دائیں ماؤس بٹن میں ادل بدل)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "طویل" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "کم" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "ماؤس" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "دہراؤ تاخیر:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "دہراؤ وقفہ:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "حساسیت:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "قصیر" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "آہستہ" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "ٹچ پیڈ" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "اپنے کیبورد کی ترتیبات دیکھنے کے لیے ذیل کے بکس میں لکھیں" diff -Nru lxinput-0.3.0/po/vi.po lxinput-0.3.1/po/vi.po --- lxinput-0.3.0/po/vi.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/vi.po 2011-07-29 13:10:06.000000000 +0000 @@ -5,12 +5,12 @@ # msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: lxinput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: 2010-05-24 03:04+0200\n" -"Last-Translator: Mario \n" -"Language-Team: LANGUAGE \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-05-28 10:06+0700\n" +"Last-Translator: Hung Tran \n" +"Language-Team: LXDE\n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -18,87 +18,91 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Pootle 2.0.1\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "Lặp lại Ký tự" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "Kiểu bàn phím" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "Chuyển động" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "Tốc độ:" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "Kêu bíp khi có lỗi bộ nhập bàn phím" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "Trễ trước khi mỗi phím bắt đầu lặp lại" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "Nhanh" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "Cao" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "Tùy chỉnh Thiết bị Nhập" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "Khoảng thời gian giữa mỗi lần lặp lại phím" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "Bàn phím" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "Thuận tay trái (Đổi chỗ nút chuột trái và chuột phải)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "Dài" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "Thấp" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "Chuột" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "Độ trễ lặp:" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "Khoảng thời gian lặp:" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "Độ nhạy:" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "Ngắn" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "Chậm" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "Tấm cảm ứng" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "Nhập vào hộp thoại sau để kiểm tra thiết lập bàn phím của bạn" diff -Nru lxinput-0.3.0/po/zh_CN.po lxinput-0.3.1/po/zh_CN.po --- lxinput-0.3.0/po/zh_CN.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/zh_CN.po 2011-07-29 13:10:06.000000000 +0000 @@ -3,107 +3,113 @@ # 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: 2010-05-24 01:27+0800\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" +"PO-Revision-Date: 2011-05-19 09:32+0200\n" +"Last-Translator: Yinghua_Wang \n" "Language-Team: LANGUAGE \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Pootle 2.0.5\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" -msgstr "" +msgstr "字符重复" + +#: ../data/lxinput.ui.h:2 +msgid "Keyboard layout" +msgstr "键盘布局" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:3 msgid "Motion" -msgstr "" +msgstr "动作" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" -msgstr "" +msgstr "加速：" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" -msgstr "" +msgstr "在键盘输入有错误时发声" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" -msgstr "" +msgstr "在按键开始重复前的延时" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" -msgstr "" +msgstr "快" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" -msgstr "" +msgstr "高" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" -msgstr "" +msgstr "输入设备偏好设置" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" -msgstr "" +msgstr "按键重复间隔" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" -msgstr "" +msgstr "键盘" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" -msgstr "" +msgstr "左手习惯(切换左右鼠标键)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" -msgstr "" +msgstr "长" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" -msgstr "" +msgstr "低" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" -msgstr "" +msgstr "鼠标" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" -msgstr "" +msgstr "重复延迟：" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" -msgstr "" +msgstr "重复间隔：" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" -msgstr "" +msgstr "敏感度：" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" -msgstr "" +msgstr "短" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" -msgstr "" +msgstr "慢" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" -msgstr "" +msgstr "触摸板" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" -msgstr "" +msgstr "在下面的框中输入来测试您的键盘设置" #: ../data/lxinput.desktop.in.h:1 msgid "Configure keyboard, mouse, and other input devices" -msgstr "" +msgstr "配置键盘、鼠标和其他输入设备" #: ../data/lxinput.desktop.in.h:2 msgid "Keyboard and Mouse" -msgstr "" +msgstr "键盘和鼠标" diff -Nru lxinput-0.3.0/po/zh_TW.po lxinput-0.3.1/po/zh_TW.po --- lxinput-0.3.0/po/zh_TW.po 2010-08-07 17:35:01.000000000 +0000 +++ lxinput-0.3.1/po/zh_TW.po 2011-07-29 13:10:06.000000000 +0000 @@ -7,97 +7,103 @@ msgstr "" "Project-Id-Version: lxinput\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-24 01:27+0800\n" +"POT-Creation-Date: 2011-07-29 15:08+0200\n" "PO-Revision-Date: 2010-05-24 01:26+0800\n" "Last-Translator: Hong Jen Yee (PCMan) \n" "Language-Team: zh_TW \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: Chinese\n" "X-Poedit-Country: TAIWAN\n" -#: ../data/lxinput.glade.h:1 +#: ../data/lxinput.ui.h:1 msgid "Character Repeat" msgstr "按鍵重複" -#: ../data/lxinput.glade.h:2 +#: ../data/lxinput.ui.h:2 +#, fuzzy +msgid "Keyboard layout" +msgstr "鍵盤及滑鼠" + +#: ../data/lxinput.ui.h:3 msgid "Motion" msgstr "移動" -#: ../data/lxinput.glade.h:3 +#: ../data/lxinput.ui.h:4 msgid "Acceleration:" msgstr "加速度：" -#: ../data/lxinput.glade.h:4 +#: ../data/lxinput.ui.h:5 msgid "Beep when there is an error of keyboard input" msgstr "當鍵盤輸入發生錯誤時發出嗶聲" -#: ../data/lxinput.glade.h:5 +#: ../data/lxinput.ui.h:6 msgid "Delay before each key starts repeating" msgstr "按鍵開始重複輸入前的延遲時間" -#: ../data/lxinput.glade.h:6 +#: ../data/lxinput.ui.h:7 msgid "Fast" msgstr "快" -#: ../data/lxinput.glade.h:7 +#: ../data/lxinput.ui.h:8 msgid "High" msgstr "高" -#: ../data/lxinput.glade.h:8 +#: ../data/lxinput.ui.h:9 msgid "Input Device Preferences" msgstr "輸入裝置偏好設定" -#: ../data/lxinput.glade.h:9 +#: ../data/lxinput.ui.h:10 msgid "Interval between each key repeat" msgstr "按鍵重複的時間間隔" -#: ../data/lxinput.glade.h:10 +#: ../data/lxinput.ui.h:11 msgid "Keyboard" msgstr "鍵盤" -#: ../data/lxinput.glade.h:11 +#: ../data/lxinput.ui.h:12 msgid "Left handed (Swap left and right mouse buttons)" msgstr "慣用左手 (滑鼠左右鍵交換)" -#: ../data/lxinput.glade.h:12 +#: ../data/lxinput.ui.h:13 msgid "Long" msgstr "長" -#: ../data/lxinput.glade.h:13 +#: ../data/lxinput.ui.h:14 msgid "Low" msgstr "低" -#: ../data/lxinput.glade.h:14 +#: ../data/lxinput.ui.h:15 msgid "Mouse" msgstr "滑鼠" -#: ../data/lxinput.glade.h:15 +#: ../data/lxinput.ui.h:16 msgid "Repeat delay:" msgstr "重複延遲：" -#: ../data/lxinput.glade.h:16 +#: ../data/lxinput.ui.h:17 msgid "Repeat interval:" msgstr "重複間隔：" -#: ../data/lxinput.glade.h:17 +#: ../data/lxinput.ui.h:18 msgid "Sensitivity:" msgstr "敏感度：" -#: ../data/lxinput.glade.h:18 +#: ../data/lxinput.ui.h:19 msgid "Short" msgstr "短" -#: ../data/lxinput.glade.h:19 +#: ../data/lxinput.ui.h:20 msgid "Slow" msgstr "慢" -#: ../data/lxinput.glade.h:20 +#: ../data/lxinput.ui.h:21 msgid "Touch Pad" msgstr "觸控板" -#: ../data/lxinput.glade.h:21 +#: ../data/lxinput.ui.h:22 msgid "Type in the following box to test your keyboard settings" msgstr "在下列方塊中打字來測試你的鍵盤設定" diff -Nru lxinput-0.3.0/src/Makefile.am lxinput-0.3.1/src/Makefile.am --- lxinput-0.3.0/src/Makefile.am 2010-08-03 09:07:30.000000000 +0000 +++ lxinput-0.3.1/src/Makefile.am 2011-07-29 13:10:06.000000000 +0000 @@ -2,7 +2,8 @@ -DPACKAGE_DATA_DIR=\""$(datadir)"/lxinput\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ $(GTK_CFLAGS) \ - $(XLIB_CFLAGS) + $(XLIB_CFLAGS) \ + $(ADDITIONAL_FLAGS) \ -Werror-implicit-function-declaration bin_PROGRAMS = lxinput diff -Nru lxinput-0.3.0/src/Makefile.in lxinput-0.3.1/src/Makefile.in --- lxinput-0.3.0/src/Makefile.in 2010-08-03 09:05:47.000000000 +0000 +++ lxinput-0.3.1/src/Makefile.in 2011-07-29 13:11:48.000000000 +0000 @@ -61,18 +61,35 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles am__mv = mv -f +AM_V_lt = $(am__v_lt_$(V)) +am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +am__v_lt_0 = --silent COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_$(V)) +am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +am__v_CC_0 = @echo " CC " $@; +AM_V_at = $(am__v_at_$(V)) +am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +am__v_at_0 = @ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_$(V)) +am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +am__v_CCLD_0 = @echo " CCLD " $@; +AM_V_GEN = $(am__v_GEN_$(V)) +am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +am__v_GEN_0 = @echo " GEN " $@; SOURCES = $(lxinput_SOURCES) $(xml_purge_SOURCES) DIST_SOURCES = $(lxinput_SOURCES) $(xml_purge_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ADDITIONAL_FLAGS = @ADDITIONAL_FLAGS@ ALL_LINGUAS = @ALL_LINGUAS@ AMTAR = @AMTAR@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -131,6 +148,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ +PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ +PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ @@ -192,7 +211,9 @@ -DPACKAGE_DATA_DIR=\""$(datadir)"/lxinput\" \ -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ $(GTK_CFLAGS) \ - $(XLIB_CFLAGS) + $(XLIB_CFLAGS) \ + $(ADDITIONAL_FLAGS) \ + -Werror-implicit-function-declaration lxinput_SOURCES = \ lxinput.c @@ -281,10 +302,10 @@ -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) lxinput$(EXEEXT): $(lxinput_OBJECTS) $(lxinput_DEPENDENCIES) @rm -f lxinput$(EXEEXT) - $(LINK) $(lxinput_OBJECTS) $(lxinput_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(lxinput_OBJECTS) $(lxinput_LDADD) $(LIBS) xml-purge$(EXEEXT): $(xml_purge_OBJECTS) $(xml_purge_DEPENDENCIES) @rm -f xml-purge$(EXEEXT) - $(xml_purge_LINK) $(xml_purge_OBJECTS) $(xml_purge_LDADD) $(LIBS) + $(AM_V_CCLD)$(xml_purge_LINK) $(xml_purge_OBJECTS) $(xml_purge_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -296,29 +317,33 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xml_purge-xml-purge.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @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@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @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) '$<'` xml_purge-xml-purge.o: xml-purge.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.o -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xml-purge.c' object='xml_purge-xml-purge.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) $(xml_purge_CFLAGS) $(CFLAGS) -c -o xml_purge-xml-purge.o `test -f 'xml-purge.c' || echo '$(srcdir)/'`xml-purge.c xml_purge-xml-purge.obj: xml-purge.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.obj -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.obj `if test -f 'xml-purge.c'; then $(CYGPATH_W) 'xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/xml-purge.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xml_purge_CFLAGS) $(CFLAGS) -MT xml_purge-xml-purge.obj -MD -MP -MF $(DEPDIR)/xml_purge-xml-purge.Tpo -c -o xml_purge-xml-purge.obj `if test -f 'xml-purge.c'; then $(CYGPATH_W) 'xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/xml-purge.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xml_purge-xml-purge.Tpo $(DEPDIR)/xml_purge-xml-purge.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xml-purge.c' object='xml_purge-xml-purge.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) $(xml_purge_CFLAGS) $(CFLAGS) -c -o xml_purge-xml-purge.obj `if test -f 'xml-purge.c'; then $(CYGPATH_W) 'xml-purge.c'; else $(CYGPATH_W) '$(srcdir)/xml-purge.c'; fi` @@ -522,7 +547,6 @@ mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \ tags uninstall uninstall-am uninstall-binPROGRAMS - -Werror-implicit-function-declaration # 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. diff -Nru lxinput-0.3.0/src/lxinput.c lxinput-0.3.1/src/lxinput.c --- lxinput-0.3.0/src/lxinput.c 2010-08-02 11:36:28.000000000 +0000 +++ lxinput-0.3.1/src/lxinput.c 2011-07-29 13:10:06.000000000 +0000 @@ -42,6 +42,8 @@ static GtkRange *kb_delay; static GtkRange *kb_interval; static GtkToggleButton* kb_beep; +static GtkButton* kb_layout; +static GtkLabel* kb_layout_label; static int accel = 20, old_accel = 20; static int threshold = 10, old_threshold = 10; @@ -55,7 +57,7 @@ static void on_mouse_accel_changed(GtkRange* range, gpointer user_data) { accel = (int)gtk_range_get_value(range); - XChangePointerControl(GDK_DISPLAY(), True, False, + XChangePointerControl(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), True, False, accel, 10, 0); } @@ -63,7 +65,7 @@ { /* threshold = 110 - sensitivity. The lower the threshold, the higher the sensitivity */ threshold = 110 - (int)gtk_range_get_value(range); - XChangePointerControl(GDK_DISPLAY(), False, True, + XChangePointerControl(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), False, True, 0, 10, threshold); } @@ -71,7 +73,7 @@ { *val = (int)gtk_range_get_value(range); /* apply keyboard values */ - XkbSetAutoRepeatRate(GDK_DISPLAY(), XkbUseCoreKbd, delay, interval); + XkbSetAutoRepeatRate(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), XkbUseCoreKbd, delay, interval); } /* This function is taken from Gnome's control-center 2.6.0.3 (gnome-settings-mouse.c) and was modified*/ @@ -83,11 +85,11 @@ gint idx_1 = 0, idx_3 = 1; buttons = g_alloca (DEFAULT_PTR_MAP_SIZE); - n_buttons = XGetPointerMapping (GDK_DISPLAY(), buttons, DEFAULT_PTR_MAP_SIZE); + n_buttons = XGetPointerMapping (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), buttons, DEFAULT_PTR_MAP_SIZE); if (n_buttons > DEFAULT_PTR_MAP_SIZE) { buttons = g_alloca (n_buttons); - n_buttons = XGetPointerMapping (GDK_DISPLAY(), buttons, n_buttons); + n_buttons = XGetPointerMapping (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), buttons, n_buttons); } for (i = 0; i < n_buttons; i++) @@ -103,7 +105,7 @@ { buttons[idx_1] = ((n_buttons < 3) ? 2 : 3); buttons[idx_3] = 1; - XSetPointerMapping (GDK_DISPLAY(), buttons, n_buttons); + XSetPointerMapping (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), buttons, n_buttons); } } @@ -118,7 +120,7 @@ XKeyboardControl values; beep = gtk_toggle_button_get_active(btn); values.bell_percent = beep ? -1 : 0; - XChangeKeyboardControl(GDK_DISPLAY(), KBBellPercent, &values); + XChangeKeyboardControl(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), KBBellPercent, &values); } static gboolean on_change_val(GtkRange *range, GtkScrollType scroll, @@ -128,6 +130,40 @@ return FALSE; } +static const gchar* detect_keymap_program() +{ + const gchar *program = NULL; + + /*find if lxkeymap is in the path*/ + program = "lxkeymap"; + if (g_find_program_in_path(program)) + { + return program; + } + /*TODO + Add other keymap executable*/ + else + { + return NULL; + } + +} + +static void on_kb_layout_clicked(GtkButton *button, gpointer user_data) +{ + + int status; + char* output = NULL; + const gchar *program = detect_keymap_program(); + + if (program) + { + g_spawn_command_line_sync(program, &output, NULL, &status, NULL ); + } + +} + + static void set_range_stops(GtkRange* range, int interval ) { /* @@ -201,6 +237,20 @@ kb_delay = (GtkRange*)gtk_builder_get_object(builder,"kb_delay"); kb_interval = (GtkRange*)gtk_builder_get_object(builder,"kb_interval"); kb_beep = (GtkToggleButton*)gtk_builder_get_object(builder,"beep"); + kb_layout = (GtkButton*)gtk_builder_get_object(builder,"keyboard_layout"); + + const gchar *program = detect_keymap_program(); + if (program == NULL) + { + /* Hide the button if there is no program to set keymap */ + kb_layout_label = (GtkLabel*)gtk_builder_get_object(builder,"keyboard_layout_label"); + gtk_widget_set_visible(GTK_WIDGET(kb_layout_label), FALSE); + gtk_widget_set_visible(GTK_WIDGET(kb_layout), FALSE); + } + else + { + gtk_button_set_label(kb_layout, program); + } g_object_unref( builder ); @@ -229,6 +279,7 @@ set_range_stops(kb_interval, 10); g_signal_connect(kb_interval, "value-changed", G_CALLBACK(on_kb_range_changed), &kb_interval); g_signal_connect(kb_beep, "toggled", G_CALLBACK(on_kb_beep_toggle), NULL); + g_signal_connect(kb_layout, "clicked", G_CALLBACK(on_kb_layout_clicked), NULL); if( gtk_dialog_run( (GtkDialog*)dlg ) == GTK_RESPONSE_OK ) { @@ -265,14 +316,14 @@ delay = old_delay; interval = old_interval; beep = old_beep; - XkbSetAutoRepeatRate(GDK_DISPLAY(), XkbUseCoreKbd, delay, interval); + XkbSetAutoRepeatRate(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), XkbUseCoreKbd, delay, interval); /* FIXME: beep? */ /* mouse */ accel = old_accel; threshold = old_threshold; left_handed = old_left_handed; - XChangePointerControl(GDK_DISPLAY(), True, True, + XChangePointerControl(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), True, True, accel, 10, threshold); set_left_handed_mouse(); }